Merge branch 'dl/submodule-set-branch'
Docfix.
* dl/submodule-set-branch:
git-submodule.txt: fix AsciiDoc formatting error
diff --git a/.clang-format b/.clang-format
index de1c8b5..c592dda 100644
--- a/.clang-format
+++ b/.clang-format
@@ -148,8 +148,21 @@
Cpp11BracedListStyle: false
# A list of macros that should be interpreted as foreach loops instead of as
-# function calls.
-ForEachMacros: ['for_each_string_list_item']
+# function calls. Taken from:
+# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' \
+# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \
+# | sort | uniq
+ForEachMacros:
+ - 'for_each_abbrev'
+ - 'for_each_builtin'
+ - 'for_each_string_list_item'
+ - 'for_each_ut'
+ - 'for_each_wanted_builtin'
+ - 'list_for_each'
+ - 'list_for_each_dir'
+ - 'list_for_each_prev'
+ - 'list_for_each_prev_safe'
+ - 'list_for_each_safe'
# The maximum number of consecutive empty lines to keep.
MaxEmptyLinesToKeep: 1
diff --git a/.gitattributes b/.gitattributes
index 9fa72ad..b08a141 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
+*.bat eol=crlf
/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 64e605a..e7b4e2f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,7 +5,7 @@
a mailing list (git@vger.kernel.org) for code submissions, code
reviews, and bug reports.
-Nevertheless, you can use [submitGit](http://submitgit.herokuapp.com/) to
+Nevertheless, you can use [GitGitGadget](https://gitgitgadget.github.io/) to
conveniently send your Pull Requests commits to our mailing list.
Please read ["A note from the maintainer"](https://git.kernel.org/pub/scm/git/git.git/plain/MaintNotes?h=todo)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index adba13e..952c7c3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
-bug reports. Nevertheless, you can use submitGit to conveniently send your Pull
-Requests commits to our mailing list.
+bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
+to conveniently send your Pull Requests commits to our mailing list.
Please read the "guidelines for contributing" linked above!
diff --git a/.gitignore b/.gitignore
index 7374587..fc445ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@
/git-difftool
/git-difftool--helper
/git-describe
+/git-env--helper
/git-fast-export
/git-fast-import
/git-fetch
@@ -82,7 +83,7 @@
/git-init-db
/git-interpret-trailers
/git-instaweb
-/git-legacy-rebase
+/git-legacy-stash
/git-log
/git-ls-files
/git-ls-remote
@@ -122,9 +123,6 @@
/git-range-diff
/git-read-tree
/git-rebase
-/git-rebase--am
-/git-rebase--common
-/git-rebase--interactive
/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
@@ -135,7 +133,6 @@
/git-remote-ftps
/git-remote-fd
/git-remote-ext
-/git-remote-testgit
/git-remote-testpy
/git-remote-testsvn
/git-repack
@@ -143,6 +140,7 @@
/git-request-pull
/git-rerere
/git-reset
+/git-restore
/git-rev-list
/git-rev-parse
/git-revert
@@ -167,6 +165,7 @@
/git-submodule
/git-submodule--helper
/git-svn
+/git-switch
/git-symbolic-ref
/git-tag
/git-unpack-file
@@ -227,6 +226,14 @@
*.user
*.idb
*.pdb
-/Debug/
-/Release/
+*.ilk
+*.iobj
+*.ipdb
+*.dll
+.vs/
+Debug/
+Release/
+/UpgradeLog*.htm
+/git.VC.VC.opendb
+/git.VC.db
*.dSYM
diff --git a/.mailmap b/.mailmap
index 247a3de..14fa041 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@
Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
+Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com>
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
Amos Waterland <apw@debian.org> <apw@us.ibm.com>
@@ -40,6 +41,8 @@
Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
+Clemens Buchacher <drizzd@gmx.net> <drizzd@aon.at>
+Clemens Buchacher <drizzd@gmx.net> <clemens.buchacher@intel.com>
Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
Dan Johnson <computerdruid@gmail.com>
Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
@@ -208,6 +211,7 @@
Petr Baudis <pasky@ucw.cz> <xpasky@machine>
Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
+Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk>
Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
diff --git a/.travis.yml b/.travis.yml
index 36cbdea..fc5730b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,16 +21,10 @@
compiler:
addons:
before_install:
- - env: jobname=Windows
+ - env: jobname=linux-gcc-4.8
os: linux
+ dist: trusty
compiler:
- addons:
- before_install:
- script:
- - >
- test "$TRAVIS_REPO_SLUG" != "git/git" ||
- ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
- after_failure:
- env: jobname=Linux32
os: linux
compiler:
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 3ef54e0..9022d48 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -13,3 +13,5 @@
manpage-base-url.xsl
SubmittingPatches.txt
tmp-doc-diff/
+GIT-ASCIIDOCFLAGS
+/GIT-EXCLUDED-PROGRAMS
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 8579530..f45db5b 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -195,10 +195,30 @@
by e.g. "echo DEVELOPER=1 >>config.mak".
- We try to support a wide range of C compilers to compile Git with,
- including old ones. That means that you should not use C99
- initializers, even if a lot of compilers grok it.
+ including old ones. You should not use features from newer C
+ standard, even if your compiler groks them.
- - Variables have to be declared at the beginning of the block.
+ There are a few exceptions to this guideline:
+
+ . since early 2012 with e1327023ea, we have been using an enum
+ definition whose last element is followed by a comma. This, like
+ an array initializer that ends with a trailing comma, can be used
+ to reduce the patch noise when adding a new identifer at the end.
+
+ . since mid 2017 with cbc0f81d, we have been using designated
+ initializers for struct (e.g. "struct t v = { .val = 'a' };").
+
+ . since mid 2017 with 512f41cf, we have been using designated
+ initializers for array (e.g. "int array[10] = { [5] = 2 }").
+
+ These used to be forbidden, but we have not heard any breakage
+ report, and they are assumed to be safe.
+
+ - Variables have to be declared at the beginning of the block, before
+ the first statement (i.e. -Wdeclaration-after-statement).
+
+ - Declaring a variable in the for loop "for (int i = 0; i < 10; i++)"
+ is still not allowed in this codebase.
- NULL pointers shall be written as NULL, not as 0.
@@ -412,6 +432,12 @@
must be declared with "extern" in header files. However, function
declarations should not use "extern", as that is already the default.
+ - You can launch gdb around your program using the shorthand GIT_DEBUGGER.
+ Run `GIT_DEBUGGER=1 ./bin-wrappers/git foo` to simply use gdb as is, or
+ run `GIT_DEBUGGER="<debugger> <debugger-args>" ./bin-wrappers/git foo` to
+ use your own debugger and arguments. Example: `GIT_DEBUGGER="ddd --gdb"
+ ./bin-wrappers/git log` (See `wrap-for-bin.sh`.)
+
For Perl programs:
- Most of the C guidelines above apply.
@@ -580,11 +606,14 @@
or commands:
Literal examples (e.g. use of command-line options, command names,
- branch names, configuration and environment variables) must be
- typeset in monospace (i.e. wrapped with backticks):
+ branch names, URLs, pathnames (files and directories), configuration and
+ environment variables) must be typeset in monospace (i.e. wrapped with
+ backticks):
`--pretty=oneline`
`git rev-list`
`remote.pushDefault`
+ `http://git.example.com`
+ `.git/config`
`GIT_DIR`
`HEAD`
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 26a2342..06d85ad 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -7,12 +7,14 @@
SP_ARTICLES =
OBSOLETE_HTML =
+-include GIT-EXCLUDED-PROGRAMS
+
MAN1_TXT += $(filter-out \
+ $(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard git-*.txt))
MAN1_TXT += git.txt
MAN1_TXT += gitk.txt
-MAN1_TXT += gitremote-helpers.txt
MAN1_TXT += gitweb.txt
MAN5_TXT += gitattributes.txt
@@ -30,6 +32,7 @@
MAN7_TXT += giteveryday.txt
MAN7_TXT += gitglossary.txt
MAN7_TXT += gitnamespaces.txt
+MAN7_TXT += gitremote-helpers.txt
MAN7_TXT += gitrevisions.txt
MAN7_TXT += gitsubmodules.txt
MAN7_TXT += gittutorial-2.txt
@@ -73,6 +76,7 @@
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)
+TECH_DOCS += MyFirstContribution
TECH_DOCS += SubmittingPatches
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
@@ -119,7 +123,8 @@
ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_CONF = -f asciidoc.conf
ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
- -agit_version=$(GIT_VERSION)
+ -amanversion=$(GIT_VERSION) \
+ -amanmanual='Git Manual' -amansource='Git'
TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
MANPAGE_XSL = manpage-normal.xsl
@@ -193,11 +198,13 @@
ASCIIDOC = asciidoctor
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
-ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_DOCBOOK = docbook5
ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
DBLATEX_COMMON =
+XMLTO_EXTRA += --skip-validation
+XMLTO_EXTRA += -x manpage.xsl
endif
SHELL_PATH ?= $(SHELL)
@@ -331,6 +338,15 @@
show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
date >$@
+TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))
+
+GIT-ASCIIDOCFLAGS: FORCE
+ @FLAGS='$(TRACK_ASCIIDOCFLAGS)'; \
+ if test x"$$FLAGS" != x"`cat GIT-ASCIIDOCFLAGS 2>/dev/null`" ; then \
+ echo >&2 " * new asciidoc flags"; \
+ echo "$$FLAGS" >GIT-ASCIIDOCFLAGS; \
+ fi
+
clean:
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
@@ -340,13 +356,14 @@
$(RM) SubmittingPatches.txt
$(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) manpage-base-url.xsl
+ $(RM) GIT-ASCIIDOCFLAGS
-$(MAN_HTML): %.html : %.txt asciidoc.conf
+$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_HTML) -d manpage -o $@+ $< && \
mv $@+ $@
-$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
+$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_HTML) -o $@+ $< && \
mv $@+ $@
@@ -354,16 +371,16 @@
manpage-base-url.xsl: manpage-base-url.xsl.in
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
-%.1 %.5 %.7 : %.xml manpage-base-url.xsl
+%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
$(QUIET_XMLTO)$(RM) $@ && \
$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-%.xml : %.txt asciidoc.conf
+%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d manpage -o $@+ $< && \
mv $@+ $@
-user-manual.xml: user-manual.txt user-manual.conf
+user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d book -o $@+ $< && \
mv $@+ $@
@@ -373,7 +390,8 @@
$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh
technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
+$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \
+ asciidoc.conf GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
SubmittingPatches.txt: SubmittingPatches
@@ -430,7 +448,7 @@
WEBDOC_DEST = /pub/software/scm/git/docs
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
sed -e '1,/^$$/d' $< | \
$(TXT_TO_HTML) - >$@+ && \
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
new file mode 100644
index 0000000..f867037
--- /dev/null
+++ b/Documentation/MyFirstContribution.txt
@@ -0,0 +1,1134 @@
+My First Contribution to the Git Project
+========================================
+:sectanchors:
+
+[[summary]]
+== Summary
+
+This is a tutorial demonstrating the end-to-end workflow of creating a change to
+the Git tree, sending it for review, and making changes based on comments.
+
+[[prerequisites]]
+=== Prerequisites
+
+This tutorial assumes you're already fairly familiar with using Git to manage
+source code. The Git workflow steps will largely remain unexplained.
+
+[[related-reading]]
+=== Related Reading
+
+This tutorial aims to summarize the following documents, but the reader may find
+useful additional context:
+
+- `Documentation/SubmittingPatches`
+- `Documentation/howto/new-command.txt`
+
+[[getting-started]]
+== Getting Started
+
+[[cloning]]
+=== Clone the Git Repository
+
+Git is mirrored in a number of locations. Clone the repository from one of them;
+https://git-scm.com/downloads suggests one of the best places to clone from is
+the mirror on GitHub.
+
+----
+$ git clone https://github.com/git/git git
+$ cd git
+----
+
+[[identify-problem]]
+=== Identify Problem to Solve
+
+////
+Use + to indicate fixed-width here; couldn't get ` to work nicely with the
+quotes around "Pony Saying 'Um, Hello'".
+////
+In this tutorial, we will add a new command, +git psuh+, short for ``Pony Saying
+`Um, Hello''' - a feature which has gone unimplemented despite a high frequency
+of invocation during users' typical daily workflow.
+
+(We've seen some other effort in this space with the implementation of popular
+commands such as `sl`.)
+
+[[setup-workspace]]
+=== Set Up Your Workspace
+
+Let's start by making a development branch to work on our changes. Per
+`Documentation/SubmittingPatches`, since a brand new command is a new feature,
+it's fine to base your work on `master`. However, in the future for bugfixes,
+etc., you should check that document and base it on the appropriate branch.
+
+For the purposes of this document, we will base all our work on the `master`
+branch of the upstream project. Create the `psuh` branch you will use for
+development like so:
+
+----
+$ git checkout -b psuh origin/master
+----
+
+We'll make a number of commits here in order to demonstrate how to send a topic
+with multiple patches up for review simultaneously.
+
+[[code-it-up]]
+== Code It Up!
+
+NOTE: A reference implementation can be found at
+https://github.com/nasamuffin/git/tree/psuh.
+
+[[add-new-command]]
+=== Adding a New Command
+
+Lots of the subcommands are written as builtins, which means they are
+implemented in C and compiled into the main `git` executable. Implementing the
+very simple `psuh` command as a built-in will demonstrate the structure of the
+codebase, the internal API, and the process of working together as a contributor
+with the reviewers and maintainer to integrate this change into the system.
+
+Built-in subcommands are typically implemented in a function named "cmd_"
+followed by the name of the subcommand, in a source file named after the
+subcommand and contained within `builtin/`. So it makes sense to implement your
+command in `builtin/psuh.c`. Create that file, and within it, write the entry
+point for your command in a function matching the style and signature:
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix)
+----
+
+We'll also need to add the declaration of psuh; open up `builtin.h`, find the
+declaration for `cmd_push`, and add a new line for `psuh` immediately before it,
+in order to keep the declarations sorted:
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix);
+----
+
+Be sure to `#include "builtin.h"` in your `psuh.c`.
+
+Go ahead and add some throwaway printf to that function. This is a decent
+starting point as we can now add build rules and register the command.
+
+NOTE: Your throwaway text, as well as much of the text you will be adding over
+the course of this tutorial, is user-facing. That means it needs to be
+localizable. Take a look at `po/README` under "Marking strings for translation".
+Throughout the tutorial, we will mark strings for translation as necessary; you
+should also do so when writing your user-facing commands in the future.
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix)
+{
+ printf(_("Pony saying hello goes here.\n"));
+ return 0;
+}
+----
+
+Let's try to build it. Open `Makefile`, find where `builtin/push.o` is added
+to `BUILTIN_OBJS`, and add `builtin/psuh.o` in the same way next to it in
+alphabetical order. Once you've done so, move to the top-level directory and
+build simply with `make`. Also add the `DEVELOPER=1` variable to turn on
+some additional warnings:
+
+----
+$ echo DEVELOPER=1 >config.mak
+$ make
+----
+
+NOTE: When you are developing the Git project, it's preferred that you use the
+`DEVELOPER` flag; if there's some reason it doesn't work for you, you can turn
+it off, but it's a good idea to mention the problem to the mailing list.
+
+NOTE: The Git build is parallelizable. `-j#` is not included above but you can
+use it as you prefer, here and elsewhere.
+
+Great, now your new command builds happily on its own. But nobody invokes it.
+Let's change that.
+
+The list of commands lives in `git.c`. We can register a new command by adding
+a `cmd_struct` to the `commands[]` array. `struct cmd_struct` takes a string
+with the command name, a function pointer to the command implementation, and a
+setup option flag. For now, let's keep mimicking `push`. Find the line where
+`cmd_push` is registered, copy it, and modify it for `cmd_psuh`, placing the new
+line in alphabetical order.
+
+The options are documented in `builtin.h` under "Adding a new built-in." Since
+we hope to print some data about the user's current workspace context later,
+we need a Git directory, so choose `RUN_SETUP` as your only option.
+
+Go ahead and build again. You should see a clean build, so let's kick the tires
+and see if it works. There's a binary you can use to test with in the
+`bin-wrappers` directory.
+
+----
+$ ./bin-wrappers/git psuh
+----
+
+Check it out! You've got a command! Nice work! Let's commit this.
+
+`git status` reveals modified `Makefile`, `builtin.h`, and `git.c` as well as
+untracked `builtin/psuh.c` and `git-psuh`. First, let's take care of the binary,
+which should be ignored. Open `.gitignore` in your editor, find `/git-push`, and
+add an entry for your new command in alphabetical order:
+
+----
+...
+/git-prune-packed
+/git-psuh
+/git-pull
+/git-push
+/git-quiltimport
+/git-range-diff
+...
+----
+
+Checking `git status` again should show that `git-psuh` has been removed from
+the untracked list and `.gitignore` has been added to the modified list. Now we
+can stage and commit:
+
+----
+$ git add Makefile builtin.h builtin/psuh.c git.c .gitignore
+$ git commit -s
+----
+
+You will be presented with your editor in order to write a commit message. Start
+the commit with a 50-column or less subject line, including the name of the
+component you're working on, followed by a blank line (always required) and then
+the body of your commit message, which should provide the bulk of the context.
+Remember to be explicit and provide the "Why" of your change, especially if it
+couldn't easily be understood from your diff. When editing your commit message,
+don't remove the Signed-off-by line which was added by `-s` above.
+
+----
+psuh: add a built-in by popular demand
+
+Internal metrics indicate this is a command many users expect to be
+present. So here's an implementation to help drive customer
+satisfaction and engagement: a pony which doubtfully greets the user,
+or, a Pony Saying "Um, Hello" (PSUH).
+
+This commit message is intentionally formatted to 72 columns per line,
+starts with a single line as "commit message subject" that is written as
+if to command the codebase to do something (add this, teach a command
+that). The body of the message is designed to add information about the
+commit that is not readily deduced from reading the associated diff,
+such as answering the question "why?".
+
+Signed-off-by: A U Thor <author@example.com>
+----
+
+Go ahead and inspect your new commit with `git show`. "psuh:" indicates you
+have modified mainly the `psuh` command. The subject line gives readers an idea
+of what you've changed. The sign-off line (`-s`) indicates that you agree to
+the Developer's Certificate of Origin 1.1 (see the
+`Documentation/SubmittingPatches` +++[[dco]]+++ header).
+
+For the remainder of the tutorial, the subject line only will be listed for the
+sake of brevity. However, fully-fleshed example commit messages are available
+on the reference implementation linked at the top of this document.
+
+[[implementation]]
+=== Implementation
+
+It's probably useful to do at least something besides printing out a string.
+Let's start by having a look at everything we get.
+
+Modify your `cmd_psuh` implementation to dump the args you're passed, keeping
+existing `printf()` calls in place:
+
+----
+ int i;
+
+ ...
+
+ printf(Q_("Your args (there is %d):\n",
+ "Your args (there are %d):\n",
+ argc),
+ argc);
+ for (i = 0; i < argc; i++)
+ printf("%d: %s\n", i, argv[i]);
+
+ printf(_("Your current working directory:\n<top-level>%s%s\n"),
+ prefix ? "/" : "", prefix ? prefix : "");
+
+----
+
+Build and try it. As you may expect, there's pretty much just whatever we give
+on the command line, including the name of our command. (If `prefix` is empty
+for you, try `cd Documentation/ && ../bin-wrappers/git psuh`). That's not so
+helpful. So what other context can we get?
+
+Add a line to `#include "config.h"`. Then, add the following bits to the
+function body:
+
+----
+ const char *cfg_name;
+
+...
+
+ git_config(git_default_config, NULL);
+ if (git_config_get_string_const("user.name", &cfg_name) > 0)
+ printf(_("No name is found in config\n"));
+ else
+ printf(_("Your name: %s\n"), cfg_name);
+----
+
+`git_config()` will grab the configuration from config files known to Git and
+apply standard precedence rules. `git_config_get_string_const()` will look up
+a specific key ("user.name") and give you the value. There are a number of
+single-key lookup functions like this one; you can see them all (and more info
+about how to use `git_config()`) in `Documentation/technical/api-config.txt`.
+
+You should see that the name printed matches the one you see when you run:
+
+----
+$ git config --get user.name
+----
+
+Great! Now we know how to check for values in the Git config. Let's commit this
+too, so we don't lose our progress.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: show parameters & config opts"
+----
+
+NOTE: Again, the above is for sake of brevity in this tutorial. In a real change
+you should not use `-m` but instead use the editor to write a meaningful
+message.
+
+Still, it'd be nice to know what the user's working context is like. Let's see
+if we can print the name of the user's current branch. We can mimic the
+`git status` implementation; the printer is located in `wt-status.c` and we can
+see that the branch is held in a `struct wt_status`.
+
+`wt_status_print()` gets invoked by `cmd_status()` in `builtin/commit.c`.
+Looking at that implementation we see the status config being populated like so:
+
+----
+status_init_config(&s, git_status_config);
+----
+
+But as we drill down, we can find that `status_init_config()` wraps a call
+to `git_config()`. Let's modify the code we wrote in the previous commit.
+
+Be sure to include the header to allow you to use `struct wt_status`:
+----
+#include "wt-status.h"
+----
+
+Then modify your `cmd_psuh` implementation to declare your `struct wt_status`,
+prepare it, and print its contents:
+
+----
+ struct wt_status status;
+
+...
+
+ wt_status_prepare(the_repository, &status);
+ git_config(git_default_config, &status);
+
+...
+
+ printf(_("Your current branch: %s\n"), status.branch);
+----
+
+Run it again. Check it out - here's the (verbose) name of your current branch!
+
+Let's commit this as well.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: print the current branch"
+----
+
+Now let's see if we can get some info about a specific commit.
+
+Luckily, there are some helpers for us here. `commit.h` has a function called
+`lookup_commit_reference_by_name` to which we can simply provide a hardcoded
+string; `pretty.h` has an extremely handy `pp_commit_easy()` call which doesn't
+require a full format object to be passed.
+
+Add the following includes:
+
+----
+#include "commit.h"
+#include "pretty.h"
+----
+
+Then, add the following lines within your implementation of `cmd_psuh()` near
+the declarations and the logic, respectively.
+
+----
+ struct commit *c = NULL;
+ struct strbuf commitline = STRBUF_INIT;
+
+...
+
+ c = lookup_commit_reference_by_name("origin/master");
+
+ if (c != NULL) {
+ pp_commit_easy(CMIT_FMT_ONELINE, c, &commitline);
+ printf(_("Current commit: %s\n"), commitline.buf);
+ }
+----
+
+The `struct strbuf` provides some safety belts to your basic `char*`, one of
+which is a length member to prevent buffer overruns. It needs to be initialized
+nicely with `STRBUF_INIT`. Keep it in mind when you need to pass around `char*`.
+
+`lookup_commit_reference_by_name` resolves the name you pass it, so you can play
+with the value there and see what kind of things you can come up with.
+
+`pp_commit_easy` is a convenience wrapper in `pretty.h` that takes a single
+format enum shorthand, rather than an entire format struct. It then
+pretty-prints the commit according to that shorthand. These are similar to the
+formats available with `--pretty=FOO` in many Git commands.
+
+Build it and run, and if you're using the same name in the example, you should
+see the subject line of the most recent commit in `origin/master` that you know
+about. Neat! Let's commit that as well.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: display the top of origin/master"
+----
+
+[[add-documentation]]
+=== Adding Documentation
+
+Awesome! You've got a fantastic new command that you're ready to share with the
+community. But hang on just a minute - this isn't very user-friendly. Run the
+following:
+
+----
+$ ./bin-wrappers/git help psuh
+----
+
+Your new command is undocumented! Let's fix that.
+
+Take a look at `Documentation/git-*.txt`. These are the manpages for the
+subcommands that Git knows about. You can open these up and take a look to get
+acquainted with the format, but then go ahead and make a new file
+`Documentation/git-psuh.txt`. Like with most of the documentation in the Git
+project, help pages are written with AsciiDoc (see CodingGuidelines, "Writing
+Documentation" section). Use the following template to fill out your own
+manpage:
+
+// Surprisingly difficult to embed AsciiDoc source within AsciiDoc.
+[listing]
+....
+git-psuh(1)
+===========
+
+NAME
+----
+git-psuh - Delight users' typo with a shy horse
+
+
+SYNOPSIS
+--------
+[verse]
+'git-psuh [<arg>...]'
+
+DESCRIPTION
+-----------
+...
+
+OPTIONS[[OPTIONS]]
+------------------
+...
+
+OUTPUT
+------
+...
+
+GIT
+---
+Part of the linkgit:git[1] suite
+....
+
+The most important pieces of this to note are the file header, underlined by =,
+the NAME section, and the SYNOPSIS, which would normally contain the grammar if
+your command took arguments. Try to use well-established manpage headers so your
+documentation is consistent with other Git and UNIX manpages; this makes life
+easier for your user, who can skip to the section they know contains the
+information they need.
+
+Now that you've written your manpage, you'll need to build it explicitly. We
+convert your AsciiDoc to troff which is man-readable like so:
+
+----
+$ make all doc
+$ man Documentation/git-psuh.1
+----
+
+or
+
+----
+$ make -C Documentation/ git-psuh.1
+$ man Documentation/git-psuh.1
+----
+
+NOTE: You may need to install the package `asciidoc` to get this to work.
+
+While this isn't as satisfying as running through `git help`, you can at least
+check that your help page looks right.
+
+You can also check that the documentation coverage is good (that is, the project
+sees that your command has been implemented as well as documented) by running
+`make check-docs` from the top-level.
+
+Go ahead and commit your new documentation change.
+
+[[add-usage]]
+=== Adding Usage Text
+
+Try and run `./bin-wrappers/git psuh -h`. Your command should crash at the end.
+That's because `-h` is a special case which your command should handle by
+printing usage.
+
+Take a look at `Documentation/technical/api-parse-options.txt`. This is a handy
+tool for pulling out options you need to be able to handle, and it takes a
+usage string.
+
+In order to use it, we'll need to prepare a NULL-terminated array of usage
+strings and a `builtin_psuh_options` array.
+
+Add a line to `#include "parse-options.h"`.
+
+At global scope, add your array of usage strings:
+
+----
+static const char * const psuh_usage[] = {
+ N_("git psuh [<arg>...]"),
+ NULL,
+};
+----
+
+Then, within your `cmd_psuh()` implementation, we can declare and populate our
+`option` struct. Ours is pretty boring but you can add more to it if you want to
+explore `parse_options()` in more detail:
+
+----
+ struct option options[] = {
+ OPT_END()
+ };
+----
+
+Finally, before you print your args and prefix, add the call to
+`parse-options()`:
+
+----
+ argc = parse_options(argc, argv, prefix, options, psuh_usage, 0);
+----
+
+This call will modify your `argv` parameter. It will strip the options you
+specified in `options` from `argv` and the locations pointed to from `options`
+entries will be updated. Be sure to replace your `argc` with the result from
+`parse_options()`, or you will be confused if you try to parse `argv` later.
+
+It's worth noting the special argument `--`. As you may be aware, many Unix
+commands use `--` to indicate "end of named parameters" - all parameters after
+the `--` are interpreted merely as positional arguments. (This can be handy if
+you want to pass as a parameter something which would usually be interpreted as
+a flag.) `parse_options()` will terminate parsing when it reaches `--` and give
+you the rest of the options afterwards, untouched.
+
+Build again. Now, when you run with `-h`, you should see your usage printed and
+your command terminated before anything else interesting happens. Great!
+
+Go ahead and commit this one, too.
+
+[[testing]]
+== Testing
+
+It's important to test your code - even for a little toy command like this one.
+Moreover, your patch won't be accepted into the Git tree without tests. Your
+tests should:
+
+* Illustrate the current behavior of the feature
+* Prove the current behavior matches the expected behavior
+* Ensure the externally-visible behavior isn't broken in later changes
+
+So let's write some tests.
+
+Related reading: `t/README`
+
+[[overview-test-structure]]
+=== Overview of Testing Structure
+
+The tests in Git live in `t/` and are named with a 4-digit decimal number using
+the schema shown in the Naming Tests section of `t/README`.
+
+[[write-new-test]]
+=== Writing Your Test
+
+Since this a toy command, let's go ahead and name the test with t9999. However,
+as many of the family/subcmd combinations are full, best practice seems to be
+to find a command close enough to the one you've added and share its naming
+space.
+
+Create a new file `t/t9999-psuh-tutorial.sh`. Begin with the header as so (see
+"Writing Tests" and "Source 'test-lib.sh'" in `t/README`):
+
+----
+#!/bin/sh
+
+test_description='git-psuh test
+
+This test runs git-psuh and makes sure it does not crash.'
+
+. ./test-lib.sh
+----
+
+Tests are framed inside of a `test_expect_success` in order to output TAP
+formatted results. Let's make sure that `git psuh` doesn't exit poorly and does
+mention the right animal somewhere:
+
+----
+test_expect_success 'runs correctly with no args and good output' '
+ git psuh >actual &&
+ test_i18ngrep Pony actual
+'
+----
+
+Indicate that you've run everything you wanted by adding the following at the
+bottom of your script:
+
+----
+test_done
+----
+
+Make sure you mark your test script executable:
+
+----
+$ chmod +x t/t9999-psuh-tutorial.sh
+----
+
+You can get an idea of whether you created your new test script successfully
+by running `make -C t test-lint`, which will check for things like test number
+uniqueness, executable bit, and so on.
+
+[[local-test]]
+=== Running Locally
+
+Let's try and run locally:
+
+----
+$ make
+$ cd t/ && prove t9999-psuh-tutorial.sh
+----
+
+You can run the full test suite and ensure `git-psuh` didn't break anything:
+
+----
+$ cd t/
+$ prove -j$(nproc) --shuffle t[0-9]*.sh
+----
+
+NOTE: You can also do this with `make test` or use any testing harness which can
+speak TAP. `prove` can run concurrently. `shuffle` randomizes the order the
+tests are run in, which makes them resilient against unwanted inter-test
+dependencies. `prove` also makes the output nicer.
+
+Go ahead and commit this change, as well.
+
+[[ready-to-share]]
+== Getting Ready to Share
+
+You may have noticed already that the Git project performs its code reviews via
+emailed patches, which are then applied by the maintainer when they are ready
+and approved by the community. The Git project does not accept patches from
+pull requests, and the patches emailed for review need to be formatted a
+specific way. At this point the tutorial diverges, in order to demonstrate two
+different methods of formatting your patchset and getting it reviewed.
+
+The first method to be covered is GitGitGadget, which is useful for those
+already familiar with GitHub's common pull request workflow. This method
+requires a GitHub account.
+
+The second method to be covered is `git send-email`, which can give slightly
+more fine-grained control over the emails to be sent. This method requires some
+setup which can change depending on your system and will not be covered in this
+tutorial.
+
+Regardless of which method you choose, your engagement with reviewers will be
+the same; the review process will be covered after the sections on GitGitGadget
+and `git send-email`.
+
+[[howto-ggg]]
+== Sending Patches via GitGitGadget
+
+One option for sending patches is to follow a typical pull request workflow and
+send your patches out via GitGitGadget. GitGitGadget is a tool created by
+Johannes Schindelin to make life as a Git contributor easier for those used to
+the GitHub PR workflow. It allows contributors to open pull requests against its
+mirror of the Git project, and does some magic to turn the PR into a set of
+emails and send them out for you. It also runs the Git continuous integration
+suite for you. It's documented at http://gitgitgadget.github.io.
+
+[[create-fork]]
+=== Forking `git/git` on GitHub
+
+Before you can send your patch off to be reviewed using GitGitGadget, you will
+need to fork the Git project and upload your changes. First thing - make sure
+you have a GitHub account.
+
+Head to the https://github.com/git/git[GitHub mirror] and look for the Fork
+button. Place your fork wherever you deem appropriate and create it.
+
+[[upload-to-fork]]
+=== Uploading to Your Own Fork
+
+To upload your branch to your own fork, you'll need to add the new fork as a
+remote. You can use `git remote -v` to show the remotes you have added already.
+From your new fork's page on GitHub, you can press "Clone or download" to get
+the URL; then you need to run the following to add, replacing your own URL and
+remote name for the examples provided:
+
+----
+$ git remote add remotename git@github.com:remotename/git.git
+----
+
+or to use the HTTPS URL:
+
+----
+$ git remote add remotename https://github.com/remotename/git/.git
+----
+
+Run `git remote -v` again and you should see the new remote showing up.
+`git fetch remotename` (with the real name of your remote replaced) in order to
+get ready to push.
+
+Next, double-check that you've been doing all your development in a new branch
+by running `git branch`. If you didn't, now is a good time to move your new
+commits to their own branch.
+
+As mentioned briefly at the beginning of this document, we are basing our work
+on `master`, so go ahead and update as shown below, or using your preferred
+workflow.
+
+----
+$ git checkout master
+$ git pull -r
+$ git rebase master psuh
+----
+
+Finally, you're ready to push your new topic branch! (Due to our branch and
+command name choices, be careful when you type the command below.)
+
+----
+$ git push remotename psuh
+----
+
+Now you should be able to go and check out your newly created branch on GitHub.
+
+[[send-pr-ggg]]
+=== Sending a PR to GitGitGadget
+
+In order to have your code tested and formatted for review, you need to start by
+opening a Pull Request against `gitgitgadget/git`. Head to
+https://github.com/gitgitgadget/git and open a PR either with the "New pull
+request" button or the convenient "Compare & pull request" button that may
+appear with the name of your newly pushed branch.
+
+Review the PR's title and description, as it's used by GitGitGadget as the cover
+letter for your change. When you're happy, submit your pull request.
+
+[[run-ci-ggg]]
+=== Running CI and Getting Ready to Send
+
+If it's your first time using GitGitGadget (which is likely, as you're using
+this tutorial) then someone will need to give you permission to use the tool.
+As mentioned in the GitGitGadget documentation, you just need someone who
+already uses it to comment on your PR with `/allow <username>`. GitGitGadget
+will automatically run your PRs through the CI even without the permission given
+but you will not be able to `/submit` your changes until someone allows you to
+use the tool.
+
+If the CI fails, you can update your changes with `git rebase -i` and push your
+branch again:
+
+----
+$ git push -f remotename psuh
+----
+
+In fact, you should continue to make changes this way up until the point when
+your patch is accepted into `next`.
+
+////
+TODO https://github.com/gitgitgadget/gitgitgadget/issues/83
+It'd be nice to be able to verify that the patch looks good before sending it
+to everyone on Git mailing list.
+[[check-work-ggg]]
+=== Check Your Work
+////
+
+[[send-mail-ggg]]
+=== Sending Your Patches
+
+Now that your CI is passing and someone has granted you permission to use
+GitGitGadget with the `/allow` command, sending out for review is as simple as
+commenting on your PR with `/submit`.
+
+[[responding-ggg]]
+=== Updating With Comments
+
+Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
+reply to review comments you will receive on the mailing list.
+
+Once you have your branch again in the shape you want following all review
+comments, you can submit again:
+
+----
+$ git push -f remotename psuh
+----
+
+Next, go look at your pull request against GitGitGadget; you should see the CI
+has been kicked off again. Now while the CI is running is a good time for you
+to modify your description at the top of the pull request thread; it will be
+used again as the cover letter. You should use this space to describe what
+has changed since your previous version, so that your reviewers have some idea
+of what they're looking at. When the CI is done running, you can comment once
+more with `/submit` - GitGitGadget will automatically add a v2 mark to your
+changes.
+
+[[howto-git-send-email]]
+== Sending Patches with `git send-email`
+
+If you don't want to use GitGitGadget, you can also use Git itself to mail your
+patches. Some benefits of using Git this way include finer grained control of
+subject line (for example, being able to use the tag [RFC PATCH] in the subject)
+and being able to send a ``dry run'' mail to yourself to ensure it all looks
+good before going out to the list.
+
+[[setup-git-send-email]]
+=== Prerequisite: Setting Up `git send-email`
+
+Configuration for `send-email` can vary based on your operating system and email
+provider, and so will not be covered in this tutorial, beyond stating that in
+many distributions of Linux, `git-send-email` is not packaged alongside the
+typical `git` install. You may need to install this additional package; there
+are a number of resources online to help you do so. You will also need to
+determine the right way to configure it to use your SMTP server; again, as this
+configuration can change significantly based on your system and email setup, it
+is out of scope for the context of this tutorial.
+
+[[format-patch]]
+=== Preparing Initial Patchset
+
+Sending emails with Git is a two-part process; before you can prepare the emails
+themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
+
+----
+$ git format-patch --cover-letter -o psuh/ master..psuh
+----
+
+The `--cover-letter` parameter tells `format-patch` to create a cover letter
+template for you. You will need to fill in the template before you're ready
+to send - but for now, the template will be next to your other patches.
+
+The `-o psuh/` parameter tells `format-patch` to place the patch files into a
+directory. This is useful because `git send-email` can take a directory and
+send out all the patches from there.
+
+`master..psuh` tells `format-patch` to generate patches for the difference
+between `master` and `psuh`. It will make one patch file per commit. After you
+run, you can go have a look at each of the patches with your favorite text
+editor and make sure everything looks alright; however, it's not recommended to
+make code fixups via the patch file. It's a better idea to make the change the
+normal way using `git rebase -i` or by adding a new commit than by modifying a
+patch.
+
+NOTE: Optionally, you can also use the `--rfc` flag to prefix your patch subject
+with ``[RFC PATCH]'' instead of ``[PATCH]''. RFC stands for ``request for
+comments'' and indicates that while your code isn't quite ready for submission,
+you'd like to begin the code review process. This can also be used when your
+patch is a proposal, but you aren't sure whether the community wants to solve
+the problem with that approach or not - to conduct a sort of design review. You
+may also see on the list patches marked ``WIP'' - this means they are incomplete
+but want reviewers to look at what they have so far. You can add this flag with
+`--subject-prefix=WIP`.
+
+Check and make sure that your patches and cover letter template exist in the
+directory you specified - you're nearly ready to send out your review!
+
+[[cover-letter]]
+=== Preparing Email
+
+In addition to an email per patch, the Git community also expects your patches
+to come with a cover letter, typically with a subject line [PATCH 0/x] (where
+x is the number of patches you're sending). Since you invoked `format-patch`
+with `--cover-letter`, you've already got a template ready. Open it up in your
+favorite editor.
+
+You should see a number of headers present already. Check that your `From:`
+header is correct. Then modify your `Subject:` to something which succinctly
+covers the purpose of your entire topic branch, for example:
+
+----
+Subject: [PATCH 0/7] adding the 'psuh' command
+----
+
+Make sure you retain the ``[PATCH 0/X]'' part; that's what indicates to the Git
+community that this email is the beginning of a review, and many reviewers
+filter their email for this type of flag.
+
+You'll need to add some extra parameters when you invoke `git send-email` to add
+the cover letter.
+
+Next you'll have to fill out the body of your cover letter. This is an important
+component of change submission as it explains to the community from a high level
+what you're trying to do, and why, in a way that's more apparent than just
+looking at your diff. Be sure to explain anything your diff doesn't make clear
+on its own.
+
+Here's an example body for `psuh`:
+
+----
+Our internal metrics indicate widespread interest in the command
+git-psuh - that is, many users are trying to use it, but finding it is
+unavailable, using some unknown workaround instead.
+
+The following handful of patches add the psuh command and implement some
+handy features on top of it.
+
+This patchset is part of the MyFirstContribution tutorial and should not
+be merged.
+----
+
+The template created by `git format-patch --cover-letter` includes a diffstat.
+This gives reviewers a summary of what they're in for when reviewing your topic.
+The one generated for `psuh` from the sample implementation looks like this:
+
+----
+ Documentation/git-psuh.txt | 40 +++++++++++++++++++++
+ Makefile | 1 +
+ builtin.h | 1 +
+ builtin/psuh.c | 73 ++++++++++++++++++++++++++++++++++++++
+ git.c | 1 +
+ t/t9999-psuh-tutorial.sh | 12 +++++++
+ 6 files changed, 128 insertions(+)
+ create mode 100644 Documentation/git-psuh.txt
+ create mode 100644 builtin/psuh.c
+ create mode 100755 t/t9999-psuh-tutorial.sh
+----
+
+Finally, the letter will include the version of Git used to generate the
+patches. You can leave that string alone.
+
+[[sending-git-send-email]]
+=== Sending Email
+
+At this point you should have a directory `psuh/` which is filled with your
+patches and a cover letter. Time to mail it out! You can send it like this:
+
+----
+$ git send-email --to=target@example.com psuh/*.patch
+----
+
+NOTE: Check `git help send-email` for some other options which you may find
+valuable, such as changing the Reply-to address or adding more CC and BCC lines.
+
+NOTE: When you are sending a real patch, it will go to git@vger.kernel.org - but
+please don't send your patchset from the tutorial to the real mailing list! For
+now, you can send it to yourself, to make sure you understand how it will look.
+
+After you run the command above, you will be presented with an interactive
+prompt for each patch that's about to go out. This gives you one last chance to
+edit or quit sending something (but again, don't edit code this way). Once you
+press `y` or `a` at these prompts your emails will be sent! Congratulations!
+
+Awesome, now the community will drop everything and review your changes. (Just
+kidding - be patient!)
+
+[[v2-git-send-email]]
+=== Sending v2
+
+Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
+handle comments from reviewers. Continue this section when your topic branch is
+shaped the way you want it to look for your patchset v2.
+
+When you're ready with the next iteration of your patch, the process is fairly
+similar.
+
+First, generate your v2 patches again:
+
+----
+$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
+----
+
+This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
+to the `psuh/` directory. You may notice that they are sitting alongside the v1
+patches; that's fine, but be careful when you are ready to send them.
+
+Edit your cover letter again. Now is a good time to mention what's different
+between your last version and now, if it's something significant. You do not
+need the exact same body in your second cover letter; focus on explaining to
+reviewers the changes you've made that may not be as visible.
+
+You will also need to go and find the Message-Id of your previous cover letter.
+You can either note it when you send the first series, from the output of `git
+send-email`, or you can look it up on the
+https://public-inbox.org/git[mailing list]. Find your cover letter in the
+archives, click on it, then click "permalink" or "raw" to reveal the Message-Id
+header. It should match:
+
+----
+Message-Id: <foo.12345.author@example.com>
+----
+
+Your Message-Id is `<foo.12345.author@example.com>`. This example will be used
+below as well; make sure to replace it with the correct Message-Id for your
+**previous cover letter** - that is, if you're sending v2, use the Message-Id
+from v1; if you're sending v3, use the Message-Id from v2.
+
+While you're looking at the email, you should also note who is CC'd, as it's
+common practice in the mailing list to keep all CCs on a thread. You can add
+these CC lines directly to your cover letter with a line like so in the header
+(before the Subject line):
+
+----
+CC: author@example.com, Othe R <other@example.com>
+----
+
+Now send the emails again, paying close attention to which messages you pass in
+to the command:
+
+----
+$ git send-email --to=target@example.com
+ --in-reply-to="<foo.12345.author@example.com>"
+ psuh/v2*
+----
+
+[[single-patch]]
+=== Bonus Chapter: One-Patch Changes
+
+In some cases, your very small change may consist of only one patch. When that
+happens, you only need to send one email. Your commit message should already be
+meaningful and explain at a high level the purpose (what is happening and why)
+of your patch, but if you need to supply even more context, you can do so below
+the `---` in your patch. Take the example below, which was generated with `git
+format-patch` on a single commit, and then edited to add the content between
+the `---` and the diffstat.
+
+----
+From 1345bbb3f7ac74abde040c12e737204689a72723 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 18 Apr 2019 15:11:02 -0700
+Subject: [PATCH] README: change the grammar
+
+I think it looks better this way. This part of the commit message will
+end up in the commit-log.
+
+Signed-off-by: A U Thor <author@example.com>
+---
+Let's have a wild discussion about grammar on the mailing list. This
+part of my email will never end up in the commit log. Here is where I
+can add additional context to the mailing list about my intent, outside
+of the context of the commit log. This section was added after `git
+format-patch` was run, by editing the patch file in a text editor.
+
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 88f126184c..38da593a60 100644
+--- a/README.md
++++ b/README.md
+@@ -3,7 +3,7 @@
+ Git - fast, scalable, distributed revision control system
+ =========================================================
+
+-Git is a fast, scalable, distributed revision control system with an
++Git is a fast, scalable, and distributed revision control system with an
+ unusually rich command set that provides both high-level operations
+ and full access to internals.
+
+--
+2.21.0.392.gf8f6787159e-goog
+----
+
+[[now-what]]
+== My Patch Got Emailed - Now What?
+
+[[reviewing]]
+=== Responding to Reviews
+
+After a few days, you will hopefully receive a reply to your patchset with some
+comments. Woohoo! Now you can get back to work.
+
+It's good manners to reply to each comment, notifying the reviewer that you have
+made the change requested, feel the original is better, or that the comment
+inspired you to do something a new way which is superior to both the original
+and the suggested change. This way reviewers don't need to inspect your v2 to
+figure out whether you implemented their comment or not.
+
+If you are going to push back on a comment, be polite and explain why you feel
+your original is better; be prepared that the reviewer may still disagree with
+you, and the rest of the community may weigh in on one side or the other. As
+with all code reviews, it's important to keep an open mind to doing something a
+different way than you originally planned; other reviewers have a different
+perspective on the project than you do, and may be thinking of a valid side
+effect which had not occurred to you. It is always okay to ask for clarification
+if you aren't sure why a change was suggested, or what the reviewer is asking
+you to do.
+
+Make sure your email client has a plaintext email mode and it is turned on; the
+Git list rejects HTML email. Please also follow the mailing list etiquette
+outlined in the
+https://kernel.googlesource.com/pub/scm/git/git/+/todo/MaintNotes[Maintainer's
+Note], which are similar to etiquette rules in most open source communities
+surrounding bottom-posting and inline replies.
+
+When you're making changes to your code, it is cleanest - that is, the resulting
+commits are easiest to look at - if you use `git rebase -i` (interactive
+rebase). Take a look at this
+https://www.oreilly.com/library/view/git-pocket-guide/9781449327507/ch10.html[overview]
+from O'Reilly. The general idea is to modify each commit which requires changes;
+this way, instead of having a patch A with a mistake, a patch B which was fine
+and required no upstream reviews in v1, and a patch C which fixes patch A for
+v2, you can just ship a v2 with a correct patch A and correct patch B. This is
+changing history, but since it's local history which you haven't shared with
+anyone, that is okay for now! (Later, it may not make sense to do this; take a
+look at the section below this one for some context.)
+
+[[after-approval]]
+=== After Review Approval
+
+The Git project has four integration branches: `pu`, `next`, `master`, and
+`maint`. Your change will be placed into `pu` fairly early on by the maintainer
+while it is still in the review process; from there, when it is ready for wider
+testing, it will be merged into `next`. Plenty of early testers use `next` and
+may report issues. Eventually, changes in `next` will make it to `master`,
+which is typically considered stable. Finally, when a new release is cut,
+`maint` is used to base bugfixes onto. As mentioned at the beginning of this
+document, you can read `Documents/SubmittingPatches` for some more info about
+the use of the various integration branches.
+
+Back to now: your code has been lauded by the upstream reviewers. It is perfect.
+It is ready to be accepted. You don't need to do anything else; the maintainer
+will merge your topic branch to `next` and life is good.
+
+However, if you discover it isn't so perfect after this point, you may need to
+take some special steps depending on where you are in the process.
+
+If the maintainer has announced in the "What's cooking in git.git" email that
+your topic is marked for `next` - that is, that they plan to merge it to `next`
+but have not yet done so - you should send an email asking the maintainer to
+wait a little longer: "I've sent v4 of my series and you marked it for `next`,
+but I need to change this and that - please wait for v5 before you merge it."
+
+If the topic has already been merged to `next`, rather than modifying your
+patches with `git rebase -i`, you should make further changes incrementally -
+that is, with another commit, based on top of the maintainer's topic branch as
+detailed in https://github.com/gitster/git. Your work is still in the same topic
+but is now incremental, rather than a wholesale rewrite of the topic branch.
+
+The topic branches in the maintainer's GitHub are mirrored in GitGitGadget, so
+if you're sending your reviews out that way, you should be sure to open your PR
+against the appropriate GitGitGadget/Git branch.
+
+If you're using `git send-email`, you can use it the same way as before, but you
+should generate your diffs from `<topic>..<mybranch>` and base your work on
+`<topic>` instead of `master`.
diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt
index cf8298d..7a49ded 100644
--- a/Documentation/RelNotes/2.21.0.txt
+++ b/Documentation/RelNotes/2.21.0.txt
@@ -26,7 +26,7 @@
the fast-export side has been made.
* "git push $there $src:$dst" rejects when $dst is not a fully
- qualified refname and not clear what the end user meant. The
+ qualified refname and it is not clear what the end user meant. The
codepath has been taught to give a clearer error message, and also
guess where the push should go by taking the type of the pushed
object into account (e.g. a tag object would want to go under
@@ -35,7 +35,8 @@
* "git checkout [<tree-ish>] path..." learned to report the number of
paths that have been checked out of the index or the tree-ish,
which gives it the same degree of noisy-ness as the case in which
- the command checks out a branch.
+ the command checks out a branch. "git checkout -m <pathspec>" to
+ undo conflict resolution gives a similar message.
* "git quiltimport" learned "--keep-non-patch" option.
@@ -76,9 +77,9 @@
* A new date format "--date=human" that morphs its output depending
on how far the time is from the current time has been introduced.
- "--date=auto" can be used to use this new format when the output is
- going to the pager or to the terminal and otherwise the default
- format.
+ "--date=auto:human" can be used to use this new format (or any
+ existing format) when the output is going to the pager or to the
+ terminal, and otherwise the default format.
Performance, Internal Implementation, Development Support etc.
@@ -87,7 +88,7 @@
(non-)existence of loose objects.
* More codepaths have become aware of working with in-core repository
- instance other than the default "the_repository".
+ instances other than the default "the_repository".
* The "strncat()" function is now among the banned functions.
@@ -124,13 +125,13 @@
* The in-core repository instances are passed through more codepaths.
* Update the protocol message specification to allow only the limited
- use of scaled quantities. This is ensure potential compatibility
- issues will not go out of hand.
+ use of scaled quantities. This is to ensure potential compatibility
+ issues will not get out of hand.
* Micro-optimize the code that prepares commit objects to be walked
by "git rev-list" when the commit-graph is available.
- * "git fetch" and "git upload-pack" learned to send all exchange over
+ * "git fetch" and "git upload-pack" learned to send all exchanges over
the sideband channel while talking the v2 protocol.
* The codepath to write out commit-graph has been optimized by
@@ -174,6 +175,18 @@
* Use of the sparse tool got easier to customize from the command
line to help developers.
+ * A new target "coverage-prove" to run the coverage test under
+ "prove" has been added.
+
+ * A flakey "p4" test has been removed.
+
+ * The code and tests assume that the system supplied iconv() would
+ always use BOM in its output when asked to encode to UTF-16 (or
+ UTF-32), but apparently some implementations output big-endian
+ without BOM. A compile-time knob has been added to help such
+ systems (e.g. NonStop) to add BOM to the output to increase
+ portability.
+
Fixes since v2.20
-----------------
@@ -403,6 +416,9 @@
repository information correctly, leading to an access of freed
piece of memory.
+ * Some errors from the other side coming over smart HTTP transport
+ were not noticed, which has been corrected.
+
* Code cleanup, docfix, build fix, etc.
(merge 89ba9a79ae hb/t0061-dot-in-path-fix later to maint).
(merge d173e799ea sb/diff-color-moved-config-option-fixup later to maint).
@@ -427,3 +443,9 @@
(merge 86fb1c4e77 km/init-doc-typofix later to maint).
(merge 5cfd4a9d10 nd/commit-doc later to maint).
(merge 9fce19a431 ab/diff-tree-doc-fix later to maint).
+ (merge 2e285e7803 tz/gpg-test-fix later to maint).
+ (merge 5427de960b kl/pretty-doc-markup-fix later to maint).
+ (merge 3815f64b0d js/mingw-host-cpu later to maint).
+ (merge 5fe81438b5 rj/sequencer-sign-off-header-static later to maint).
+ (merge 18a4f6be6b nd/fileno-may-be-macro later to maint).
+ (merge 99e9ab54ab kd/t0028-octal-del-is-377-not-777 later to maint).
diff --git a/Documentation/RelNotes/2.22.0.txt b/Documentation/RelNotes/2.22.0.txt
new file mode 100644
index 0000000..91e6ae9
--- /dev/null
+++ b/Documentation/RelNotes/2.22.0.txt
@@ -0,0 +1,597 @@
+Git 2.22 Release Notes
+======================
+
+Updates since v2.21
+-------------------
+
+Backward compatibility note
+
+ * The filter specification "--filter=sparse:path=<path>" used to
+ create a lazy/partial clone has been removed. Using a blob that is
+ part of the project as sparse specification is still supported with
+ the "--filter=sparse:oid=<blob>" option.
+
+UI, Workflows & Features
+
+ * "git checkout --no-overlay" can be used to trigger a new mode of
+ checking out paths out of the tree-ish, that allows paths that
+ match the pathspec that are in the current index and working tree
+ and are not in the tree-ish.
+
+ * The %(trailers) formatter in "git log --format=..." now allows to
+ optionally pick trailers selectively by keyword, show only values,
+ etc.
+
+ * Four new configuration variables {author,committer}.{name,email}
+ have been introduced to override user.{name,email} in more specific
+ cases.
+
+ * Command-line completion (in contrib/) learned to tab-complete the
+ "git submodule absorbgitdirs" subcommand.
+
+ * "git branch" learned a new subcommand "--show-current".
+
+ * Output from "diff --cc" did not show the original paths when the
+ merge involved renames. A new option adds the paths in the
+ original trees to the output.
+
+ * The command line completion (in contrib/) has been taught to
+ complete more subcommand parameters.
+
+ * The final report from "git bisect" used to show the suspected
+ culprit using a raw "diff-tree", with which there is no output for
+ a merge commit. This has been updated to use a more modern and
+ human readable output that still is concise enough.
+
+ * "git rebase --rebase-merges" replaces its old "--preserve-merges"
+ option; the latter is now marked as deprecated.
+
+ * Error message given while cloning with --recurse-submodules has
+ been updated.
+
+ * The completion helper code now pays attention to repository-local
+ configuration (when available), which allows --list-cmds to honour
+ a repository specific setting of completion.commands, for example.
+
+ * "git mergetool" learned to offer Sublime Merge (smerge) as one of
+ its backends.
+
+ * A new hook "post-index-change" is called when the on-disk index
+ file changes, which can help e.g. a virtualized working tree
+ implementation.
+
+ * "git difftool" can now run outside a repository.
+
+ * "git checkout -m <other>" was about carrying the differences
+ between HEAD and the working-tree files forward while checking out
+ another branch, and ignored the differences between HEAD and the
+ index. The command has been taught to abort when the index and the
+ HEAD are different.
+
+ * A progress indicator has been added to the "index-pack" step, which
+ often makes users wait for completion during "git clone".
+
+ * "git submodule" learns "set-branch" subcommand that allows the
+ submodule.*.branch settings to be modified.
+
+ * "git merge-recursive" backend recently learned a new heuristics to
+ infer file movement based on how other files in the same directory
+ moved. As this is inherently less robust heuristics than the one
+ based on the content similarity of the file itself (rather than
+ based on what its neighbours are doing), it sometimes gives an
+ outcome unexpected by the end users. This has been toned down to
+ leave the renamed paths in higher/conflicted stages in the index so
+ that the user can examine and confirm the result.
+
+ * "git tag" learned to give an advice suggesting it might be a
+ mistake when creating an annotated or signed tag that points at
+ another tag.
+
+ * The "git pack-objects" command learned to report the number of
+ objects it packed via the trace2 mechanism.
+
+ * The list of conflicted paths shown in the editor while concluding a
+ conflicted merge was shown above the scissors line when the
+ clean-up mode is set to "scissors", even though it was commented
+ out just like the list of updated paths and other information to
+ help the user explain the merge better.
+
+ * The trace2 tracing facility learned to auto-generate a filename
+ when told to log to a directory.
+
+ * "git clone" learned a new --server-option option when talking over
+ the protocol version 2.
+
+ * The connectivity bitmaps are created by default in bare
+ repositories now; also the pathname hash-cache is created by
+ default to avoid making crappy deltas when repacking.
+
+ * "git branch new A...B" and "git checkout -b new A...B" have been
+ taught that in their contexts, the notation A...B means "the merge
+ base between these two commits", just like "git checkout A...B"
+ detaches HEAD at that commit.
+
+ * Update "git difftool" and "git mergetool" so that the combinations
+ of {diff,merge}.{tool,guitool} configuration variables serve as
+ fallback settings of each other in a sensible order.
+
+ * The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
+ mode; they are now explicitly marked as mutually incompatible.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The diff machinery, one of the oldest parts of the system, which
+ long predates the parse-options API, uses fairly long and complex
+ handcrafted option parser. This is being rewritten to use the
+ parse-options API.
+
+ * The implementation of pack-redundant has been updated for
+ performance in a repository with many packfiles.
+
+ * A more structured way to obtain execution trace has been added.
+
+ * "git prune" has been taught to take advantage of reachability
+ bitmap when able.
+
+ * The command line parser of "git commit-tree" has been rewritten to
+ use the parse-options API.
+
+ * Suggest GitGitGadget instead of submitGit as a way to submit
+ patches based on GitHub PR to us.
+
+ * The test framework has been updated to help developers by making it
+ easier to run most of the tests under different versions of
+ over-the-wire protocols.
+
+ * Dev support update to make it easier to compare two formatted
+ results from our documentation.
+
+ * The scripted "git rebase" implementation has been retired.
+
+ * "git multi-pack-index verify" did not scale well with the number of
+ packfiles, which is being improved.
+
+ * "git stash" has been rewritten in C.
+
+ * The "check-docs" Makefile target to support developers has been
+ updated.
+
+ * The tests have been updated not to rely on the abbreviated option
+ names the parse-options API offers, to protect us from an
+ abbreviated form of an option that used to be unique within the
+ command getting non-unique when a new option that share the same
+ prefix is added.
+
+ * The scripted version of "git rebase -i" wrote and rewrote the todo
+ list many times during a single step of its operation, and the
+ recent C-rewrite made a faithful conversion of the logic to C. The
+ implementation has been updated to carry necessary information
+ around in-core to avoid rewriting the same file over and over
+ unnecessarily.
+
+ * Test framework update to more robustly clean up leftover files and
+ processes after tests are done.
+
+ * Conversion from unsigned char[20] to struct object_id continues.
+
+ * While running "git diff" in a lazy clone, we can upfront know which
+ missing blobs we will need, instead of waiting for the on-demand
+ machinery to discover them one by one. The code learned to aim to
+ achieve better performance by batching the request for these
+ promised blobs.
+
+ * During an initial "git clone --depth=..." partial clone, it is
+ pointless to spend cycles for a large portion of the connectivity
+ check that enumerates and skips promisor objects (which by
+ definition is all objects fetched from the other side). This has
+ been optimized out.
+
+ * Mechanically and systematically drop "extern" from function
+ declaration.
+
+ * The script to aggregate perf result unconditionally depended on
+ libjson-perl even though it did not have to, which has been
+ corrected.
+
+ * The internal implementation of "git rebase -i" has been updated to
+ avoid forking a separate "rebase--interactive" process.
+
+ * Allow DEP and ASLR for Windows build to for security hardening.
+
+ * Performance test framework has been broken and measured the version
+ of Git that happens to be on $PATH, not the specified one to
+ measure, for a while, which has been corrected.
+
+ * Optionally "make coccicheck" can feed multiple source files to
+ spatch, gaining performance while spending more memory.
+
+ * Attempt to use an abbreviated option in "git clone --recurs" is
+ responded by a request to disambiguate between --recursive and
+ --recurse-submodules, which is bad because these two are synonyms.
+ The parse-options API has been extended to define such synonyms
+ more easily and not produce an unnecessary failure.
+
+ * A pair of private functions in http.c that had names similar to
+ fread/fwrite did not return the number of elements, which was found
+ to be confusing.
+
+ * Update collision-detecting SHA-1 code to build properly on HP-UX.
+
+
+Fixes since v2.21
+-----------------
+
+ * "git prune-packed" did not notice and complain against excess
+ arguments given from the command line, which now it does.
+ (merge 9b0bd87ed2 rj/prune-packed-excess-args later to maint).
+
+ * Split-index fix.
+ (merge 6e37c8ed3c nd/split-index-null-base-fix later to maint).
+
+ * "git diff --no-index" may still want to access Git goodies like
+ --ext-diff and --textconv, but so far these have been ignored,
+ which has been corrected.
+ (merge 287ab28bfa jk/diff-no-index-initialize later to maint).
+
+ * Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
+ a bug in the latter (lack of authentication retry) and generally
+ improves the code base.
+ (merge a97d00799a jt/http-auth-proto-v2-fix later to maint).
+
+ * The include file compat/bswap.h has been updated so that it is safe
+ to (accidentally) include it more than once.
+ (merge 33aa579a55 jk/guard-bswap-header later to maint).
+
+ * The set of header files used by "make hdr-check" unconditionally
+ included sha256/gcrypt.h, even when it is not used, causing the
+ make target to fail. We now skip it when GCRYPT_SHA256 is not in
+ use.
+ (merge f23aa18e7f rj/hdr-check-gcrypt-fix later to maint).
+
+ * The Makefile uses 'find' utility to enumerate all the *.h header
+ files, which is expensive on platforms with slow filesystems; it
+ now optionally uses "ls-files" if working within a repository,
+ which is a trick similar to how all sources are enumerated to run
+ ETAGS on.
+ (merge 92b88eba9f js/find-lib-h-with-ls-files-when-possible later to maint).
+
+ * "git rebase" that was reimplemented in C did not set ORIG_HEAD
+ correctly, which has been corrected.
+ (merge cbd29ead92 js/rebase-orig-head-fix later to maint).
+
+ * Dev support.
+ (merge f545737144 js/stress-test-ui-tweak later to maint).
+
+ * CFLAGS now can be tweaked when invoking Make while using
+ DEVELOPER=YesPlease; this did not work well before.
+ (merge 6d5d4b4e93 ab/makefile-help-devs-more later to maint).
+
+ * "git fsck --connectivity-only" omits computation necessary to sift
+ the objects that are not reachable from any of the refs into
+ unreachable and dangling. This is now enabled when dangling
+ objects are requested (which is done by default, but can be
+ overridden with the "--no-dangling" option).
+ (merge 8d8c2a5aef jk/fsck-doc later to maint).
+
+ * On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
+ the upload-pack that runs on the other end that hangs up after
+ detecting an error could cause "git fetch" to die with a signal,
+ which led to a flaky test. "git fetch" now ignores SIGPIPE during
+ the network portion of its operation (this is not a problem as we
+ check the return status from our write(2)s).
+ (merge 143588949c jk/no-sigpipe-during-network-transport later to maint).
+
+ * A recent update broke "is this object available to us?" check for
+ well-known objects like an empty tree (which should yield "yes",
+ even when there is no on-disk object for an empty tree), which has
+ been corrected.
+ (merge f06ab027ef jk/virtual-objects-do-exist later to maint).
+
+ * The setup code has been cleaned up to avoid leaks around the
+ repository_format structure.
+ (merge e8805af1c3 ma/clear-repository-format later to maint).
+
+ * "git config --type=color ..." is meant to replace "git config --get-color"
+ but there is a slight difference that wasn't documented, which is
+ now fixed.
+ (merge cd8e7593b9 jk/config-type-color-ends-with-lf later to maint).
+
+ * When the "clean" filter can reduce the size of a huge file in the
+ working tree down to a small "token" (a la Git LFS), there is no
+ point in allocating a huge scratch area upfront, but the buffer is
+ sized based on the original file size. The convert mechanism now
+ allocates very minimum and reallocates as it receives the output
+ from the clean filter process.
+ (merge 02156ab031 jh/resize-convert-scratch-buffer later to maint).
+
+ * "git rebase" uses the refs/rewritten/ hierarchy to store its
+ intermediate states, which inherently makes the hierarchy per
+ worktree, but it didn't quite work well.
+ (merge b9317d55a3 nd/rewritten-ref-is-per-worktree later to maint).
+
+ * "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
+ output as it should. This has been corrected.
+ (merge 05314efaea jk/line-log-with-patch later to maint).
+
+ * "git worktree add" used to do a "find an available name with stat
+ and then mkdir", which is race-prone. This has been fixed by using
+ mkdir and reacting to EEXIST in a loop.
+ (merge 7af01f2367 ms/worktree-add-atomic-mkdir later to maint).
+
+ * Build update for SHA-1 with collision detection.
+ (merge 07a20f569b jk/sha1dc later to maint).
+
+ * Build procedure has been fixed around use of asciidoctor instead of
+ asciidoc.
+ (merge 185f9a0ea0 ma/asciidoctor-fixes later to maint).
+
+ * remote-http transport did not anonymize URLs reported in its error
+ messages at places.
+ (merge c1284b21f2 js/anonymize-remote-curl-diag later to maint).
+
+ * Error messages given from the http transport have been updated so
+ that they can be localized.
+ (merge ed8b4132c8 js/remote-curl-i18n later to maint).
+
+ * "git init" forgot to read platform-specific repository
+ configuration, which made Windows port to ignore settings of
+ core.hidedotfiles, for example.
+
+ * A corner-case object name ambiguity while the sequencer machinery
+ is working (e.g. "rebase -i -x") has been fixed.
+
+ * "git format-patch" did not diagnose an error while opening the
+ output file for the cover-letter, which has been corrected.
+ (merge 2fe95f494c jc/format-patch-error-check later to maint).
+
+ * "git checkout -f <branch>" while the index has an unmerged path
+ incorrectly left some paths in an unmerged state, which has been
+ corrected.
+
+ * A corner case bug in the refs API has been corrected.
+ (merge d3322eb28b jk/refs-double-abort later to maint).
+
+ * Unicode update.
+ (merge 584b62c37b bb/unicode-12 later to maint).
+
+ * dumb-http walker has been updated to share more error recovery
+ strategy with the normal codepath.
+
+ * A buglet in configuration parser has been fixed.
+ (merge 19e7fdaa58 nd/include-if-wildmatch later to maint).
+
+ * The documentation for "git read-tree --reset -u" has been updated.
+ (merge b5a0bd694c nd/read-tree-reset-doc later to maint).
+
+ * Code clean-up around a much-less-important-than-it-used-to-be
+ update_server_info() function.
+ (merge b3223761c8 jk/server-info-rabbit-hole later to maint).
+
+ * The message given when "git commit -a <paths>" errors out has been
+ updated.
+ (merge 5a1dbd48bc nd/commit-a-with-paths-msg-update later to maint).
+
+ * "git cherry-pick --options A..B", after giving control back to the
+ user to ask help resolving a conflicted step, did not honor the
+ options it originally received, which has been corrected.
+
+ * Various glitches in "git gc" around reflog handling have been fixed.
+
+ * The code to read from commit-graph file has been cleanup with more
+ careful error checking before using data read from it.
+
+ * Performance fix around "git fetch" that grabs many refs.
+ (merge b764300912 jt/fetch-pack-wanted-refs-optim later to maint).
+
+ * Protocol v2 support in "git fetch-pack" of shallow clones has been
+ corrected.
+
+ * Performance fix around "git blame", especially in a linear history
+ (which is the norm we should optimize for).
+ (merge f892014943 dk/blame-keep-origin-blob later to maint).
+
+ * Performance fix for "rev-list --parents -- pathspec".
+ (merge 8320b1dbe7 jk/revision-rewritten-parents-in-prio-queue later to maint).
+
+ * Updating the display with progress message has been cleaned up to
+ deal better with overlong messages.
+ (merge 545dc345eb sg/overlong-progress-fix later to maint).
+
+ * "git blame -- path" in a non-bare repository starts blaming from
+ the working tree, and the same command in a bare repository errors
+ out because there is no working tree by definition. The command
+ has been taught to instead start blaming from the commit at HEAD,
+ which is more useful.
+ (merge a544fb08f8 sg/blame-in-bare-start-at-head later to maint).
+
+ * An underallocation in the code to read the untracked cache
+ extension has been corrected.
+ (merge 3a7b45a623 js/untracked-cache-allocfix later to maint).
+
+ * The code is updated to check the result of memory allocation before
+ it is used in more places, by using xmalloc and/or xcalloc calls.
+ (merge 999b951b28 jk/xmalloc later to maint).
+
+ * The GETTEXT_POISON test option has been quite broken ever since it
+ was made runtime-tunable, which has been fixed.
+ (merge f88b9cb603 jc/gettext-test-fix later to maint).
+
+ * Test fix on APFS that is incapable of store paths in Latin-1.
+ (merge 3889149619 js/iso8895-test-on-apfs later to maint).
+
+ * "git submodule foreach <command> --quiet" did not pass the option
+ down correctly, which has been corrected.
+ (merge a282f5a906 nd/submodule-foreach-quiet later to maint).
+
+ * "git send-email" has been taught to use quoted-printable when the
+ payload contains carriage-return. The use of the mechanism is in
+ line with the design originally added the codepath that chooses QP
+ when the payload has overly long lines.
+ (merge 74d76a1701 bc/send-email-qp-cr later to maint).
+
+ * The recently added feature to add addresses that are on
+ anything-by: trailers in 'git send-email' was found to be way too
+ eager and considered nonsense strings as if they can be legitimate
+ beginning of *-by: trailer. This has been tightened.
+
+ * Builds with gettext broke on recent macOS w/ Homebrew, which
+ seems to have stopped including from /usr/local/include; this
+ has been corrected.
+ (merge 92a1377a2a js/macos-gettext-build later to maint).
+
+ * Running "git add" on a repository created inside the current
+ repository is an explicit indication that the user wants to add it
+ as a submodule, but when the HEAD of the inner repository is on an
+ unborn branch, it cannot be added as a submodule. Worse, the files
+ in its working tree can be added as if they are a part of the outer
+ repository, which is not what the user wants. These problems are
+ being addressed.
+ (merge f937bc2f86 km/empty-repo-is-still-a-repo later to maint).
+
+ * "git cherry-pick" run with the "-x" or the "--signoff" option used
+ to (and more importantly, ought to) clean up the commit log message
+ with the --cleanup=space option by default, but this has been
+ broken since late 2017. This has been fixed.
+
+ * When given a tag that points at a commit-ish, "git replace --graft"
+ failed to peel the tag before writing a replace ref, which did not
+ make sense because the old graft mechanism the feature wants to
+ mimic only allowed to replace one commit object with another.
+ This has been fixed.
+ (merge ee521ec4cb cc/replace-graft-peel-tags later to maint).
+
+ * Code tightening against a "wrong" object appearing where an object
+ of a different type is expected, instead of blindly assuming that
+ the connection between objects are correctly made.
+ (merge 97dd512af7 tb/unexpected later to maint).
+
+ * An earlier update for MinGW and Cygwin accidentally broke MSVC build,
+ which has been fixed.
+ (merge 22c3634c0f ss/msvc-path-utils-fix later to maint).
+
+ * %(push:track) token used in the --format option to "git
+ for-each-ref" and friends was not showing the right branch, which
+ has been fixed.
+ (merge c646d0934e dr/ref-filter-push-track-fix later to maint).
+
+ * "make check-docs", "git help -a", etc. did not account for cases
+ where a particular build may deliberately omit some subcommands,
+ which has been corrected.
+
+ * The logic to tell if a Git repository has a working tree protects
+ "git branch -D" from removing the branch that is currently checked
+ out by mistake. The implementation of this logic was broken for
+ repositories with unusual name, which unfortunately is the norm for
+ submodules these days. This has been fixed.
+ (merge f3534c98e4 jt/submodule-repo-is-with-worktree later to maint).
+
+ * AIX shared the same build issues with other BSDs around fileno(fp),
+ which has been corrected.
+ (merge ee662bf5c6 cc/aix-has-fileno-as-a-macro later to maint).
+
+ * The autoconf generated configure script failed to use the right
+ gettext() implementations from -libintl by ignoring useless stub
+ implementations shipped in some C library, which has been
+ corrected.
+ (merge b71e56a683 vk/autoconf-gettext later to maint).
+
+ * Fix index-pack perf test so that the repeated invocations always
+ run in an empty repository, which emulates the initial clone
+ situation better.
+ (merge 775c71e16d jk/p5302-avoid-collision-check-cost later to maint).
+
+ * A "ls-files" that emulates "find" to enumerate files in the working
+ tree resulted in duplicated Makefile rules that caused the build to
+ issue an unnecessary warning during a trial build after merge
+ conflicts are resolved in working tree *.h files but before the
+ resolved results are added to the index. This has been corrected.
+
+ * "git cherry-pick" (and "revert" that shares the same runtime engine)
+ that deals with multiple commits got confused when the final step
+ gets stopped with a conflict and the user concluded the sequence
+ with "git commit". Attempt to fix it by cleaning up the state
+ files used by these commands in such a situation.
+ (merge 4a72486de9 pw/clean-sequencer-state-upon-final-commit later to maint).
+
+ * On a filesystem like HFS+, the names of the refs stored as filesystem
+ entities may become different from what the end-user expects, just
+ like files in the working tree get "renamed". Work around the
+ mismatch by paying attention to the core.precomposeUnicode
+ configuration.
+ (merge 8e712ef6fc en/unicode-in-refnames later to maint).
+
+ * The code to generate the multi-pack idx file was not prepared to
+ see too many packfiles and ran out of open file descriptor, which
+ has been corrected.
+
+ * To run tests for Git SVN, our scripts for CI used to install the
+ git-svn package (in the hope that it would bring in the right
+ dependencies). This has been updated to install the more direct
+ dependency, namely, libsvn-perl.
+ (merge db864306cf sg/ci-libsvn-perl later to maint).
+
+ * "git cvsexportcommit" running on msys did not expect cvsnt showed
+ "cvs status" output with CRLF line endings.
+
+ * The fsmonitor interface got out of sync after the in-core index
+ file gets discarded, which has been corrected.
+ (merge 398a3b0899 js/fsmonitor-refresh-after-discarding-index later to maint).
+
+ * "git status" did not know that the "label" instruction in the
+ todo-list "rebase -i -r" uses should not be shown as a hex object
+ name.
+
+ * A prerequisite check in the test suite to see if a working jgit is
+ available was made more robust.
+ (merge abd0f28983 tz/test-lib-check-working-jgit later to maint).
+
+ * The codepath to parse :<path> that obtains the object name for an
+ indexed object has been made more robust.
+
+ * Code cleanup, docfix, build fix, etc.
+ (merge 11f470aee7 jc/test-yes-doc later to maint).
+ (merge 90503a240b js/doc-symref-in-proto-v1 later to maint).
+ (merge 5c326d1252 jk/unused-params later to maint).
+ (merge 68cabbfda3 dl/doc-submodule-wo-subcommand later to maint).
+ (merge 9903623761 ab/receive-pack-use-after-free-fix later to maint).
+ (merge 1ede45e44b en/merge-options-doc later to maint).
+ (merge 3e14dd2c8e rd/doc-hook-used-in-sample later to maint).
+ (merge c271dc28fd nd/no-more-check-racy later to maint).
+ (merge e6e15194a8 yb/utf-16le-bom-spellfix later to maint).
+ (merge bb101aaf0c rd/attr.c-comment-typofix later to maint).
+ (merge 716a5af812 rd/gc-prune-doc-fix later to maint).
+ (merge 50b206371d js/untravis-windows later to maint).
+ (merge dbf47215e3 js/rebase-recreate-merge later to maint).
+ (merge 56cb2d30f8 dl/reset-doc-no-wrt-abbrev later to maint).
+ (merge 64eca306a2 ja/dir-rename-doc-markup-fix later to maint).
+ (merge af91b0230c dl/ignore-docs later to maint).
+ (merge 59a06e947b ra/t3600-test-path-funcs later to maint).
+ (merge e041d0781b ar/t4150-remove-cruft later to maint).
+ (merge 8d75a1d183 ma/asciidoctor-fixes-more later to maint).
+ (merge 74cc547b0f mh/pack-protocol-doc-fix later to maint).
+ (merge ed31851fa6 ab/doc-misc-typofixes later to maint).
+ (merge a7256debd4 nd/checkout-m-doc-update later to maint).
+ (merge 3a9e1ad78d jt/t5551-protocol-v2-does-not-have-half-auth later to maint).
+ (merge 0b918b75af sg/t5318-cleanup later to maint).
+ (merge 68ed71b53c cb/doco-mono later to maint).
+ (merge a34dca2451 nd/interpret-trailers-docfix later to maint).
+ (merge cf7b857a77 en/fast-import-parsing-fix later to maint).
+ (merge fe61ccbc35 po/rerere-doc-fmt later to maint).
+ (merge ffea0248bf po/describe-not-necessarily-7 later to maint).
+ (merge 7cb7283adb tg/ls-files-debug-format-fix later to maint).
+ (merge f64a21bd82 tz/doc-apostrophe-no-longer-needed later to maint).
+ (merge dbe7b41019 js/t3301-unbreak-notes-test later to maint).
+ (merge d8083e4180 km/t3000-retitle later to maint).
+ (merge 9e4cbccbd7 tz/git-svn-doc-markup-fix later to maint).
+ (merge da9ca955a7 jk/ls-files-doc-markup-fix later to maint).
+ (merge 6804ba3a58 cw/diff-highlight later to maint).
+ (merge 1a8787144d nd/submodule-helper-incomplete-line-fix later to maint).
+ (merge d9ef573837 jk/apache-lsan later to maint).
+ (merge c871fbee2b js/t6500-use-windows-pid-on-mingw later to maint).
+ (merge ce4c7bfc90 bl/t4253-exit-code-from-format-patch later to maint).
+ (merge 397a46db78 js/t5580-unc-alternate-test later to maint).
+ (merge d4907720a2 cm/notes-comment-fix later to maint).
+ (merge 9dde06de13 cb/http-push-null-in-message-fix later to maint).
+ (merge 4c785c0edc js/rebase-config-bitfix later to maint).
+ (merge 8e9fe16c87 es/doc-gitsubmodules-markup later to maint).
diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
new file mode 100644
index 0000000..432762f
--- /dev/null
+++ b/Documentation/RelNotes/2.22.1.txt
@@ -0,0 +1,150 @@
+Git 2.22.1 Release Notes
+========================
+
+Fixes since v2.22
+-----------------
+
+ * A relative pathname given to "git init --template=<path> <repo>"
+ ought to be relative to the directory "git init" gets invoked in,
+ but it instead was made relative to the repository, which has been
+ corrected.
+
+ * "git worktree add" used to fail when another worktree connected to
+ the same repository was corrupt, which has been corrected.
+
+ * The ownership rule for the file descriptor to fast-import remote
+ backend was mixed up, leading to unrelated file descriptor getting
+ closed, which has been fixed.
+
+ * "git update-server-info" used to leave stale packfiles in its
+ output, which has been corrected.
+
+ * The server side support for "git fetch" used to show incorrect
+ value for the HEAD symbolic ref when the namespace feature is in
+ use, which has been corrected.
+
+ * "git am -i --resolved" segfaulted after trying to see a commit as
+ if it were a tree, which has been corrected.
+
+ * "git bundle verify" needs to see if prerequisite objects exist in
+ the receiving repository, but the command did not check if we are
+ in a repository upfront, which has been corrected.
+
+ * "git merge --squash" is designed to update the working tree and the
+ index without creating the commit, and this cannot be countermanded
+ by adding the "--commit" option; the command now refuses to work
+ when both options are given.
+
+ * The data collected by fsmonitor was not properly written back to
+ the on-disk index file, breaking t7519 tests occasionally, which
+ has been corrected.
+
+ * Update to Unicode 12.1 width table.
+
+ * The command line to invoke a "git cat-file" command from inside
+ "git p4" was not properly quoted to protect a caret and running a
+ broken command on Windows, which has been corrected.
+
+ * "git request-pull" learned to warn when the ref we ask them to pull
+ from in the local repository and in the published repository are
+ different.
+
+ * When creating a partial clone, the object filtering criteria is
+ recorded for the origin of the clone, but this incorrectly used a
+ hardcoded name "origin" to name that remote; it has been corrected
+ to honor the "--origin <name>" option.
+
+ * "git fetch" into a lazy clone forgot to fetch base objects that are
+ necessary to complete delta in a thin packfile, which has been
+ corrected.
+
+ * The filter_data used in the list-objects-filter (which manages a
+ lazily sparse clone repository) did not use the dynamic array API
+ correctly---'nr' is supposed to point at one past the last element
+ of the array in use. This has been corrected.
+
+ * The description about slashes in gitignore patterns (used to
+ indicate things like "anchored to this level only" and "only
+ matches directories") has been revamped.
+
+ * The URL decoding code has been updated to avoid going past the end
+ of the string while parsing %-<hex>-<hex> sequence.
+
+ * The list of for-each like macros used by clang-format has been
+ updated.
+
+ * "git push --atomic" that goes over the transport-helper (namely,
+ the smart http transport) failed to prevent refs to be pushed when
+ it can locally tell that one of the ref update will fail without
+ having to consult the other end, which has been corrected.
+
+ * "git clean" silently skipped a path when it cannot lstat() it; now
+ it gives a warning.
+
+ * A codepath that reads from GPG for signed object verification read
+ past the end of allocated buffer, which has been fixed.
+
+ * "git rm" to resolve a conflicted path leaked an internal message
+ "needs merge" before actually removing the path, which was
+ confusing. This has been corrected.
+
+ * The "git clone" documentation refers to command line options in its
+ description in the short form; they have been replaced with long
+ forms to make them more recognisable.
+
+ * The configuration variable rebase.rescheduleFailedExec should be
+ effective only while running an interactive rebase and should not
+ affect anything when running a non-interactive one, which was not
+ the case. This has been corrected.
+
+ * "git submodule foreach" did not protect command line options passed
+ to the command to be run in each submodule correctly, when the
+ "--recursive" option was in use.
+
+ * Use "Erase in Line" CSI sequence that is already used in the editor
+ support to clear cruft in the progress output.
+
+ * The codepath to compute delta islands used to spew progress output
+ without giving the callers any way to squelch it, which has been
+ fixed.
+
+ * The code to parse scaled numbers out of configuration files has
+ been made more robust and also easier to follow.
+
+ * An incorrect list of options was cached after command line
+ completion failed (e.g. trying to complete a command that requires
+ a repository outside one), which has been corrected.
+
+ * "git rebase --abort" used to leave refs/rewritten/ when concluding
+ "git rebase -r", which has been corrected.
+
+ * "git stash show 23" used to work, but no more after getting
+ rewritten in C; this regression has been corrected.
+
+ * "git interpret-trailers" always treated '#' as the comment
+ character, regardless of core.commentChar setting, which has been
+ corrected.
+
+ * Code clean-up to avoid signed integer overlaps during binary search.
+
+ * "git checkout -p" needs to selectively apply a patch in reverse,
+ which did not work well.
+
+ * The commit-graph file is now part of the "files that the runtime
+ may keep open file descriptors on, all of which would need to be
+ closed when done with the object store", and the file descriptor to
+ an existing commit-graph file now is closed before "gc" finalizes a
+ new instance to replace it.
+
+ * Code restructuring during 2.20 period broke fetching tags via
+ "import" based transports.
+
+ * We have been trying out a few language features outside c89; the
+ coding guidelines document did not talk about them and instead had
+ a blanket ban against them.
+
+ * The internal diff machinery can be made to read out of bounds while
+ looking for --funcion-context line in a corner case, which has been
+ corrected.
+
+Also contains various documentation updates, code clean-ups and minor fixups.
diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
new file mode 100644
index 0000000..e3c4e78
--- /dev/null
+++ b/Documentation/RelNotes/2.23.0.txt
@@ -0,0 +1,348 @@
+Git 2.23 Release Notes
+======================
+
+Updates since v2.22
+-------------------
+
+Backward compatibility note
+
+ * The "--base" option of "format-patch" computed the patch-ids for
+ prerequisite patches in an unstable way, which has been updated to
+ compute in a way that is compatible with "git patch-id --stable".
+
+ * The "git log" command by default behaves as if the --mailmap option
+ was given.
+
+
+UI, Workflows & Features
+
+ * The "git fast-export/import" pair has been taught to handle commits
+ with log messages in encoding other than UTF-8 better.
+
+ * In recent versions of Git, per-worktree refs are exposed in
+ refs/worktrees/<wtname>/ hierarchy, which means that worktree names
+ must be a valid refname component. The code now sanitizes the names
+ given to worktrees, to make sure these refs are well-formed.
+
+ * "git merge" learned "--quit" option that cleans up the in-progress
+ merge while leaving the working tree and the index still in a mess.
+
+ * "git format-patch" learns a configuration to set the default for
+ its --notes=<ref> option.
+
+ * The code to show args with potential typo that cannot be
+ interpreted as a commit-ish has been improved.
+
+ * "git clone --recurse-submodules" learned to set up the submodules
+ to ignore commit object names recorded in the superproject gitlink
+ and instead use the commits that happen to be at the tip of the
+ remote-tracking branches from the get-go, by passing the new
+ "--remote-submodules" option.
+
+ * The pattern "git diff/grep" use to extract funcname and words
+ boundary for Matlab has been extend to cover Octave, which is more
+ or less equivalent.
+
+ * "git help git" was hard to discover (well, at least for some
+ people).
+
+ * The pattern "git diff/grep" use to extract funcname and words
+ boundary for Rust has been added.
+
+ * "git status" can be told a non-standard default value for the
+ "--[no-]ahead-behind" option with a new configuration variable
+ status.aheadBehind.
+
+ * "git fetch" and "git pull" reports when a fetch results in
+ non-fast-forward updates to let the user notice unusual situation.
+ The commands learned "--no-show-forced-updates" option to disable
+ this safety feature.
+
+ * Two new commands "git switch" and "git restore" are introduced to
+ split "checking out a branch to work on advancing its history" and
+ "checking out paths out of the index and/or a tree-ish to work on
+ advancing the current history" out of the single "git checkout"
+ command.
+
+ * "git branch --list" learned to always output the detached HEAD as
+ the first item (when the HEAD is detached, of course), regardless
+ of the locale.
+
+ * The conditional inclusion mechanism learned to base the choice on
+ the branch the HEAD currently is on.
+
+ * "git rev-list --objects" learned the "--no-object-names" option to
+ squelch the path to the object that is used as a grouping hint for
+ pack-objects.
+
+ * A new tag.gpgSign configuration variable turns "git tag -a" into
+ "git tag -s".
+
+ * "git multi-pack-index" learned expire and repack subcommands.
+
+ * "git blame" learned to "ignore" commits in the history, whose
+ effects (as well as their presence) get ignored.
+
+ * "git cherry-pick/revert" learned a new "--skip" action.
+
+ * The tips of refs from the alternate object store can be used as
+ starting point for reachability computation now.
+
+ * Extra blank lines in "git status" output have been reduced.
+
+ * The commits in a repository can be described by multiple
+ commit-graph files now, which allows the commit-graph files to be
+ updated incrementally.
+
+ * "git range-diff" output has been tweaked for easier identification
+ of which part of what file the patch shown is about.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Update supporting parts of "git rebase" to remove code that should
+ no longer be used.
+
+ * Developer support to emulate unsatisfied prerequisites in tests to
+ ensure that the remainder of the tests still succeeds when tests
+ with prerequisites are skipped.
+
+ * "git update-server-info" learned not to rewrite the file with the
+ same contents.
+
+ * The way of specifying the path to find dynamic libraries at runtime
+ has been simplified. The old default to pass -R/path/to/dir has been
+ replaced with the new default to pass -Wl,-rpath,/path/to/dir,
+ which is the more recent GCC uses. Those who need to build with an
+ old GCC can still use "CC_LD_DYNPATH=-R"
+
+ * Prepare use of reachability index in topological walker that works
+ on a range (A..B).
+
+ * A new tutorial targeting specifically aspiring git-core
+ developers has been added.
+
+ * Auto-detect how to tell HP-UX aCC where to use dynamically linked
+ libraries from at runtime.
+
+ * "git mergetool" and its tests now spawn fewer subprocesses.
+
+ * Dev support update to help tracing out tests.
+
+ * Support to build with MSVC has been updated.
+
+ * "git fetch" that grabs from a group of remotes learned to run the
+ auto-gc only once at the very end.
+
+ * A handful of Windows build patches have been upstreamed.
+
+ * The code to read state files used by the sequencer machinery for
+ "git status" has been made more robust against a corrupt or stale
+ state files.
+
+ * "git for-each-ref" with multiple patterns have been optimized.
+
+ * The tree-walk API learned to pass an in-core repository
+ instance throughout more codepaths.
+
+ * When one step in multi step cherry-pick or revert is reset or
+ committed, the command line prompt script failed to notice the
+ current status, which has been improved.
+
+ * Many GIT_TEST_* environment variables control various aspects of
+ how our tests are run, but a few followed "non-empty is true, empty
+ or unset is false" while others followed the usual "there are a few
+ ways to spell true, like yes, on, etc., and also ways to spell
+ false, like no, off, etc." convention.
+
+ * Adjust the dir-iterator API and apply it to the local clone
+ optimization codepath.
+
+ * We have been trying out a few language features outside c89; the
+ coding guidelines document did not talk about them and instead had
+ a blanket ban against them.
+
+ * A test helper has been introduced to optimize preparation of test
+ repositories with many simple commits, and a handful of test
+ scripts have been updated to use it.
+
+
+Fixes since v2.22
+-----------------
+
+ * A relative pathname given to "git init --template=<path> <repo>"
+ ought to be relative to the directory "git init" gets invoked in,
+ but it instead was made relative to the repository, which has been
+ corrected.
+
+ * "git worktree add" used to fail when another worktree connected to
+ the same repository was corrupt, which has been corrected.
+
+ * The ownership rule for the file descriptor to fast-import remote
+ backend was mixed up, leading to an unrelated file descriptor getting
+ closed, which has been fixed.
+
+ * A "merge -c" instruction during "git rebase --rebase-merges" should
+ give the user a chance to edit the log message, even when there is
+ otherwise no need to create a new merge and replace the existing
+ one (i.e. fast-forward instead), but did not. Which has been
+ corrected.
+
+ * Code cleanup and futureproof.
+
+ * More parameter validation.
+
+ * "git update-server-info" used to leave stale packfiles in its
+ output, which has been corrected.
+
+ * The server side support for "git fetch" used to show incorrect
+ value for the HEAD symbolic ref when the namespace feature is in
+ use, which has been corrected.
+
+ * "git am -i --resolved" segfaulted after trying to see a commit as
+ if it were a tree, which has been corrected.
+
+ * "git bundle verify" needs to see if prerequisite objects exist in
+ the receiving repository, but the command did not check if we are
+ in a repository upfront, which has been corrected.
+
+ * "git merge --squash" is designed to update the working tree and the
+ index without creating the commit, and this cannot be countermanded
+ by adding the "--commit" option; the command now refuses to work
+ when both options are given.
+
+ * The data collected by fsmonitor was not properly written back to
+ the on-disk index file, breaking t7519 tests occasionally, which
+ has been corrected.
+
+ * Update to Unicode 12.1 width table.
+
+ * The command line to invoke a "git cat-file" command from inside
+ "git p4" was not properly quoted to protect a caret and running a
+ broken command on Windows, which has been corrected.
+
+ * "git request-pull" learned to warn when the ref we ask them to pull
+ from in the local repository and in the published repository are
+ different.
+
+ * When creating a partial clone, the object filtering criteria is
+ recorded for the origin of the clone, but this incorrectly used a
+ hardcoded name "origin" to name that remote; it has been corrected
+ to honor the "--origin <name>" option.
+
+ * "git fetch" into a lazy clone forgot to fetch base objects that are
+ necessary to complete delta in a thin packfile, which has been
+ corrected.
+
+ * The filter_data used in the list-objects-filter (which manages a
+ lazily sparse clone repository) did not use the dynamic array API
+ correctly---'nr' is supposed to point at one past the last element
+ of the array in use. This has been corrected.
+
+ * The description about slashes in gitignore patterns (used to
+ indicate things like "anchored to this level only" and "only
+ matches directories") has been revamped.
+
+ * The URL decoding code has been updated to avoid going past the end
+ of the string while parsing %-<hex>-<hex> sequence.
+
+ * The list of for-each like macros used by clang-format has been
+ updated.
+
+ * "git branch --list" learned to show branches that are checked out
+ in other worktrees connected to the same repository prefixed with
+ '+', similar to the way the currently checked out branch is shown
+ with '*' in front.
+ (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint).
+
+ * Code restructuring during 2.20 period broke fetching tags via
+ "import" based transports.
+
+ * The commit-graph file is now part of the "files that the runtime
+ may keep open file descriptors on, all of which would need to be
+ closed when done with the object store", and the file descriptor to
+ an existing commit-graph file now is closed before "gc" finalizes a
+ new instance to replace it.
+
+ * "git checkout -p" needs to selectively apply a patch in reverse,
+ which did not work well.
+
+ * Code clean-up to avoid signed integer wraparounds during binary search.
+
+ * "git interpret-trailers" always treated '#' as the comment
+ character, regardless of core.commentChar setting, which has been
+ corrected.
+
+ * "git stash show 23" used to work, but no more after getting
+ rewritten in C; this regression has been corrected.
+
+ * "git rebase --abort" used to leave refs/rewritten/ when concluding
+ "git rebase -r", which has been corrected.
+
+ * An incorrect list of options was cached after command line
+ completion failed (e.g. trying to complete a command that requires
+ a repository outside one), which has been corrected.
+
+ * The code to parse scaled numbers out of configuration files has
+ been made more robust and also easier to follow.
+
+ * The codepath to compute delta islands used to spew progress output
+ without giving the callers any way to squelch it, which has been
+ fixed.
+
+ * Protocol capabilities that go over wire should never be translated,
+ but it was incorrectly marked for translation, which has been
+ corrected. The output of protocol capabilities for debugging has
+ been tweaked a bit.
+
+ * Use "Erase in Line" CSI sequence that is already used in the editor
+ support to clear cruft in the progress output.
+
+ * "git submodule foreach" did not protect command line options passed
+ to the command to be run in each submodule correctly, when the
+ "--recursive" option was in use.
+
+ * The configuration variable rebase.rescheduleFailedExec should be
+ effective only while running an interactive rebase and should not
+ affect anything when running a non-interactive one, which was not
+ the case. This has been corrected.
+
+ * The "git clone" documentation refers to command line options in its
+ description in the short form; they have been replaced with long
+ forms to make them more recognisable.
+
+ * Generation of pack bitmaps are now disabled when .keep files exist,
+ as these are mutually exclusive features.
+ (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint).
+
+ * "git rm" to resolve a conflicted path leaked an internal message
+ "needs merge" before actually removing the path, which was
+ confusing. This has been corrected.
+
+ * "git stash --keep-index" did not work correctly on paths that have
+ been removed, which has been fixed.
+ (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).
+
+ * Window 7 update ;-)
+
+ * A codepath that reads from GPG for signed object verification read
+ past the end of allocated buffer, which has been fixed.
+
+ * "git clean" silently skipped a path when it cannot lstat() it; now
+ it gives a warning.
+
+ * "git push --atomic" that goes over the transport-helper (namely,
+ the smart http transport) failed to prevent refs to be pushed when
+ it can locally tell that one of the ref update will fail without
+ having to consult the other end, which has been corrected.
+
+ * The internal diff machinery can be made to read out of bounds while
+ looking for --function-context line in a corner case, which has been
+ corrected.
+ (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge fbec05c210 cc/test-oidmap later to maint).
+ (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint).
+ (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint).
+ (merge d61e6ce1dd sg/fsck-config-in-doc later to maint).
diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
new file mode 100644
index 0000000..8e1e2fa
--- /dev/null
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -0,0 +1,226 @@
+Git 2.24 Release Notes
+======================
+
+Updates since v2.23
+-------------------
+
+Backward compatibility note
+
+ * Although it is not officially deprecated, "filter-branch" is
+ showing its age and alternatives are available. From this release,
+ we started to discourage its uses and hint people about
+ filter-repo.
+
+UI, Workflows & Features
+
+ * We now have an active interim maintainer for the Git-Gui part of
+ the system. Praise and thank Pratyush Yadav for volunteering.
+
+ * The command line parser learned "--end-of-options" notation; the
+ standard convention for scripters to have hardcoded set of options
+ first on the command line, and force the command to treat end-user
+ input as non-options, has been to use "--" as the delimiter, but
+ that would not work for commands that use "--" as a delimiter
+ between revs and pathspec.
+
+ * A mechanism to affect the default setting for a (related) group of
+ configuration variables is introduced.
+
+ * "git fetch" learned "--set-upstream" option to help those who first
+ clone from their private fork they intend to push to, add the true
+ upstream via "git remote add" and then "git fetch" from it.
+
+ * Device-tree files learned their own userdiff patterns.
+ (merge 3c81760bc6 sb/userdiff-dts later to maint).
+
+ * "git rebase --rebase-merges" learned to drive different merge
+ strategies and pass strategy specific options to them.
+
+ * A new "pre-merge-commit" hook has been introduced.
+
+ * Command line completion updates for "git -c var.name=val" have been
+ added.
+
+ * The lazy clone machinery has been taught that there can be more
+ than one promisor remote and consult them in order when downloading
+ missing objects on demand.
+
+ * The list-objects-filter API (used to create a sparse/lazy clone)
+ learned to take a combined filter specification.
+
+ * The documentation and tests for "git format-patch" have been
+ cleaned up.
+
+ * On Windows, the root level of UNC share is now allowed to be used
+ just like any other directory.
+
+ * The command line completion support (in contrib/) learned about the
+ "--skip" option of "git revert" and "git cherry-pick".
+
+ * "git rebase --keep-base <upstream>" tries to find the original base
+ of the topic being rebased and rebase on top of that same base,
+ which is useful when running the "git rebase -i" (and its limited
+ variant "git rebase -x").
+
+ The command also has learned to fast-forward in more cases where it
+ can instead of replaying to recreate identical commits.
+
+ * A configuration variable tells "git fetch" to write the commit
+ graph after finishing.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The code to write commit-graph over given commit object names has
+ been made a bit more robust.
+
+ * The first line of verbose output from each test piece now carries
+ the test name and number to help scanning with eyeballs.
+
+ * Further clean-up of the initialization code.
+
+ * xmalloc() used to have a mechanism to ditch memory and address
+ space resources as the last resort upon seeing an allocation
+ failure from the underlying malloc(), which made the code complex
+ and thread-unsafe with dubious benefit, as major memory resource
+ users already do limit their uses with various other mechanisms.
+ It has been simplified away.
+
+ * Unnecessary full-tree diff in "git log -L" machinery has been
+ optimized away.
+
+ * The http transport lacked some optimization the native transports
+ learned to avoid unnecessary ref advertisement, which has been
+ corrected.
+
+ * Preparation for SHA-256 upgrade continues in the test department.
+ (merge 0c37c41d13 bc/hash-independent-tests-part-5 later to maint).
+
+ * The memory ownership model of the "git fast-import" got
+ straightened out.
+
+ * Output from trace2 subsystem is formatted more prettily now.
+
+ * The internal code originally invented for ".gitignore" processing
+ got reshuffled and renamed to make it less tied to "excluding" and
+ stress more that it is about "matching", as it has been reused for
+ things like sparse checkout specification that want to check if a
+ path is "included".
+
+
+
+Fixes since v2.23
+-----------------
+
+ * "git grep --recurse-submodules" that looks at the working tree
+ files looked at the contents in the index in submodules, instead of
+ files in the working tree.
+ (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint).
+
+ * Codepaths to walk tree objects have been audited for integer
+ overflows and hardened.
+ (merge 5aa02f9868 jk/tree-walk-overflow later to maint).
+
+ * "git pack-refs" can lose refs that are created while running, which
+ is getting corrected.
+ (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint).
+
+ * "git checkout" and "git restore" to re-populate the index from a
+ tree-ish (typically HEAD) did not work correctly for a path that
+ was removed and then added again with the intent-to-add bit, when
+ the corresponding working tree file was empty. This has been
+ corrected.
+
+ * Compilation fix.
+ (merge 70597e8386 rs/nedalloc-fixlets later to maint).
+
+ * "git gui" learned to call the clean-up procedure before exiting.
+ (merge 0d88f3d2c5 py/git-gui-do-quit later to maint).
+
+ * We promoted the "indent heuristics" that decides where to split
+ diff hunks from experimental to the default a few years ago, but
+ some stale documentation still marked it as experimental, which has
+ been corrected.
+ (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint).
+
+ * Fix a mismerge that happened in 2.22 timeframe.
+ (merge acb7da05ac en/checkout-mismerge-fix later to maint).
+
+ * "git archive" recorded incorrect length in extended pax header in
+ some corner cases, which has been corrected.
+ (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint).
+
+ * On-demand object fetching in lazy clone incorrectly tried to fetch
+ commits from submodule projects, while still working in the
+ superproject, which has been corrected.
+ (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint).
+
+ * Prepare get_short_oid() codepath to be thread-safe.
+ (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint).
+
+ * "for-each-ref" and friends that show refs did not protect themselves
+ against ancient tags that did not record tagger names when asked to
+ show "%(taggername)", which have been corrected.
+ (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint).
+
+ * The "git am" based backend of "git rebase" ignored the result of
+ updating ".gitattributes" done in one step when replaying
+ subsequent steps.
+ (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).
+
+ * Tell cURL library to use the same malloc() implementation, with the
+ xmalloc() wrapper, as the rest of the system, for consistency.
+ (merge 93b980e58f cb/curl-use-xmalloc later to maint).
+
+ * Build fix to adjust .gitignore to unignore a path that we started to track.
+ (merge aac6ff7b5b js/visual-studio later to maint).
+
+ * A few implementation fixes in the notes API.
+ (merge 60fe477a0b mh/notes-duplicate-entries later to maint).
+
+ * Fix an earlier regression to "git push --all" which should have
+ been forbidden when the target remote repository is set to be a
+ mirror.
+ (merge 8e4c8af058 tg/push-all-in-mirror-forbidden later to maint).
+
+ * Fix an earlier regression in the test suite, which mistakenly
+ stopped running HTTPD tests.
+ (merge 3960290675 sg/git-test-boolean later to maint).
+
+ * "git rebase --autostash <upstream> <branch>", when <branch> is
+ different from the current branch, incorrectly moved the tip of the
+ current branch, which has been corrected.
+ (merge bf1e28e0ad bw/rebase-autostash-keep-current-branch later to maint).
+
+ * Update support for Asciidoctor documentation toolchain.
+ (merge 83b0b8953e ma/asciidoctor-refmiscinfo later to maint).
+
+ * Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
+ no longer works with the older one.
+ (merge f6461b82b9 bc/doc-use-docbook-5 later to maint).
+
+ * The markup used in user-manual has been updated to work better with
+ asciidoctor.
+ (merge c4d2f6143a ma/user-manual-markup-update later to maint).
+
+ * Make sure the grep machinery does not abort when seeing a payload
+ that is not UTF-8 even when JIT is not in use with PCRE1.
+ (merge ad7c543e3b cb/skip-utf8-check-with-pcre1 later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge d1387d3895 en/fast-import-merge-doc later to maint).
+ (merge 1c24a54ea4 bm/repository-layout-typofix later to maint).
+ (merge 415b770b88 ds/midx-expire-repack later to maint).
+ (merge 19800bdc3f nd/diff-parseopt later to maint).
+ (merge 58166c2e9d tg/t0021-racefix later to maint).
+ (merge 7027f508c7 dl/compat-cleanup later to maint).
+ (merge e770fbfeff jc/test-cleanup later to maint).
+ (merge 1fd881d404 rs/trace2-dst-warning later to maint).
+ (merge 7e92756751 mh/http-urlmatch-cleanup later to maint).
+ (merge 9784f97321 mh/release-commit-memory-fix later to maint).
+ (merge 60d198d022 tb/banned-vsprintf-namefix later to maint).
+ (merge 80e3658647 rs/help-unknown-ref-does-not-return later to maint).
+ (merge 0a8bc7068f dt/remote-helper-doc-re-lock-option later to maint).
+ (merge 27fd1e4ea7 en/merge-options-ff-and-friends later to maint).
+ (merge 502c386ff9 sg/clean-nested-repo-with-ignored later to maint).
+ (merge 26e3d1cbea am/mailmap-andrey-mazo later to maint).
diff --git a/Documentation/RelNotes/2.7.1.txt b/Documentation/RelNotes/2.7.1.txt
index 6553d69..6323fea 100644
--- a/Documentation/RelNotes/2.7.1.txt
+++ b/Documentation/RelNotes/2.7.1.txt
@@ -10,7 +10,7 @@
setting GIT_WORK_TREE environment themselves.
* The "exclude_list" structure has the usual "alloc, nr" pair of
- fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+ fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot
to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
array.
diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
index 2507971..5fbe1b8 100644
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -270,7 +270,7 @@
setting GIT_WORK_TREE environment themselves.
* The "exclude_list" structure has the usual "alloc, nr" pair of
- fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
+ fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot
to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
array.
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index ec8b205..1a60cc1 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -372,15 +372,15 @@
Some parts of the system have dedicated maintainers with their own
repositories.
-- 'git-gui/' comes from git-gui project, maintained by Pat Thoyts:
+- `git-gui/` comes from git-gui project, maintained by Pratyush Yadav:
- git://repo.or.cz/git-gui.git
+ https://github.com/prati0100/git-gui.git
-- 'gitk-git/' comes from Paul Mackerras's gitk project:
+- `gitk-git/` comes from Paul Mackerras's gitk project:
git://ozlabs.org/~paulus/gitk
-- 'po/' comes from the localization coordinator, Jiang Xin:
+- `po/` comes from the localization coordinator, Jiang Xin:
https://github.com/git-l10n/git-po/
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 2c16c53..8fc4b67 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -78,9 +78,9 @@
<refmeta>
<refentrytitle>{mantitle}</refentrytitle>
<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">Git</refmiscinfo>
-<refmiscinfo class="version">{git_version}</refmiscinfo>
-<refmiscinfo class="manual">Git Manual</refmiscinfo>
+<refmiscinfo class="source">{mansource}</refmiscinfo>
+<refmiscinfo class="version">{manversion}</refmiscinfo>
+<refmiscinfo class="manual">{manmanual}</refmiscinfo>
</refmeta>
<refnamediv>
<refname>{manname}</refname>
diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
index ec83b49..d906a00 100644
--- a/Documentation/asciidoctor-extensions.rb
+++ b/Documentation/asciidoctor-extensions.rb
@@ -9,20 +9,40 @@
named :chrome
def process(parent, target, attrs)
- if parent.document.basebackend? 'html'
- prefix = parent.document.attr('git-relative-html-prefix')
- %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>\n)
+ prefix = parent.document.attr('git-relative-html-prefix')
+ if parent.document.doctype == 'book'
+ "<ulink url=\"#{prefix}#{target}.html\">" \
+ "#{target}(#{attrs[1]})</ulink>"
+ elsif parent.document.basebackend? 'html'
+ %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>)
elsif parent.document.basebackend? 'docbook'
"<citerefentry>\n" \
"<refentrytitle>#{target}</refentrytitle>" \
"<manvolnum>#{attrs[1]}</manvolnum>\n" \
- "</citerefentry>\n"
+ "</citerefentry>"
end
end
end
+
+ class DocumentPostProcessor < Asciidoctor::Extensions::Postprocessor
+ def process document, output
+ if document.basebackend? 'docbook'
+ mansource = document.attributes['mansource']
+ manversion = document.attributes['manversion']
+ manmanual = document.attributes['manmanual']
+ new_tags = "" \
+ "<refmiscinfo class=\"source\">#{mansource}</refmiscinfo>\n" \
+ "<refmiscinfo class=\"version\">#{manversion}</refmiscinfo>\n" \
+ "<refmiscinfo class=\"manual\">#{manmanual}</refmiscinfo>\n"
+ output = output.sub(/<\/refmeta>/, new_tags + "</refmeta>")
+ end
+ output
+ end
+ end
end
end
Asciidoctor::Extensions.register do
inline_macro Git::Documentation::LinkGitProcessor, :linkgit
+ postprocessor Git::Documentation::DocumentPostProcessor
end
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index dc41957..5d122db 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -110,5 +110,24 @@
`-C` options given, the <num> argument of the last `-C` will
take effect.
+--ignore-rev <rev>::
+ Ignore changes made by the revision when assigning blame, as if the
+ change never happened. Lines that were changed or added by an ignored
+ commit will be blamed on the previous commit that changed that line or
+ nearby lines. This option may be specified multiple times to ignore
+ more than one revision. If the `blame.markIgnoredLines` config option
+ is set, then lines that were changed by an ignored commit and attributed to
+ another commit will be marked with a `?` in the blame output. If the
+ `blame.markUnblamableLines` config option is set, then those lines touched
+ by an ignored commit that we could not attribute to another revision are
+ marked with a '*'.
+
+--ignore-revs-file <file>::
+ Ignore revisions listed in `file`, which must be in the same format as an
+ `fsck.skipList`. This option may be repeated, and these files will be
+ processed after any files specified with the `blame.ignoreRevsFile` config
+ option. An empty file name, `""`, will clear the list of revs from
+ previously processed files.
+
-h::
Show help message.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d87846f..f50f1b4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -144,6 +144,20 @@
This is the same as `gitdir` except that matching is done
case-insensitively (e.g. on case-insensitive file sytems)
+`onbranch`::
+ The data that follows the keyword `onbranch:` is taken to be a
+ pattern with standard globbing wildcards and two additional
+ ones, `**/` and `/**`, that can match multiple path components.
+ If we are in a worktree where the name of the branch that is
+ currently checked out matches the pattern, the include condition
+ is met.
++
+If the pattern ends with `/`, `**` will be automatically added. For
+example, the pattern `foo/` becomes `foo/**`. In other words, it matches
+all branches that begin with `foo/`. This is useful if your branches are
+organized hierarchically and you would like to apply a configuration to
+all the branches in that hierarchy.
+
A few more notes on matching via `gitdir` and `gitdir/i`:
* Symlinks in `$GIT_DIR` are not resolved before matching.
@@ -164,46 +178,53 @@
Example
~~~~~~~
- # Core variables
- [core]
- ; Don't trust file modes
- filemode = false
+----
+# Core variables
+[core]
+ ; Don't trust file modes
+ filemode = false
- # Our diff algorithm
- [diff]
- external = /usr/local/bin/diff-wrapper
- renames = true
+# Our diff algorithm
+[diff]
+ external = /usr/local/bin/diff-wrapper
+ renames = true
- [branch "devel"]
- remote = origin
- merge = refs/heads/devel
+[branch "devel"]
+ remote = origin
+ merge = refs/heads/devel
- # Proxy settings
- [core]
- gitProxy="ssh" for "kernel.org"
- gitProxy=default-proxy ; for the rest
+# Proxy settings
+[core]
+ gitProxy="ssh" for "kernel.org"
+ gitProxy=default-proxy ; for the rest
- [include]
- path = /path/to/foo.inc ; include by absolute path
- path = foo.inc ; find "foo.inc" relative to the current file
- path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
+[include]
+ path = /path/to/foo.inc ; include by absolute path
+ path = foo.inc ; find "foo.inc" relative to the current file
+ path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
- ; include if $GIT_DIR is /path/to/foo/.git
- [includeIf "gitdir:/path/to/foo/.git"]
- path = /path/to/foo.inc
+; include if $GIT_DIR is /path/to/foo/.git
+[includeIf "gitdir:/path/to/foo/.git"]
+ path = /path/to/foo.inc
- ; include for all repositories inside /path/to/group
- [includeIf "gitdir:/path/to/group/"]
- path = /path/to/foo.inc
+; include for all repositories inside /path/to/group
+[includeIf "gitdir:/path/to/group/"]
+ path = /path/to/foo.inc
- ; include for all repositories inside $HOME/to/group
- [includeIf "gitdir:~/to/group/"]
- path = /path/to/foo.inc
+; include for all repositories inside $HOME/to/group
+[includeIf "gitdir:~/to/group/"]
+ path = /path/to/foo.inc
- ; relative paths are always relative to the including
- ; file (if the condition is true); their location is not
- ; affected by the condition
- [includeIf "gitdir:/path/to/group/"]
+; relative paths are always relative to the including
+; file (if the condition is true); their location is not
+; affected by the condition
+[includeIf "gitdir:/path/to/group/"]
+ path = foo.inc
+----
+
+ ; include only if we are in a worktree where foo-branch is
+ ; currently checked out
+ [includeIf "onbranch:foo-branch"]
path = foo.inc
Values
@@ -326,6 +347,8 @@
include::config/fastimport.txt[]
+include::config/feature.txt[]
+
include::config/fetch.txt[]
include::config/format.txt[]
@@ -422,6 +445,8 @@
include::config/tag.txt[]
+include::config/trace2.txt[]
+
include::config/transfer.txt[]
include::config/uploadarchive.txt[]
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 8862042..6aaa360 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -4,6 +4,10 @@
can tell Git that you do not need help by setting these to 'false':
+
--
+ fetchShowForcedUpdates::
+ Advice shown when linkgit:git-fetch[1] takes a long time
+ to calculate forced updates after ref updates, or to warn
+ that the check is disabled.
pushUpdateRejected::
Set this variable to 'false' if you want to disable
'pushNonFFCurrent',
@@ -37,12 +41,19 @@
we can still suggest that the user push to either
refs/heads/* or refs/tags/* based on the type of the
source object.
+ statusAheadBehind::
+ Shown when linkgit:git-status[1] computes the ahead/behind
+ counts for a local ref compared to its remote tracking ref,
+ and that calculation takes longer than expected. Will not
+ appear if `status.aheadBehind` is false or the option
+ `--no-ahead-behind` is given.
statusHints::
Show directions on how to proceed from the current
state in the output of linkgit:git-status[1], in
the template shown when writing commit messages in
linkgit:git-commit[1], and in the help message shown
- by linkgit:git-checkout[1] when switching branch.
+ by linkgit:git-switch[1] or
+ linkgit:git-checkout[1] when switching branch.
statusUoption::
Advise to consider using the `-u` option to linkgit:git-status[1]
when the command takes more than 2 seconds to enumerate untracked
@@ -57,17 +68,21 @@
resolveConflict::
Advice shown by various commands when conflicts
prevent the operation from being performed.
+ sequencerInUse::
+ Advice shown when a sequencer command is already in progress.
implicitIdentity::
Advice on how to set your identity configuration when
your information is guessed from the system username and
domain name.
detachedHead::
- Advice shown when you used linkgit:git-checkout[1] to
- move to the detach HEAD state, to instruct how to create
- a local branch after the fact.
+ Advice shown when you used
+ linkgit:git-switch[1] or linkgit:git-checkout[1]
+ to move to the detach HEAD state, to instruct how to
+ create a local branch after the fact.
checkoutAmbiguousRemoteBranchName::
Advice shown when the argument to
- linkgit:git-checkout[1] ambiguously resolves to a
+ linkgit:git-checkout[1] and linkgit:git-switch[1]
+ ambiguously resolves to a
remote tracking branch on more than one remote in
situations where an unambiguous argument would have
otherwise caused a remote-tracking branch to be
@@ -90,4 +105,6 @@
waitingForEditor::
Print a message to the terminal whenever Git is waiting for
editor input from the user.
+ nestedTag::
+ Advice shown if a user attempts to recursively tag a tag object.
--
diff --git a/Documentation/config/alias.txt b/Documentation/config/alias.txt
index 0b14178..f1ca739 100644
--- a/Documentation/config/alias.txt
+++ b/Documentation/config/alias.txt
@@ -1,18 +1,28 @@
alias.*::
Command aliases for the linkgit:git[1] command wrapper - e.g.
- after defining "alias.last = cat-file commit HEAD", the invocation
- "git last" is equivalent to "git cat-file commit HEAD". To avoid
+ after defining `alias.last = cat-file commit HEAD`, the invocation
+ `git last` is equivalent to `git cat-file commit HEAD`. To avoid
confusion and troubles with script usage, aliases that
hide existing Git commands are ignored. Arguments are split by
spaces, the usual shell quoting and escaping is supported.
A quote pair or a backslash can be used to quote them.
+
+Note that the first word of an alias does not necessarily have to be a
+command. It can be a command-line option that will be passed into the
+invocation of `git`. In particular, this is useful when used with `-c`
+to pass in one-time configurations or `-p` to force pagination. For example,
+`loud-rebase = -c commit.verbose=true rebase` can be defined such that
+running `git loud-rebase` would be equivalent to
+`git -c commit.verbose=true rebase`. Also, `ps = -p status` would be a
+helpful alias since `git ps` would paginate the output of `git status`
+where the original command does not.
++
If the alias expansion is prefixed with an exclamation point,
it will be treated as a shell command. For example, defining
-"alias.new = !gitk --all --not ORIG_HEAD", the invocation
-"git new" is equivalent to running the shell command
-"gitk --all --not ORIG_HEAD". Note that shell commands will be
+`alias.new = !gitk --all --not ORIG_HEAD`, the invocation
+`git new` is equivalent to running the shell command
+`gitk --all --not ORIG_HEAD`. Note that shell commands will be
executed from the top-level directory of a repository, which may
not necessarily be the current directory.
-`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix'
+`GIT_PREFIX` is set as returned by running `git rev-parse --show-prefix`
from the original current directory. See linkgit:git-rev-parse[1].
diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt
index 67b5c1d..9468e85 100644
--- a/Documentation/config/blame.txt
+++ b/Documentation/config/blame.txt
@@ -19,3 +19,19 @@
blame.showRoot::
Do not treat root commits as boundaries in linkgit:git-blame[1].
This option defaults to false.
+
+blame.ignoreRevsFile::
+ Ignore revisions listed in the file, one unabbreviated object name per
+ line, in linkgit:git-blame[1]. Whitespace and comments beginning with
+ `#` are ignored. This option may be repeated multiple times. Empty
+ file names will reset the list of ignored revisions. This option will
+ be handled before the command line option `--ignore-revs-file`.
+
+blame.markUnblamables::
+ Mark lines that were changed by an ignored revision that we could not
+ attribute to another commit with a '*' in the output of
+ linkgit:git-blame[1].
+
+blame.markIgnoredLines::
+ Mark lines that were changed by an ignored revision that we attributed to
+ another commit with a '?' in the output of linkgit:git-blame[1].
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index 019d60e..a592d52 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -1,5 +1,5 @@
branch.autoSetupMerge::
- Tells 'git branch' and 'git checkout' to set up new branches
+ Tells 'git branch', 'git switch' and 'git checkout' to set up new branches
so that linkgit:git-pull[1] will appropriately merge from the
starting point branch. Note that even if this option is not set,
this behavior can be chosen per-branch using the `--track`
@@ -11,7 +11,7 @@
branch. This option defaults to true.
branch.autoSetupRebase::
- When a new branch is created with 'git branch' or 'git checkout'
+ When a new branch is created with 'git branch', 'git switch' or 'git checkout'
that tracks another branch, this variable tells Git to set
up pull to rebase instead of merge (see "branch.<name>.rebase").
When `never`, rebase is never automatically set to true.
@@ -85,9 +85,9 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When preserve, also pass `--preserve-merges` along to 'git rebase'
-so that locally committed merge commits will not be flattened
-by running 'git pull'.
+When `preserve` (deprecated in favor of `merges`), also pass
+`--preserve-merges` along to 'git rebase' so that locally committed merge
+commits will not be flattened by running 'git pull'.
+
When the value is `interactive`, the rebase is run in interactive mode.
+
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index c4118fa..6b64681 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -1,5 +1,6 @@
checkout.defaultRemote::
- When you run 'git checkout <something>' and only have one
+ When you run 'git checkout <something>'
+ or 'git switch <something>' and only have one
remote, it may implicitly fall back on checking out and
tracking e.g. 'origin/<something>'. This stops working as soon
as you have more than one remote with a '<something>'
@@ -8,16 +9,10 @@
disambiguation. The typical use-case is to set this to
`origin`.
+
-Currently this is used by linkgit:git-checkout[1] when 'git checkout
-<something>' will checkout the '<something>' branch on another remote,
+Currently this is used by linkgit:git-switch[1] and
+linkgit:git-checkout[1] when 'git checkout <something>'
+or 'git switch <something>'
+will checkout the '<something>' branch on another remote,
and by linkgit:git-worktree[1] when 'git worktree add' refers to a
remote branch. This setting might be used for other checkout-like
commands or functionality in the future.
-
-checkout.optimizeNewBranch::
- Optimizes the performance of "git checkout -b <new_branch>" when
- using sparse-checkout. When set to true, git will not update the
- repo based on the current sparse-checkout settings. This means it
- will not update the skip-worktree bit in the index nor add/remove
- files in the working directory to reflect the current sparse checkout
- settings nor will it show the local changes.
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index 8375596..d5daacb 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -14,7 +14,7 @@
+
This setting should be set to a comma-separated list of color and date settings,
starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the the line was introduced
+The metadata will be colored given the colors if the line was introduced
before the given timestamp, overwriting older timestamped colors.
+
Instead of an absolute timestamp relative timestamps work as well, e.g.
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index 7e9b6c8..852d2ba 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -86,7 +86,9 @@
it will automatically be removed, if set to `false`. Before
setting it to `true`, you should check that mtime is working
properly on your system.
- See linkgit:git-update-index[1]. `keep` by default.
+ See linkgit:git-update-index[1]. `keep` by default, unless
+ `feature.manyFiles` is enabled which sets this setting to
+ `true` by default.
core.checkStat::
When missing or is set to `default`, many fields in the stat
@@ -414,7 +416,7 @@
core.excludesFile::
Specifies the pathname to the file that contains patterns to
describe paths that are not meant to be tracked, in addition
- to '.gitignore' (per-directory) and '.git/info/exclude'.
+ to `.gitignore` (per-directory) and `.git/info/exclude`.
Defaults to `$XDG_CONFIG_HOME/git/ignore`.
If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore`
is used instead. See linkgit:gitignore[5].
@@ -429,8 +431,8 @@
command-line argument and write the password on its STDOUT.
core.attributesFile::
- In addition to '.gitattributes' (per-directory) and
- '.git/info/attributes', Git looks into this file for attributes
+ In addition to `.gitattributes` (per-directory) and
+ `.git/info/attributes`, Git looks into this file for attributes
(see linkgit:gitattributes[5]). Path expansions are made the same
way as for `core.excludesFile`. Its default value is
`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
@@ -438,10 +440,10 @@
core.hooksPath::
By default Git will look for your hooks in the
- '$GIT_DIR/hooks' directory. Set this to different path,
- e.g. '/etc/git/hooks', and Git will try to find your hooks in
- that directory, e.g. '/etc/git/hooks/pre-receive' instead of
- in '$GIT_DIR/hooks/pre-receive'.
+ `$GIT_DIR/hooks` directory. Set this to different path,
+ e.g. `/etc/git/hooks`, and Git will try to find your hooks in
+ that directory, e.g. `/etc/git/hooks/pre-receive` instead of
+ in `$GIT_DIR/hooks/pre-receive`.
+
The path can be either absolute or relative. A relative path is
taken as relative to the directory where the hooks are run (see
@@ -577,7 +579,7 @@
core.commitGraph::
If true, then git will read the commit-graph file (if it exists)
- to parse the graph structure of commits. Defaults to false. See
+ to parse the graph structure of commits. Defaults to true. See
linkgit:git-commit-graph[1] for more information.
core.useReplaceRefs::
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index e48bb98..ff09f1c 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -10,7 +10,7 @@
diff.dirstat::
A comma separated list of `--dirstat` parameters specifying the
- default behavior of the `--dirstat` option to linkgit:git-diff[1]`
+ default behavior of the `--dirstat` option to linkgit:git-diff[1]
and friends. The defaults can be overridden on the command line
(using `--dirstat=<param1,param2,...>`). The fallback defaults
(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
@@ -73,12 +73,13 @@
environment variable. The command is called with parameters
as described under "git Diffs" in linkgit:git[1]. Note: if
you want to use an external diff program only on a subset of
- your files, you might want to use linkgit:gitattributes[5] instead.
+ your files, you might want to use linkgit:gitattributes[5] instead.
diff.ignoreSubmodules::
Sets the default value of --ignore-submodules. Note that this
affects only 'git diff' Porcelain, and not lower level 'diff'
- commands such as 'git diff-files'. 'git checkout' also honors
+ commands such as 'git diff-files'. 'git checkout'
+ and 'git switch' also honor
this setting when reporting uncommitted changes. Setting it to
'all' disables the submodule summary normally shown by 'git commit'
and 'git status' when `status.submoduleSummary` is set unless it is
@@ -188,7 +189,7 @@
include::../mergetools-diff.txt[]
diff.indentHeuristic::
- Set this option to `true` to enable experimental heuristics
+ Set this option to `false` to disable the default heuristics
that shift diff hunk boundaries to make patches easier to read.
diff.algorithm::
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt
new file mode 100644
index 0000000..875f8c8
--- /dev/null
+++ b/Documentation/config/feature.txt
@@ -0,0 +1,37 @@
+feature.*::
+ The config settings that start with `feature.` modify the defaults of
+ a group of other config settings. These groups are created by the Git
+ developer community as recommended defaults and are subject to change.
+ In particular, new config options may be added with different defaults.
+
+feature.experimental::
+ Enable config options that are new to Git, and are being considered for
+ future defaults. Config settings included here may be added or removed
+ with each release, including minor version updates. These settings may
+ have unintended interactions since they are so new. Please enable this
+ setting if you are interested in providing feedback on experimental
+ features. The new default values are:
++
+* `pack.useSparse=true` uses a new algorithm when constructing a pack-file
+which can improve `git push` performance in repos with many files.
++
+* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
+skipping more commits at a time, reducing the number of round trips.
++
+* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
+command that downloads a pack-file from a remote. Using the `--split` option,
+most executions will create a very small commit-graph file on top of the
+existing commit-graph file(s). Occasionally, these files will merge and the
+write may take longer. Having an updated commit-graph file helps performance
+of many Git commands, including `git merge-base`, `git push -f`, and
+`git log --graph`.
+
+feature.manyFiles::
+ Enable config options that optimize for repos with many files in the
+ working directory. With many files, commands such as `git status` and
+ `git checkout` may be slow and these new defaults improve performance:
++
+* `index.version=4` enables path-prefix compression in the index.
++
+* `core.untrackedCache=true` enables the untracked cache. This setting assumes
+that mtime is working on your machine.
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index cbfad6c..e8cb205 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -59,7 +59,23 @@
effort to converge faster, but may result in a larger-than-necessary
packfile; The default is "default" which instructs Git to use the default algorithm
that never skips commits (unless the server has acknowledged it or one
- of its descendants).
+ of its descendants). If `feature.experimental` is enabled, then this
+ setting defaults to "skipping".
Unknown values will cause 'git fetch' to error out.
+
See also the `--negotiation-tip` option for linkgit:git-fetch[1].
+
+fetch.showForcedUpdates::
+ Set to false to enable `--no-show-forced-updates` in
+ linkgit:git-fetch[1] and linkgit:git-pull[1] commands.
+ Defaults to true.
+
+fetch.writeCommitGraph::
+ Set to true to write a commit-graph after every `git fetch` command
+ that downloads a pack-file from a remote. Using the `--split` option,
+ most executions will create a very small commit-graph file on top of
+ the existing commit-graph file(s). Occasionally, these files will
+ merge and the write may take longer. Having an updated commit-graph
+ file helps performance of many Git commands, including `git merge-base`,
+ `git push -f`, and `git log --graph`. Defaults to false, unless
+ `feature.experimental` is true.
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index dc77941..cb629fa 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -77,6 +77,7 @@
A boolean that controls whether to generate a cover-letter when
format-patch is invoked, but in addition can be set to "auto", to
generate a cover-letter only when there's more than one patch.
+ Default is false.
format.outputDirectory::
Set a custom directory to store the resulting files instead of the
@@ -85,3 +86,18 @@
format.useAutoBase::
A boolean value which lets you enable the `--base=auto` option of
format-patch by default.
+
+format.notes::
+ Provides the default value for the `--notes` option to
+ format-patch. Accepts a boolean value, or a ref which specifies
+ where to get notes. If false, format-patch defaults to
+ `--no-notes`. If true, format-patch defaults to `--notes`. If
+ set to a non-boolean value, format-patch defaults to
+ `--notes=<ref>`, where `ref` is the non-boolean value. Defaults
+ to false.
++
+If one wishes to use the ref `ref/notes/true`, please use that literal
+instead.
++
+This configuration can be specified multiple times in order to allow
+multiple notes refs to be included.
diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt
index 879c5a2..450e8c3 100644
--- a/Documentation/config/fsck.txt
+++ b/Documentation/config/fsck.txt
@@ -23,9 +23,9 @@
vice versa by configuring the `fsck.<msg-id>` setting where the
`<msg-id>` is the fsck message ID and the value is one of `error`,
`warn` or `ignore`. For convenience, fsck prefixes the error/warning
-with the message ID, e.g. "missingEmail: invalid author/committer line
-- missing email" means that setting `fsck.missingEmail = ignore` will
-hide that issue.
+with the message ID, e.g. "missingEmail: invalid author/committer
+line - missing email" means that setting `fsck.missingEmail = ignore`
+will hide that issue.
+
In general, it is better to enumerate existing objects with problems
with `fsck.skipList`, instead of listing the kind of breakages these
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index c6fbb8a..00ea0a6 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -1,25 +1,42 @@
gc.aggressiveDepth::
The depth parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
- to 50.
+ to 50, which is the default for the `--depth` option when
+ `--aggressive` isn't in use.
++
+See the documentation for the `--depth` option in
+linkgit:git-repack[1] for more details.
gc.aggressiveWindow::
The window size parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
- to 250.
+ to 250, which is a much more aggressive window size than
+ the default `--window` of 10.
++
+See the documentation for the `--window` option in
+linkgit:git-repack[1] for more details.
gc.auto::
When there are approximately more than this many loose
objects in the repository, `git gc --auto` will pack them.
Some Porcelain commands use this command to perform a
light-weight garbage collection from time to time. The
- default value is 6700. Setting this to 0 disables it.
+ default value is 6700.
++
+Setting this to 0 disables not only automatic packing based on the
+number of loose objects, but any other heuristic `git gc --auto` will
+otherwise use to determine if there's work to do, such as
+`gc.autoPackLimit`.
gc.autoPackLimit::
When there are more than this many packs that are not
marked with `*.keep` file in the repository, `git gc
--auto` consolidates them into one larger pack. The
- default value is 50. Setting this to 0 disables it.
+ default value is 50. Setting this to 0 disables it.
+ Setting `gc.auto` to 0 will also disable this.
++
+See the `gc.bigPackThreshold` configuration variable below. When in
+use, it'll affect how the auto pack limit works.
gc.autoDetach::
Make `git gc --auto` return immediately and run in background
@@ -36,12 +53,17 @@
this configuration variable is ignored, all packs except the base pack
will be repacked. After this the number of packs should go below
gc.autoPackLimit and gc.bigPackThreshold should be respected again.
++
+If the amount of memory estimated for `git repack` to run smoothly is
+not available and `gc.bigPackThreshold` is not set, the largest pack
+will also be excluded (this is the equivalent of running `git gc` with
+`--keep-base-pack`).
gc.writeCommitGraph::
If true, then gc will rewrite the commit-graph file when
- linkgit:git-gc[1] is run. When using linkgit:git-gc[1]
- '--auto' the commit-graph will be updated if housekeeping is
- required. Default is false. See linkgit:git-commit-graph[1]
+ linkgit:git-gc[1] is run. When using `git gc --auto`
+ the commit-graph will be updated if housekeeping is
+ required. Default is true. See linkgit:git-commit-graph[1]
for details.
gc.logExpiry::
@@ -94,6 +116,12 @@
With "<pattern>" (e.g. "refs/stash")
in the middle, the setting applies only to the refs that
match the <pattern>.
++
+These types of entries are generally created as a result of using `git
+commit --amend` or `git rebase` and are the commits prior to the amend
+or rebase occurring. Since these changes are not part of the current
+project most users will want to expire them sooner, which is why the
+default is more aggressive than `gc.reflogExpire`.
gc.rerereResolved::
Records of conflicted merge you resolved earlier are
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 590fe0d..cce2c89 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -2,7 +2,7 @@
Use this custom program instead of "`gpg`" found on `$PATH` when
making or verifying a PGP signature. The program must support the
same command-line interface as GPG, namely, to verify a detached
- signature, "`gpg --verify $file - <$signature`" is run, and the
+ signature, "`gpg --verify $signature - <$file`" is run, and the
program is expected to signal a good signature by exiting with
code 0, and to generate an ASCII-armored detached signature, the
standard input of "`gpg -bsau $key`" is fed with the contents to be
@@ -16,5 +16,5 @@
gpg.<format>.program::
Use this to customize the program used for the signing format you
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
- be used as a legacy synonym for `gpg.openpgp.program`. The default
+ be used as a legacy synonym for `gpg.openpgp.program`. The default
value for `gpg.x509.program` is "gpgsm".
diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt
index f181503..7cb50b3 100644
--- a/Documentation/config/index.txt
+++ b/Documentation/config/index.txt
@@ -24,3 +24,4 @@
index.version::
Specify the version with which new index files should be
initialized. This does not affect existing repositories.
+ If `feature.manyFiles` is enabled, then the default is 4.
diff --git a/Documentation/config/interactive.txt b/Documentation/config/interactive.txt
index ad846dd..a2d3c7e 100644
--- a/Documentation/config/interactive.txt
+++ b/Documentation/config/interactive.txt
@@ -2,7 +2,8 @@
In interactive commands, allow the user to provide one-letter
input with a single key (i.e., without hitting enter).
Currently this is used by the `--patch` mode of
- linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
+ linkgit:git-add[1], linkgit:git-checkout[1],
+ linkgit:git-restore[1], linkgit:git-commit[1],
linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
setting is silently ignored if portable keystroke input
is not available; requires the Perl module Term::ReadKey.
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 78d9e44..e9e1e39 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -40,4 +40,5 @@
log.mailmap::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
- linkgit:git-whatchanged[1] assume `--use-mailmap`.
+ linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
+ assume `--no-use-mailmap`. True by default.
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index d389c73..6a31393 100644
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -39,9 +39,22 @@
is turned off.
merge.renames::
- Whether and how Git detects renames. If set to "false",
- rename detection is disabled. If set to "true", basic rename
- detection is enabled. Defaults to the value of diff.renames.
+ Whether Git detects renames. If set to "false", rename detection
+ is disabled. If set to "true", basic rename detection is enabled.
+ Defaults to the value of diff.renames.
+
+merge.directoryRenames::
+ Whether Git detects directory renames, affecting what happens at
+ merge time to new files added to a directory on one side of
+ history when that directory was renamed on the other side of
+ history. If merge.directoryRenames is set to "false", directory
+ rename detection is disabled, meaning that such new files will be
+ left behind in the old directory. If set to "true", directory
+ rename detection is enabled, meaning that such new files will be
+ moved into the new directory. If set to "conflict", a conflict
+ will be reported for such paths. If merge.renames is false,
+ merge.directoryRenames is ignored and treated as false. Defaults
+ to "conflict".
merge.renormalize::
Tell Git that canonical representation of files in the
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 425c73a..1d66f0c 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -112,7 +112,8 @@
objects. This can have significant performance benefits when
computing a pack to send a small change. However, it is possible
that extra objects are added to the pack-file if the included
- commits contain certain types of direct renames.
+ commits contain certain types of direct renames. Default is `false`
+ unless `feature.experimental` is enabled.
pack.writeBitmaps (deprecated)::
This is a deprecated synonym for `repack.writeBitmaps`.
@@ -124,6 +125,4 @@
bitmapped and non-bitmapped objects (e.g., when serving a fetch
between an older, bitmapped pack and objects that have been
pushed since the last gc). The downside is that it consumes 4
- bytes per object of disk space, and that JGit's bitmap
- implementation does not understand it, causing it to complain if
- Git and JGit are used on the same repository. Defaults to false.
+ bytes per object of disk space. Defaults to true.
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index bb23a99..b87cab3 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -18,9 +18,9 @@
so that the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When preserve, also pass `--preserve-merges` along to 'git rebase'
-so that locally committed merge commits will not be flattened
-by running 'git pull'.
+When `preserve` (deprecated in favor of `merges`), also pass
+`--preserve-merges` along to 'git rebase' so that locally committed merge
+commits will not be flattened by running 'git pull'.
+
When the value is `interactive`, the rebase is run in interactive mode.
+
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index 331d250..d98e32d 100644
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -1,16 +1,9 @@
rebase.useBuiltin::
- Set to `false` to use the legacy shellscript implementation of
- linkgit:git-rebase[1]. Is `true` by default, which means use
- the built-in rewrite of it in C.
-+
-The C rewrite is first included with Git version 2.20. This option
-serves an an escape hatch to re-enable the legacy version in case any
-bugs are found in the rewrite. This option and the shellscript version
-of linkgit:git-rebase[1] will be removed in some future release.
-+
-If you find some reason to set this option to `false` other than
-one-off testing you should report the behavior difference as a bug in
-git.
+ Unused configuration variable. Used in Git versions 2.20 and
+ 2.21 as an escape hatch to enable the legacy shellscript
+ implementation of rebase. Now the built-in rewrite of it in C
+ is always used. Setting this will emit a warning, to alert any
+ remaining users that setting this now does nothing.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt
index 6c4cad8..a8e6437 100644
--- a/Documentation/config/remote.txt
+++ b/Documentation/config/remote.txt
@@ -76,3 +76,11 @@
+
See also `remote.<name>.prune` and the PRUNING section of
linkgit:git-fetch[1].
+
+remote.<name>.promisor::
+ When set to true, this remote will be used to fetch promisor
+ objects.
+
+remote.<name>.partialclonefilter::
+ The filter that will be applied when fetching from this
+ promisor remote.
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt
index a5c3781..9c413e1 100644
--- a/Documentation/config/repack.txt
+++ b/Documentation/config/repack.txt
@@ -24,4 +24,4 @@
packs created for clones and fetches, at the cost of some disk
space and extra time spent on the initial repack. This has
no effect if multiple packfiles are created.
- Defaults to false.
+ Defaults to true on bare repos, false otherwise.
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
index c583d46..abc7ef4 100644
--- a/Documentation/config/stash.txt
+++ b/Documentation/config/stash.txt
@@ -1,3 +1,18 @@
+stash.useBuiltin::
+ Set to `false` to use the legacy shell script implementation of
+ linkgit:git-stash[1]. Is `true` by default, which means use
+ the built-in rewrite of it in C.
++
+The C rewrite is first included with Git version 2.22 (and Git for Windows
+version 2.19). This option serves as an escape hatch to re-enable the
+legacy version in case any bugs are found in the rewrite. This option and
+the shell script version of linkgit:git-stash[1] will be removed in some
+future release.
++
+If you find some reason to set this option to `false`, other than
+one-off testing, you should report the behavior difference as a bug in
+Git (see https://git-scm.com/community for details).
+
stash.showPatch::
If this is set to true, the `git stash show` command without an
option will show the stash entry in patch form. Defaults to false.
diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt
index ed72fa7d..0fc704a 100644
--- a/Documentation/config/status.txt
+++ b/Documentation/config/status.txt
@@ -12,6 +12,11 @@
Set to true to enable --branch by default in linkgit:git-status[1].
The option --no-branch takes precedence over this variable.
+status.aheadBehind::
+ Set to true to enable `--ahead-behind` and false to enable
+ `--no-ahead-behind` by default in linkgit:git-status[1] for
+ non-porcelain status formats. Defaults to true.
+
status.displayCommentPrefix::
If set to true, linkgit:git-status[1] will insert a comment
prefix before each output line (starting with
diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt
index 663663b..ef5adb3 100644
--- a/Documentation/config/tag.txt
+++ b/Documentation/config/tag.txt
@@ -8,6 +8,14 @@
linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
value of this variable will be used as the default.
+tag.gpgSign::
+ A boolean to specify whether all tags should be GPG signed.
+ Use of this option when running in an automated script can
+ result in a large number of tags being signed. It is therefore
+ convenient to use an agent to avoid typing your gpg passphrase
+ several times. Note that this option doesn't affects tag signing
+ behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
+
tar.umask::
This variable can be used to restrict the permission bits of
tar archive entries. The default is 0002, which turns off the
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
new file mode 100644
index 0000000..2edbfb0
--- /dev/null
+++ b/Documentation/config/trace2.txt
@@ -0,0 +1,56 @@
+Trace2 config settings are only read from the system and global
+config files; repository local and worktree config files and `-c`
+command line arguments are not respected.
+
+trace2.normalTarget::
+ This variable controls the normal target destination.
+ It may be overridden by the `GIT_TRACE2` environment variable.
+ The following table shows possible values.
+
+trace2.perfTarget::
+ This variable controls the performance target destination.
+ It may be overridden by the `GIT_TRACE2_PERF` environment variable.
+ The following table shows possible values.
+
+trace2.eventTarget::
+ This variable controls the event target destination.
+ It may be overridden by the `GIT_TRACE2_EVENT` environment variable.
+ The following table shows possible values.
++
+include::../trace2-target-values.txt[]
+
+trace2.normalBrief::
+ Boolean. When true `time`, `filename`, and `line` fields are
+ omitted from normal output. May be overridden by the
+ `GIT_TRACE2_BRIEF` environment variable. Defaults to false.
+
+trace2.perfBrief::
+ Boolean. When true `time`, `filename`, and `line` fields are
+ omitted from PERF output. May be overridden by the
+ `GIT_TRACE2_PERF_BRIEF` environment variable. Defaults to false.
+
+trace2.eventBrief::
+ Boolean. When true `time`, `filename`, and `line` fields are
+ omitted from event output. May be overridden by the
+ `GIT_TRACE2_EVENT_BRIEF` environment variable. Defaults to false.
+
+trace2.eventNesting::
+ Integer. Specifies desired depth of nested regions in the
+ event output. Regions deeper than this value will be
+ omitted. May be overridden by the `GIT_TRACE2_EVENT_NESTING`
+ environment variable. Defaults to 2.
+
+trace2.configParams::
+ A comma-separated list of patterns of "important" config
+ settings that should be recorded in the trace2 output.
+ For example, `core.*,remote.*.url` would cause the trace2
+ output to contain events listing each configured remote.
+ May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment
+ variable. Unset by default.
+
+trace2.destinationDebug::
+ Boolean. When true Git will print error messages when a
+ trace target destination cannot be opened for writing.
+ By default, these errors are suppressed and tracing is
+ silently disabled. May be overridden by the
+ `GIT_TRACE2_DST_DEBUG` environment variable.
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index 4a5dfe2..f5b6245 100644
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -17,7 +17,7 @@
instead be left unreferenced in the repository.
+
Due to the non-quarantine nature of the `fetch.fsckObjects`
-implementation it can not be relied upon to leave the object store
+implementation it cannot be relied upon to leave the object store
clean like `receive.fsckObjects` can.
+
As objects are unpacked they're written to the object store, so there
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index b5b2ba1..0557cbb 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -1,12 +1,19 @@
-user.email::
- Your email address to be recorded in any newly created commits.
- Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
- `EMAIL` environment variables. See linkgit:git-commit-tree[1].
-
user.name::
- Your full name to be recorded in any newly created commits.
- Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
- environment variables. See linkgit:git-commit-tree[1].
+user.email::
+author.name::
+author.email::
+committer.name::
+committer.email::
+ The `user.name` and `user.email` variables determine what ends
+ up in the `author` and `committer` field of commit
+ objects.
+ If you need the `author` or `committer` to be different, the
+ `author.name`, `author.email`, `committer.name` or
+ `committer.email` variables can be set.
+ Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
+ `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
+ `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
+ See linkgit:git-commit-tree[1] for more information.
user.useConfigOnly::
Instruct Git to avoid trying to guess defaults for `user.email`
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index cdcc17f..4d846d7 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -95,12 +95,26 @@
. there are more "src" modes and "src" sha1
. status is concatenated status characters for each parent
. no optional "score" number
-. single path, only for "dst"
+. tab-separated pathname(s) of the file
-Example:
+For `-c` and `--cc`, only the destination or final path is shown even
+if the file was renamed on any side of history. With
+`--combined-all-paths`, the name of the path in each parent is shown
+followed by the name of the path in the merge commit.
+
+Examples for `-c` and `--cc` without `--combined-all-paths`:
+------------------------------------------------
+::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c
+::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
+::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c
+------------------------------------------------
+
+Examples when `--combined-all-paths` added to either `-c` or `--cc`:
------------------------------------------------
-::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
+::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
+::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
+::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c
------------------------------------------------
Note that 'combined diff' lists only files which were modified from
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 231105c..f10ca41 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -143,6 +143,19 @@
Similar to two-line header for traditional 'unified' diff
format, `/dev/null` is used to signal created or deleted
files.
++
+However, if the --combined-all-paths option is provided, instead of a
+two-line from-file/to-file you get a N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit
+
+ --- a/file
+ --- a/file
+ --- a/file
+ +++ b/file
++
+This extended format can be useful if rename or copy detection is
+active, to allow you to see the original name of the file in different
+parents.
4. Chunk header format is modified to prevent people from
accidentally feeding it to `patch -p1`. Combined diff format
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 554a340..09faee3 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,11 +36,21 @@
-U<n>::
--unified=<n>::
Generate diffs with <n> lines of context instead of
- the usual three.
+ the usual three. Implies `--patch`.
ifndef::git-format-patch[]
Implies `-p`.
endif::git-format-patch[]
+--output=<file>::
+ Output to a specific file instead of stdout.
+
+--output-indicator-new=<char>::
+--output-indicator-old=<char>::
+--output-indicator-context=<char>::
+ Specify the character used to indicate new, old or context
+ lines in the generated patch. Normally they are '+', '-' and
+ ' ' respectively.
+
ifndef::git-format-patch[]
--raw::
ifndef::git-log[]
@@ -148,6 +158,7 @@
number of modified files, as well as number of added and deleted
lines.
+-X[<param1,param2,...>]::
--dirstat[=<param1,param2,...>]::
Output the distribution of relative amount of changes for each
sub-directory. The behavior of `--dirstat` can be customized by
@@ -192,6 +203,12 @@
and accumulating child directory counts in the parent directories:
`--dirstat=files,10,cumulative`.
+--cumulative::
+ Synonym for --dirstat=cumulative
+
+--dirstat-by-file[=<param1,param2>...]::
+ Synonym for --dirstat=files,param1,param2...
+
--summary::
Output a condensed summary of extended header information
such as creations, renames and mode changes.
@@ -386,6 +403,9 @@
Turn off rename detection, even when the configuration
file gives the default to do so.
+--[no-]rename-empty::
+ Whether to use empty blobs as rename source.
+
ifndef::git-format-patch[]
--check::
Warn if changes introduce conflict markers or whitespace errors.
@@ -416,7 +436,7 @@
--binary::
In addition to `--full-index`, output a binary diff that
- can be applied with `git-apply`.
+ can be applied with `git-apply`. Implies `--patch`.
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 32c83dd..88a9b20 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -12,9 +12,16 @@
doc-diff [options] <from> <to> [-- <diff-options>]
doc-diff (-c|--clean)
--
-j=n parallel argument to pass to make
-f force rebuild; do not rely on cached results
-c,clean cleanup temporary working files
+j=n parallel argument to pass to make
+f force rebuild; do not rely on cached results
+c,clean cleanup temporary working files
+from-asciidoc use asciidoc with the 'from'-commit
+from-asciidoctor use asciidoctor with the 'from'-commit
+asciidoc use asciidoc with both commits
+to-asciidoc use asciidoc with the 'to'-commit
+to-asciidoctor use asciidoctor with the 'to'-commit
+asciidoctor use asciidoctor with both commits
+cut-footer cut away footer
"
SUBDIRECTORY_OK=1
. "$(git --exec-path)/git-sh-setup"
@@ -22,6 +29,9 @@
parallel=
force=
clean=
+from_program=
+to_program=
+cut_footer=
while test $# -gt 0
do
case "$1" in
@@ -31,6 +41,22 @@
clean=t ;;
-f)
force=t ;;
+ --from-asciidoctor)
+ from_program=-asciidoctor ;;
+ --to-asciidoctor)
+ to_program=-asciidoctor ;;
+ --asciidoctor)
+ from_program=-asciidoctor
+ to_program=-asciidoctor ;;
+ --from-asciidoc)
+ from_program=-asciidoc ;;
+ --to-asciidoc)
+ to_program=-asciidoc ;;
+ --asciidoc)
+ from_program=-asciidoc
+ to_program=-asciidoc ;;
+ --cut-footer)
+ cut_footer=-cut-footer ;;
--)
shift; break ;;
*)
@@ -79,6 +105,22 @@
ln -s "$dots/config.mak" "$tmp/worktree/config.mak"
fi
+construct_makemanflags () {
+ if test "$1" = "-asciidoc"
+ then
+ echo USE_ASCIIDOCTOR=
+ elif test "$1" = "-asciidoctor"
+ then
+ echo USE_ASCIIDOCTOR=YesPlease
+ fi
+}
+
+from_makemanflags=$(construct_makemanflags "$from_program") &&
+to_makemanflags=$(construct_makemanflags "$to_program") &&
+
+from_dir=$from_oid$from_program$cut_footer &&
+to_dir=$to_oid$to_program$cut_footer &&
+
# generate_render_makefile <srcdir> <dstdir>
generate_render_makefile () {
find "$1" -type f |
@@ -94,7 +136,7 @@
done
}
-# render_tree <committish_oid>
+# render_tree <committish_oid> <directory_name> <makemanflags>
render_tree () {
# Skip install-man entirely if we already have an installed directory.
# We can't rely on make here, since "install-man" unconditionally
@@ -102,28 +144,43 @@
# we then can't rely on during the render step). We use "mv" to make
# sure we don't get confused by a previous run that failed partway
# through.
- if ! test -d "$tmp/installed/$1"
+ oid=$1 &&
+ dname=$2 &&
+ makemanflags=$3 &&
+ if ! test -d "$tmp/installed/$dname"
then
- git -C "$tmp/worktree" checkout --detach "$1" &&
+ git -C "$tmp/worktree" checkout --detach "$oid" &&
make -j$parallel -C "$tmp/worktree" \
+ $makemanflags \
GIT_VERSION=omitted \
SOURCE_DATE_EPOCH=0 \
- DESTDIR="$tmp/installed/$1+" \
+ DESTDIR="$tmp/installed/$dname+" \
install-man &&
- mv "$tmp/installed/$1+" "$tmp/installed/$1"
+ mv "$tmp/installed/$dname+" "$tmp/installed/$dname"
fi &&
# As with "installed" above, we skip the render if it's already been
# done. So using make here is primarily just about running in
# parallel.
- if ! test -d "$tmp/rendered/$1"
+ if ! test -d "$tmp/rendered/$dname"
then
- generate_render_makefile "$tmp/installed/$1" "$tmp/rendered/$1+" |
+ generate_render_makefile "$tmp/installed/$dname" \
+ "$tmp/rendered/$dname+" |
make -j$parallel -f - &&
- mv "$tmp/rendered/$1+" "$tmp/rendered/$1"
+ mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
+
+ if test "$cut_footer" = "-cut-footer"
+ then
+ for f in $(find "$tmp/rendered/$dname" -type f)
+ do
+ head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" &&
+ mv "$f+" "$f" ||
+ return 1
+ done
+ fi
fi
}
-render_tree $from_oid &&
-render_tree $to_oid &&
-git -C $tmp/rendered diff --no-index "$@" $from_oid $to_oid
+render_tree $from_oid $from_dir $from_makemanflags &&
+render_tree $to_oid $to_dir $to_makemanflags &&
+git -C $tmp/rendered diff --no-index "$@" $from_dir $to_dir
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index fa0a315..99df1f3 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -88,6 +88,10 @@
Allow several <repository> and <group> arguments to be
specified. No <refspec>s may be specified.
+--[no-]auto-gc::
+ Run `git gc --auto` at the end to perform garbage collection
+ if needed. This is enabled by default.
+
-p::
--prune::
Before fetching, remove any remote-tracking references that no
@@ -165,6 +169,13 @@
Disable recursive fetching of submodules (this has the same effect as
using the `--recurse-submodules=no` option).
+--set-upstream::
+ If the remote is fetched successfully, pull and add upstream
+ (tracking) reference, used by argument-less
+ linkgit:git-pull[1] and other commands. For more information,
+ see `branch.<name>.merge` and `branch.<name>.remote` in
+ linkgit:git-config[1].
+
--submodule-prefix=<path>::
Prepend <path> to paths printed in informative messages
such as "Fetching submodule foo". This option is used
@@ -216,10 +227,24 @@
--server-option=<option>::
Transmit the given string to the server when communicating using
protocol version 2. The given string must not contain a NUL or LF
- character.
+ character. The server's handling of server options, including
+ unknown ones, is server-specific.
When multiple `--server-option=<option>` are given, they are all
sent to the other side in the order listed on the command line.
+--show-forced-updates::
+ By default, git checks if a branch is force-updated during
+ fetch. This can be disabled through fetch.showForcedUpdates, but
+ the --show-forced-updates option guarantees this check occurs.
+ See linkgit:git-config[1].
+
+--no-show-forced-updates::
+ By default, git checks if a branch is force-updated during
+ fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates
+ to false to skip this check for performance reasons. If used during
+ 'git-pull' the --ff-only option will still check for forced updates
+ before attempting a fast-forward update. See linkgit:git-config[1].
+
-4::
--ipv4::
Use IPv4 addresses only, ignoring IPv6 addresses.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 37bcab9..8b0e4c7 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -193,15 +193,6 @@
for command-line options).
-CONFIGURATION
--------------
-
-The optional configuration variable `core.excludesFile` indicates a path to a
-file containing patterns of file names to exclude from git-add, similar to
-$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
-those in info/exclude. See linkgit:gitignore[5].
-
-
EXAMPLES
--------
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6f6c34b..fc3b993 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -99,6 +99,11 @@
am.threeWay configuration variable. For more information,
see am.threeWay in linkgit:git-config[1].
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
--ignore-space-change::
--ignore-whitespace::
--whitespace=<option>::
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 16323eb..7e81541 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -10,6 +10,7 @@
[verse]
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
[-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
+ [--ignore-rev <rev>] [--ignore-revs-file <file>]
[--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
[--] <file>
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 3bd83a7..135206f 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -8,12 +8,14 @@
SYNOPSIS
--------
[verse]
-'git branch' [--color[=<when>] | --no-color] [-r | -a]
- [--list] [-v [--abbrev=<length> | --no-abbrev]]
+'git branch' [--color[=<when>] | --no-color] [--show-current]
+ [-v [--abbrev=<length> | --no-abbrev]]
[--column[=<options>] | --no-column] [--sort=<key>]
[(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]]
- [--points-at <object>] [--format=<format>] [<pattern>...]
+ [--points-at <object>] [--format=<format>]
+ [(-r | --remotes) | (-a | --all)]
+ [--list] [<pattern>...]
'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
'git branch' --unset-upstream [<branchname>]
@@ -26,13 +28,19 @@
-----------
If `--list` is given, or if there are no non-option arguments, existing
-branches are listed; the current branch will be highlighted with an
-asterisk. Option `-r` causes the remote-tracking branches to be listed,
-and option `-a` shows both local and remote branches. If a `<pattern>`
+branches are listed; the current branch will be highlighted in green and
+marked with an asterisk. Any branches checked out in linked worktrees will
+be highlighted in cyan and marked with a plus sign. Option `-r` causes the
+remote-tracking branches to be listed,
+and option `-a` shows both local and remote branches.
+
+If a `<pattern>`
is given, it is used as a shell wildcard to restrict the output to
matching branches. If multiple patterns are given, a branch is shown if
-it matches any of the patterns. Note that when providing a
-`<pattern>`, you must use `--list`; otherwise the command is interpreted
+it matches any of the patterns.
+
+Note that when providing a
+`<pattern>`, you must use `--list`; otherwise the command may be interpreted
as branch creation.
With `--contains`, shows only the branches that contain the named commit
@@ -45,10 +53,14 @@
branch).
The command's second form creates a new branch head named <branchname>
-which points to the current `HEAD`, or <start-point> if given.
+which points to the current `HEAD`, or <start-point> if given. As a
+special case, for <start-point>, you may use `"A...B"` as a shortcut for
+the merge base of `A` and `B` if there is exactly one merge base. You
+can leave out at most one of `A` and `B`, in which case it defaults to
+`HEAD`.
Note that this will create the new branch, but it will not switch the
-working tree to it; use "git checkout <newbranch>" to switch to the
+working tree to it; use "git switch <newbranch>" to switch to the
new branch.
When a local branch is started off a remote-tracking branch, Git sets up the
@@ -149,10 +161,12 @@
-r::
--remotes::
List or delete (if used with -d) the remote-tracking branches.
+ Combine with `--list` to match the optional pattern(s).
-a::
--all::
List both remote-tracking branches and local branches.
+ Combine with `--list` to match optional pattern(s).
-l::
--list::
@@ -160,14 +174,20 @@
branch --list 'maint-*'`, list only the branches that match
the pattern(s).
+--show-current::
+ Print the name of the current branch. In detached HEAD state,
+ nothing is printed.
+
-v::
-vv::
--verbose::
When in list mode,
show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
- the name of the upstream branch, as well (see also `git remote
- show <remote>`).
+ the path of the linked worktree (if any) and the name of the upstream
+ branch, as well (see also `git remote show <remote>`). Note that the
+ current worktree's HEAD will not have its path printed (it will always
+ be your current directory).
-q::
--quiet::
@@ -194,7 +214,7 @@
+
This behavior is the default when the start point is a remote-tracking branch.
Set the branch.autoSetupMerge configuration variable to `false` if you
-want `git checkout` and `git branch` to always behave as if `--no-track`
+want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
were given. Set it to `always` if you want this behavior when the
start-point is either a local or remote-tracking branch.
@@ -293,7 +313,7 @@
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git branch my2.6.14 v2.6.14 <1>
-$ git checkout my2.6.14
+$ git switch my2.6.14
------------
+
<1> This step and the next one could be combined into a single step with
@@ -314,13 +334,25 @@
<2> Delete the "test" branch even if the "master" branch (or whichever branch
is currently checked out) does not have all commits from the test branch.
+Listing branches from a specific remote::
++
+------------
+$ git branch -r -l '<remote>/<pattern>' <1>
+$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>
+------------
++
+<1> Using `-a` would conflate <remote> with any local branches you happen to
+ have been prefixed with the same <remote> pattern.
+<2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]
+
+Patterns will normally need quoting.
NOTES
-----
-If you are creating a branch that you want to checkout immediately, it is
-easier to use the git checkout command with its `-b` option to create
-a branch and check it out with a single command.
+If you are creating a branch that you want to switch to immediately,
+it is easier to use the "git switch" command with its `-c` option to
+do the same thing with a single command.
The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
serve four related but different purposes:
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index d9de992..ee6a414 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -88,7 +88,8 @@
When run with `--branch` option in a repository, the input is first
expanded for the ``previous checkout syntax''
`@{-n}`. For example, `@{-1}` is a way to refer the last thing that
-was checked out using "git checkout" operation. This option should be
+was checked out using "git switch" or "git checkout" operation.
+This option should be
used by porcelains to accept this syntax anywhere a branch name is
expected, so they can act as if you typed the branch name. As an
exception note that, the ``previous checkout operation'' might result
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 9a39649..cf3cac0 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -23,31 +23,22 @@
also update `HEAD` to set the specified branch as the current
branch.
-'git checkout' <branch>::
- To prepare for working on <branch>, switch to it by updating
+'git checkout' [<branch>]::
+ To prepare for working on `<branch>`, switch to it by updating
the index and the files in the working tree, and by pointing
- HEAD at the branch. Local modifications to the files in the
+ `HEAD` at the branch. Local modifications to the files in the
working tree are kept, so that they can be committed to the
- <branch>.
+ `<branch>`.
+
-If <branch> is not found but there does exist a tracking branch in
-exactly one remote (call it <remote>) with a matching name, treat as
-equivalent to
+If `<branch>` is not found but there does exist a tracking branch in
+exactly one remote (call it `<remote>`) with a matching name and
+`--no-guess` is not specified, treat as equivalent to
+
------------
$ git checkout -b <branch> --track <remote>/<branch>
------------
+
-If the branch exists in multiple remotes and one of them is named by
-the `checkout.defaultRemote` configuration variable, we'll use that
-one for the purposes of disambiguation, even if the `<branch>` isn't
-unique across all remotes. Set it to
-e.g. `checkout.defaultRemote=origin` to always checkout remote
-branches from there if `<branch>` is ambiguous but exists on the
-'origin' remote. See also `checkout.defaultRemote` in
-linkgit:git-config[1].
-+
-You could omit <branch>, in which case the command degenerates to
+You could omit `<branch>`, in which case the command degenerates to
"check out the current branch", which is a glorified no-op with
rather expensive side-effects to show only the tracking information,
if exists, for the current branch.
@@ -61,7 +52,7 @@
`--track` without `-b` implies branch creation; see the
description of `--track` below.
+
-If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it
+If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
is reset. This is the transactional equivalent of
+
------------
@@ -75,25 +66,25 @@
'git checkout' --detach [<branch>]::
'git checkout' [--detach] <commit>::
- Prepare to work on top of <commit>, by detaching HEAD at it
+ Prepare to work on top of `<commit>`, by detaching `HEAD` at it
(see "DETACHED HEAD" section), and updating the index and the
files in the working tree. Local modifications to the files
in the working tree are kept, so that the resulting working
tree will be the state recorded in the commit plus the local
modifications.
+
-When the <commit> argument is a branch name, the `--detach` option can
-be used to detach HEAD at the tip of the branch (`git checkout
-<branch>` would check out that branch without detaching HEAD).
+When the `<commit>` argument is a branch name, the `--detach` option can
+be used to detach `HEAD` at the tip of the branch (`git checkout
+<branch>` would check out that branch without detaching `HEAD`).
+
-Omitting <branch> detaches HEAD at the tip of the current branch.
+Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
'git checkout' [<tree-ish>] [--] <pathspec>...::
Overwrite paths in the working tree by replacing with the
- contents in the index or in the <tree-ish> (most often a
- commit). When a <tree-ish> is given, the paths that
- match the <pathspec> are updated both in the index and in
+ contents in the index or in the `<tree-ish>` (most often a
+ commit). When a `<tree-ish>` is given, the paths that
+ match the `<pathspec>` are updated both in the index and in
the working tree.
+
The index may contain unmerged entries because of a previous failed merge.
@@ -118,7 +109,8 @@
--quiet::
Quiet, suppress feedback messages.
---[no-]progress::
+--progress::
+--no-progress::
Progress status is reported on the standard error stream
by default when it is attached to a terminal, unless `--quiet`
is specified. This flag enables progress reporting even if not
@@ -127,7 +119,7 @@
-f::
--force::
When switching branches, proceed even if the index or the
- working tree differs from HEAD. This is used to throw away
+ working tree differs from `HEAD`. This is used to throw away
local changes.
+
When checking out paths from the index, do not fail upon unmerged
@@ -154,12 +146,12 @@
of it").
-b <new_branch>::
- Create a new branch named <new_branch> and start it at
- <start_point>; see linkgit:git-branch[1] for details.
+ Create a new branch named `<new_branch>` and start it at
+ `<start_point>`; see linkgit:git-branch[1] for details.
-B <new_branch>::
- Creates the branch <new_branch> and start it at <start_point>;
- if it already exists, then reset it to <start_point>. This is
+ Creates the branch `<new_branch>` and start it at `<start_point>`;
+ if it already exists, then reset it to `<start_point>`. This is
equivalent to running "git branch" with "-f"; see
linkgit:git-branch[1] for details.
@@ -172,15 +164,36 @@
derived from the remote-tracking branch, by looking at the local part of
the refspec configured for the corresponding remote, and then stripping
the initial part up to the "*".
-This would tell us to use "hack" as the local branch when branching
-off of "origin/hack" (or "remotes/origin/hack", or even
-"refs/remotes/origin/hack"). If the given name has no slash, or the above
+This would tell us to use `hack` as the local branch when branching
+off of `origin/hack` (or `remotes/origin/hack`, or even
+`refs/remotes/origin/hack`). If the given name has no slash, or the above
guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with `-b` in such a case.
--no-track::
Do not set up "upstream" configuration, even if the
- branch.autoSetupMerge configuration variable is true.
+ `branch.autoSetupMerge` configuration variable is true.
+
+--guess::
+--no-guess::
+ If `<branch>` is not found but there does exist a tracking
+ branch in exactly one remote (call it `<remote>`) with a
+ matching name, treat as equivalent to
++
+------------
+$ git checkout -b <branch> --track <remote>/<branch>
+------------
++
+If the branch exists in multiple remotes and one of them is named by
+the `checkout.defaultRemote` configuration variable, we'll use that
+one for the purposes of disambiguation, even if the `<branch>` isn't
+unique across all remotes. Set it to
+e.g. `checkout.defaultRemote=origin` to always checkout remote
+branches from there if `<branch>` is ambiguous but exists on the
+'origin' remote. See also `checkout.defaultRemote` in
+linkgit:git-config[1].
++
+Use `--no-guess` to disable this.
-l::
Create the new branch's reflog; see linkgit:git-branch[1] for
@@ -189,21 +202,21 @@
--detach::
Rather than checking out a branch to work on it, check out a
commit for inspection and discardable experiments.
- This is the default behavior of "git checkout <commit>" when
- <commit> is not a branch name. See the "DETACHED HEAD" section
+ This is the default behavior of `git checkout <commit>` when
+ `<commit>` is not a branch name. See the "DETACHED HEAD" section
below for details.
--orphan <new_branch>::
- Create a new 'orphan' branch, named <new_branch>, started from
- <start_point> and switch to it. The first commit made on this
+ Create a new 'orphan' branch, named `<new_branch>`, started from
+ `<start_point>` and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new
history totally disconnected from all the other branches and
commits.
+
The index and the working tree are adjusted as if you had previously run
-"git checkout <start_point>". This allows you to start a new history
-that records a set of paths similar to <start_point> by easily running
-"git commit -a" to make the root commit.
+`git checkout <start_point>`. This allows you to start a new history
+that records a set of paths similar to `<start_point>` by easily running
+`git commit -a` to make the root commit.
+
This can be useful when you want to publish the tree from a commit
without exposing its full history. You might want to do this to publish
@@ -212,17 +225,17 @@
code.
+
If you want to start a disconnected history that records a set of paths
-that is totally different from the one of <start_point>, then you should
+that is totally different from the one of `<start_point>`, then you should
clear the index and the working tree right after creating the orphan
-branch by running "git rm -rf ." from the top level of the working tree.
+branch by running `git rm -rf .` from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
working tree, by copying them from elsewhere, extracting a tarball, etc.
--ignore-skip-worktree-bits::
In sparse checkout mode, `git checkout -- <paths>` would
- update only entries matched by <paths> and sparse patterns
- in $GIT_DIR/info/sparse-checkout. This option ignores
- the sparse patterns and adds back any files in <paths>.
+ update only entries matched by `<paths>` and sparse patterns
+ in `$GIT_DIR/info/sparse-checkout`. This option ignores
+ the sparse patterns and adds back any files in `<paths>`.
-m::
--merge::
@@ -242,24 +255,29 @@
+
When checking out paths from the index, this option lets you recreate
the conflicted merge in the specified paths.
++
+When switching branches with `--merge`, staged changes may be lost.
--conflict=<style>::
- The same as --merge option above, but changes the way the
+ The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
- merge.conflictStyle configuration variable. Possible values are
+ `merge.conflictStyle` configuration variable. Possible values are
"merge" (default) and "diff3" (in addition to what is shown by
"merge" style, shows the original contents).
-p::
--patch::
Interactively select hunks in the difference between the
- <tree-ish> (or the index, if unspecified) and the working
+ `<tree-ish>` (or the index, if unspecified) and the working
tree. The chosen hunks are then applied in reverse to the
- working tree (and if a <tree-ish> was specified, the index).
+ working tree (and if a `<tree-ish>` was specified, the index).
+
This means that you can use `git checkout -p` to selectively discard
edits from your current working tree. See the ``Interactive Mode''
section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
++
+Note that this option uses the no overlay mode by default (see also
+`--overlay`), and currently doesn't support overlay mode.
--ignore-other-worktrees::
`git checkout` refuses when the wanted ref is already checked
@@ -267,31 +285,42 @@
out anyway. In other words, the ref can be held by more than one
worktree.
---[no-]recurse-submodules::
- Using --recurse-submodules will update the content of all initialized
+--overwrite-ignore::
+--no-overwrite-ignore::
+ Silently overwrite ignored files when switching branches. This
+ is the default behavior. Use `--no-overwrite-ignore` to abort
+ the operation when the new branch contains ignored files.
+
+--recurse-submodules::
+--no-recurse-submodules::
+ Using `--recurse-submodules` will update the content of all initialized
submodules according to the commit recorded in the superproject. If
local modifications in a submodule would be overwritten the checkout
- will fail unless `-f` is used. If nothing (or --no-recurse-submodules)
+ will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`)
is used, the work trees of submodules will not be updated.
- Just like linkgit:git-submodule[1], this will detach the
- submodules HEAD.
+ Just like linkgit:git-submodule[1], this will detach `HEAD` of the
+ submodule.
---no-guess::
- Do not attempt to create a branch if a remote tracking branch
- of the same name exists.
+--overlay::
+--no-overlay::
+ In the default overlay mode, `git checkout` never
+ removes files from the index or the working tree. When
+ specifying `--no-overlay`, files that appear in the index and
+ working tree, but not in `<tree-ish>` are removed, to make them
+ match `<tree-ish>` exactly.
<branch>::
Branch to checkout; if it refers to a branch (i.e., a name that,
when prepended with "refs/heads/", is a valid ref), then that
branch is checked out. Otherwise, if it refers to a valid
- commit, your HEAD becomes "detached" and you are no longer on
+ commit, your `HEAD` becomes "detached" and you are no longer on
any branch (see below for details).
+
-You can use the `"@{-N}"` syntax to refer to the N-th last
+You can use the `@{-N}` syntax to refer to the N-th last
branch/commit checked out using "git checkout" operation. You may
-also specify `-` which is synonymous to `"@{-1}`.
+also specify `-` which is synonymous to `@{-1}`.
+
-As a special case, you may use `"A...B"` as a shortcut for the
+As a special case, you may use `A...B` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
@@ -300,7 +329,11 @@
<start_point>::
The name of a commit at which to start the new branch; see
- linkgit:git-branch[1] for details. Defaults to HEAD.
+ linkgit:git-branch[1] for details. Defaults to `HEAD`.
++
+As a special case, you may use `"A...B"` as a shortcut for the
+merge base of `A` and `B` if there is exactly one merge base. You can
+leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
<tree-ish>::
Tree to checkout from (when paths are given). If not specified,
@@ -310,9 +343,9 @@
DETACHED HEAD
-------------
-HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each
+`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each
branch refers to a specific commit. Let's look at a repo with three
-commits, one of them tagged, and with branch 'master' checked out:
+commits, one of them tagged, and with branch `master` checked out:
------------
HEAD (refers to branch 'master')
@@ -325,10 +358,10 @@
------------
When a commit is created in this state, the branch is updated to refer to
-the new commit. Specifically, 'git commit' creates a new commit 'd', whose
-parent is commit 'c', and then updates branch 'master' to refer to new
-commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers
-to commit 'd':
+the new commit. Specifically, 'git commit' creates a new commit `d`, whose
+parent is commit `c`, and then updates branch `master` to refer to new
+commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers
+to commit `d`:
------------
$ edit; git add; git commit
@@ -345,7 +378,7 @@
It is sometimes useful to be able to checkout a commit that is not at
the tip of any named branch, or even to create a new commit that is not
referenced by a named branch. Let's look at what happens when we
-checkout commit 'b' (here we show two ways this may be done):
+checkout commit `b` (here we show two ways this may be done):
------------
$ git checkout v2.0 # or
@@ -360,9 +393,9 @@
tag 'v2.0' (refers to commit 'b')
------------
-Notice that regardless of which checkout command we use, HEAD now refers
-directly to commit 'b'. This is known as being in detached HEAD state.
-It means simply that HEAD refers to a specific commit, as opposed to
+Notice that regardless of which checkout command we use, `HEAD` now refers
+directly to commit `b`. This is known as being in detached `HEAD` state.
+It means simply that `HEAD` refers to a specific commit, as opposed to
referring to a named branch. Let's see what happens when we create a commit:
------------
@@ -379,7 +412,7 @@
tag 'v2.0' (refers to commit 'b')
------------
-There is now a new commit 'e', but it is referenced only by HEAD. We can
+There is now a new commit `e`, but it is referenced only by `HEAD`. We can
of course add yet another commit in this state:
------------
@@ -397,7 +430,7 @@
------------
In fact, we can perform all the normal Git operations. But, let's look
-at what happens when we then checkout master:
+at what happens when we then checkout `master`:
------------
$ git checkout master
@@ -412,9 +445,9 @@
------------
It is important to realize that at this point nothing refers to commit
-'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted
+`f`. Eventually commit `f` (and by extension commit `e`) will be deleted
by the routine Git garbage collection process, unless we create a reference
-before that happens. If we have not yet moved away from commit 'f',
+before that happens. If we have not yet moved away from commit `f`,
any of these will create a reference to it:
------------
@@ -423,19 +456,19 @@
$ git tag foo <3>
------------
-<1> creates a new branch 'foo', which refers to commit 'f', and then
- updates HEAD to refer to branch 'foo'. In other words, we'll no longer
- be in detached HEAD state after this command.
+<1> creates a new branch `foo`, which refers to commit `f`, and then
+ updates `HEAD` to refer to branch `foo`. In other words, we'll no longer
+ be in detached `HEAD` state after this command.
-<2> similarly creates a new branch 'foo', which refers to commit 'f',
- but leaves HEAD detached.
+<2> similarly creates a new branch `foo`, which refers to commit `f`,
+ but leaves `HEAD` detached.
-<3> creates a new tag 'foo', which refers to commit 'f',
- leaving HEAD detached.
+<3> creates a new tag `foo`, which refers to commit `f`,
+ leaving `HEAD` detached.
-If we have moved away from commit 'f', then we must first recover its object
+If we have moved away from commit `f`, then we must first recover its object
name (typically by using git reflog), and then we can create a reference to
-it. For example, to see the last two commits to which HEAD referred, we
+it. For example, to see the last two commits to which `HEAD` referred, we
can use either of these commands:
------------
@@ -446,12 +479,12 @@
ARGUMENT DISAMBIGUATION
-----------------------
-When there is only one argument given and it is not `--` (e.g. "git
-checkout abc"), and when the argument is both a valid `<tree-ish>`
-(e.g. a branch "abc" exists) and a valid `<pathspec>` (e.g. a file
+When there is only one argument given and it is not `--` (e.g. `git
+checkout abc`), and when the argument is both a valid `<tree-ish>`
+(e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file
or a directory whose name is "abc" exists), Git would usually ask
you to disambiguate. Because checking out a branch is so common an
-operation, however, "git checkout abc" takes "abc" as a `<tree-ish>`
+operation, however, `git checkout abc` takes "abc" as a `<tree-ish>`
in such a situation. Use `git checkout -- <pathspec>` if you want
to checkout these paths out of the index.
@@ -459,7 +492,7 @@
--------
. The following sequence checks out the `master` branch, reverts
- the `Makefile` to two revisions back, deletes hello.c by
+ the `Makefile` to two revisions back, deletes `hello.c` by
mistake, and gets it back from the index.
+
------------
@@ -471,7 +504,7 @@
+
<1> switch branch
<2> take a file out of another commit
-<3> restore hello.c from the index
+<3> restore `hello.c` from the index
+
If you want to check out _all_ C source files out of the index,
you can say
@@ -500,7 +533,7 @@
$ git checkout mytopic
------------
+
-However, your "wrong" branch and correct "mytopic" branch may
+However, your "wrong" branch and correct `mytopic` branch may
differ in files that you have modified locally, in which case
the above checkout would fail like this:
+
@@ -541,6 +574,11 @@
$ git add frotz
------------
+SEE ALSO
+--------
+linkgit:git-switch[1],
+linkgit:git-restore[1]
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b8cfeec..83ce51a 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -10,9 +10,7 @@
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>...
-'git cherry-pick' --continue
-'git cherry-pick' --quit
-'git cherry-pick' --abort
+'git cherry-pick' (--continue | --skip | --abort | --quit)
DESCRIPTION
-----------
@@ -57,6 +55,13 @@
With this option, 'git cherry-pick' will let you edit the commit
message prior to committing.
+--cleanup=<mode>::
+ This option determines how the commit message will be cleaned up before
+ being passed on to the commit machinery. See linkgit:git-commit[1] for more
+ details. In particular, if the '<mode>' is given a value of `scissors`,
+ scissors will be appended to `MERGE_MSG` before being passed on in the case
+ of a conflict.
+
-x::
When recording the commit, append a line that says
"(cherry picked from commit ...)" to the original commit
@@ -148,6 +153,11 @@
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
SEQUENCER SUBCOMMANDS
---------------------
include::sequencer.txt[]
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 03056da..0028ff1 100644
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -55,16 +55,15 @@
-e <pattern>::
--exclude=<pattern>::
- In addition to those found in .gitignore (per directory) and
- $GIT_DIR/info/exclude, also consider these patterns to be in the
- set of the ignore rules in effect.
+ Use the given exclude pattern in addition to the standard ignore rules
+ (see linkgit:gitignore[5]).
-x::
- Don't use the standard ignore rules read from .gitignore (per
- directory) and $GIT_DIR/info/exclude, but do still use the ignore
- rules given with `-e` options. This allows removing all untracked
+ Don't use the standard ignore rules (see linkgit:gitignore[5]), but
+ still use the ignore rules given with `-e` options from the command
+ line. This allows removing all untracked
files, including build products. This can be used (possibly in
- conjunction with 'git reset') to create a pristine
+ conjunction with 'git restore' or 'git reset') to create a pristine
working directory to test a clean build.
-X::
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 2fd1252..34011c2 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -15,14 +15,15 @@
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
- [--jobs <n>] [--] <repository> [<directory>]
+ [--[no-]remote-submodules] [--jobs <n>] [--] <repository>
+ [<directory>]
DESCRIPTION
-----------
Clones a repository into a newly created directory, creates
remote-tracking branches for each branch in the cloned repository
-(visible using `git branch -r`), and creates and checks out an
+(visible using `git branch --remotes`), and creates and checks out an
initial branch that is forked from the cloned repository's
currently active branch.
@@ -40,8 +41,8 @@
OPTIONS
-------
---local::
-l::
+--local::
When the repository to clone from is on a local machine,
this flag bypasses the normal "Git aware" transport
mechanism and clones the repository by making a copy of
@@ -62,8 +63,8 @@
directory instead of using hardlinks. This may be desirable
if you are trying to make a back-up of your repository.
---shared::
-s::
+--shared::
When the repository to clone is on the local machine,
instead of using hard links, automatically setup
`.git/objects/info/alternates` to share the objects
@@ -80,13 +81,13 @@
If these objects are removed and were referenced by the cloned repository,
then the cloned repository will become corrupt.
+
-Note that running `git repack` without the `-l` option in a repository
-cloned with `-s` will copy objects from the source repository into a pack
-in the cloned repository, removing the disk space savings of `clone -s`.
-It is safe, however, to run `git gc`, which uses the `-l` option by
+Note that running `git repack` without the `--local` option in a repository
+cloned with `--shared` will copy objects from the source repository into a pack
+in the cloned repository, removing the disk space savings of `clone --shared`.
+It is safe, however, to run `git gc`, which uses the `--local` option by
default.
+
-If you want to break the dependency of a repository cloned with `-s` on
+If you want to break the dependency of a repository cloned with `--shared` on
its source repository, you can simply run `git repack -a` to copy all
objects from the source repository into a pack in the cloned repository.
@@ -115,31 +116,39 @@
same repository, and this option can be used to stop the
borrowing.
---quiet::
-q::
+--quiet::
Operate quietly. Progress is not reported to the standard
error stream.
---verbose::
-v::
+--verbose::
Run verbosely. Does not affect the reporting of progress status
to the standard error stream.
--progress::
Progress status is reported on the standard error stream
- by default when it is attached to a terminal, unless -q
+ by default when it is attached to a terminal, unless `--quiet`
is specified. This flag forces progress status even if the
standard error stream is not directed to a terminal.
---no-checkout::
+--server-option=<option>::
+ Transmit the given string to the server when communicating using
+ protocol version 2. The given string must not contain a NUL or LF
+ character. The server's handling of server options, including
+ unknown ones, is server-specific.
+ When multiple `--server-option=<option>` are given, they are all
+ sent to the other side in the order listed on the command line.
+
-n::
+--no-checkout::
No checkout of HEAD is performed after the clone is complete.
--bare::
Make a 'bare' Git repository. That is, instead of
creating `<directory>` and placing the administrative
files in `<directory>/.git`, make the `<directory>`
- itself the `$GIT_DIR`. This obviously implies the `-n`
+ itself the `$GIT_DIR`. This obviously implies the `--no-checkout`
because there is nowhere to check out the working tree.
Also the branch heads at the remote are copied directly
to corresponding local branch heads, without mapping
@@ -155,13 +164,13 @@
that all these refs are overwritten by a `git remote update` in the
target repository.
---origin <name>::
-o <name>::
+--origin <name>::
Instead of using the remote name `origin` to keep track
of the upstream repository, use `<name>`.
---branch <name>::
-b <name>::
+--branch <name>::
Instead of pointing the newly created HEAD to the branch pointed
to by the cloned repository's HEAD, point to `<name>` branch
instead. In a non-bare repository, this is the branch that will
@@ -169,8 +178,8 @@
`--branch` can also take tags and detaches the HEAD at that commit
in the resulting repository.
---upload-pack <upload-pack>::
-u <upload-pack>::
+--upload-pack <upload-pack>::
When given, and the repository to clone from is accessed
via ssh, this specifies a non-default path for the command
run on the other end.
@@ -179,8 +188,8 @@
Specify the directory from which templates will be used;
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
---config <key>=<value>::
-c <key>=<value>::
+--config <key>=<value>::
Set a configuration variable in the newly-created repository;
this takes effect immediately after the repository is
initialized, but before the remote history is fetched or any
@@ -252,6 +261,12 @@
--[no-]shallow-submodules::
All submodules which are cloned will be shallow with a depth of 1.
+--[no-]remote-submodules::
+ All submodules which are cloned will use the status of the submodule’s
+ remote-tracking branch to update the submodule, rather than the
+ superproject’s recorded SHA-1. Equivalent to passing `--remote` to
+ `git submodule update`.
+
--separate-git-dir=<git dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
index 624470e..eb5e786 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git commit-graph read' [--object-dir <dir>]
-'git commit-graph verify' [--object-dir <dir>]
+'git commit-graph verify' [--object-dir <dir>] [--shallow]
'git commit-graph write' <options> [--object-dir <dir>]
@@ -26,7 +26,7 @@
Use given directory for the location of packfiles and commit-graph
file. This parameter exists to specify the location of an alternate
that only has the objects directory, not a full `.git` directory. The
- commit-graph file is expected to be at `<dir>/info/commit-graph` and
+ commit-graph file is expected to be in the `<dir>/info` directory and
the packfiles are expected to be in `<dir>/pack`.
@@ -51,6 +51,25 @@
+
With the `--append` option, include all commits that are present in the
existing commit-graph file.
++
+With the `--split` option, write the commit-graph as a chain of multiple
+commit-graph files stored in `<dir>/info/commit-graphs`. The new commits
+not already in the commit-graph are added in a new "tip" file. This file
+is merged with the existing file if the following merge conditions are
+met:
++
+* If `--size-multiple=<X>` is not specified, let `X` equal 2. If the new
+tip file would have `N` commits and the previous tip has `M` commits and
+`X` times `N` is greater than `M`, instead merge the two files into a
+single file.
++
+* If `--max-commits=<M>` is specified with `M` a positive integer, and the
+new tip file would have more than `M` commits, then instead merge the new
+tip with the previous tip.
++
+Finally, if `--expire-time=<datetime>` is not specified, let `datetime`
+be the current time. After writing the split commit-graph, delete all
+unused commit-graph whose modified times are older than `datetime`.
'read'::
@@ -61,6 +80,9 @@
Read the commit-graph file and verify its contents against the object
database. Used to check for corrupted data.
++
+With the `--shallow` option, only check the tip commit-graph file in
+a chain of split commit-graphs.
EXAMPLES
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 002dae6..4b90b9c 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -23,6 +23,10 @@
emits the new commit object id on stdout. The log message is read
from the standard input, unless `-m` or `-F` options are given.
+The `-m` and `-F` options can be given any number of times, in any
+order. The commit log message will be composed in the order in which
+the options are given.
+
A commit object may have any number of parents. With exactly one
parent, it is an ordinary commit. Having more than one parent makes
the commit a merge between several lines of history. Initial (root)
@@ -41,7 +45,7 @@
OPTIONS
-------
<tree>::
- An existing tree object
+ An existing tree object.
-p <parent>::
Each `-p` indicates the id of a parent commit object.
@@ -52,7 +56,8 @@
-F <file>::
Read the commit log message from the given file. Use `-` to read
- from the standard input.
+ from the standard input. This can be given more than once and the
+ content of each file becomes its own paragraph.
-S[<keyid>]::
--gpg-sign[=<keyid>]::
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index a85c2c2..afa7b75 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -282,18 +282,20 @@
--untracked-files[=<mode>]::
Show untracked files.
+
+--
The mode parameter is optional (defaults to 'all'), and is used to
specify the handling of untracked files; when -u is not used, the
default is 'normal', i.e. show untracked files and directories.
-+
+
The possible options are:
-+
+
- 'no' - Show no untracked files
- 'normal' - Shows untracked files and directories
- 'all' - Also shows individual files in untracked directories.
-+
+
The default can be changed using the status.showUntrackedFiles
configuration variable documented in linkgit:git-config[1].
+--
-v::
--verbose::
@@ -359,7 +361,7 @@
your working tree are temporarily stored to a staging area
called the "index" with 'git add'. A file can be
reverted back, only in the index but not in the working tree,
-to that of the last commit with `git reset HEAD -- <file>`,
+to that of the last commit with `git restore --staged <file>`,
which effectively reverts 'git add' and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 1bfe9f5..899e92a 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -126,7 +126,7 @@
--local::
For writing options: write to the repository `.git/config` file.
- This is the default behavior.
+ This is the default behavior.
+
For reading options: read only from the repository `.git/config` rather than
from all available files.
@@ -240,7 +240,9 @@
output. The optional `default` parameter is used instead, if
there is no color configured for `name`.
+
-`--type=color [--default=<default>]` is preferred over `--get-color`.
+`--type=color [--default=<default>]` is preferred over `--get-color`
+(but note that `--get-color` will omit the trailing newline printed by
+`--type=color`).
-e::
--edit::
@@ -337,33 +339,35 @@
Given a .git/config like this:
- #
- # This is the config file, and
- # a '#' or ';' character indicates
- # a comment
- #
+------------
+#
+# This is the config file, and
+# a '#' or ';' character indicates
+# a comment
+#
- ; core variables
- [core]
- ; Don't trust file modes
- filemode = false
+; core variables
+[core]
+ ; Don't trust file modes
+ filemode = false
- ; Our diff algorithm
- [diff]
- external = /usr/local/bin/diff-wrapper
- renames = true
+; Our diff algorithm
+[diff]
+ external = /usr/local/bin/diff-wrapper
+ renames = true
- ; Proxy settings
- [core]
- gitproxy=proxy-command for kernel.org
- gitproxy=default-proxy ; for all the rest
+; Proxy settings
+[core]
+ gitproxy=proxy-command for kernel.org
+ gitproxy=default-proxy ; for all the rest
- ; HTTP
- [http]
- sslVerify
- [http "https://weak.example.com"]
- sslVerify = false
- cookieFile = /tmp/cookie.txt
+; HTTP
+[http]
+ sslVerify
+[http "https://weak.example.com"]
+ sslVerify = false
+ cookieFile = /tmp/cookie.txt
+------------
you can set the filemode to true with
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index f98b7c6..79e22b1 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -232,7 +232,7 @@
'git-cvsserver' write access to the database file without granting
them write access to the directory, too.
-The database can not be reliably regenerated in a
+The database cannot be reliably regenerated in a
consistent form after the branch it is tracking has changed.
Example: For merged branches, 'git-cvsserver' only tracks
one branch of development, and after a 'git merge' an
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 56d54a4..fdc28c0 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -57,7 +57,7 @@
This is sort of "Git root" - if you run 'git daemon' with
'--base-path=/srv/git' on example.com, then if you later try to pull
'git://example.com/hello.git', 'git daemon' will interpret the path
- as '/srv/git/hello.git'.
+ as `/srv/git/hello.git`.
--base-path-relaxed::
If --base-path is enabled and repo lookup fails, with this option
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index ccdc5f8..a88f6ae 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -139,7 +139,7 @@
The number of additional commits is the number
of commits which would be displayed by "git log v1.0.4..parent".
-The hash suffix is "-g" + 7-char abbreviation for the tip commit
+The hash suffix is "-g" + unambiguous abbreviation for the tip commit
of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`).
The "g" prefix stands for "git" and is used to allow describing the version of
a software depending on the SCM the software is managed with. This is useful
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 43daa7c..5c8a2a5 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -10,8 +10,8 @@
--------
[verse]
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
- [-t] [-r] [-c | --cc] [--root] [<common diff options>]
- <tree-ish> [<tree-ish>] [<path>...]
+ [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+ [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
-----------
@@ -105,12 +105,20 @@
itself and the commit log message is not shown, just like in any other
"empty diff" case.
+--combined-all-paths::
+ This flag causes combined diffs (used for merge commits) to
+ list the name of the file from all parents. It thus only has
+ effect when -c or --cc are specified, and is likely only
+ useful if filename changes are detected (i.e. when either
+ rename or copy detection have been requested).
+
--always::
Show the commit itself and the commit log message even
if the diff itself is empty.
include::pretty-formats.txt[]
+
include::diff-format.txt[]
GIT
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 96c26e6..484c485 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -90,7 +90,9 @@
When 'git-difftool' is invoked with the `-g` or `--gui` option
the default diff tool will be read from the configured
`diff.guitool` variable instead of `diff.tool`. The `--no-gui`
- option can be used to override this setting.
+ option can be used to override this setting. If `diff.guitool`
+ is not set, we will fallback in the order of `merge.guitool`,
+ `diff.tool`, `merge.tool` until a tool is found.
--[no-]trust-exit-code::
'git-difftool' invokes a diff tool individually on each file.
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 64c01ba..784e934 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -17,9 +17,9 @@
into 'git fast-import'.
You can use it as a human-readable bundle replacement (see
-linkgit:git-bundle[1]), or as a kind of an interactive
-'git filter-branch'.
-
+linkgit:git-bundle[1]), or as a format that can be edited before being
+fed to 'git fast-import' in order to do history rewrites (an ability
+relied on by tools like 'git filter-repo').
OPTIONS
-------
@@ -116,7 +116,7 @@
and will make master{tilde}4 no longer have master{tilde}5 as
a parent (though both the old master{tilde}4 and new
master{tilde}4 will have all the same files). Use
- --reference-excluded-parents to instead have the the stream
+ --reference-excluded-parents to instead have the stream
refer to commits in the excluded range of history by their
sha1sum. Note that the resulting stream can only be used by a
repository which already contains the necessary parent
@@ -129,6 +129,13 @@
for intermediary filters (e.g. for rewriting commit messages
which refer to older commits, or for stripping blobs by id).
+--reencode=(yes|no|abort)::
+ Specify how to handle `encoding` header in commit objects. When
+ asking to 'abort' (which is the default), this program will die
+ when encountering such a commit object. With 'yes', the commit
+ message will be reencoded into UTF-8. With 'no', the original
+ encoding will be preserved.
+
--refspec::
Apply the specified refspec to each ref exported. Multiple of them can
be specified.
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 43ab3b1..0bb2762 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -388,9 +388,10 @@
original-oid?
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
+ ('encoding' SP <encoding>)?
data
('from' SP <commit-ish> LF)?
- ('merge' SP <commit-ish> LF)?
+ ('merge' SP <commit-ish> LF)*
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
LF?
....
@@ -422,7 +423,12 @@
all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in
the same commit, as `filedeleteall` wipes the branch clean (see below).
-The `LF` after the command is optional (it used to be required).
+The `LF` after the command is optional (it used to be required). Note
+that for reasons of backward compatibility, if the commit ends with a
+`data` command (i.e. it has no `from`, `merge`, `filemodify`,
+`filedelete`, `filecopy`, `filerename`, `filedeleteall` or
+`notemodify` commands) then two `LF` commands may appear at the end of
+the command instead of just one.
`author`
^^^^^^^^
@@ -450,6 +456,12 @@
See ``Date Formats'' above for the set of supported formats, and
their syntax.
+`encoding`
+^^^^^^^^^^
+The optional `encoding` command indicates the encoding of the commit
+message. Most commits are UTF-8 and the encoding is omitted, but this
+allows importing commit messages into git without first reencoding them.
+
`from`
^^^^^^
The `from` command is used to specify the commit to initialize
@@ -966,10 +978,6 @@
'get-mark' SP ':' <idnum> LF
....
-This command can be used anywhere in the stream that comments are
-accepted. In particular, the `get-mark` command can be used in the
-middle of a commit but not in the middle of a `data` command.
-
See ``Responses To Commands'' below for details about how to read
this output safely.
@@ -996,9 +1004,10 @@
<contents> LF
====
-This command can be used anywhere in the stream that comments are
-accepted. In particular, the `cat-blob` command can be used in the
-middle of a commit but not in the middle of a `data` command.
+This command can be used where a `filemodify` directive can appear,
+allowing it to be used in the middle of a commit. For a `filemodify`
+using an inline directive, it can also appear right before the `data`
+directive.
See ``Responses To Commands'' below for details about how to read
this output safely.
@@ -1011,8 +1020,8 @@
blob or tree from a previous commit for use in the current one (with
`filemodify`).
-The `ls` command can be used anywhere in the stream that comments are
-accepted, including the middle of a commit.
+The `ls` command can also be used where a `filemodify` directive can
+appear, allowing it to be used in the middle of a commit.
Reading from the active commit::
This form can only be used in the middle of a `commit`.
@@ -1396,6 +1405,13 @@
to force recomputation of all deltas can significantly reduce the
final packfile size (30-50% smaller can be quite typical).
+Instead of running `git repack` you can also run `git gc
+--aggressive`, which will also optimize other things after an import
+(e.g. pack loose refs). As noted in the "AGGRESSIVE" section in
+linkgit:git-gc[1] the `--aggressive` option will find new deltas with
+the `-f` option to linkgit:git-repack[1]. For the reasons elaborated
+on above using `--aggressive` after a fast-import is one of the few
+cases where it's known to be worthwhile.
MEMORY UTILIZATION
------------------
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 266d63c..5b1909f 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -262,7 +262,7 @@
the local repository by fetching from the branches (respectively)
`pu` and `maint` from the remote repository.
+
-The `pu` branch will be updated even if it is does not fast-forward,
+The `pu` branch will be updated even if it does not fast-forward,
because it is prefixed with a plus sign; `tmp` will not be.
* Peek at a remote's branch, without configuring the remote in your local
@@ -285,7 +285,7 @@
----
Using --recurse-submodules can only fetch new commits in already checked
out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be
fetched, making it impossible to check out that submodule later without
having to do a fetch again. This is expected to be fixed in a future Git
version.
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index e6f08ab..5876598 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -16,6 +16,19 @@
[--original <namespace>] [-d <directory>] [-f | --force]
[--state-branch <branch>] [--] [<rev-list options>...]
+WARNING
+-------
+'git filter-branch' has a plethora of pitfalls that can produce non-obvious
+manglings of the intended history rewrite (and can leave you with little
+time to investigate such problems since it has such abysmal performance).
+These safety and performance issues cannot be backward compatibly fixed and
+as such, its use is not recommended. Please use an alternative history
+filtering tool such as https://github.com/newren/git-filter-repo/[git
+filter-repo]. If you still need to use 'git filter-branch', please
+carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land
+mines of filter-branch, and then vigilantly avoid as many of the hazards
+listed there as reasonably possible.
+
DESCRIPTION
-----------
Lets you rewrite Git revision history by rewriting the branches mentioned
@@ -189,7 +202,7 @@
rewriting. When applying a tree filter, the command needs to
temporarily check out the tree to some directory, which may consume
considerable space in case of large projects. By default it
- does this in the '.git-rewrite/' directory but you can override
+ does this in the `.git-rewrite/` directory but you can override
that choice by this parameter.
-f::
@@ -445,36 +458,236 @@
(or if your git-gc is not new enough to support arguments to
`--prune`, use `git repack -ad; git prune` instead).
-NOTES
------
+[[PERFORMANCE]]
+PERFORMANCE
+-----------
-git-filter-branch allows you to make complex shell-scripted rewrites
-of your Git history, but you probably don't need this flexibility if
-you're simply _removing unwanted data_ like large files or passwords.
-For those operations you may want to consider
-http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner],
-a JVM-based alternative to git-filter-branch, typically at least
-10-50x faster for those use-cases, and with quite different
-characteristics:
+The performance of git-filter-branch is glacially slow; its design makes it
+impossible for a backward-compatible implementation to ever be fast:
-* Any particular version of a file is cleaned exactly _once_. The BFG,
- unlike git-filter-branch, does not give you the opportunity to
- handle a file differently based on where or when it was committed
- within your history. This constraint gives the core performance
- benefit of The BFG, and is well-suited to the task of cleansing bad
- data - you don't care _where_ the bad data is, you just want it
- _gone_.
+* In editing files, git-filter-branch by design checks out each and
+every commit as it existed in the original repo. If your repo has 10\^5
+files and 10\^5 commits, but each commit only modifies 5 files, then
+git-filter-branch will make you do 10\^10 modifications, despite only
+having (at most) 5*10^5 unique blobs.
-* By default The BFG takes full advantage of multi-core machines,
- cleansing commit file-trees in parallel. git-filter-branch cleans
- commits sequentially (i.e. in a single-threaded manner), though it
- _is_ possible to write filters that include their own parallelism,
- in the scripts executed against each commit.
+* If you try and cheat and try to make git-filter-branch only work on
+files modified in a commit, then two things happen
-* The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options]
- are much more restrictive than git-filter branch, and dedicated just
- to the tasks of removing unwanted data- e.g:
- `--strip-blobs-bigger-than 1M`.
+ ** you run into problems with deletions whenever the user is simply
+ trying to rename files (because attempting to delete files that
+ don't exist looks like a no-op; it takes some chicanery to remap
+ deletes across file renames when the renames happen via arbitrary
+ user-provided shell)
+
+ ** even if you succeed at the map-deletes-for-renames chicanery, you
+ still technically violate backward compatibility because users are
+ allowed to filter files in ways that depend upon topology of
+ commits instead of filtering solely based on file contents or names
+ (though this has not been observed in the wild).
+
+* Even if you don't need to edit files but only want to e.g. rename or
+remove some and thus can avoid checking out each file (i.e. you can use
+--index-filter), you still are passing shell snippets for your filters.
+This means that for every commit, you have to have a prepared git repo
+where those filters can be run. That's a significant setup.
+
+* Further, several additional files are created or updated per commit by
+git-filter-branch. Some of these are for supporting the convenience
+functions provided by git-filter-branch (such as map()), while others
+are for keeping track of internal state (but could have also been
+accessed by user filters; one of git-filter-branch's regression tests
+does so). This essentially amounts to using the filesystem as an IPC
+mechanism between git-filter-branch and the user-provided filters.
+Disks tend to be a slow IPC mechanism, and writing these files also
+effectively represents a forced synchronization point between separate
+processes that we hit with every commit.
+
+* The user-provided shell commands will likely involve a pipeline of
+commands, resulting in the creation of many processes per commit.
+Creating and running another process takes a widely varying amount of
+time between operating systems, but on any platform it is very slow
+relative to invoking a function.
+
+* git-filter-branch itself is written in shell, which is kind of slow.
+This is the one performance issue that could be backward-compatibly
+fixed, but compared to the above problems that are intrinsic to the
+design of git-filter-branch, the language of the tool itself is a
+relatively minor issue.
+
+ ** Side note: Unfortunately, people tend to fixate on the
+ written-in-shell aspect and periodically ask if git-filter-branch
+ could be rewritten in another language to fix the performance
+ issues. Not only does that ignore the bigger intrinsic problems
+ with the design, it'd help less than you'd expect: if
+ git-filter-branch itself were not shell, then the convenience
+ functions (map(), skip_commit(), etc) and the `--setup` argument
+ could no longer be executed once at the beginning of the program
+ but would instead need to be prepended to every user filter (and
+ thus re-executed with every commit).
+
+The https://github.com/newren/git-filter-repo/[git filter-repo] tool is
+an alternative to git-filter-branch which does not suffer from these
+performance problems or the safety problems (mentioned below). For those
+with existing tooling which relies upon git-filter-branch, 'git
+repo-filter' also provides
+https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely],
+a drop-in git-filter-branch replacement (with a few caveats). While
+filter-lamely suffers from all the same safety issues as
+git-filter-branch, it at least ameloriates the performance issues a
+little.
+
+[[SAFETY]]
+SAFETY
+------
+
+git-filter-branch is riddled with gotchas resulting in various ways to
+easily corrupt repos or end up with a mess worse than what you started
+with:
+
+* Someone can have a set of "working and tested filters" which they
+document or provide to a coworker, who then runs them on a different OS
+where the same commands are not working/tested (some examples in the
+git-filter-branch manpage are also affected by this). BSD vs. GNU
+userland differences can really bite. If lucky, error messages are
+spewed. But just as likely, the commands either don't do the filtering
+requested, or silently corrupt by making some unwanted change. The
+unwanted change may only affect a few commits, so it's not necessarily
+obvious either. (The fact that problems won't necessarily be obvious
+means they are likely to go unnoticed until the rewritten history is in
+use for quite a while, at which point it's really hard to justify
+another flag-day for another rewrite.)
+
+* Filenames with spaces are often mishandled by shell snippets since
+they cause problems for shell pipelines. Not everyone is familiar with
+find -print0, xargs -0, git-ls-files -z, etc. Even people who are
+familiar with these may assume such flags are not relevant because
+someone else renamed any such files in their repo back before the person
+doing the filtering joined the project. And often, even those familiar
+with handling arguments with spaces may not do so just because they
+aren't in the mindset of thinking about everything that could possibly
+go wrong.
+
+* Non-ascii filenames can be silently removed despite being in a desired
+directory. Keeping only wanted paths is often done using pipelines like
+`git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. ls-files will
+only quote filenames if needed, so folks may not notice that one of the
+files didn't match the regex (at least not until it's much too late).
+Yes, someone who knows about core.quotePath can avoid this (unless they
+have other special characters like \t, \n, or "), and people who use
+ls-files -z with something other than grep can avoid this, but that
+doesn't mean they will.
+
+* Similarly, when moving files around, one can find that filenames with
+non-ascii or special characters end up in a different directory, one
+that includes a double quote character. (This is technically the same
+issue as above with quoting, but perhaps an interesting different way
+that it can and has manifested as a problem.)
+
+* It's far too easy to accidentally mix up old and new history. It's
+still possible with any tool, but git-filter-branch almost invites it.
+If lucky, the only downside is users getting frustrated that they don't
+know how to shrink their repo and remove the old stuff. If unlucky,
+they merge old and new history and end up with multiple "copies" of each
+commit, some of which have unwanted or sensitive files and others which
+don't. This comes about in multiple different ways:
+
+ ** the default to only doing a partial history rewrite ('--all' is not
+ the default and few examples show it)
+
+ ** the fact that there's no automatic post-run cleanup
+
+ ** the fact that --tag-name-filter (when used to rename tags) doesn't
+ remove the old tags but just adds new ones with the new name
+
+ ** the fact that little educational information is provided to inform
+ users of the ramifications of a rewrite and how to avoid mixing old
+ and new history. For example, this man page discusses how users
+ need to understand that they need to rebase their changes for all
+ their branches on top of new history (or delete and reclone), but
+ that's only one of multiple concerns to consider. See the
+ "DISCUSSION" section of the git filter-repo manual page for more
+ details.
+
+* Annotated tags can be accidentally converted to lightweight tags, due
+to either of two issues:
+
+ ** Someone can do a history rewrite, realize they messed up, restore
+ from the backups in refs/original/, and then redo their
+ git-filter-branch command. (The backup in refs/original/ is not a
+ real backup; it dereferences tags first.)
+
+ ** Running git-filter-branch with either --tags or --all in your
+ <rev-list options>. In order to retain annotated tags as
+ annotated, you must use --tag-name-filter (and must not have
+ restored from refs/original/ in a previously botched rewrite).
+
+* Any commit messages that specify an encoding will become corrupted
+by the rewrite; git-filter-branch ignores the encoding, takes the original
+bytes, and feeds it to commit-tree without telling it the proper
+encoding. (This happens whether or not --msg-filter is used.)
+
+* Commit messages (even if they are all UTF-8) by default become
+corrupted due to not being updated -- any references to other commit
+hashes in commit messages will now refer to no-longer-extant commits.
+
+* There are no facilities for helping users find what unwanted crud they
+should delete, which means they are much more likely to have incomplete
+or partial cleanups that sometimes result in confusion and people
+wasting time trying to understand. (For example, folks tend to just
+look for big files to delete instead of big directories or extensions,
+and once they do so, then sometime later folks using the new repository
+who are going through history will notice a build artifact directory
+that has some files but not others, or a cache of dependencies
+(node_modules or similar) which couldn't have ever been functional since
+it's missing some files.)
+
+* If --prune-empty isn't specified, then the filtering process can
+create hoards of confusing empty commits
+
+* If --prune-empty is specified, then intentionally placed empty
+commits from before the filtering operation are also pruned instead of
+just pruning commits that became empty due to filtering rules.
+
+* If --prune empty is specified, sometimes empty commits are missed
+and left around anyway (a somewhat rare bug, but it happens...)
+
+* A minor issue, but users who have a goal to update all names and
+emails in a repository may be led to --env-filter which will only update
+authors and committers, missing taggers.
+
+* If the user provides a --tag-name-filter that maps multiple tags to
+the same name, no warning or error is provided; git-filter-branch simply
+overwrites each tag in some undocumented pre-defined order resulting in
+only one tag at the end. (A git-filter-branch regression test requires
+this surprising behavior.)
+
+Also, the poor performance of git-filter-branch often leads to safety
+issues:
+
+* Coming up with the correct shell snippet to do the filtering you want
+is sometimes difficult unless you're just doing a trivial modification
+such as deleting a couple files. Unfortunately, people often learn if
+the snippet is right or wrong by trying it out, but the rightness or
+wrongness can vary depending on special circumstances (spaces in
+filenames, non-ascii filenames, funny author names or emails, invalid
+timezones, presence of grafts or replace objects, etc.), meaning they
+may have to wait a long time, hit an error, then restart. The
+performance of git-filter-branch is so bad that this cycle is painful,
+reducing the time available to carefully re-check (to say nothing about
+what it does to the patience of the person doing the rewrite even if
+they do technically have more time available). This problem is extra
+compounded because errors from broken filters may not be shown for a
+long time and/or get lost in a sea of output. Even worse, broken
+filters often just result in silent incorrect rewrites.
+
+* To top it all off, even when users finally find working commands, they
+naturally want to share them. But they may be unaware that their repo
+didn't have some special cases that someone else's does. So, when
+someone else with a different repository runs the same commands, they
+get hit by the problems above. Or, the user just runs commands that
+really were vetted for special cases, but they run it on a different OS
+where it doesn't work, as noted above.
GIT
---
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 774cecc..6dcd39f 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -214,6 +214,11 @@
`:lstrip` and `:rstrip` options in the same way as `refname`
above.
+worktreepath::
+ The absolute path to the worktree in which the ref is checked
+ out, if it is checked out in any linked worktree. Empty string
+ otherwise.
+
In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can
be used to specify the value in the header field.
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 1af85d4..0ac56f4 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -17,12 +17,13 @@
[--signature-file=<file>]
[-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
- [--in-reply-to=Message-Id] [--suffix=.<sfx>]
+ [--in-reply-to=<message id>] [--suffix=.<sfx>]
[--ignore-if-in-upstream]
- [--rfc] [--subject-prefix=Subject-Prefix]
+ [--rfc] [--subject-prefix=<subject prefix>]
[(--reroll-count|-v) <n>]
[--to=<email>] [--cc=<email>]
- [--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+ [--[no-]cover-letter] [--quiet]
+ [--no-notes | --notes[=<ref>]]
[--interdiff=<previous>]
[--range-diff=<previous> [--creation-factor=<percent>]]
[--progress]
@@ -158,9 +159,9 @@
itself. If you want `git format-patch` to take care of threading, you
will want to ensure that threading is disabled for `git send-email`.
---in-reply-to=Message-Id::
+--in-reply-to=<message id>::
Make the first mail (or all the mails with `--no-thread`) appear as a
- reply to the given Message-Id, which avoids breaking threads to
+ reply to the given <message id>, which avoids breaking threads to
provide a new patch series.
--ignore-if-in-upstream::
@@ -170,9 +171,9 @@
patches being generated, and any patch that matches is
ignored.
---subject-prefix=<Subject-Prefix>::
+--subject-prefix=<subject prefix>::
Instead of the standard '[PATCH]' prefix in the subject
- line, instead use '[<Subject-Prefix>]'. This
+ line, instead use '[<subject prefix>]'. This
allows for useful naming of a patch series, and can be
combined with the `--numbered` option.
@@ -263,6 +264,7 @@
for details.
--notes[=<ref>]::
+--no-notes::
Append the notes (see linkgit:git-notes[1]) for the commit
after the three-dash line.
+
@@ -273,6 +275,9 @@
keeping them as Git notes allows them to be maintained between versions
of the patch series (but see the discussion of the `notes.rewrite`
configuration options in linkgit:git-notes[1] to use this workflow).
++
+The default is `--no-notes`, unless the `format.notes` configuration is
+set.
--[no-]signature=<signature>::
Add a signature to each message produced. Per RFC 3676 the signature
@@ -309,7 +314,8 @@
--base=<commit>::
Record the base tree information to identify the state the
patch series applies to. See the BASE TREE INFORMATION section
- below for details.
+ below for details. If <commit> is "auto", a base commit is
+ automatically chosen.
--root::
Treat the revision argument as a <revision range>, even if it
@@ -325,8 +331,9 @@
-------------
You can specify extra mail header lines to be added to each message,
defaults for the subject prefix and file suffix, number patches when
-outputting more than one patch, add "To" or "Cc:" headers, configure
-attachments, and sign off patches with configuration variables.
+outputting more than one patch, add "To:" or "Cc:" headers, configure
+attachments, change the patch output directory, and sign off patches
+with configuration variables.
------------
[format]
@@ -338,7 +345,8 @@
cc = <email>
attach [ = mime-boundary-string ]
signOff = true
- coverletter = auto
+ outputDirectory = <directory>
+ coverLetter = auto
------------
@@ -421,8 +429,8 @@
* Apply it:
$ git fetch <project> master:test-apply
- $ git checkout test-apply
- $ git reset --hard
+ $ git switch test-apply
+ $ git restore --source=HEAD --staged --worktree :/
$ git am a.patch
If it does not apply correctly, there can be various reasons.
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index 55950d9..d72d15b 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -62,9 +62,17 @@
with --no-full.
--connectivity-only::
- Check only the connectivity of tags, commits and tree objects. By
- avoiding to unpack blobs, this speeds up the operation, at the
- expense of missing corrupt objects or other problematic issues.
+ Check only the connectivity of reachable objects, making sure
+ that any objects referenced by a reachable tag, commit, or tree
+ is present. This speeds up the operation by avoiding reading
+ blobs entirely (though it does still check that referenced blobs
+ exist). This will detect corruption in commits and trees, but
+ not do any semantic checks (e.g., for format errors). Corruption
+ in blob objects will not be detected at all.
++
+Unreachable tags, commits, and trees will also be accessed to find the
+tips of dangling segments of history. Use `--no-dangling` if you don't
+care about this output and want to speed it up further.
--strict::
Enable more strict checking, namely to catch a file mode
@@ -96,6 +104,11 @@
progress status even if the standard error stream is not
directed to a terminal.
+CONFIGURATION
+-------------
+
+include::config/fsck.txt[]
+
DISCUSSION
----------
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index a744249..0c114ad 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -20,17 +20,16 @@
reflog, rerere metadata or stale working trees. May also update ancillary
indexes such as the commit-graph.
-Users are encouraged to run this task on a regular basis within
-each repository to maintain good disk space utilization and good
-operating performance.
+When common porcelain operations that create objects are run, they
+will check whether the repository has grown substantially since the
+last maintenance, and if so run `git gc` automatically. See `gc.auto`
+below for how to disable this behavior.
-Some git commands may automatically run 'git gc'; see the `--auto` flag
-below for details. If you know what you're doing and all you want is to
-disable this behavior permanently without further considerations, just do:
-
-----------------------
-$ git config --global gc.auto 0
-----------------------
+Running `git gc` manually should only be needed when adding objects to
+a repository without regularly running such porcelain commands, to do
+a one-off repository optimization, or e.g. to clean up a suboptimal
+mass-import. See the "PACKFILE OPTIMIZATION" section in
+linkgit:git-fast-import[1] for more details on the import case.
OPTIONS
-------
@@ -40,35 +39,17 @@
space utilization and performance. This option will cause
'git gc' to more aggressively optimize the repository at the expense
of taking much more time. The effects of this optimization are
- persistent, so this option only needs to be used occasionally; every
- few hundred changesets or so.
+ mostly persistent. See the "AGGRESSIVE" section below for details.
--auto::
With this option, 'git gc' checks whether any housekeeping is
required; if not, it exits without performing any work.
- Some git commands run `git gc --auto` after performing
- operations that could create many loose objects. Housekeeping
- is required if there are too many loose objects or too many
- packs in the repository.
+
-If the number of loose objects exceeds the value of the `gc.auto`
-configuration variable, then all loose objects are combined into a
-single pack using `git repack -d -l`. Setting the value of `gc.auto`
-to 0 disables automatic packing of loose objects.
+See the `gc.auto` option in the "CONFIGURATION" section below for how
+this heuristic works.
+
-If the number of packs exceeds the value of `gc.autoPackLimit`,
-then existing packs (except those marked with a `.keep` file
-or over `gc.bigPackThreshold` limit)
-are consolidated into a single pack by using the `-A` option of
-'git repack'.
-If the amount of memory is estimated not enough for `git repack` to
-run smoothly and `gc.bigPackThreshold` is not set, the largest
-pack will also be excluded (this is the equivalent of running `git gc`
-with `--keep-base-pack`).
-Setting `gc.autoPackLimit` to 0 disables automatic consolidation of
-packs.
-+
-If houskeeping is required due to many loose objects or packs, all
+Once housekeeping is triggered by exceeding the limits of
+configuration options such as `gc.auto` and `gc.autoPackLimit`, all
other housekeeping tasks (e.g. rerere, working trees, reflog...) will
be performed as well.
@@ -76,7 +57,7 @@
--prune=<date>::
Prune loose objects older than date (default is 2 weeks ago,
overridable by the config variable `gc.pruneExpire`).
- --prune=all prunes loose objects regardless of their age and
+ --prune=now prunes loose objects regardless of their age and
increases the risk of corruption if another process is writing to
the repository concurrently; see "NOTES" below. --prune is on by
default.
@@ -96,83 +77,52 @@
`.keep` files are consolidated into a single pack. When this
option is used, `gc.bigPackThreshold` is ignored.
+AGGRESSIVE
+----------
+
+When the `--aggressive` option is supplied, linkgit:git-repack[1] will
+be invoked with the `-f` flag, which in turn will pass
+`--no-reuse-delta` to linkgit:git-pack-objects[1]. This will throw
+away any existing deltas and re-compute them, at the expense of
+spending much more time on the repacking.
+
+The effects of this are mostly persistent, e.g. when packs and loose
+objects are coalesced into one another pack the existing deltas in
+that pack might get re-used, but there are also various cases where we
+might pick a sub-optimal delta from a newer pack instead.
+
+Furthermore, supplying `--aggressive` will tweak the `--depth` and
+`--window` options passed to linkgit:git-repack[1]. See the
+`gc.aggressiveDepth` and `gc.aggressiveWindow` settings below. By
+using a larger window size we're more likely to find more optimal
+deltas.
+
+It's probably not worth it to use this option on a given repository
+without running tailored performance benchmarks on it. It takes a lot
+more time, and the resulting space/delta optimization may or may not
+be worth it. Not using this at all is the right trade-off for most
+users and their repositories.
+
CONFIGURATION
-------------
-The optional configuration variable `gc.reflogExpire` can be
-set to indicate how long historical entries within each branch's
-reflog should remain available in this repository. The setting is
-expressed as a length of time, for example '90 days' or '3 months'.
-It defaults to '90 days'.
+The below documentation is the same as what's found in
+linkgit:git-config[1]:
-The optional configuration variable `gc.reflogExpireUnreachable`
-can be set to indicate how long historical reflog entries which
-are not part of the current branch should remain available in
-this repository. These types of entries are generally created as
-a result of using `git commit --amend` or `git rebase` and are the
-commits prior to the amend or rebase occurring. Since these changes
-are not part of the current project most users will want to expire
-them sooner. This option defaults to '30 days'.
-
-The above two configuration variables can be given to a pattern. For
-example, this sets non-default expiry values only to remote-tracking
-branches:
-
-------------
-[gc "refs/remotes/*"]
- reflogExpire = never
- reflogExpireUnreachable = 3 days
-------------
-
-The optional configuration variable `gc.rerereResolved` indicates
-how long records of conflicted merge you resolved earlier are
-kept. This defaults to 60 days.
-
-The optional configuration variable `gc.rerereUnresolved` indicates
-how long records of conflicted merge you have not resolved are
-kept. This defaults to 15 days.
-
-The optional configuration variable `gc.packRefs` determines if
-'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
-it within all non-bare repos or it can be set to a boolean value.
-This defaults to true.
-
-The optional configuration variable `gc.writeCommitGraph` determines if
-'git gc' should run 'git commit-graph write'. This can be set to a
-boolean value. This defaults to false.
-
-The optional configuration variable `gc.aggressiveWindow` controls how
-much time is spent optimizing the delta compression of the objects in
-the repository when the --aggressive option is specified. The larger
-the value, the more time is spent optimizing the delta compression. See
-the documentation for the --window option in linkgit:git-repack[1] for
-more details. This defaults to 250.
-
-Similarly, the optional configuration variable `gc.aggressiveDepth`
-controls --depth option in linkgit:git-repack[1]. This defaults to 50.
-
-The optional configuration variable `gc.pruneExpire` controls how old
-the unreferenced loose objects have to be before they are pruned. The
-default is "2 weeks ago".
-
-Optional configuration variable `gc.worktreePruneExpire` controls how
-old a stale working tree should be before `git worktree prune` deletes
-it. Default is "3 months ago".
-
+include::config/gc.txt[]
NOTES
-----
'git gc' tries very hard not to delete objects that are referenced
-anywhere in your repository. In
-particular, it will keep not only objects referenced by your current set
-of branches and tags, but also objects referenced by the index,
-remote-tracking branches, refs saved by 'git filter-branch' in
-refs/original/, or reflogs (which may reference commits in branches
-that were later amended or rewound).
-If you are expecting some objects to be deleted and they aren't, check
-all of those locations and decide whether it makes sense in your case to
-remove those references.
+anywhere in your repository. In particular, it will keep not only
+objects referenced by your current set of branches and tags, but also
+objects referenced by the index, remote-tracking branches, notes saved
+by 'git notes' under refs/notes/, reflogs (which may reference commits
+in branches that were later amended or rewound), and anything else in
+the refs/* namespace. If you are expecting some objects to be deleted
+and they aren't, check all of those locations and decide whether it
+makes sense in your case to remove those references.
On the other hand, when 'git gc' runs concurrently with another process,
there is a risk of it deleting an object that the other process is using
@@ -190,8 +140,7 @@
However, these features fall short of a complete solution, so users who
run commands concurrently have to live with some risk of corruption (which
-seems to be low in practice) unless they turn off automatic garbage
-collection with 'git config gc.auto 0'.
+seems to be low in practice).
HOOKS
-----
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 84fe236..2d27969 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -88,7 +88,7 @@
mechanism. Only useful with `--untracked`.
--exclude-standard::
- Do not pay attention to ignored files specified via the `.gitignore`
+ Do not pay attention to ignored files specified via the `.gitignore`
mechanism. Only useful when searching files in the current directory
with `--no-index`.
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 814e744..df9e2c5 100644
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -18,9 +18,7 @@
with the contents of the named file (which can be outside of the
work tree), and optionally writes the resulting object into the
object database. Reports its object ID to its standard output.
-This is used by 'git cvsimport' to update the index
-without modifying files in the work tree. When <type> is not
-specified, it defaults to "blob".
+When <type> is not specified, it defaults to "blob".
OPTIONS
-------
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index c318bf8..f71db0d 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -171,8 +171,8 @@
already opened konqueror in a new tab if possible.
For consistency, we also try such a trick if 'man.konqueror.path' is
-set to something like 'A_PATH_TO/konqueror'. That means we will try to
-launch 'A_PATH_TO/kfmclient' instead.
+set to something like `A_PATH_TO/konqueror`. That means we will try to
+launch `A_PATH_TO/kfmclient` instead.
If you really want to use 'konqueror', then you can use something like
the following:
diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index bb0db19..558966a 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -162,7 +162,7 @@
Accelerated static Apache 2.x::
Similar to the above, but Apache can be used to return static
- files that are stored on disk. On many systems this may
+ files that are stored on disk. On many systems this may
be more efficient as Apache can ask the kernel to copy the
file contents from the file system directly to the network:
+
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index a5e8b36..96ec649 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -3,7 +3,7 @@
NAME
----
-git-interpret-trailers - add or parse structured information in commit messages
+git-interpret-trailers - Add or parse structured information in commit messages
SYNOPSIS
--------
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b02e922..b406bc4 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -49,7 +49,7 @@
Print out the ref name given on the command line by which each
commit was reached.
---use-mailmap::
+--[no-]use-mailmap::
Use mailmap file to map author and committer names and email
addresses to canonical real names and email addresses. See
linkgit:git-shortlog[1].
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 5298f1b..8461c0e 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -118,6 +118,7 @@
linkgit:git-status[1] `--short` or linkgit:git-diff[1]
`--name-status` for more user-friendly alternatives.
+
+--
This option identifies the file status with the following tags (followed by
a space) at the start of each line:
@@ -128,6 +129,7 @@
C:: modified/changed
K:: to be killed
?:: other
+--
-v::
Similar to `-t`, but use lowercase letters for files
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index b9fd377..a2ea1fd 100644
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -31,7 +31,7 @@
displayed.
--refs::
- Do not show peeled tags or pseudorefs like HEAD in the output.
+ Do not show peeled tags or pseudorefs like `HEAD` in the output.
-q::
--quiet::
@@ -92,21 +92,23 @@
EXAMPLES
--------
- $ git ls-remote --tags ./.
- d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
- f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
- 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
- c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
- 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
- $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
- 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
- c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
- $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
- $ git ls-remote --tags korg v\*
- d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
- f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
- c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
- 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
+----
+$ git ls-remote --tags ./.
+d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
+f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
+7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
+c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
+0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
+$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
+5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
+c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
+$ git remote add korg http://www.kernel.org/pub/scm/git/git.git
+$ git ls-remote --tags korg v\*
+d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
+f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
+c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
+7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
+----
SEE ALSO
--------
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 9dee7be..a751571 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -27,9 +27,9 @@
taken as relative to the current working directory. E.g. when you are
in a directory 'sub' that has a directory 'dir', you can run 'git
ls-tree -r HEAD dir' to list the contents of the tree (that is
- 'sub/dir' in `HEAD`). You don't want to give a tree that is not at the
+ `sub/dir` in `HEAD`). You don't want to give a tree that is not at the
root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that
- would result in asking for 'sub/sub/dir' in the `HEAD` commit.
+ would result in asking for `sub/sub/dir` in the `HEAD` commit.
However, the current working directory can be ignored by passing
--full-tree option.
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 9f07f4f..2d944e0 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -80,9 +80,11 @@
For example, with this topology:
- o---o---o---B
- /
- ---o---1---o---o---o---A
+....
+ o---o---o---B
+ /
+---o---1---o---o---o---A
+....
the merge base between 'A' and 'B' is '1'.
@@ -90,21 +92,25 @@
merge base between 'A' and a hypothetical commit 'M', which is a merge
between 'B' and 'C'. For example, with this topology:
- o---o---o---o---C
- /
- / o---o---o---B
- / /
- ---2---1---o---o---o---A
+....
+ o---o---o---o---C
+ /
+ / o---o---o---B
+ / /
+---2---1---o---o---o---A
+....
the result of `git merge-base A B C` is '1'. This is because the
equivalent topology with a merge commit 'M' between 'B' and 'C' is:
- o---o---o---o---o
- / \
- / o---o---o---o---M
- / /
- ---2---1---o---o---o---A
+....
+ o---o---o---o---o
+ / \
+ / o---o---o---o---M
+ / /
+---2---1---o---o---o---A
+....
and the result of `git merge-base A M` is '1'. Commit '2' is also a
common ancestor between 'A' and 'M', but '1' is a better common ancestor,
@@ -116,11 +122,13 @@
When the history involves criss-cross merges, there can be more than one
'best' common ancestor for two commits. For example, with this topology:
- ---1---o---A
- \ /
- X
- / \
- ---2---o---o---B
+....
+---1---o---A
+ \ /
+ X
+ / \
+---2---o---o---B
+....
both '1' and '2' are merge-bases of A and B. Neither one is better than
the other (both are 'best' merge bases). When the `--all` option is not given,
@@ -131,36 +139,42 @@
A and B, and check if it is the same as A, in which case, A is an
ancestor of B. You will see this idiom used often in older scripts.
- A=$(git rev-parse --verify A)
- if test "$A" = "$(git merge-base A B)"
- then
- ... A is an ancestor of B ...
- fi
+....
+A=$(git rev-parse --verify A)
+if test "$A" = "$(git merge-base A B)"
+then
+ ... A is an ancestor of B ...
+fi
+....
In modern git, you can say this in a more direct way:
- if git merge-base --is-ancestor A B
- then
- ... A is an ancestor of B ...
- fi
+....
+if git merge-base --is-ancestor A B
+then
+ ... A is an ancestor of B ...
+fi
+....
instead.
Discussion on fork-point mode
-----------------------------
-After working on the `topic` branch created with `git checkout -b
+After working on the `topic` branch created with `git switch -c
topic origin/master`, the history of remote-tracking branch
`origin/master` may have been rewound and rebuilt, leading to a
history of this shape:
- o---B2
- /
- ---o---o---B1--o---o---o---B (origin/master)
- \
- B0
- \
- D0---D1---D (topic)
+....
+ o---B2
+ /
+---o---o---B1--o---o---o---B (origin/master)
+ \
+ B0
+ \
+ D0---D1---D (topic)
+....
where `origin/master` used to point at commits B0, B1, B2 and now it
points at B, and your `topic` branch was started on top of it back
@@ -193,13 +207,15 @@
will replay D0, D1 and D on top of B to create a new history of this
shape:
- o---B2
- /
- ---o---o---B1--o---o---o---B (origin/master)
- \ \
- B0 D0'--D1'--D' (topic - updated)
- \
- D0---D1---D (topic - old)
+....
+ o---B2
+ /
+---o---o---B1--o---o---o---B (origin/master)
+ \ \
+ B0 D0'--D1'--D' (topic - updated)
+ \
+ D0---D1---D (topic - old)
+....
A caveat is that older reflog entries in your repository may be
expired by `git gc`. If B0 no longer appears in the reflog of the
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 02676fb..2ab84a9 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -54,20 +54,24 @@
Examples:
- torvalds@ppc970:~/merge-test> git merge-index cat MM
- This is MM from the original tree. # original
- This is modified MM in the branch A. # merge1
- This is modified MM in the branch B. # merge2
- This is modified MM in the branch B. # current contents
+----
+torvalds@ppc970:~/merge-test> git merge-index cat MM
+This is MM from the original tree. # original
+This is modified MM in the branch A. # merge1
+This is modified MM in the branch B. # merge2
+This is modified MM in the branch B. # current contents
+----
or
- torvalds@ppc970:~/merge-test> git merge-index cat AA MM
- cat: : No such file or directory
- This is added AA in the branch A.
- This is added AA in the branch B.
- This is added AA in the branch B.
- fatal: merge program failed
+----
+torvalds@ppc970:~/merge-test> git merge-index cat AA MM
+cat: : No such file or directory
+This is added AA in the branch A.
+This is added AA in the branch B.
+This is added AA in the branch B.
+fatal: merge program failed
+----
where the latter example shows how 'git merge-index' will stop trying to
merge once anything has returned an error (i.e., `cat` returned an error
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4cc8646..092529c 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,11 +10,10 @@
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
- [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+ [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]allow-unrelated-histories]
[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
-'git merge' --abort
-'git merge' --continue
+'git merge' (--continue | --abort | --quit)
DESCRIPTION
-----------
@@ -83,10 +82,16 @@
If `--log` is specified, a shortlog of the commits being merged
will be appended to the specified message.
---[no-]rerere-autoupdate::
+--rerere-autoupdate::
+--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.
+--overwrite-ignore::
+--no-overwrite-ignore::
+ Silently overwrite ignored files from the merge result. This
+ is the default behavior. Use `--no-overwrite-ignore` to abort.
+
--abort::
Abort the current conflict resolution process, and
try to reconstruct the pre-merge state.
@@ -99,6 +104,10 @@
'git merge --abort' is equivalent to 'git reset --merge' when
`MERGE_HEAD` is present.
+--quit::
+ Forget about the current merge in progress. Leave the index
+ and the working tree as-is.
+
--continue::
After a 'git merge' stops due to conflicts you can conclude the
merge by running 'git merge --continue' (see "HOW TO RESOLVE
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 055550b..4da9d24 100644
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -28,7 +28,9 @@
FUNCTIONS
---------
get_merge_tool::
- returns a merge tool.
+ returns a merge tool. the return code is 1 if we returned a guessed
+ merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to
+ search for the appropriate guitool.
get_merge_tool_cmd::
returns the custom command for a merge tool.
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 0c7975a..6b14702 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -83,7 +83,9 @@
--gui::
When 'git-mergetool' is invoked with the `-g` or `--gui` option
the default merge tool will be read from the configured
- `merge.guitool` variable instead of `merge.tool`.
+ `merge.guitool` variable instead of `merge.tool`. If
+ `merge.guitool` is not set, we will fallback to the tool
+ configured under `merge.tool`.
--no-gui::
This overrides a previous `-g` or `--gui` setting and reads the
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index f7778a2..233b2b7 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git multi-pack-index' [--object-dir=<dir>] <verb>
+'git multi-pack-index' [--object-dir=<dir>] <subcommand>
DESCRIPTION
-----------
@@ -23,13 +23,35 @@
`<dir>/packs/multi-pack-index` for the current MIDX file, and
`<dir>/packs` for the pack-files to index.
+The following subcommands are available:
+
write::
- When given as the verb, write a new MIDX file to
- `<dir>/packs/multi-pack-index`.
+ Write a new MIDX file.
verify::
- When given as the verb, verify the contents of the MIDX file
- at `<dir>/packs/multi-pack-index`.
+ Verify the contents of the MIDX file.
+
+expire::
+ Delete the pack-files that are tracked by the MIDX file, but
+ have no objects referenced by the MIDX. Rewrite the MIDX file
+ afterward to remove all references to these pack-files.
+
+repack::
+ Create a new pack-file containing objects in small pack-files
+ referenced by the multi-pack-index. If the size given by the
+ `--batch-size=<size>` argument is zero, then create a pack
+ containing all objects referenced by the multi-pack-index. For
+ a non-zero batch size, Select the pack-files by examining packs
+ from oldest-to-newest, computing the "expected size" by counting
+ the number of objects in the pack referenced by the
+ multi-pack-index, then divide by the total number of objects in
+ the pack and multiply by the pack size. We select packs with
+ expected size below the batch size until the set of packs have
+ total expected size at least the batch size. If the total size
+ does not reach the batch size, then do nothing. If a new pack-
+ file is created, rewrite the multi-pack-index to reference the
+ new pack-file. A later run of 'git multi-pack-index expire' will
+ delete the pack-files that were part of this batch.
EXAMPLES
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index df2b64d..f56a5a9 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -146,7 +146,7 @@
-C <object>::
--reuse-message=<object>::
- Take the given blob object (for example, another note) as the
+ Take the given blob object (for example, another note) as the
note message. (Use `git notes copy <object>` instead to
copy notes between objects.)
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index e45f3e6..fecdf26 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -131,7 +131,7 @@
--keep-pack=<pack-name>::
This flag causes an object already in the given pack to be
ignored, even if it would have otherwise been
- packed. `<pack-name>` is the the pack file name without
+ packed. `<pack-name>` is the pack file name without
leading directory (e.g. `pack-123.pack`). The option could be
specified multiple times to keep multiple packs.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 118d9d8..dfb901f 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -112,8 +112,9 @@
the local merge commits are included in the rebase (see
linkgit:git-rebase[1] for details).
+
-When set to preserve, rebase with the `--preserve-merges` option passed
-to `git rebase` so that locally created merge commits will not be flattened.
+When set to `preserve` (deprecated in favor of `merges`), rebase with the
+`--preserve-merges` option passed to `git rebase` so that locally created
+merge commits will not be flattened.
+
When false, merge the current branch into the upstream branch.
+
@@ -248,7 +249,7 @@
----
Using --recurse-submodules can only fetch new commits in already checked
out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be
fetched, making it impossible to check out that submodule later without
having to do a fetch again. This is expected to be fixed in a future Git
version.
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 6a8a0d9..3b80534 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -75,7 +75,7 @@
+
If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will
try to infer where in `refs/*` on the destination <repository> it
-belongs based on the the type of <src> being pushed and whether <dst>
+belongs based on the type of <src> being pushed and whether <dst>
is ambiguous.
+
--
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5c70bc2..d271842 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -38,8 +38,9 @@
started.
--reset::
- Same as -m, except that unmerged entries are discarded
- instead of failing.
+ Same as -m, except that unmerged entries are discarded instead
+ of failing. When used with `-u`, updates leading to loss of
+ working tree changes will not abort the operation.
-u::
After a successful merge, update the files in the work
@@ -128,6 +129,10 @@
Instead of reading tree object(s) into the index, just empty
it.
+-q::
+--quiet::
+ Quiet, suppress feedback messages.
+
<tree-ish#>::
The id of the tree object(s) to be read/merged.
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 7e695b3..639a417 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -8,16 +8,16 @@
SYNOPSIS
--------
[verse]
-'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
- [<upstream> [<branch>]]
+'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]
+ [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
+'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
DESCRIPTION
-----------
If <branch> is specified, 'git rebase' will perform an automatic
-`git checkout <branch>` before doing anything else. Otherwise
+`git switch <branch>` before doing anything else. Otherwise
it remains on the current branch.
If <upstream> is not specified, the upstream configured in
@@ -217,6 +217,24 @@
merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD.
+--keep-base::
+ Set the starting point at which to create the new commits to the
+ merge base of <upstream> <branch>. Running
+ 'git rebase --keep-base <upstream> <branch>' is equivalent to
+ running 'git rebase --onto <upstream>... <upstream>'.
++
+This option is useful in the case where one is developing a feature on
+top of an upstream branch. While the feature is being worked on, the
+upstream branch may advance and it may not be the best idea to keep
+rebasing on top of the upstream but to keep the base commit as-is.
++
+Although both this option and --fork-point find the merge base between
+<upstream> and <branch>, this option uses the merge base as the _starting
+point_ on which new commits will be created, whereas --fork-point uses
+the merge base to determine the _set of commits_ which will be rebased.
++
+See also INCOMPATIBLE OPTIONS below.
+
<upstream>::
Upstream branch to compare against. May be any valid commit,
not just an existing branch name. Defaults to the configured
@@ -300,6 +318,11 @@
+
See also INCOMPATIBLE OPTIONS below.
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
-S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign commits. The `keyid` argument is optional and
@@ -364,6 +387,10 @@
+
If either <upstream> or --root is given on the command line, then the
default is `--no-fork-point`, otherwise the default is `--fork-point`.
++
+If your branch was based on <upstream> but <upstream> was rewound and
+your branch contains commits which were dropped, this option can be used
+with `--keep-base` in order to drop those commits from your branch.
--ignore-whitespace::
--whitespace=<option>::
@@ -410,14 +437,14 @@
+
By default, or when `no-rebase-cousins` was specified, commits which do not
have `<upstream>` as direct ancestor will keep their original branch point,
-i.e. commits that would be excluded by gitlink:git-log[1]'s
+i.e. commits that would be excluded by linkgit:git-log[1]'s
`--ancestry-path` option will keep their original ancestry by default. If
the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified).
+
-The `--rebase-merges` mode is similar in spirit to `--preserve-merges`, but
-in contrast to that option works well in interactive rebases: commits can be
-reordered, inserted and dropped at will.
+The `--rebase-merges` mode is similar in spirit to the deprecated
+`--preserve-merges`, but in contrast to that option works well in interactive
+rebases: commits can be reordered, inserted and dropped at will.
+
It is currently only possible to recreate the merge commits using the
`recursive` merge strategy; Different merge strategies can be used only via
@@ -427,9 +454,10 @@
-p::
--preserve-merges::
- Recreate merge commits instead of flattening the history by replaying
- commits a merge commit introduces. Merge conflict resolutions or manual
- amendments to merge commits are not preserved.
+ [DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
+ instead of flattening the history by replaying commits a merge commit
+ introduces. Merge conflict resolutions or manual amendments to merge
+ commits are not preserved.
+
This uses the `--interactive` machinery internally, but combining it
with the `--interactive` option explicitly is generally not a good
@@ -462,12 +490,6 @@
+
See also INCOMPATIBLE OPTIONS below.
--y <cmd>::
- This is the same as passing `--reschedule-failed-exec` before
- `-x <cmd>`, i.e. it appends the specified `exec` command and
- turns on the mode where failed `exec` commands are automatically
- rescheduled.
-
--root::
Rebase all commits reachable from <branch>, instead of
limiting them with an <upstream>. This allows you to rebase
@@ -535,7 +557,6 @@
* --interactive
* --exec
* --keep-empty
- * --autosquash
* --edit-todo
* --root when used in combination with --onto
@@ -544,8 +565,8 @@
* --preserve-merges and --interactive
* --preserve-merges and --signoff
* --preserve-merges and --rebase-merges
- * --rebase-merges and --strategy
- * --rebase-merges and --strategy-option
+ * --keep-base and --onto
+ * --keep-base and --root
BEHAVIORAL DIFFERENCES
-----------------------
@@ -560,8 +581,6 @@
start with) or ended empty (all changes were already applied
upstream in other commits).
-The merge backend does the same.
-
The interactive backend drops commits by default that
started empty and halts if it hits a commit that ended up empty.
The `--keep-empty` option exists for the interactive backend to allow
@@ -678,7 +697,8 @@
And move the first patch to the end of the list.
-You might want to preserve merges, if you have a history like this:
+You might want to recreate merge commits, e.g. if you have a history
+like this:
------------------
X
@@ -692,7 +712,7 @@
sure that the current HEAD is "B", and call
-----------------------------
-$ git rebase -i -p --onto Q O
+$ git rebase -i -r --onto Q O
-----------------------------
Reordering and editing commits usually creates untested intermediate
@@ -834,7 +854,8 @@
This happens if the 'subsystem' rebase had conflicts, or used
`--interactive` to omit, edit, squash, or fixup commits; or
if the upstream used one of `commit --amend`, `reset`, or
- `filter-branch`.
+ a full history rewriting command like
+ https://github.com/newren/git-filter-repo[`filter-repo`].
The easy case
@@ -872,7 +893,7 @@
--interactive` will be **resurrected**!
The idea is to manually tell 'git rebase' "where the old 'subsystem'
-ended and your 'topic' began", that is, what the old merge-base
+ended and your 'topic' began", that is, what the old merge base
between them was. You will have to find a way to name the last commit
of the old 'subsystem', for example:
@@ -1029,11 +1050,11 @@
BUGS
----
-The todo list presented by `--preserve-merges --interactive` does not
-represent the topology of the revision graph. Editing commits and
-rewording their commit messages should work fine, but attempts to
-reorder commits tend to produce counterintuitive results. Use
-`--rebase-merges` in such scenarios instead.
+The todo list presented by the deprecated `--preserve-merges --interactive`
+does not represent the topology of the revision graph (use `--rebase-merges`
+instead). Editing commits and rewording their commit messages should work
+fine, but attempts to reorder commits tend to produce counterintuitive results.
+Use `--rebase-merges` in such scenarios instead.
For example, an attempt to rearrange
------------
diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index dedf97e..25702ed 100644
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -165,29 +165,31 @@
certificates of signed pushes with good signatures to a logger
service:
- #!/bin/sh
- # mail out commit update information.
- while read oval nval ref
- do
- if expr "$oval" : '0*$' >/dev/null
- then
- echo "Created a new ref, with the following commits:"
- git rev-list --pretty "$nval"
- else
- echo "New commits:"
- git rev-list --pretty "$nval" "^$oval"
- fi |
- mail -s "Changes to ref $ref" commit-list@mydomain
- done
- # log signed push certificate, if any
- if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
+----
+#!/bin/sh
+# mail out commit update information.
+while read oval nval ref
+do
+ if expr "$oval" : '0*$' >/dev/null
then
- (
- echo expected nonce is ${GIT_PUSH_NONCE}
- git cat-file blob ${GIT_PUSH_CERT}
- ) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
- fi
- exit 0
+ echo "Created a new ref, with the following commits:"
+ git rev-list --pretty "$nval"
+ else
+ echo "New commits:"
+ git rev-list --pretty "$nval" "^$oval"
+ fi |
+ mail -s "Changes to ref $ref" commit-list@mydomain
+done
+# log signed push certificate, if any
+if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
+then
+ (
+ echo expected nonce is ${GIT_PUSH_NONCE}
+ git cat-file blob ${GIT_PUSH_CERT}
+ ) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
+fi
+exit 0
+----
The exit code from this hook invocation is ignored, however a
non-zero exit code will generate an error message.
@@ -212,8 +214,10 @@
This hook can be used, for example, to run `git update-server-info`
if the repository is packed and is served via a dumb transport.
- #!/bin/sh
- exec git update-server-info
+----
+#!/bin/sh
+exec git update-server-info
+----
QUARANTINE ENVIRONMENT
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index 3fc5d94..88ea7e1 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -104,7 +104,7 @@
link-level address).
"ext::git-server-alias foo %G/repo% with% spaces %Vfoo"::
- Represents a repository with path '/repo with spaces' accessed
+ Represents a repository with path `/repo with spaces` accessed
using the helper program "git-server-alias foo". The hostname for
the remote server passed in the protocol stream will be "foo"
(this allows multiple virtual Git servers to share a
@@ -118,7 +118,7 @@
SEE ALSO
--------
-linkgit:gitremote-helpers[1]
+linkgit:gitremote-helpers[7]
GIT
---
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index 80afca8..0451ceb 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -52,7 +52,7 @@
SEE ALSO
--------
-linkgit:gitremote-helpers[1]
+linkgit:gitremote-helpers[7]
GIT
---
diff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.txto
index 49233f5..6f353eb 100644
--- a/Documentation/git-remote-helpers.txto
+++ b/Documentation/git-remote-helpers.txto
@@ -1,7 +1,7 @@
git-remote-helpers
==================
-This document has been moved to linkgit:gitremote-helpers[1].
+This document has been moved to linkgit:gitremote-helpers[7].
Please let the owners of the referring site know so that they can update the
link you clicked to get here.
diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
deleted file mode 100644
index f791d73..0000000
--- a/Documentation/git-remote-testgit.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-git-remote-testgit(1)
-=====================
-
-NAME
-----
-git-remote-testgit - Example remote-helper
-
-
-SYNOPSIS
---------
-[verse]
-git clone testgit::<source-repo> [<destination>]
-
-DESCRIPTION
------------
-
-This command is a simple remote-helper, that is used both as a
-testcase for the remote-helper functionality, and as an example to
-show remote-helper authors one possible implementation.
-
-The best way to learn more is to read the comments and source code in
-'git-remote-testgit'.
-
-SEE ALSO
---------
-linkgit:gitremote-helpers[1]
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 0cad37f..9659abb 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -230,7 +230,7 @@
staging/master
staging/staging-linus
staging/staging-next
-$ git checkout -b staging staging/master
+$ git switch -c staging staging/master
...
------------
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index aa0cc8b..92f146d 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -142,7 +142,7 @@
--keep-pack=<pack-name>::
Exclude the given pack from repacking. This is the equivalent
- of having `.keep` file on the pack. `<pack-name>` is the the
+ of having `.keep` file on the pack. `<pack-name>` is the
pack file name without leading directory (e.g. `pack-123.pack`).
The option could be specified multiple times to keep multiple
packs.
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 246dc99..f271d75 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -123,10 +123,10 @@
CREATING REPLACEMENT OBJECTS
----------------------------
-linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and
-linkgit:git-rebase[1], among other git commands, can be used to create
-replacement objects from existing objects. The `--edit` option can
-also be used with 'git replace' to create a replacement object by
+linkgit:git-hash-object[1], linkgit:git-rebase[1], and
+https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to
+create replacement objects from existing objects. The `--edit` option
+can also be used with 'git replace' to create a replacement object by
editing an existing object.
If you want to replace many blobs, trees or commits that are part of a
@@ -148,13 +148,13 @@
SEE ALSO
--------
linkgit:git-hash-object[1]
-linkgit:git-filter-branch[1]
linkgit:git-rebase[1]
linkgit:git-tag[1]
linkgit:git-branch[1]
linkgit:git-commit[1]
linkgit:git-var[1]
linkgit:git[1]
+https://github.com/newren/git-filter-repo[git-filter-repo]
GIT
---
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index df310d2..4cfc883 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -24,7 +24,7 @@
hand resolutions to their corresponding automerge results.
[NOTE]
-You need to set the configuration variable rerere.enabled in order to
+You need to set the configuration variable `rerere.enabled` in order to
enable this command.
@@ -91,7 +91,7 @@
One way to do it is to pull master into the topic branch:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
o---*---o---+ topic
@@ -113,10 +113,10 @@
in which case the final commit graph would look like this:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
$ ... work on both topic and master branches
- $ git checkout master
+ $ git switch master
$ git merge topic
o---*---o---+---o---o topic
@@ -136,11 +136,11 @@
top of the tip before the test merge:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
$ git reset --hard HEAD^ ;# rewind the test merge
$ ... work on both topic and master branches
- $ git checkout master
+ $ git switch master
$ git merge topic
o---*---o-------o---o topic
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 132f8e5..97e0544 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -25,12 +25,13 @@
the current branch.)
+
This means that `git reset <paths>` is the opposite of `git add
-<paths>`.
+<paths>`. This command is equivalent to
+`git restore [--source=<tree-ish>] --staged <paths>...`.
+
After running `git reset <paths>` to update the index entry, you can
-use linkgit:git-checkout[1] to check the contents out of the index to
-the working tree.
-Alternatively, using linkgit:git-checkout[1] and specifying a commit, you
+use linkgit:git-restore[1] to check the contents out of the index to
+the working tree. Alternatively, using linkgit:git-restore[1]
+and specifying a commit with `--source`, you
can copy the contents of a path out of a commit to the index and to the
working tree in one go.
@@ -86,8 +87,8 @@
changes, reset is aborted.
--
-If you want to undo a commit other than the latest on a branch,
-linkgit:git-revert[1] is your friend.
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
OPTIONS
@@ -149,9 +150,9 @@
Undo a commit, making it a topic branch::
+
------------
-$ git branch topic/wip <1>
-$ git reset --hard HEAD~3 <2>
-$ git checkout topic/wip <3>
+$ git branch topic/wip <1>
+$ git reset --hard HEAD~3 <2>
+$ git switch topic/wip <3>
------------
+
<1> You have made some commits, but realize they were premature
@@ -232,13 +233,13 @@
need to get to the other branch for a quick bugfix.
+
------------
-$ git checkout feature ;# you were working in "feature" branch and
-$ work work work ;# got interrupted
+$ git switch feature ;# you were working in "feature" branch and
+$ work work work ;# got interrupted
$ git commit -a -m "snapshot WIP" <1>
-$ git checkout master
+$ git switch master
$ fix fix fix
$ git commit ;# commit with real log
-$ git checkout feature
+$ git switch feature
$ git reset --soft HEAD^ ;# go back to WIP state <2>
$ git reset <3>
------------
@@ -279,18 +280,18 @@
+
------------
$ git tag start
-$ git checkout -b branch1
+$ git switch -c branch1
$ edit
$ git commit ... <1>
$ edit
-$ git checkout -b branch2 <2>
+$ git switch -c branch2 <2>
$ git reset --keep start <3>
------------
+
<1> This commits your first edits in `branch1`.
<2> In the ideal world, you could have realized that the earlier
commit did not belong to the new topic when you created and switched
- to `branch2` (i.e. `git checkout -b branch2 start`), but nobody is
+ to `branch2` (i.e. `git switch -c branch2 start`), but nobody is
perfect.
<3> But you can use `reset --keep` to remove the unwanted commit after
you switched to `branch2`.
@@ -428,8 +429,8 @@
`reset --merge` is meant to be used when resetting out of a conflicted
merge. Any mergy operation guarantees that the working tree file that is
-involved in the merge does not have local change wrt the index before
-it starts, and that it writes the result out to the working tree. So if
+involved in the merge does not have a local change with respect to the index
+before it starts, and that it writes the result out to the working tree. So if
we see some difference between the index and the target and also
between the index and the working tree, then it means that we are not
resetting out from a state that a mergy operation left after failing
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
new file mode 100644
index 0000000..1ab2e40
--- /dev/null
+++ b/Documentation/git-restore.txt
@@ -0,0 +1,185 @@
+git-restore(1)
+==============
+
+NAME
+----
+git-restore - Restore working tree files
+
+SYNOPSIS
+--------
+[verse]
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...
+'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]
+
+DESCRIPTION
+-----------
+Restore specified paths in the working tree with some contents from a
+restore source. If a path is tracked but does not exist in the restore
+source, it will be removed to match the source.
+
+The command can also be used to restore the content in the index with
+`--staged`, or restore both the working tree and the index with
+`--staged --worktree`.
+
+By default, the restore sources for working tree and the index are the
+index and `HEAD` respectively. `--source` could be used to specify a
+commit as the restore source.
+
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+OPTIONS
+-------
+-s <tree>::
+--source=<tree>::
+ Restore the working tree files with the content from the given
+ tree. It is common to specify the source tree by naming a
+ commit, branch or tag associated with it.
++
+If not specified, the default restore source for the working tree is
+the index, and the default restore source for the index is
+`HEAD`. When both `--staged` and `--worktree` are specified,
+`--source` must also be specified.
+
+-p::
+--patch::
+ Interactively select hunks in the difference between the
+ restore source and the restore location. See the ``Interactive
+ Mode'' section of linkgit:git-add[1] to learn how to operate
+ the `--patch` mode.
++
+Note that `--patch` can accept no pathspec and will prompt to restore
+all modified paths.
+
+-W::
+--worktree::
+-S::
+--staged::
+ Specify the restore location. If neither option is specified,
+ by default the working tree is restored. Specifying `--staged`
+ will only restore the index. Specifying both restores both.
+
+-q::
+--quiet::
+ Quiet, suppress feedback messages. Implies `--no-progress`.
+
+--progress::
+--no-progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal, unless `--quiet`
+ is specified. This flag enables progress reporting even if not
+ attached to a terminal, regardless of `--quiet`.
+
+--ours::
+--theirs::
+ When restoring files in the working tree from the index, use
+ stage #2 ('ours') or #3 ('theirs') for unmerged paths.
++
+Note that during `git rebase` and `git pull --rebase`, 'ours' and
+'theirs' may appear swapped. See the explanation of the same options
+in linkgit:git-checkout[1] for details.
+
+-m::
+--merge::
+ When restoring files on the working tree from the index,
+ recreate the conflicted merge in the unmerged paths.
+
+--conflict=<style>::
+ The same as `--merge` option above, but changes the way the
+ conflicting hunks are presented, overriding the
+ `merge.conflictStyle` configuration variable. Possible values
+ are "merge" (default) and "diff3" (in addition to what is
+ shown by "merge" style, shows the original contents).
+
+--ignore-unmerged::
+ When restoring files on the working tree from the index, do
+ not abort the operation if there are unmerged entries and
+ neither `--ours`, `--theirs`, `--merge` or `--conflict` is
+ specified. Unmerged paths on the working tree are left alone.
+
+--ignore-skip-worktree-bits::
+ In sparse checkout mode, by default is to only update entries
+ matched by `<pathspec>` and sparse patterns in
+ $GIT_DIR/info/sparse-checkout. This option ignores the sparse
+ patterns and unconditionally restores any files in
+ `<pathspec>`.
+
+--overlay::
+--no-overlay::
+ In overlay mode, the command never removes files when
+ restoring. In no-overlay mode, tracked files that do not
+ appear in the `--source` tree are removed, to make them match
+ `<tree>` exactly. The default is no-overlay mode.
+
+EXAMPLES
+--------
+
+The following sequence switches to the `master` branch, reverts the
+`Makefile` to two revisions back, deletes hello.c by mistake, and gets
+it back from the index.
+
+------------
+$ git switch master
+$ git restore --source master~2 Makefile <1>
+$ rm -f hello.c
+$ git restore hello.c <2>
+------------
+
+<1> take a file out of another commit
+<2> restore hello.c from the index
+
+If you want to restore _all_ C source files to match the version in
+the index, you can say
+
+------------
+$ git restore '*.c'
+------------
+
+Note the quotes around `*.c`. The file `hello.c` will also be
+restored, even though it is no longer in the working tree, because the
+file globbing is used to match entries in the index (not in the
+working tree by the shell).
+
+To restore all files in the current directory
+
+------------
+$ git restore .
+------------
+
+or to restore all working tree files with 'top' pathspec magic (see
+linkgit:gitglossary[7])
+
+------------
+$ git restore :/
+------------
+
+To restore a file in the index to match the version in `HEAD` (this is
+the same as using linkgit:git-reset[1])
+
+------------
+$ git restore --staged hello.c
+------------
+
+or you can restore both the index and the working tree (this the same
+as using linkgit:git-checkout[1])
+
+------------
+$ git restore --source=HEAD --staged --worktree hello.c
+------------
+
+or the short form which is more practical but less readable:
+
+------------
+$ git restore -s@ -SW hello.c
+------------
+
+SEE ALSO
+--------
+linkgit:git-checkout[1],
+linkgit:git-reset[1]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 88609ff..9392760 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -48,6 +48,7 @@
[ --date=<format>]
[ [ --objects | --objects-edge | --objects-edge-aggressive ]
[ --unpacked ]
+ [ --object-names | --no-object-names ]
[ --filter=<filter-spec> [ --filter-print-omitted ] ] ]
[ --missing=<missing-action> ]
[ --pretty | --header ]
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 837707a..9d22270 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -9,9 +9,7 @@
--------
[verse]
'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
-'git revert' --continue
-'git revert' --quit
-'git revert' --abort
+'git revert' (--continue | --skip | --abort | --quit)
DESCRIPTION
-----------
@@ -26,10 +24,13 @@
throw away all uncommitted changes in your working directory, you
should see linkgit:git-reset[1], particularly the `--hard` option. If
you want to extract specific files as they were in another commit, you
-should see linkgit:git-checkout[1], specifically the `git checkout
-<commit> -- <filename>` syntax. Take care with these alternatives as
+should see linkgit:git-restore[1], specifically the `--source`
+option. Take care with these alternatives as
both will discard uncommitted changes in your working directory.
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
+
OPTIONS
-------
<commit>...::
@@ -66,6 +67,13 @@
With this option, 'git revert' will not start the commit
message editor.
+--cleanup=<mode>::
+ This option determines how the commit message will be cleaned up before
+ being passed on to the commit machinery. See linkgit:git-commit[1] for more
+ details. In particular, if the '<mode>' is given a value of `scissors`,
+ scissors will be appended to `MERGE_MSG` before being passed on in the case
+ of a conflict.
+
-n::
--no-commit::
Usually the command automatically creates some commits with
@@ -101,6 +109,11 @@
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
SEQUENCER SUBCOMMANDS
---------------------
include::sequencer.txt[]
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 1afe9fc..0a69810 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -278,6 +278,14 @@
Automating
~~~~~~~~~~
+--no-[to|cc|bcc]::
+ Clears any list of "To:", "Cc:", "Bcc:" addresses previously
+ set via config.
+
+--no-identity::
+ Clears the previously read value of `sendemail.identity` set
+ via config, if any.
+
--to-cmd=<command>::
Specify a command to execute once per patch file which
should generate patch file specific "To:" entries.
@@ -478,11 +486,13 @@
To use 'git send-email' to send your patches through the GMail SMTP server,
edit ~/.gitconfig to specify your account settings:
- [sendemail]
- smtpEncryption = tls
- smtpServer = smtp.gmail.com
- smtpUser = yourname@gmail.com
- smtpServerPort = 587
+----
+[sendemail]
+ smtpEncryption = tls
+ smtpServer = smtp.gmail.com
+ smtpUser = yourname@gmail.com
+ smtpServerPort = 587
+----
If you have multifactor authentication setup on your gmail account, you will
need to generate an app-specific password for use with 'git send-email'. Visit
@@ -500,8 +510,12 @@
helper configured (see linkgit:git-credential[1]), the password will be saved in
the credential store so you won't have to type it the next time.
-Note: the following perl modules are required
- Net::SMTP::SSL, MIME::Base64 and Authen::SASL
+Note: the following core Perl modules that may be installed with your
+distribution of Perl are required:
+MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP.
+These additional Perl modules are also required:
+Authen::SASL and Mail::Address.
+
SEE ALSO
--------
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 4a01371..5cc2fce 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -167,7 +167,7 @@
------------------------------------------------
These three branches all forked from a common commit, [master],
-whose commit message is "Add {apostrophe}git show-branch{apostrophe}".
+whose commit message is "Add \'git show-branch'".
The "fixes" branch adds one commit "Introduce "reset type" flag to
"git reset"". The "mhf" branch adds many other commits.
The current branch is "master".
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 7ef8c47..8fbe12c 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -9,7 +9,7 @@
--------
[verse]
'git stash' list [<options>]
-'git stash' show [<stash>]
+'git stash' show [<options>] [<stash>]
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
@@ -106,7 +106,7 @@
The command takes options applicable to the 'git log'
command to control what is shown and how. See linkgit:git-log[1].
-show [<stash>]::
+show [<options>] [<stash>]::
Show the changes recorded in the stash entry as a diff between the
stashed contents and the commit back when the stash entry was first
@@ -235,12 +235,12 @@
+
----------------------------------------------------------------
# ... hack hack hack ...
-$ git checkout -b my_wip
+$ git switch -c my_wip
$ git commit -a -m "WIP"
-$ git checkout master
+$ git switch master
$ edit emergency fix
$ git commit -a -m "Fix in a hurry"
-$ git checkout my_wip
+$ git switch my_wip
$ git reset --soft HEAD^
# ... continue hacking ...
----------------------------------------------------------------
@@ -293,7 +293,8 @@
linkgit:git-checkout[1],
linkgit:git-commit[1],
linkgit:git-reflog[1],
-linkgit:git-reset[1]
+linkgit:git-reset[1],
+linkgit:git-switch[1]
GIT
---
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 861d821..7731b45 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -59,16 +59,17 @@
--untracked-files[=<mode>]::
Show untracked files.
+
+--
The mode parameter is used to specify the handling of untracked files.
It is optional: it defaults to 'all', and if specified, it must be
stuck to the option (e.g. `-uno`, but not `-u no`).
-+
+
The possible options are:
-+
+
- 'no' - Show no untracked files.
- 'normal' - Shows untracked files and directories.
- 'all' - Also shows individual files in untracked directories.
-+
+
When `-u` option is not used, untracked files and directories are
shown (i.e. the same as specifying `normal`), to help you avoid
forgetting to add newly created files. Because it takes extra work
@@ -78,9 +79,10 @@
`git update-index --untracked-cache` and `git update-index
--split-index`), Otherwise you can use `no` to have `git status`
return more quickly without showing untracked files.
-+
+
The default can be changed using the status.showUntrackedFiles
configuration variable documented in linkgit:git-config[1].
+--
--ignore-submodules[=<when>]::
Ignore changes to submodules when looking for changes. <when> can be
@@ -100,11 +102,12 @@
--ignored[=<mode>]::
Show ignored files as well.
+
+--
The mode parameter is used to specify the handling of ignored files.
It is optional: it defaults to 'traditional'.
-+
+
The possible options are:
-+
+
- 'traditional' - Shows ignored files and directories, unless
--untracked-files=all is specified, in which case
individual files in ignored directories are
@@ -112,12 +115,13 @@
- 'no' - Show no ignored files.
- 'matching' - Shows ignored files and directories matching an
ignore pattern.
-+
+
When 'matching' mode is specified, paths that explicitly match an
ignored pattern are shown. If a directory matches an ignore pattern,
then it is shown, but not paths contained in the ignored directory. If
a directory does not match an ignore pattern, but all contents are
ignored, then the directory is not shown, but all contents are shown.
+--
-z::
Terminate entries with NUL, instead of LF. This implies
@@ -278,7 +282,8 @@
command line arguments. Parsers should ignore headers they
don't recognize.
-### Branch Headers
+Branch Headers
+^^^^^^^^^^^^^^
If `--branch` is given, a series of header lines are printed with
information about the current branch.
@@ -294,7 +299,8 @@
------------------------------------------------------------
....
-### Changed Tracked Entries
+Changed Tracked Entries
+^^^^^^^^^^^^^^^^^^^^^^^
Following the headers, a series of lines are printed for tracked
entries. One of three different line formats may be used to describe
@@ -365,7 +371,8 @@
--------------------------------------------------------
....
-### Other Items
+Other Items
+^^^^^^^^^^^
Following the tracked entries (and if requested), a series of
lines will be printed for untracked and then ignored items
@@ -379,7 +386,8 @@
! <path>
-### Pathname Format Notes and -z
+Pathname Format Notes and -z
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
When the `-z` option is given, pathnames are printed as is and
without any quoting and lines are terminated with a NUL (ASCII 0x00)
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 0474e7a..1f46380 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -9,6 +9,7 @@
SYNOPSIS
--------
[verse]
+'git submodule' [--quiet] [--cached]
'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]
'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
'git submodule' [--quiet] init [--] [<path>...]
@@ -29,6 +30,9 @@
COMMANDS
--------
+With no arguments, shows the status of existing submodules. Several
+subcommands are available to perform operations on the submodules.
+
add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]::
Add the given repository as a submodule at the given path
to the changeset to be committed next to the current
@@ -39,7 +43,7 @@
or ../), the location relative to the superproject's default remote
repository (Please note that to specify a repository 'foo.git'
which is located right next to a superproject 'bar.git', you'll
-have to use '../foo.git' instead of './foo.git' - as one might expect
+have to use `../foo.git` instead of `./foo.git` - as one might expect
when following the rules for relative URLs - because the evaluation
of relative URLs in Git is identical to that of relative directories).
+
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index b990295..53774f5 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -126,7 +126,7 @@
command-line argument.
+
This automatically updates the rev_map if needed (see
-'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
+'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
--localtime;;
Store Git commit times in the local time zone instead of UTC. This
@@ -239,7 +239,7 @@
and have no uncommitted changes.
+
This automatically updates the rev_map if needed (see
-'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
+'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
-l;;
--local;;
@@ -524,7 +524,7 @@
way to repair the repo is to use 'reset'.
+
Only the rev_map and refs/remotes/git-svn are changed (see
-'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
+'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
move local branches onto the new tree.
@@ -760,7 +760,7 @@
+
This option can only be used for one-shot imports as 'git svn'
will not be able to fetch again without metadata. Additionally,
-if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not
+if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not
be able to rebuild them.
+
The 'git svn log' command will not work on repositories using
@@ -769,11 +769,11 @@
+
This option is NOT recommended as it makes it difficult to track down
old references to SVN revision numbers in existing documentation, bug
-reports and archives. If you plan to eventually migrate from SVN to Git
-and are certain about dropping SVN history, consider
-linkgit:git-filter-branch[1] instead. filter-branch also allows
-reformatting of metadata for ease-of-reading and rewriting authorship
-info for non-"svn.authorsFile" users.
+reports, and archives. If you plan to eventually migrate from SVN to
+Git and are certain about dropping SVN history, consider
+https://github.com/newren/git-filter-repo[git-filter-repo] instead.
+filter-repo also allows reformatting of metadata for ease-of-reading
+and rewriting authorship info for non-"svn.authorsFile" users.
svn.useSvmProps::
svn-remote.<name>.useSvmProps::
@@ -1100,10 +1100,10 @@
tags = tags/*/project-a:refs/remotes/project-a/tags/*
------------------------------------------------------------------------
-Keep in mind that the '\*' (asterisk) wildcard of the local ref
-(right of the ':') *must* be the farthest right path component;
+Keep in mind that the `*` (asterisk) wildcard of the local ref
+(right of the `:`) *must* be the farthest right path component;
however the remote wildcard may be anywhere as long as it's an
-independent path component (surrounded by '/' or EOL). This
+independent path component (surrounded by `/` or EOL). This
type of configuration is not automatically created by 'init' and
should be manually entered with a text-editor or using 'git config'.
@@ -1154,7 +1154,7 @@
FILES
-----
-$GIT_DIR/svn/\*\*/.rev_map.*::
+$GIT_DIR/svn/\**/.rev_map.*::
Mapping between Subversion revision numbers and Git commit
names. In a repository where the noMetadata option is not set,
this can be rebuilt from the git-svn-id: lines that are at the
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
new file mode 100644
index 0000000..1979003
--- /dev/null
+++ b/Documentation/git-switch.txt
@@ -0,0 +1,273 @@
+git-switch(1)
+=============
+
+NAME
+----
+git-switch - Switch branches
+
+SYNOPSIS
+--------
+[verse]
+'git switch' [<options>] [--no-guess] <branch>
+'git switch' [<options>] --detach [<start-point>]
+'git switch' [<options>] (-c|-C) <new-branch> [<start-point>]
+'git switch' [<options>] --orphan <new-branch>
+
+DESCRIPTION
+-----------
+Switch to a specified branch. The working tree and the index are
+updated to match the branch. All new commits will be added to the tip
+of this branch.
+
+Optionally a new branch could be created with either `-c`, `-C`,
+automatically from a remote branch of same name (see `--guess`), or
+detach the working tree from any branch with `--detach`, along with
+switching.
+
+Switching branches does not require a clean index and working tree
+(i.e. no differences compared to `HEAD`). The operation is aborted
+however if the operation leads to loss of local changes, unless told
+otherwise with `--discard-changes` or `--merge`.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+OPTIONS
+-------
+<branch>::
+ Branch to switch to.
+
+<new-branch>::
+ Name for the new branch.
+
+<start-point>::
+ The starting point for the new branch. Specifying a
+ `<start-point>` allows you to create a branch based on some
+ other point in history than where HEAD currently points. (Or,
+ in the case of `--detach`, allows you to inspect and detach
+ from some other point.)
++
+You can use the `@{-N}` syntax to refer to the N-th last
+branch/commit switched to using "git switch" or "git checkout"
+operation. You may also specify `-` which is synonymous to `@{-1}`.
+This is often used to switch quickly between two branches, or to undo
+a branch switch by mistake.
++
+As a special case, you may use `A...B` as a shortcut for the merge
+base of `A` and `B` if there is exactly one merge base. You can leave
+out at most one of `A` and `B`, in which case it defaults to `HEAD`.
+
+-c <new-branch>::
+--create <new-branch>::
+ Create a new branch named `<new-branch>` starting at
+ `<start-point>` before switching to the branch. This is a
+ convenient shortcut for:
++
+------------
+$ git branch <new-branch>
+$ git switch <new-branch>
+------------
+
+-C <new-branch>::
+--force-create <new-branch>::
+ Similar to `--create` except that if `<new-branch>` already
+ exists, it will be reset to `<start-point>`. This is a
+ convenient shortcut for:
++
+------------
+$ git branch -f <new-branch>
+$ git switch <new-branch>
+------------
+
+-d::
+--detach::
+ Switch to a commit for inspection and discardable
+ experiments. See the "DETACHED HEAD" section in
+ linkgit:git-checkout[1] for details.
+
+--guess::
+--no-guess::
+ If `<branch>` is not found but there does exist a tracking
+ branch in exactly one remote (call it `<remote>`) with a
+ matching name, treat as equivalent to
++
+------------
+$ git switch -c <branch> --track <remote>/<branch>
+------------
++
+If the branch exists in multiple remotes and one of them is named by
+the `checkout.defaultRemote` configuration variable, we'll use that
+one for the purposes of disambiguation, even if the `<branch>` isn't
+unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin`
+to always checkout remote branches from there if `<branch>` is
+ambiguous but exists on the 'origin' remote. See also
+`checkout.defaultRemote` in linkgit:git-config[1].
++
+`--guess` is the default behavior. Use `--no-guess` to disable it.
+
+-f::
+--force::
+ An alias for `--discard-changes`.
+
+--discard-changes::
+ Proceed even if the index or the working tree differs from
+ `HEAD`. Both the index and working tree are restored to match
+ the switching target. If `--recurse-submodules` is specified,
+ submodule content is also restored to match the switching
+ target. This is used to throw away local changes.
+
+-m::
+--merge::
+ If you have local modifications to one or more files that are
+ different between the current branch and the branch to which
+ you are switching, the command refuses to switch branches in
+ order to preserve your modifications in context. However,
+ with this option, a three-way merge between the current
+ branch, your working tree contents, and the new branch is
+ done, and you will be on the new branch.
++
+When a merge conflict happens, the index entries for conflicting
+paths are left unmerged, and you need to resolve the conflicts
+and mark the resolved paths with `git add` (or `git rm` if the merge
+should result in deletion of the path).
+
+--conflict=<style>::
+ The same as `--merge` option above, but changes the way the
+ conflicting hunks are presented, overriding the
+ `merge.conflictStyle` configuration variable. Possible values are
+ "merge" (default) and "diff3" (in addition to what is shown by
+ "merge" style, shows the original contents).
+
+-q::
+--quiet::
+ Quiet, suppress feedback messages.
+
+--progress::
+--no-progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal, unless `--quiet`
+ is specified. This flag enables progress reporting even if not
+ attached to a terminal, regardless of `--quiet`.
+
+-t::
+--track::
+ When creating a new branch, set up "upstream" configuration.
+ `-c` is implied. See `--track` in linkgit:git-branch[1] for
+ details.
++
+If no `-c` option is given, the name of the new branch will be derived
+from the remote-tracking branch, by looking at the local part of the
+refspec configured for the corresponding remote, and then stripping
+the initial part up to the "*". This would tell us to use `hack` as
+the local branch when branching off of `origin/hack` (or
+`remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the
+given name has no slash, or the above guessing results in an empty
+name, the guessing is aborted. You can explicitly give a name with
+`-c` in such a case.
+
+--no-track::
+ Do not set up "upstream" configuration, even if the
+ `branch.autoSetupMerge` configuration variable is true.
+
+--orphan <new-branch>::
+ Create a new 'orphan' branch, named `<new-branch>`. All
+ tracked files are removed.
+
+--ignore-other-worktrees::
+ `git switch` refuses when the wanted ref is already
+ checked out by another worktree. This option makes it check
+ the ref out anyway. In other words, the ref can be held by
+ more than one worktree.
+
+--recurse-submodules::
+--no-recurse-submodules::
+ Using `--recurse-submodules` will update the content of all
+ initialized submodules according to the commit recorded in the
+ superproject. If nothing (or `--no-recurse-submodules`) is
+ used, the work trees of submodules will not be updated. Just
+ like linkgit:git-submodule[1], this will detach `HEAD` of the
+ submodules.
+
+EXAMPLES
+--------
+
+The following command switches to the "master" branch:
+
+------------
+$ git switch master
+------------
+
+After working in the wrong branch, switching to the correct branch
+would be done using:
+
+------------
+$ git switch mytopic
+------------
+
+However, your "wrong" branch and correct "mytopic" branch may differ
+in files that you have modified locally, in which case the above
+switch would fail like this:
+
+------------
+$ git switch mytopic
+error: You have local changes to 'frotz'; not switching branches.
+------------
+
+You can give the `-m` flag to the command, which would try a three-way
+merge:
+
+------------
+$ git switch -m mytopic
+Auto-merging frotz
+------------
+
+After this three-way merge, the local modifications are _not_
+registered in your index file, so `git diff` would show you what
+changes you made since the tip of the new branch.
+
+To switch back to the previous branch before we switched to mytopic
+(i.e. "master" branch):
+
+------------
+$ git switch -
+------------
+
+You can grow a new branch from any commit. For example, switch to
+"HEAD~3" and create branch "fixup":
+
+------------
+$ git switch -c fixup HEAD~3
+Switched to a new branch 'fixup'
+------------
+
+If you want to start a new branch from a remote branch of the same
+name:
+
+------------
+$ git switch new-topic
+Branch 'new-topic' set up to track remote branch 'new-topic' from 'origin'
+Switched to a new branch 'new-topic'
+------------
+
+To check out commit `HEAD~3` for temporary inspection or experiment
+without creating a new branch:
+
+------------
+$ git switch --detach HEAD~3
+HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits'
+------------
+
+If it turns out whatever you have done is worth keeping, you can
+always create a new name for it (without switching away):
+
+------------
+$ git switch -c good-surprises
+------------
+
+SEE ALSO
+--------
+linkgit:git-checkout[1],
+linkgit:git-branch[1]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index a74e7b9..2e5599a 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -64,6 +64,13 @@
-s::
--sign::
Make a GPG-signed tag, using the default e-mail address's key.
+ The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
+ configuration variable if it exists, or disabled oder otherwise.
+ See linkgit:git-config[1].
+
+--no-sign::
+ Override `tag.gpgSign` configuration variable that is
+ set to force each and every tag to be signed.
-u <keyid>::
--local-user=<keyid>::
diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index bd0e364..969bb2e 100644
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git update-server-info' [--force]
+'git update-server-info'
DESCRIPTION
-----------
@@ -19,15 +19,6 @@
what references and packs the server has. This command
generates such auxiliary files.
-
-OPTIONS
--------
-
--f::
---force::
- Update the info files from scratch.
-
-
OUTPUT
------
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index fd952a5..8d162b5 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -92,8 +92,8 @@
man page on an already opened konqueror in a new tab if possible.
For consistency, we also try such a trick if 'browser.konqueror.path' is
-set to something like 'A_PATH_TO/konqueror'. That means we will try to
-launch 'A_PATH_TO/kfmclient' instead.
+set to something like `A_PATH_TO/konqueror`. That means we will try to
+launch `A_PATH_TO/kfmclient` instead.
If you really want to use 'konqueror', then you can use something like
the following:
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index cb86318..85d92c9 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -213,7 +213,7 @@
In general, all pseudo refs are per working tree and all refs starting
with "refs/" are shared. Pseudo refs are ones like HEAD which are
-directly under GIT_DIR instead of inside GIT_DIR/refs. There are one
+directly under GIT_DIR instead of inside GIT_DIR/refs. There is one
exception to this: refs inside refs/bisect and refs/worktree is not
shared.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 00156d6..9b82564 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -33,7 +33,8 @@
manual page gives you an overview of the command-line command syntax.
A formatted and hyperlinked copy of the latest Git documentation
-can be viewed at `https://git.github.io/htmldocs/git.html`.
+can be viewed at https://git.github.io/htmldocs/git.html
+or https://git-scm.com/docs.
OPTIONS
@@ -56,7 +57,8 @@
Run as if git was started in '<path>' instead of the current working
directory. When multiple `-C` options are given, each subsequent
non-absolute `-C <path>` is interpreted relative to the preceding `-C
- <path>`.
+ <path>`. If '<path>' is present but empty, e.g. `-C ""`, then the
+ current working directory is left unchanged.
+
This option affects options that expect path name like `--git-dir` and
`--work-tree` in that their interpretations of the path names would be
@@ -210,6 +212,26 @@
include::cmds-foreignscminterface.txt[]
+Reset, restore and revert
+~~~~~~~~~~~~~~~~~~~~~~~~~
+There are three commands with similar names: `git reset`,
+`git restore` and `git revert`.
+
+* linkgit:git-revert[1] is about making a new commit that reverts the
+ changes made by other commits.
+
+* linkgit:git-restore[1] is about restoring files in the working tree
+ from either the index or another commit. This command does not
+ update your branch. The command can also be used to restore files in
+ the index from another commit.
+
+* linkgit:git-reset[1] is about updating your branch, moving the tip
+ in order to add or remove commits from the branch. This operation
+ changes the commit history.
++
+`git reset` can also be used to restore the index, overlapping with
+`git restore`.
+
Low-level commands (plumbing)
-----------------------------
@@ -536,7 +558,6 @@
The command-line parameters passed to the configured command are
determined by the ssh variant. See `ssh.variant` option in
linkgit:git-config[1] for details.
-
+
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
by the shell, which allows additional arguments to be included.
@@ -661,6 +682,54 @@
When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump
data (that is, only dump info lines and headers).
+`GIT_TRACE2`::
+ Enables more detailed trace messages from the "trace2" library.
+ Output from `GIT_TRACE2` is a simple text-based format for human
+ readability.
++
+If this variable is set to "1", "2" or "true" (comparison
+is case insensitive), trace messages will be printed to
+stderr.
++
+If the variable is set to an integer value greater than 2
+and lower than 10 (strictly) then Git will interpret this
+value as an open file descriptor and will try to write the
+trace messages into this file descriptor.
++
+Alternatively, if the variable is set to an absolute path
+(starting with a '/' character), Git will interpret this
+as a file path and will try to append the trace messages
+to it. If the path already exists and is a directory, the
+trace messages will be written to files (one per process)
+in that directory, named according to the last component
+of the SID and an optional counter (to avoid filename
+collisions).
++
+In addition, if the variable is set to
+`af_unix:[<socket_type>:]<absolute-pathname>`, Git will try
+to open the path as a Unix Domain Socket. The socket type
+can be either `stream` or `dgram`.
++
+Unsetting the variable, or setting it to empty, "0" or
+"false" (case insensitive) disables trace messages.
++
+See link:technical/api-trace2.html[Trace2 documentation]
+for full details.
+
+
+`GIT_TRACE2_EVENT`::
+ This setting writes a JSON-based format that is suited for machine
+ interpretation.
+ See `GIT_TRACE2` for available trace output options and
+ link:technical/api-trace2.html[Trace2 documentation] for full details.
+
+`GIT_TRACE2_PERF`::
+ In addition to the text-based messages available in `GIT_TRACE2`, this
+ setting writes a column-based format for understanding nesting
+ regions.
+ See `GIT_TRACE2` for available trace output options and
+ link:technical/api-trace2.html[Trace2 documentation] for full details.
+
`GIT_REDACT_COOKIES`::
This can be set to a comma-separated list of strings. When a curl trace
is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 9b41f81..c5a528c 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -18,7 +18,7 @@
Each line in `gitattributes` file is of form:
- pattern attr1 attr2 ...
+ pattern attr1 attr2 ...
That is, a pattern followed by an attributes list,
separated by whitespaces. Leading and trailing whitespaces are
@@ -112,7 +112,8 @@
These attributes affect how the contents stored in the
repository are copied to the working tree files when commands
-such as 'git checkout' and 'git merge' run. They also affect how
+such as 'git switch', 'git checkout' and 'git merge' run.
+They also affect how
Git stores the contents you prepare in the working tree in the
repository upon 'git add' and 'git commit'.
@@ -314,8 +315,8 @@
support will checkout `foo.ps1` as UTF-8 encoded file. This will
typically cause trouble for the users of this file.
+
-If a Git client, that does not support the `working-tree-encoding`
-attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
+If a Git client that does not support the `working-tree-encoding`
+attribute adds a new file `bar.ps1`, then `bar.ps1` will be
stored "as-is" internally (in this example probably as UTF-16).
A client with `working-tree-encoding` support will interpret the
internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
@@ -346,7 +347,7 @@
Use the following attributes if your '*.ps1' files are UTF-16 little
endian encoded without BOM and you want Git to use Windows line endings
-in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
+in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
you want UTF-16 little endian with BOM).
Please note, it is highly recommended to
explicitly define the line endings with `eol` if the `working-tree-encoding`
@@ -809,6 +810,8 @@
- `css` suitable for cascading style sheets.
+- `dts` suitable for devicetree (DTS) files.
+
- `fortran` suitable for source code in the Fortran language.
- `fountain` suitable for Fountain documents.
@@ -819,7 +822,7 @@
- `java` suitable for source code in the Java language.
-- `matlab` suitable for source code in the MATLAB language.
+- `matlab` suitable for source code in the MATLAB and Octave languages.
- `objc` suitable for source code in the Objective-C language.
@@ -833,6 +836,8 @@
- `ruby` suitable for source code in the Ruby language.
+- `rust` suitable for source code in the Rust language.
+
- `tex` suitable for source code for LaTeX documents.
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 592e06d..4b32876 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -37,6 +37,12 @@
file called HEAD in your work tree, `git diff HEAD` is ambiguous, and
you have to say either `git diff HEAD --` or `git diff -- HEAD` to
disambiguate.
+
+ * Because `--` disambiguates revisions and paths in some commands, it
+ cannot be used for those commands to separate options and revisions.
+ You can use `--end-of-options` for this (it also works for commands
+ that do not distinguish between revisions in paths, in which case it
+ is simply an alias for `--`).
+
When writing a script that is expected to handle random user-input, it is
a good practice to make it explicit which arguments are which by placing
@@ -47,8 +53,8 @@
things:
+
--------------------------------
-$ git checkout -- *.c
-$ git checkout -- \*.c
+$ git restore *.c
+$ git restore \*.c
--------------------------------
+
The former lets your shell expand the fileglob, and you are asking
@@ -209,6 +215,18 @@
http://marc.info/?l=git&m=119150393620273 for further
information.
+Some other commands that also work on files in the working tree and/or
+in the index can take `--staged` and/or `--worktree`.
+
+* `--staged` is exactly like `--cached`, which is used to ask a
+ command to only work on the index, not the working tree.
+
+* `--worktree` is the opposite, to ask a command to work on the
+ working tree only, not the index.
+
+* The two options can be specified together to ask a command to work
+ on both the index and the working tree.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index e29a9ef..f880d21 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -741,7 +741,7 @@
saying that you want to check out a new branch:
------------
-$ git checkout -b mybranch
+$ git switch -c mybranch
------------
will create a new branch based at the current `HEAD` position, and switch
@@ -755,7 +755,7 @@
In other words, if you have an earlier tag or branch, you'd just do
------------
-$ git checkout -b mybranch earlier-commit
+$ git switch -c mybranch earlier-commit
------------
and it would create the new branch `mybranch` at the earlier commit,
@@ -765,7 +765,7 @@
You can always just jump back to your original `master` branch by doing
------------
-$ git checkout master
+$ git switch master
------------
(or any other branch-name, for that matter) and if you forget which
@@ -794,7 +794,7 @@
which will simply _create_ the branch, but will not do anything further.
You can then later -- once you decide that you want to actually develop
-on that branch -- switch to that branch with a regular 'git checkout'
+on that branch -- switch to that branch with a regular 'git switch'
with the branchname as the argument.
@@ -808,7 +808,7 @@
that branch, and do some work there.
------------------------------------------------
-$ git checkout mybranch
+$ git switch mybranch
$ echo "Work, work, work" >>hello
$ git commit -m "Some work." -i hello
------------------------------------------------
@@ -825,7 +825,7 @@
to the master branch, and editing the same file differently there:
------------
-$ git checkout master
+$ git switch master
------------
Here, take a moment to look at the contents of `hello`, and notice how they
@@ -958,7 +958,7 @@
'git merge' to get the "upstream changes" back to your branch.
------------
-$ git checkout mybranch
+$ git switch mybranch
$ git merge -m "Merge upstream changes." master
------------
@@ -1133,9 +1133,8 @@
work." commit.
------------
-$ git checkout mybranch
-$ git reset --hard master^2
-$ git checkout master
+$ git switch -C mybranch master^2
+$ git switch master
$ git reset --hard master^
------------
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 9f2528f..1bd919f 100644
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -41,7 +41,7 @@
* linkgit:git-log[1] to see what happened.
- * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
+ * linkgit:git-switch[1] and linkgit:git-branch[1] to switch
branches.
* linkgit:git-add[1] to manage the index file.
@@ -51,8 +51,7 @@
* linkgit:git-commit[1] to advance the current branch.
- * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
- pathname parameters) to undo changes.
+ * linkgit:git-restore[1] to undo changes.
* linkgit:git-merge[1] to merge between local branches.
@@ -80,9 +79,9 @@
Create a topic branch and develop.::
+
------------
-$ git checkout -b alsa-audio <1>
+$ git switch -c alsa-audio <1>
$ edit/compile/test
-$ git checkout -- curses/ux_audio_oss.c <2>
+$ git restore curses/ux_audio_oss.c <2>
$ git add curses/ux_audio_alsa.c <3>
$ edit/compile/test
$ git diff HEAD <4>
@@ -90,7 +89,7 @@
$ edit/compile/test
$ git diff HEAD^ <6>
$ git commit -a --amend <7>
-$ git checkout master <8>
+$ git switch master <8>
$ git merge alsa-audio <9>
$ git log --since='3 days ago' <10>
$ git log v2.43.. curses/ <11>
@@ -148,11 +147,11 @@
------------
$ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
$ cd my2.6
-$ git checkout -b mine master <1>
+$ git switch -c mine master <1>
$ edit/compile/test; git commit -a -s <2>
$ git format-patch master <3>
$ git send-email --to="person <email@example.com>" 00*.patch <4>
-$ git checkout master <5>
+$ git switch master <5>
$ git pull <6>
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <7>
$ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <8>
@@ -194,7 +193,7 @@
satellite$ git push origin <4>
mothership$ cd frotz
-mothership$ git checkout master
+mothership$ git switch master
mothership$ git merge satellite/master <5>
------------
+
@@ -216,7 +215,7 @@
Branch off of a specific tag.::
+
------------
-$ git checkout -b private2.6.14 v2.6.14 <1>
+$ git switch -c private2.6.14 v2.6.14 <1>
$ edit/compile/test; git commit -a
$ git checkout master
$ git cherry-pick v2.6.14..private2.6.14 <2>
@@ -274,14 +273,14 @@
& s 2 3 4 5 ./+to-apply
& s 7 8 ./+hold-linus
& q
-$ git checkout -b topic/one master
+$ git switch -c topic/one master
$ git am -3 -i -s ./+to-apply <4>
$ compile/test
-$ git checkout -b hold/linus && git am -3 -i -s ./+hold-linus <5>
-$ git checkout topic/one && git rebase master <6>
-$ git checkout pu && git reset --hard next <7>
+$ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <5>
+$ git switch topic/one && git rebase master <6>
+$ git switch -C pu next <7>
$ git merge topic/one topic/two && git merge hold/linus <8>
-$ git checkout maint
+$ git switch maint
$ git cherry-pick master~4 <9>
$ compile/test
$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 9590443..50365f2 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -99,6 +99,32 @@
variable `GIT_EDITOR=:` if the command will not bring up an editor
to modify the commit message.
+The default 'pre-commit' hook, when enabled--and with the
+`hooks.allownonascii` config option unset or set to false--prevents
+the use of non-ASCII filenames.
+
+pre-merge-commit
+~~~~~~~~~~~~~~~~
+
+This hook is invoked by linkgit:git-merge[1], and can be bypassed
+with the `--no-verify` option. It takes no parameters, and is
+invoked after the merge has been carried out successfully and before
+obtaining the proposed commit log message to
+make a commit. Exiting with a non-zero status from this script
+causes the `git merge` command to abort before creating a commit.
+
+The default 'pre-merge-commit' hook, when enabled, runs the
+'pre-commit' hook, if the latter is enabled.
+
+This hook is invoked with the environment variable
+`GIT_EDITOR=:` if the command will not bring up an editor
+to modify the commit message.
+
+If the merge cannot be carried out automatically, the conflicts
+need to be resolved and the result committed separately (see
+linkgit:git-merge[1]). At that point, this hook will not be executed,
+but the 'pre-commit' hook will, if it is enabled.
+
prepare-commit-msg
~~~~~~~~~~~~~~~~~~
@@ -161,12 +187,13 @@
post-checkout
~~~~~~~~~~~~~
-This hook is invoked when a linkgit:git-checkout[1] is run after having updated the
+This hook is invoked when a linkgit:git-checkout[1] or
+linkgit:git-switch[1] is run after having updated the
worktree. The hook is given three parameters: the ref of the previous HEAD,
the ref of the new HEAD (which may or may not have changed), and a flag
indicating whether the checkout was a branch checkout (changing branches,
flag=1) or a file checkout (retrieving a file from the index, flag=0).
-This hook cannot affect the outcome of `git checkout`.
+This hook cannot affect the outcome of `git switch` or `git checkout`.
It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is
used. The first parameter given to the hook is the null-ref, the second the
@@ -402,7 +429,8 @@
For example, the hook can simply run `git read-tree -u -m HEAD "$1"`
in order to emulate `git fetch` that is run in the reverse direction
with `git push`, as the two-tree form of `git read-tree -u -m` is
-essentially the same as `git checkout` that switches branches while
+essentially the same as `git switch` or `git checkout`
+that switches branches while
keeping the local changes in the working tree that do not interfere
with the difference between the branches.
@@ -419,10 +447,12 @@
This hook is invoked by commands that rewrite commits
(linkgit:git-commit[1] when called with `--amend` and
-linkgit:git-rebase[1]; currently `git filter-branch` does 'not' call
-it!). Its first argument denotes the command it was invoked by:
-currently one of `amend` or `rebase`. Further command-dependent
-arguments may be passed in the future.
+linkgit:git-rebase[1]; however, full-history (re)writing tools like
+linkgit:git-fast-import[1] or
+https://github.com/newren/git-filter-repo[git-filter-repo] typically
+do not call it!). Its first argument denotes the command it was
+invoked by: currently one of `amend` or `rebase`. Further
+command-dependent arguments may be passed in the future.
The hook receives a list of the rewritten commits on stdin, in the
format
@@ -492,6 +522,24 @@
from standard input. Exiting with non-zero status from this script prevent
`git-p4 submit` from launching. Run `git-p4 submit --help` for details.
+post-index-change
+~~~~~~~~~~~~~~~~~
+
+This hook is invoked when the index is written in read-cache.c
+do_write_locked_index.
+
+The first parameter passed to the hook is the indicator for the
+working directory being updated. "1" meaning working directory
+was updated or "0" when the working directory was not updated.
+
+The second parameter passed to the hook is the indicator for whether
+or not the index was updated and the skip-worktree bit could have
+changed. "1" meaning skip-worktree bits could have been updated
+and "0" meaning they were not.
+
+Only one parameter should be set to "1" when the hook runs. The hook
+running passing "1", "1" should not be possible.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 1c94f08..d47b1ae 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -89,28 +89,28 @@
Put a backslash ("`\`") in front of the first "`!`" for patterns
that begin with a literal "`!`", for example, "`\!important!.txt`".
- - If the pattern ends with a slash, it is removed for the
- purpose of the following description, but it would only find
- a match with a directory. In other words, `foo/` will match a
- directory `foo` and paths underneath it, but will not match a
- regular file or a symbolic link `foo` (this is consistent
- with the way how pathspec works in general in Git).
+ - The slash '/' is used as the directory separator. Separators may
+ occur at the beginning, middle or end of the `.gitignore` search pattern.
- - If the pattern does not contain a slash '/', Git treats it as
- a shell glob pattern and checks for a match against the
- pathname relative to the location of the `.gitignore` file
- (relative to the toplevel of the work tree if not from a
- `.gitignore` file).
+ - If there is a separator at the beginning or middle (or both) of the
+ pattern, then the pattern is relative to the directory level of the
+ particular `.gitignore` file itself. Otherwise the pattern may also
+ match at any level below the `.gitignore` level.
- - Otherwise, Git treats the pattern as a shell glob: "`*`" matches
- anything except "`/`", "`?`" matches any one character except "`/`"
- and "`[]`" matches one character in a selected range. See
- fnmatch(3) and the FNM_PATHNAME flag for a more detailed
- description.
+ - If there is a separator at the end of the pattern then the pattern
+ will only match directories, otherwise the pattern can match both
+ files and directories.
- - A leading slash matches the beginning of the pathname.
- For example, "/{asterisk}.c" matches "cat-file.c" but not
- "mozilla-sha1/sha1.c".
+ - For example, a pattern `doc/frotz/` matches `doc/frotz` directory,
+ but not `a/doc/frotz` directory; however `frotz/` matches `frotz`
+ and `a/frotz` that is a directory (all paths are relative from
+ the `.gitignore` file).
+
+ - An asterisk "`*`" matches anything except a slash.
+ The character "`?`" matches any one character except "`/`".
+ The range notation, e.g. `[a-zA-Z]`, can be used to match
+ one of the characters in a range. See fnmatch(3) and the
+ FNM_PATHNAME flag for a more detailed description.
Two consecutive asterisks ("`**`") in patterns matched against
full pathname may have special meaning:
@@ -132,6 +132,14 @@
- Other consecutive asterisks are considered regular asterisks and
will match according to the previous rules.
+CONFIGURATION
+-------------
+
+The optional configuration variable `core.excludesFile` indicates a path to a
+file containing patterns of file names to exclude, similar to
+`$GIT_DIR/info/exclude`. Patterns in the exclude file are used in addition to
+those in `$GIT_DIR/info/exclude`.
+
NOTES
-----
@@ -144,6 +152,28 @@
EXAMPLES
--------
+ - The pattern `hello.*` matches any file or folder
+ whose name begins with `hello`. If one wants to restrict
+ this only to the directory and not in its subdirectories,
+ one can prepend the pattern with a slash, i.e. `/hello.*`;
+ the pattern now matches `hello.txt`, `hello.c` but not
+ `a/hello.java`.
+
+ - The pattern `foo/` will match a directory `foo` and
+ paths underneath it, but will not match a regular file
+ or a symbolic link `foo` (this is consistent with the
+ way how pathspec works in general in Git)
+
+ - The pattern `doc/frotz` and `/doc/frotz` have the same effect
+ in any `.gitignore` file. In other words, a leading slash
+ is not relevant if there is already a middle slash in
+ the pattern.
+
+ - The pattern "foo/*", matches "foo/test.json"
+ (a regular file), "foo/bar" (a directory), but it does not match
+ "foo/bar/hello.c" (a regular file), as the asterisk in the
+ pattern does not match "bar/hello.c" which has a slash in it.
+
--------------------------------------------------------------
$ git status
[...]
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 244cd01..1eabb0a 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -168,12 +168,12 @@
-----
User configuration and preferences are stored at:
-* '$XDG_CONFIG_HOME/git/gitk' if it exists, otherwise
-* '$HOME/.gitk' if it exists
+* `$XDG_CONFIG_HOME/git/gitk` if it exists, otherwise
+* `$HOME/.gitk` if it exists
-If neither of the above exist then '$XDG_CONFIG_HOME/git/gitk' is created and
+If neither of the above exist then `$XDG_CONFIG_HOME/git/gitk` is created and
used by default. If '$XDG_CONFIG_HOME' is not set it defaults to
-'$HOME/.config' in all cases.
+`$HOME/.config` in all cases.
History
-------
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 312b6f9..08c7b8a 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -105,17 +105,18 @@
Consider the following .gitmodules file:
- [submodule "libfoo"]
- path = include/foo
- url = git://foo.com/git/lib.git
+----
+[submodule "libfoo"]
+ path = include/foo
+ url = git://foo.com/git/lib.git
- [submodule "libbar"]
- path = include/bar
- url = git://bar.com/git/lib.git
-
+[submodule "libbar"]
+ path = include/bar
+ url = git://bar.com/git/lib.git
+----
This defines two submodules, `libfoo` and `libbar`. These are expected to
-be checked out in the paths 'include/foo' and 'include/bar', and for both
+be checked out in the paths `include/foo` and `include/bar`, and for both
submodules a URL is specified which can be used for cloning the submodules.
SEE ALSO
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 9d1459a..a5c3c04 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -1,4 +1,4 @@
-gitremote-helpers(1)
+gitremote-helpers(7)
====================
NAME
@@ -297,9 +297,13 @@
same batch are complete. Only objects which were reported
in the output of 'list' with a sha1 may be fetched this way.
+
-Optionally may output a 'lock <file>' line indicating a file under
-GIT_DIR/objects/pack which is keeping a pack until refs can be
-suitably updated.
+Optionally may output a 'lock <file>' line indicating the full path of
+a file under `$GIT_DIR/objects/pack` which is keeping a pack until
+refs can be suitably updated. The path must end with `.keep`. This is
+a mechanism to name a <pack,idx,keep> tuple by giving only the keep
+component. The kept pack will not be deleted by a concurrent repack,
+even though its objects may not be referenced until the fetch completes.
+The `.keep` file will be deleted at the conclusion of the fetch.
+
If option 'check-connectivity' is requested, the helper must output
'connectivity-ok' if the clone is self-contained and connected.
@@ -468,7 +472,7 @@
'option dry-run' {'true'|'false'}:
If true, pretend the operation completed successfully,
- but don't actually change any repository data. For most
+ but don't actually change any repository data. For most
helpers this only applies to the 'push', if supported.
'option servpath <c-style-quoted-path>'::
@@ -513,8 +517,6 @@
linkgit:git-remote-fd[1]
-linkgit:git-remote-testgit[1]
-
linkgit:git-fast-import[1]
GIT
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 366dee2..d6388f1 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -59,7 +59,7 @@
here are often called 'unpacked' (or 'loose') objects.
objects/pack::
- Packs (files that store many object in compressed form,
+ Packs (files that store many objects in compressed form,
along with index files to allow them to be randomly
accessed) are found in this directory.
@@ -84,7 +84,7 @@
to the object database, not to the repository!) in your
alternates file, but it will not work if you use absolute
paths unless the absolute path in filesystem and web URL
- is the same. See also 'objects/info/http-alternates'.
+ is the same. See also `objects/info/http-alternates`.
objects/info/http-alternates::
This file records URLs to alternate object stores that
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 57999e9..0a89020 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -169,15 +169,15 @@
A submodule is considered active,
- a. if `submodule.<name>.active` is set to `true`
+ 1. if `submodule.<name>.active` is set to `true`
+
or
- b. if the submodule's path matches the pathspec in `submodule.active`
+ 2. if the submodule's path matches the pathspec in `submodule.active`
+
or
- c. if `submodule.<name>.url` is set.
+ 3. if `submodule.<name>.url` is set.
and these are evaluated in this order.
@@ -193,11 +193,11 @@
url = https://example.org/baz
In the above config only the submodule 'bar' and 'baz' are active,
-'bar' due to (a) and 'baz' due to (c). 'foo' is inactive because
-(a) takes precedence over (c)
+'bar' due to (1) and 'baz' due to (3). 'foo' is inactive because
+(1) takes precedence over (3)
-Note that (c) is a historical artefact and will be ignored if the
-(a) and (b) specify that the submodule is not active. In other words,
+Note that (3) is a historical artefact and will be ignored if the
+(1) and (2) specify that the submodule is not active. In other words,
if we have a `submodule.<name>.active` set to `false` or if the
submodule's path is excluded in the pathspec in `submodule.active`, the
url doesn't matter whether it is present or not. This is illustrated in
diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt
index e0976f6..8bdb7d0 100644
--- a/Documentation/gittutorial-2.txt
+++ b/Documentation/gittutorial-2.txt
@@ -370,13 +370,13 @@
$ git status
On branch master
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
new file: closing.txt
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
+ (use "git restore <file>..." to discard changes in working directory)
modified: file.txt
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 242de31..59ef5ce 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -110,7 +110,7 @@
On branch master
Changes to be committed:
Your branch is up to date with 'origin/master'.
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
modified: file1
modified: file2
@@ -207,7 +207,7 @@
type
------------------------------------------------
-$ git checkout experimental
+$ git switch experimental
------------------------------------------------
to switch to the experimental branch. Now edit a file, commit the
@@ -216,7 +216,7 @@
------------------------------------------------
(edit file)
$ git commit -a
-$ git checkout master
+$ git switch master
------------------------------------------------
Check that the change you made is no longer visible, since it was
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index 92535db..7963a79 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -50,11 +50,11 @@
* built-in values (some set during build stage),
* common system-wide configuration file (defaults to
- '/etc/gitweb-common.conf'),
+ `/etc/gitweb-common.conf`),
* either per-instance configuration file (defaults to 'gitweb_config.perl'
in the same directory as the installed gitweb), or if it does not exists
- then fallback system-wide configuration file (defaults to '/etc/gitweb.conf').
+ then fallback system-wide configuration file (defaults to `/etc/gitweb.conf`).
Values obtained in later configuration files override values obtained earlier
in the above sequence.
@@ -82,7 +82,7 @@
subroutine. For example, one might want to put gitweb configuration
related to access control for viewing repositories via Gitolite (one
of Git repository management tools) in a separate file, e.g. in
-'/etc/gitweb-gitolite.conf'. To include it, put
+`/etc/gitweb-gitolite.conf`. To include it, put
--------------------------------------------------
read_config_file("/etc/gitweb-gitolite.conf");
@@ -142,7 +142,7 @@
http://git.example.com/gitweb.cgi/foo/bar.git
------------------------------------------------
+
-will map to the path '/srv/git/foo/bar.git' on the filesystem.
+will map to the path `/srv/git/foo/bar.git` on the filesystem.
$projects_list::
Name of a plain text file listing projects, or a name of directory
@@ -234,9 +234,9 @@
$mimetypes_file::
File to use for (filename extension based) guessing of MIME types before
- trying '/etc/mime.types'. *NOTE* that this path, if relative, is taken
+ trying `/etc/mime.types`. *NOTE* that this path, if relative, is taken
as relative to the current Git repository, not to CGI script. If unset,
- only '/etc/mime.types' is used (if present on filesystem). If no mimetypes
+ only `/etc/mime.types` is used (if present on filesystem). If no mimetypes
file is found, mimetype guessing based on extension of file is disabled.
Unset by default.
@@ -297,8 +297,8 @@
+
This list should contain the URI of gitweb's standard stylesheet. The default
URI of gitweb stylesheet can be set at build time using the `GITWEB_CSS`
-makefile variable. Its default value is 'static/gitweb.css'
-(or 'static/gitweb.min.css' if the `CSSMIN` variable is defined,
+makefile variable. Its default value is `static/gitweb.css`
+(or `static/gitweb.min.css` if the `CSSMIN` variable is defined,
i.e. if CSS minifier is used during build).
+
*Note*: there is also a legacy `$stylesheet` configuration variable, which was
@@ -311,7 +311,7 @@
is displayed in the top right corner of each gitweb page and used as
a logo for the Atom feed. Relative to the base URI of gitweb (as a path).
Can be adjusted when building gitweb using `GITWEB_LOGO` variable
- By default set to 'static/git-logo.png'.
+ By default set to `static/git-logo.png`.
$favicon::
Points to the location where you put 'git-favicon.png' on your web
@@ -320,7 +320,7 @@
may display them in the browser's URL bar and next to the site name in
bookmarks. Relative to the base URI of gitweb. Can be adjusted at
build time using `GITWEB_FAVICON` variable.
- By default set to 'static/git-favicon.png'.
+ By default set to `static/git-favicon.png`.
$javascript::
Points to the location where you put 'gitweb.js' on your web server,
@@ -328,7 +328,7 @@
Relative to the base URI of gitweb. Can be set at build time using
the `GITWEB_JS` build-time configuration variable.
+
-The default value is either 'static/gitweb.js', or 'static/gitweb.min.js' if
+The default value is either `static/gitweb.js`, or `static/gitweb.min.js` if
the `JSMIN` build variable was defined, i.e. if JavaScript minifier was used
at build time. *Note* that this single file is generated from multiple
individual JavaScript "modules".
@@ -444,7 +444,7 @@
doesn't result in some other type; by default "text/plain".
Gitweb guesses mimetype of a file to display based on extension
of its filename, using `$mimetypes_file` (if set and file exists)
- and '/etc/mime.types' files (see *mime.types*(5) manpage; only
+ and `/etc/mime.types` files (see *mime.types*(5) manpage; only
filename extension rules are supported by gitweb).
$default_text_plain_charset::
@@ -486,7 +486,7 @@
(for example one for `git://` protocol, and one for `http://`
protocol).
+
-Note that per repository configuration can be set in '$GIT_DIR/cloneurl'
+Note that per repository configuration can be set in `$GIT_DIR/cloneurl`
file, or as values of multi-value `gitweb.url` configuration variable in
project config. Per-repository configuration takes precedence over value
composed from `@git_base_url_list` elements and project name.
@@ -520,7 +520,7 @@
If the server load exceeds this value then gitweb will return
"503 Service Unavailable" error. The server load is taken to be 0
if gitweb cannot determine its value. Currently it works only on Linux,
- where it uses '/proc/loadavg'; the load there is the number of active
+ where it uses `/proc/loadavg`; the load there is the number of active
tasks on the system -- processes that are actually running -- averaged
over the last minute.
+
@@ -536,7 +536,7 @@
$per_request_config::
If this is set to code reference, it will be run once for each request.
- You can set parts of configuration that change per session this way.
+ You can set parts of configuration that change per session this way.
For example, one might use the following code in a gitweb configuration
file
+
@@ -739,7 +739,7 @@
Only one provider at a time can be selected ('default' is one element list).
If an unknown provider is specified, the feature is disabled.
*Note* that some providers might require extra Perl packages to be
-installed; see 'gitweb/INSTALL' for more details.
+installed; see `gitweb/INSTALL` for more details.
+
This feature can be configured on a per-repository basis via
repository's `gitweb.avatar` configuration variable.
@@ -786,9 +786,9 @@
subdirectories of project root (basename) to be forks of existing
projects. For each project +$projname.git+, projects in the
+$projname/+ directory and its subdirectories will not be
- shown in the main projects list. Instead, a \'\+' mark is shown
- next to +$projname+, which links to a "forks" view that lists all
- the forks (all projects in +$projname/+ subdirectory). Additionally
+ shown in the main projects list. Instead, a \'+' mark is shown
+ next to `$projname`, which links to a "forks" view that lists all
+ the forks (all projects in `$projname/` subdirectory). Additionally
a "forks" view for a project is linked from project summary page.
+
If the project list is taken from a file (+$projects_list+ points to a
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 8845058..3cc9b03 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -28,15 +28,14 @@
revisions one at a time, viewing the history of the repository.
* Finding commits which commit messages matches given search term.
-See http://git.kernel.org/?p=git/git.git;a=tree;f=gitweb[] or
-http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,
+See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,
browsed using gitweb itself.
CONFIGURATION
-------------
Various aspects of gitweb's behavior can be controlled through the configuration
-file 'gitweb_config.perl' or '/etc/gitweb.conf'. See the linkgit:gitweb.conf[5]
+file `gitweb_config.perl` or `/etc/gitweb.conf`. See the linkgit:gitweb.conf[5]
for details.
Repositories
@@ -51,7 +50,7 @@
our $projectroot = '/path/to/parent/directory';
-----------------------------------------------------------------------
-The default value for `$projectroot` is '/pub/git'. You can change it during
+The default value for `$projectroot` is `/pub/git`. You can change it during
building gitweb via `GITWEB_PROJECTROOT` build configuration variable.
By default all Git repositories under `$projectroot` are visible and available
@@ -231,7 +230,7 @@
-------------------------------------------------------------------------------
+
from the template during repository creation, usually installed in
-'/usr/share/git-core/templates/'. You can use the `gitweb.description` repo
+`/usr/share/git-core/templates/`. You can use the `gitweb.description` repo
configuration variable, but the file takes precedence.
category (or `gitweb.category`)::
@@ -407,7 +406,7 @@
Apache as CGI
~~~~~~~~~~~~~
Apache must be configured to support CGI scripts in the directory in
-which gitweb is installed. Let's assume that it is '/var/www/cgi-bin'
+which gitweb is installed. Let's assume that it is `/var/www/cgi-bin`
directory.
-----------------------------------------------------------------------
@@ -431,7 +430,7 @@
(for mod_perl 1.x) or ModPerl::Registry (for mod_perl 2.x) to enable
this support.
-Assuming that gitweb is installed to '/var/www/perl', the following
+Assuming that gitweb is installed to `/var/www/perl`, the following
Apache configuration (for mod_perl 2.x) is suitable.
-----------------------------------------------------------------------
@@ -456,7 +455,7 @@
~~~~~~~~~~~~~~~~~~~
Gitweb works with Apache and FastCGI. First you need to rename, copy
or symlink gitweb.cgi to gitweb.fcgi. Let's assume that gitweb is
-installed in '/usr/share/gitweb' directory. The following Apache
+installed in `/usr/share/gitweb` directory. The following Apache
configuration is suitable (UNTESTED!)
-----------------------------------------------------------------------
@@ -503,22 +502,22 @@
-----------------------------------------------------------------------
The above configuration expects your public repositories to live under
-'/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`,
+`/pub/git` and will serve them as `http://git.domain.org/dir-under-pub-git`,
both as clonable Git URL and as browseable gitweb interface. If you then
start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`
then you can even use the `git://` URL with exactly the same path.
Setting the environment variable `GITWEB_CONFIG` will tell gitweb to use the
-named file (i.e. in this example '/etc/gitweb.conf') as a configuration for
+named file (i.e. in this example `/etc/gitweb.conf`) as a configuration for
gitweb. You don't really need it in above example; it is required only if
your configuration file is in different place than built-in (during
-compiling gitweb) 'gitweb_config.perl' or '/etc/gitweb.conf'. See
+compiling gitweb) 'gitweb_config.perl' or `/etc/gitweb.conf`. See
linkgit:gitweb.conf[5] for details, especially information about precedence
rules.
If you use the rewrite rules from the example you *might* also need
something like the following in your gitweb configuration file
-('/etc/gitweb.conf' following example):
+(`/etc/gitweb.conf` following example):
----------------------------------------------------------------------------
@stylesheets = ("/some/absolute/path/gitweb.css");
$my_uri = "/";
@@ -575,7 +574,7 @@
Here actual project root is passed to gitweb via `GITWEB_PROJECT_ROOT`
environment variable from a web server, so you need to put the following
-line in gitweb configuration file ('/etc/gitweb.conf' in above example):
+line in gitweb configuration file (`/etc/gitweb.conf` in above example):
--------------------------------------------------------------------------
$projectroot = $ENV{'GITWEB_PROJECTROOT'} || "/pub/git";
--------------------------------------------------------------------------
@@ -585,7 +584,7 @@
These configurations enable two things. First, each unix user (`<user>`) of
the server will be able to browse through gitweb Git repositories found in
-'~/public_git/' with the following url:
+`~/public_git/` with the following url:
http://git.example.org/~<user>/
@@ -596,7 +595,7 @@
use the \'~' as first character, just comment or remove the second rewrite
rule, and uncomment one of the following according to what you want.
-Second, repositories found in '/pub/scm/' and '/var/git/' will be accessible
+Second, repositories found in `/pub/scm/` and `/var/git/` will be accessible
through `http://git.example.org/scm/` and `http://git.example.org/var/`.
You can add as many project roots as you want by adding rewrite rules like
the third and the fourth.
@@ -614,7 +613,7 @@
http://git.example.com/project.git/shortlog/sometag
i.e. without 'gitweb.cgi' part, by using a configuration such as the
-following. This configuration assumes that '/var/www/gitweb' is the
+following. This configuration assumes that `/var/www/gitweb` is the
DocumentRoot of your webserver, contains the gitweb.cgi script and
complementary static files (stylesheet, favicon, JavaScript):
@@ -645,9 +644,9 @@
`@stylesheets`, `$my_uri` and `$home_link`, but you lose "dumb client"
access to your project .git dirs (described in "Single URL for gitweb and
for fetching" section). A possible workaround for the latter is the
-following: in your project root dir (e.g. '/pub/git') have the projects
-named *without* a .git extension (e.g. '/pub/git/project' instead of
-'/pub/git/project.git') and configure Apache as follows:
+following: in your project root dir (e.g. `/pub/git`) have the projects
+named *without* a .git extension (e.g. `/pub/git/project` instead of
+`/pub/git/project.git`) and configure Apache as follows:
----------------------------------------------------------------------------
<VirtualHost *:80>
ServerAlias git.example.com
@@ -681,7 +680,7 @@
will provide human-friendly gitweb access.
This solution is not 100% bulletproof, in the sense that if some project has
-a named ref (branch, tag) starting with 'git/', then paths such as
+a named ref (branch, tag) starting with `git/`, then paths such as
http://git.example.com/project/command/abranch..git/abranch
@@ -697,7 +696,7 @@
--------
linkgit:gitweb.conf[5], linkgit:git-instaweb[1]
-'gitweb/README', 'gitweb/INSTALL'
+`gitweb/README`, `gitweb/INSTALL`
GIT
---
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index ca11c7b..abc0dc6 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -301,8 +301,7 @@
.Rewind and rebuild next
[caption="Recipe: "]
=====================================
-* `git checkout next`
-* `git reset --hard master`
+* `git switch -C next master`
* `git merge ai/topic_in_next1`
* `git merge ai/topic_in_next2`
* ...
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 023ca95..090c888 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -255,7 +255,7 @@
[[def_object]]object::
The unit of storage in Git. It is uniquely identified by the
<<def_SHA1,SHA-1>> of its contents. Consequently, an
- object can not be changed.
+ object cannot be changed.
[[def_object_database]]object database::
Stores a set of "objects", and an individual <<def_object,object>> is
@@ -287,6 +287,15 @@
origin/name-of-upstream-branch, which you can see using
`git branch -r`.
+[[def_overlay]]overlay::
+ Only update and add files to the working directory, but don't
+ delete them, similar to how 'cp -R' would update the contents
+ in the destination directory. This is the default mode in a
+ <<def_checkout,checkout>> when checking out files from the
+ <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In
+ contrast, no-overlay mode also deletes tracked files not
+ present in the source, similar to 'rsync --delete'.
+
[[def_pack]]pack::
A set of objects which have been compressed into one file (to save space
or to transmit them efficiently).
diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index f44e5e9..bfe6f9b 100644
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -244,8 +244,8 @@
--------------
If you have to access the WebDAV server from behind an HTTP(S) proxy,
-set the variable 'all_proxy' to 'http://proxy-host.com:port', or
-'http://login-on-proxy:passwd-on-proxy@proxy-host.com:port'. See 'man
+set the variable 'all_proxy' to `http://proxy-host.com:port`, or
+`http://login-on-proxy:passwd-on-proxy@proxy-host.com:port`. See 'man
curl' for details.
diff --git a/Documentation/manpage.xsl b/Documentation/manpage.xsl
new file mode 100644
index 0000000..ef64bab
--- /dev/null
+++ b/Documentation/manpage.xsl
@@ -0,0 +1,3 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl" />
+</xsl:stylesheet>
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 63a3fc0..59b8ff1 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -3,9 +3,14 @@
Perform the merge and commit the result. This option can
be used to override --no-commit.
+
-With --no-commit perform the merge but pretend the merge
-failed and do not autocommit, to give the user a chance to
-inspect and further tweak the merge result before committing.
+With --no-commit perform the merge and stop just before creating
+a merge commit, to give the user a chance to inspect and further
+tweak the merge result before committing.
++
+Note that fast-forward updates do not create a merge commit and
+therefore there is no way to stop those merges with --no-commit.
+Thus, if you want to ensure your branch is not changed or updated
+by the merge command, use --no-ff with --no-commit.
--edit::
-e::
@@ -27,21 +32,32 @@
updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
set to `no` at the beginning of them.
+--cleanup=<mode>::
+ This option determines how the merge message will be cleaned up before
+ commiting. See linkgit:git-commit[1] for more details. In addition, if
+ the '<mode>' is given a value of `scissors`, scissors will be appended
+ to `MERGE_MSG` before being passed on to the commit machinery in the
+ case of a merge conflict.
+
--ff::
- When the merge resolves as a fast-forward, only update the branch
- pointer, without creating a merge commit. This is the default
- behavior.
-
--no-ff::
- Create a merge commit even when the merge resolves as a
- fast-forward. This is the default behaviour when merging an
- annotated (and possibly signed) tag that is not stored in
- its natural place in 'refs/tags/' hierarchy.
-
--ff-only::
- Refuse to merge and exit with a non-zero status unless the
- current `HEAD` is already up to date or the merge can be
- resolved as a fast-forward.
+ Specifies how a merge is handled when the merged-in history is
+ already a descendant of the current history. `--ff` is the
+ default unless merging an annotated (and possibly signed) tag
+ that is not stored in its natural place in the `refs/tags/`
+ hierarchy, in which case `--no-ff` is assumed.
++
+With `--ff`, when possible resolve the merge as a fast-forward (only
+update the branch pointer to match the merged branch; do not create a
+merge commit). When not possible (when the merged-in history is not a
+descendant of the current history), create a merge commit.
++
+With `--no-ff`, create a merge commit in all cases, even when the merge
+could instead be resolved as a fast-forward.
++
+With `--ff-only`, resolve the merge as a fast-forward when possible.
+When not possible, refuse to merge and exit with a non-zero status.
-S[<keyid>]::
--gpg-sign[=<keyid>]::
@@ -90,6 +106,12 @@
+
With --no-squash perform the merge and commit the result. This
option can be used to override --squash.
++
+With --squash, --commit is not allowed, and will fail.
+
+--no-verify::
+ This option bypasses the pre-merge and commit-msg hooks.
+ See also linkgit:githooks[5].
-s <strategy>::
--strategy=<strategy>::
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index de69531..b87e2e8 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -102,120 +102,160 @@
+
The placeholders are:
-- '%H': commit hash
-- '%h': abbreviated commit hash
-- '%T': tree hash
-- '%t': abbreviated tree hash
-- '%P': parent hashes
-- '%p': abbreviated parent hashes
-- '%an': author name
-- '%aN': author name (respecting .mailmap, see linkgit:git-shortlog[1]
- or linkgit:git-blame[1])
-- '%ae': author email
-- '%aE': author email (respecting .mailmap, see
- linkgit:git-shortlog[1] or linkgit:git-blame[1])
-- '%ad': author date (format respects --date= option)
-- '%aD': author date, RFC2822 style
-- '%ar': author date, relative
-- '%at': author date, UNIX timestamp
-- '%ai': author date, ISO 8601-like format
-- '%aI': author date, strict ISO 8601 format
-- '%cn': committer name
-- '%cN': committer name (respecting .mailmap, see
- linkgit:git-shortlog[1] or linkgit:git-blame[1])
-- '%ce': committer email
-- '%cE': committer email (respecting .mailmap, see
- linkgit:git-shortlog[1] or linkgit:git-blame[1])
-- '%cd': committer date (format respects --date= option)
-- '%cD': committer date, RFC2822 style
-- '%cr': committer date, relative
-- '%ct': committer date, UNIX timestamp
-- '%ci': committer date, ISO 8601-like format
-- '%cI': committer date, strict ISO 8601 format
-- '%d': ref names, like the --decorate option of linkgit:git-log[1]
-- '%D': ref names without the " (", ")" wrapping.
-- '%S': ref name given on the command line by which the commit was reached
- (like `git log --source`), only works with `git log`
-- '%e': encoding
-- '%s': subject
-- '%f': sanitized subject line, suitable for a filename
-- '%b': body
-- '%B': raw body (unwrapped subject and body)
+- Placeholders that expand to a single literal character:
+'%n':: newline
+'%%':: a raw '%'
+'%x00':: print a byte from a hex code
+
+- Placeholders that affect formatting of later placeholders:
+'%Cred':: switch color to red
+'%Cgreen':: switch color to green
+'%Cblue':: switch color to blue
+'%Creset':: reset color
+'%C(...)':: color specification, as described under Values in the
+ "CONFIGURATION FILE" section of linkgit:git-config[1]. By
+ default, colors are shown only when enabled for log output
+ (by `color.diff`, `color.ui`, or `--color`, and respecting
+ the `auto` settings of the former if we are going to a
+ terminal). `%C(auto,...)` is accepted as a historical
+ synonym for the default (e.g., `%C(auto,red)`). Specifying
+ `%C(always,...)` will show the colors even when color is
+ not otherwise enabled (though consider just using
+ `--color=always` to enable color for the whole output,
+ including this format and anything else git might color).
+ `auto` alone (i.e. `%C(auto)`) will turn on auto coloring
+ on the next placeholders until the color is switched
+ again.
+'%m':: left (`<`), right (`>`) or boundary (`-`) mark
+'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
+ linkgit:git-shortlog[1].
+'%<(<N>[,trunc|ltrunc|mtrunc])':: make the next placeholder take at
+ least N columns, padding spaces on
+ the right if necessary. Optionally
+ truncate at the beginning (ltrunc),
+ the middle (mtrunc) or the end
+ (trunc) if the output is longer than
+ N columns. Note that truncating
+ only works correctly with N >= 2.
+'%<|(<N>)':: make the next placeholder take at least until Nth
+ columns, padding spaces on the right if necessary
+'%>(<N>)', '%>|(<N>)':: similar to '%<(<N>)', '%<|(<N>)' respectively,
+ but padding spaces on the left
+'%>>(<N>)', '%>>|(<N>)':: similar to '%>(<N>)', '%>|(<N>)'
+ respectively, except that if the next
+ placeholder takes more spaces than given and
+ there are spaces on its left, use those
+ spaces
+'%><(<N>)', '%><|(<N>)':: similar to '%<(<N>)', '%<|(<N>)'
+ respectively, but padding both sides
+ (i.e. the text is centered)
+
+- Placeholders that expand to information extracted from the commit:
+'%H':: commit hash
+'%h':: abbreviated commit hash
+'%T':: tree hash
+'%t':: abbreviated tree hash
+'%P':: parent hashes
+'%p':: abbreviated parent hashes
+'%an':: author name
+'%aN':: author name (respecting .mailmap, see linkgit:git-shortlog[1]
+ or linkgit:git-blame[1])
+'%ae':: author email
+'%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
+ or linkgit:git-blame[1])
+'%ad':: author date (format respects --date= option)
+'%aD':: author date, RFC2822 style
+'%ar':: author date, relative
+'%at':: author date, UNIX timestamp
+'%ai':: author date, ISO 8601-like format
+'%aI':: author date, strict ISO 8601 format
+'%cn':: committer name
+'%cN':: committer name (respecting .mailmap, see
+ linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%ce':: committer email
+'%cE':: committer email (respecting .mailmap, see
+ linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%cd':: committer date (format respects --date= option)
+'%cD':: committer date, RFC2822 style
+'%cr':: committer date, relative
+'%ct':: committer date, UNIX timestamp
+'%ci':: committer date, ISO 8601-like format
+'%cI':: committer date, strict ISO 8601 format
+'%d':: ref names, like the --decorate option of linkgit:git-log[1]
+'%D':: ref names without the " (", ")" wrapping.
+'%S':: ref name given on the command line by which the commit was reached
+ (like `git log --source`), only works with `git log`
+'%e':: encoding
+'%s':: subject
+'%f':: sanitized subject line, suitable for a filename
+'%b':: body
+'%B':: raw body (unwrapped subject and body)
ifndef::git-rev-list[]
-- '%N': commit notes
+'%N':: commit notes
endif::git-rev-list[]
-- '%GG': raw verification message from GPG for a signed commit
-- '%G?': show "G" for a good (valid) signature,
- "B" for a bad signature,
- "U" for a good signature with unknown validity,
- "X" for a good signature that has expired,
- "Y" for a good signature made by an expired key,
- "R" for a good signature made by a revoked key,
- "E" if the signature cannot be checked (e.g. missing key)
- and "N" for no signature
-- '%GS': show the name of the signer for a signed commit
-- '%GK': show the key used to sign a signed commit
-- '%GF': show the fingerprint of the key used to sign a signed commit
-- '%GP': show the fingerprint of the primary key whose subkey was used
- to sign a signed commit
-- '%gD': reflog selector, e.g., `refs/stash@{1}` or
- `refs/stash@{2 minutes ago`}; the format follows the rules described
- for the `-g` option. The portion before the `@` is the refname as
- given on the command line (so `git log -g refs/heads/master` would
- yield `refs/heads/master@{0}`).
-- '%gd': shortened reflog selector; same as `%gD`, but the refname
- portion is shortened for human readability (so `refs/heads/master`
- becomes just `master`).
-- '%gn': reflog identity name
-- '%gN': reflog identity name (respecting .mailmap, see
- linkgit:git-shortlog[1] or linkgit:git-blame[1])
-- '%ge': reflog identity email
-- '%gE': reflog identity email (respecting .mailmap, see
- linkgit:git-shortlog[1] or linkgit:git-blame[1])
-- '%gs': reflog subject
-- '%Cred': switch color to red
-- '%Cgreen': switch color to green
-- '%Cblue': switch color to blue
-- '%Creset': reset color
-- '%C(...)': color specification, as described under Values in the
- "CONFIGURATION FILE" section of linkgit:git-config[1].
- By default, colors are shown only when enabled for log output (by
- `color.diff`, `color.ui`, or `--color`, and respecting the `auto`
- settings of the former if we are going to a terminal). `%C(auto,...)`
- is accepted as a historical synonym for the default (e.g.,
- `%C(auto,red)`). Specifying `%C(always,...) will show the colors
- even when color is not otherwise enabled (though consider
- just using `--color=always` to enable color for the whole output,
- including this format and anything else git might color). `auto`
- alone (i.e. `%C(auto)`) will turn on auto coloring on the next
- placeholders until the color is switched again.
-- '%m': left (`<`), right (`>`) or boundary (`-`) mark
-- '%n': newline
-- '%%': a raw '%'
-- '%x00': print a byte from a hex code
-- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
- linkgit:git-shortlog[1].
-- '%<(<N>[,trunc|ltrunc|mtrunc])': make the next placeholder take at
- least N columns, padding spaces on the right if necessary.
- Optionally truncate at the beginning (ltrunc), the middle (mtrunc)
- or the end (trunc) if the output is longer than N columns.
- Note that truncating only works correctly with N >= 2.
-- '%<|(<N>)': make the next placeholder take at least until Nth
- columns, padding spaces on the right if necessary
-- '%>(<N>)', '%>|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
- respectively, but padding spaces on the left
-- '%>>(<N>)', '%>>|(<N>)': similar to '%>(<N>)', '%>|(<N>)'
- respectively, except that if the next placeholder takes more spaces
- than given and there are spaces on its left, use those spaces
-- '%><(<N>)', '%><|(<N>)': similar to '%<(<N>)', '%<|(<N>)'
- respectively, but padding both sides (i.e. the text is centered)
-- %(trailers[:options]): display the trailers of the body as interpreted
- by linkgit:git-interpret-trailers[1]. The `trailers` string may be
- followed by a colon and zero or more comma-separated options. If the
- `only` option is given, omit non-trailer lines from the trailer block.
- If the `unfold` option is given, behave as if interpret-trailer's
- `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do
- both.
+'%GG':: raw verification message from GPG for a signed commit
+'%G?':: show "G" for a good (valid) signature,
+ "B" for a bad signature,
+ "U" for a good signature with unknown validity,
+ "X" for a good signature that has expired,
+ "Y" for a good signature made by an expired key,
+ "R" for a good signature made by a revoked key,
+ "E" if the signature cannot be checked (e.g. missing key)
+ and "N" for no signature
+'%GS':: show the name of the signer for a signed commit
+'%GK':: show the key used to sign a signed commit
+'%GF':: show the fingerprint of the key used to sign a signed commit
+'%GP':: show the fingerprint of the primary key whose subkey was used
+ to sign a signed commit
+'%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
+ minutes ago}`; the format follows the rules described for the
+ `-g` option. The portion before the `@` is the refname as
+ given on the command line (so `git log -g refs/heads/master`
+ would yield `refs/heads/master@{0}`).
+'%gd':: shortened reflog selector; same as `%gD`, but the refname
+ portion is shortened for human readability (so
+ `refs/heads/master` becomes just `master`).
+'%gn':: reflog identity name
+'%gN':: reflog identity name (respecting .mailmap, see
+ linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%ge':: reflog identity email
+'%gE':: reflog identity email (respecting .mailmap, see
+ linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%gs':: reflog subject
+'%(trailers[:options])':: display the trailers of the body as
+ interpreted by
+ linkgit:git-interpret-trailers[1]. The
+ `trailers` string may be followed by a colon
+ and zero or more comma-separated options:
+** 'key=<K>': only show trailers with specified key. Matching is done
+ case-insensitively and trailing colon is optional. If option is
+ given multiple times trailer lines matching any of the keys are
+ shown. This option automatically enables the `only` option so that
+ non-trailer lines in the trailer block are hidden. If that is not
+ desired it can be disabled with `only=false`. E.g.,
+ `%(trailers:key=Reviewed-by)` shows trailer lines with key
+ `Reviewed-by`.
+** 'only[=val]': select whether non-trailer lines from the trailer
+ block should be included. The `only` keyword may optionally be
+ followed by an equal sign and one of `true`, `on`, `yes` to omit or
+ `false`, `off`, `no` to show the non-trailer lines. If option is
+ given without value it is enabled. If given multiple times the last
+ value is used.
+** 'separator=<SEP>': specify a separator inserted between trailer
+ lines. When this option is not given each trailer line is
+ terminated with a line feed character. The string SEP may contain
+ the literal formatting codes described above. To use comma as
+ separator one must use `%x2C` as it would otherwise be parsed as
+ next option. If separator option is given multiple times only the
+ last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )`
+ shows all trailer lines whose key is "Ticket" separated by a comma
+ and a space.
+** 'unfold[=val]': make it behave as if interpret-trailer's `--unfold`
+ option was given. In same way as to for `only` it can be followed
+ by an equal sign and explicit value. E.g.,
+ `%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
+** 'valueonly[=val]': skip over the key part of the trailer line and only
+ show the value part. Also this optionally allows explicit value.
NOTE: Some placeholders may depend on other options given to the
revision traversal engine. For example, the `%g*` reflog options will
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index cad711c..90ff9e2 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -182,6 +182,14 @@
Pretend as if all objects mentioned by reflogs are listed on the
command line as `<commit>`.
+--alternate-refs::
+ Pretend as if all objects mentioned as ref tips of alternate
+ repositories were listed on the command line. An alternate
+ repository is any repository whose object directory is specified
+ in `objects/info/alternates`. The set of included objects may
+ be modified by `core.alternateRefsCommand`, etc. See
+ linkgit:git-config[1].
+
--single-worktree::
By default, all working trees will be examined by the
following options when there are more than one (see
@@ -708,6 +716,16 @@
Only useful with `--objects`; print the object IDs that are not
in packs.
+--object-names::
+ Only useful with `--objects`; print the names of the object IDs
+ that are found. This is the default behavior.
+
+--no-object-names::
+ Only useful with `--objects`; does not print the names of the object
+ IDs that are found. This inverts `--object-names`. This flag allows
+ the output to be more easily parsed by commands such as
+ linkgit:git-cat-file[1].
+
--filter=<filter-spec>::
Only useful with one of the `--objects*`; omits objects (usually
blobs) from the list of printed objects. The '<filter-spec>'
@@ -725,9 +743,6 @@
to omit blobs that would not be not required for a sparse checkout on
the requested refs.
+
-The form '--filter=sparse:path=<path>' similarly uses a sparse-checkout
-specification contained in <path>.
-+
The form '--filter=tree:<depth>' omits all blobs and trees whose depth
from the root tree is >= <depth> (minimum depth if an object is located
at multiple depths in the commits traversed). <depth>=0 will not include
@@ -737,13 +752,33 @@
<commit> or an explicitly-given object. <depth>=2 is like <depth>=1
while also including trees and blobs one more level removed from an
explicitly-given commit or tree.
++
+Note that the form '--filter=sparse:path=<path>' that wants to read
+from an arbitrary path on the filesystem has been dropped for security
+reasons.
++
+Multiple '--filter=' flags can be specified to combine filters. Only
+objects which are accepted by every filter are included.
++
+The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
+used to combined several filters, but this is harder than just repeating
+the '--filter' flag and is usually not necessary. Filters are joined by
+'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
+Besides the '{plus}' and '%' characters, the following characters are
+reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+'`+
+as well as all characters with ASCII code <= `0x20`, which includes
+space and newline.
++
+Other arbitrary characters can also be encoded. For instance,
+'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
+equivalent.
--no-filter::
Turn off any previous `--filter=` argument.
--filter-print-omitted::
Only useful with `--filter=`; prints a list of the objects omitted
- by the filter. Object IDs are prefixed with a ``~'' character.
+ by the filter. Object IDs are prefixed with a ``~'' character.
--missing=<missing-action>::
A debug option to help with future "partial clone" development.
@@ -805,12 +840,13 @@
author's). If `-local` is appended to the format (e.g.,
`iso-local`), the user's local time zone is used instead.
+
+--
`--date=relative` shows dates relative to the current time,
e.g. ``2 hours ago''. The `-local` option has no effect for
`--date=relative`.
-+
+
`--date=local` is an alias for `--date=default-local`.
-+
+
`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
The differences to the strict ISO 8601 format are:
@@ -818,15 +854,14 @@
- a space between time and time zone
- no colon between hours and minutes of the time zone
-+
`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
ISO 8601 format.
-+
+
`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
format, often found in email messages.
-+
+
`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
-+
+
`--date=raw` shows the date as seconds since the epoch (1970-01-01
00:00:00 UTC), followed by a space, and then the timezone as an offset
from UTC (a `+` or `-` with four digits; the first two are hours, and
@@ -835,28 +870,28 @@
Note that the `-local` option does not affect the seconds-since-epoch
value (which is always measured in UTC), but does switch the accompanying
timezone value.
-+
+
`--date=human` shows the timezone if the timezone does not match the
current time-zone, and doesn't print the whole date if that matches
(ie skip printing year for dates that are "this year", but also skip
the whole date itself if it's in the last few days and we can just say
what weekday it was). For older dates the hour and minute is also
omitted.
-+
+
`--date=unix` shows the date as a Unix epoch timestamp (seconds since
1970). As with `--raw`, this is always in UTC and therefore `-local`
has no effect.
-+
+
`--date=format:...` feeds the format `...` to your system `strftime`,
except for %z and %Z, which are handled internally.
Use `--date=format:%c` to show the date in your system locale's
preferred format. See the `strftime` manual for a complete list of
format placeholders. When using `-local`, the correct syntax is
`--date=format-local:...`.
-+
+
`--date=default` is the default format, and is similar to
`--date=rfc2822`, with a few exceptions:
-
+--
- there is no comma after the day-of-week
- the time zone is omitted when the local time zone is used
@@ -960,6 +995,13 @@
the parents have only two variants and the merge result picks
one of them without modification.
+--combined-all-paths::
+ This flag causes combined diffs (used for merge commits) to
+ list the name of the file from all parents. It thus only has
+ effect when -c or --cc are specified, and is likely only
+ useful if filename changes are detected (i.e. when either
+ rename or copy detection have been requested).
+
-m::
This flag makes the merge commits show the full diff like
regular commits; for each merge parent, a separate log entry
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 72daa20..97f995e 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -58,14 +58,14 @@
when you run `git cherry-pick`.
+
Note that any of the 'refs/*' cases above may come either from
-the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.
+the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.
While the ref name encoding is unspecified, UTF-8 is preferred as
some output processing may assume ref names in UTF-8.
'@'::
'@' alone is a shortcut for `HEAD`.
-'<refname>@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
+'[<refname>]@{<date>}', e.g. 'master@\{yesterday\}', 'HEAD@{5 minutes ago}'::
A ref followed by the suffix '@' with a date specification
enclosed in a brace
pair (e.g. '\{yesterday\}', '{1 month 2 weeks 3 days 1 hour 1
@@ -95,7 +95,7 @@
The construct '@{-<n>}' means the <n>th branch/commit checked out
before the current one.
-'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
+'[<branchname>]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
refers to the branch that the branch specified by branchname is set to build on
top of (configured with `branch.<name>.remote` and
@@ -103,19 +103,19 @@
current one. These suffixes are also accepted when spelled in uppercase, and
they mean the same thing no matter the case.
-'<branchname>@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
+'[<branchname>]@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
The suffix '@\{push}' reports the branch "where we would push to" if
`git push` were run while `branchname` was checked out (or the current
`HEAD` if no branchname is specified). Since our push destination is
in a remote repository, of course, we report the local tracking branch
- that corresponds to that branch (i.e., something in 'refs/remotes/').
+ that corresponds to that branch (i.e., something in `refs/remotes/`).
+
Here's an example to make it more clear:
+
------------------------------
$ git config push.default current
$ git config remote.pushdefault myfork
-$ git checkout -b mybranch origin/master
+$ git switch -c mybranch origin/master
$ git rev-parse --symbolic-full-name @{upstream}
refs/remotes/origin/master
@@ -131,7 +131,7 @@
This suffix is also accepted when spelled in uppercase, and means the same
thing no matter the case.
-'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
+'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'<rev>{caret}'
@@ -139,7 +139,9 @@
'<rev>{caret}0' means the commit itself and is used when '<rev>' is the
object name of a tag object that refers to a commit object.
-'<rev>{tilde}<n>', e.g. 'master{tilde}3'::
+'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'::
+ A suffix '{tilde}' to a revision parameter means the first parent of
+ that commit object.
A suffix '{tilde}<n>' to a revision parameter means the commit
object that is the <n>th generation ancestor of the named
commit object, following only the first parents. I.e. '<rev>{tilde}3' is
@@ -159,12 +161,12 @@
'<rev>{caret}0'
is a short-hand for '<rev>{caret}\{commit\}'.
+
-'rev{caret}\{object\}' can be used to make sure 'rev' names an
-object that exists, without requiring 'rev' to be a tag, and
-without dereferencing 'rev'; because a tag is already an object,
+'<rev>{caret}\{object\}' can be used to make sure '<rev>' names an
+object that exists, without requiring '<rev>' to be a tag, and
+without dereferencing '<rev>'; because a tag is already an object,
it does not have to be dereferenced even once to get to an object.
+
-'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an
+'<rev>{caret}\{tag\}' can be used to ensure that '<rev>' identifies an
existing tag object.
'<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'::
@@ -194,19 +196,16 @@
Depending on the given text, the shell's word splitting rules might
require additional quoting.
-'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
+'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'::
A suffix ':' followed by a path names the blob or tree
at the given path in the tree-ish object named by the part
before the colon.
- ':path' (with an empty part before the colon)
- is a special case of the syntax described next: content
- recorded in the index at the given path.
A path starting with './' or '../' is relative to the current working directory.
The given path will be converted to be relative to the working tree's root directory.
This is most useful to address a blob or tree from a commit or tree that has
the same tree structure as the working tree.
-':<n>:<path>', e.g. ':0:README', ':README'::
+':[<n>:]<path>', e.g. ':0:README', ':README'::
A colon, optionally followed by a stage number (0 to 3) and a
colon, followed by a path, names a blob object in the
index at the given path. A missing stage number (and the colon
@@ -302,7 +301,7 @@
The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents.
By itself, this notation denotes the single commit 'r1'.
-The '<rev>{caret}-<n>' notation includes '<rev>' but excludes the <n>th
+The '<rev>{caret}-[<n>]' notation includes '<rev>' but excludes the <n>th
parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if
not given. This is typically useful for merge commits where you
can just pass '<commit>{caret}-' to get all the commits in the branch
diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
index 5747f44..3bceb56 100644
--- a/Documentation/sequencer.txt
+++ b/Documentation/sequencer.txt
@@ -1,8 +1,12 @@
--continue::
Continue the operation in progress using the information in
- '.git/sequencer'. Can be used to continue after resolving
+ `.git/sequencer`. Can be used to continue after resolving
conflicts in a failed cherry-pick or revert.
+--skip::
+ Skip the current commit and continue with the rest of the
+ sequence.
+
--quit::
Forget about the current operation in progress. Can be used
to clear the sequencer state after a failed cherry-pick or
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index fa39ac9..7d20716 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -229,7 +229,7 @@
config-like files that the caller specifies (i.e., files like `.gitmodules`,
`~/.gitconfig` etc.). For example,
----------------------------------------
+----------------------------------------
struct config_set gm_config;
git_configset_init(&gm_config);
int b;
diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt
index 5abb8e8..76b6e4f 100644
--- a/Documentation/technical/api-directory-listing.txt
+++ b/Documentation/technical/api-directory-listing.txt
@@ -111,11 +111,11 @@
* Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
sizeof(dir))`.
-* To add single exclude pattern, call `add_exclude_list()` and then
- `add_exclude()`.
+* To add single exclude pattern, call `add_pattern_list()` and then
+ `add_pattern()`.
* To add patterns from a file (e.g. `.git/info/exclude`), call
- `add_excludes_from_file()` , and/or set `dir.exclude_per_dir`. A
+ `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`. A
short-hand function `setup_standard_excludes()` can be used to set
up the standard set of exclude settings.
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 2b036d7..2e2e7c1 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -198,8 +198,10 @@
The filename will be prefixed by passing the filename along with
the prefix argument of `parse_options()` to `prefix_filename()`.
-`OPT_ARGUMENT(long, description)`::
+`OPT_ARGUMENT(long, &int_var, description)`::
Introduce a long-option argument that will be kept in `argv[]`.
+ If this option was seen, `int_var` will be set to one (except
+ if a `NULL` pointer was passed).
`OPT_NUMBER_CALLBACK(&var, description, func_ptr)`::
Recognize numerical options like -123 and feed the integer as
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index 46c3d5c..ad9d019 100644
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -54,7 +54,7 @@
do not do this you will get an error for each ref that it does not point
to a valid object.
-Note: As a side-effect of this you can not safely assume that all
+Note: As a side-effect of this you cannot safely assume that all
objects you lookup are available in superproject. All submodule objects
will be available the same way as the superprojects objects.
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
new file mode 100644
index 0000000..71eb081
--- /dev/null
+++ b/Documentation/technical/api-trace2.txt
@@ -0,0 +1,1378 @@
+= Trace2 API
+
+The Trace2 API can be used to print debug, performance, and telemetry
+information to stderr or a file. The Trace2 feature is inactive unless
+explicitly enabled by enabling one or more Trace2 Targets.
+
+The Trace2 API is intended to replace the existing (Trace1)
+printf-style tracing provided by the existing `GIT_TRACE` and
+`GIT_TRACE_PERFORMANCE` facilities. During initial implementation,
+Trace2 and Trace1 may operate in parallel.
+
+The Trace2 API defines a set of high-level messages with known fields,
+such as (`start`: `argv`) and (`exit`: {`exit-code`, `elapsed-time`}).
+
+Trace2 instrumentation throughout the Git code base sends Trace2
+messages to the enabled Trace2 Targets. Targets transform these
+messages content into purpose-specific formats and write events to
+their data streams. In this manner, the Trace2 API can drive
+many different types of analysis.
+
+Targets are defined using a VTable allowing easy extension to other
+formats in the future. This might be used to define a binary format,
+for example.
+
+Trace2 is controlled using `trace2.*` config values in the system and
+global config files and `GIT_TRACE2*` environment variables. Trace2 does
+not read from repo local or worktree config files or respect `-c`
+command line config settings.
+
+== Trace2 Targets
+
+Trace2 defines the following set of Trace2 Targets.
+Format details are given in a later section.
+
+=== The Normal Format Target
+
+The normal format target is a tradition printf format and similar
+to GIT_TRACE format. This format is enabled with the `GIT_TRACE2`
+environment variable or the `trace2.normalTarget` system or global
+config setting.
+
+For example
+
+------------
+$ export GIT_TRACE2=~/log.normal
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+or
+
+------------
+$ git config --global trace2.normalTarget ~/log.normal
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+yields
+
+------------
+$ cat ~/log.normal
+12:28:42.620009 common-main.c:38 version 2.20.1.155.g426c96fcdb
+12:28:42.620989 common-main.c:39 start git version
+12:28:42.621101 git.c:432 cmd_name version (version)
+12:28:42.621215 git.c:662 exit elapsed:0.001227 code:0
+12:28:42.621250 trace2/tr2_tgt_normal.c:124 atexit elapsed:0.001265 code:0
+------------
+
+=== The Performance Format Target
+
+The performance format target (PERF) is a column-based format to
+replace GIT_TRACE_PERFORMANCE and is suitable for development and
+testing, possibly to complement tools like gprof. This format is
+enabled with the `GIT_TRACE2_PERF` environment variable or the
+`trace2.perfTarget` system or global config setting.
+
+For example
+
+------------
+$ export GIT_TRACE2_PERF=~/log.perf
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+or
+
+------------
+$ git config --global trace2.perfTarget ~/log.perf
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+yields
+
+------------
+$ cat ~/log.perf
+12:28:42.620675 common-main.c:38 | d0 | main | version | | | | | 2.20.1.155.g426c96fcdb
+12:28:42.621001 common-main.c:39 | d0 | main | start | | 0.001173 | | | git version
+12:28:42.621111 git.c:432 | d0 | main | cmd_name | | | | | version (version)
+12:28:42.621225 git.c:662 | d0 | main | exit | | 0.001227 | | | code:0
+12:28:42.621259 trace2/tr2_tgt_perf.c:211 | d0 | main | atexit | | 0.001265 | | | code:0
+------------
+
+=== The Event Format Target
+
+The event format target is a JSON-based format of event data suitable
+for telemetry analysis. This format is enabled with the `GIT_TRACE2_EVENT`
+environment variable or the `trace2.eventTarget` system or global config
+setting.
+
+For example
+
+------------
+$ export GIT_TRACE2_EVENT=~/log.event
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+or
+
+------------
+$ git config --global trace2.eventTarget ~/log.event
+$ git version
+git version 2.20.1.155.g426c96fcdb
+------------
+
+yields
+
+------------
+$ cat ~/log.event
+{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"1","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
+{"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
+{"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
+{"event":"atexit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621268Z","file":"trace2/tr2_tgt_event.c","line":163,"t_abs":0.001265,"code":0}
+------------
+
+=== Enabling a Target
+
+To enable a target, set the corresponding environment variable or
+system or global config value to one of the following:
+
+include::../trace2-target-values.txt[]
+
+If the target already exists and is a directory, the traces will be
+written to files (one per process) underneath the given directory. They
+will be named according to the last component of the SID (optionally
+followed by a counter to avoid filename collisions).
+
+== Trace2 API
+
+All public Trace2 functions and macros are defined in `trace2.h` and
+`trace2.c`. All public symbols are prefixed with `trace2_`.
+
+There are no public Trace2 data structures.
+
+The Trace2 code also defines a set of private functions and data types
+in the `trace2/` directory. These symbols are prefixed with `tr2_`
+and should only be used by functions in `trace2.c`.
+
+== Conventions for Public Functions and Macros
+
+The functions defined by the Trace2 API are declared and documented
+in `trace2.h`. It defines the API functions and wrapper macros for
+Trace2.
+
+Some functions have a `_fl()` suffix to indicate that they take `file`
+and `line-number` arguments.
+
+Some functions have a `_va_fl()` suffix to indicate that they also
+take a `va_list` argument.
+
+Some functions have a `_printf_fl()` suffix to indicate that they also
+take a varargs argument.
+
+There are CPP wrapper macros and ifdefs to hide most of these details.
+See `trace2.h` for more details. The following discussion will only
+describe the simplified forms.
+
+== Public API
+
+All Trace2 API functions send a messsage to all of the active
+Trace2 Targets. This section describes the set of available
+messages.
+
+It helps to divide these functions into groups for discussion
+purposes.
+
+=== Basic Command Messages
+
+These are concerned with the lifetime of the overall git process.
+
+`void trace2_initialize_clock()`::
+
+ Initialize the Trace2 start clock and nothing else. This should
+ be called at the very top of main() to capture the process start
+ time and reduce startup order dependencies.
+
+`void trace2_initialize()`::
+
+ Determines if any Trace2 Targets should be enabled and
+ initializes the Trace2 facility. This includes setting up the
+ Trace2 thread local storage (TLS).
++
+This function emits a "version" message containing the version of git
+and the Trace2 protocol.
++
+This function should be called from `main()` as early as possible in
+the life of the process after essential process initialization.
+
+`int trace2_is_enabled()`::
+
+ Returns 1 if Trace2 is enabled (at least one target is
+ active).
+
+`void trace2_cmd_start(int argc, const char **argv)`::
+
+ Emits a "start" message containing the process command line
+ arguments.
+
+`int trace2_cmd_exit(int exit_code)`::
+
+ Emits an "exit" message containing the process exit-code and
+ elapsed time.
++
+Returns the exit-code.
+
+`void trace2_cmd_error(const char *fmt, va_list ap)`::
+
+ Emits an "error" message containing a formatted error message.
+
+`void trace2_cmd_path(const char *pathname)`::
+
+ Emits a "cmd_path" message with the full pathname of the
+ current process.
+
+=== Command Detail Messages
+
+These are concerned with describing the specific Git command
+after the command line, config, and environment are inspected.
+
+`void trace2_cmd_name(const char *name)`::
+
+ Emits a "cmd_name" message with the canonical name of the
+ command, for example "status" or "checkout".
+
+`void trace2_cmd_mode(const char *mode)`::
+
+ Emits a "cmd_mode" message with a qualifier name to further
+ describe the current git command.
++
+This message is intended to be used with git commands having multiple
+major modes. For example, a "checkout" command can checkout a new
+branch or it can checkout a single file, so the checkout code could
+emit a cmd_mode message of "branch" or "file".
+
+`void trace2_cmd_alias(const char *alias, const char **argv_expansion)`::
+
+ Emits an "alias" message containing the alias used and the
+ argument expansion.
+
+`void trace2_def_param(const char *parameter, const char *value)`::
+
+ Emits a "def_param" message containing a key/value pair.
++
+This message is intended to report some global aspect of the current
+command, such as a configuration setting or command line switch that
+significantly affects program performance or behavior, such as
+`core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`.
+
+`void trace2_cmd_list_config()`::
+
+ Emits a "def_param" messages for "important" configuration
+ settings.
++
+The environment variable `GIT_TRACE2_CONFIG_PARAMS` or the `trace2.configParams`
+config value can be set to a
+list of patterns of important configuration settings, for example:
+`core.*,remote.*.url`. This function will iterate over all config
+settings and emit a "def_param" message for each match.
+
+`void trace2_cmd_set_config(const char *key, const char *value)`::
+
+ Emits a "def_param" message for a new or updated key/value
+ pair IF `key` is considered important.
++
+This is used to hook into `git_config_set()` and catch any
+configuration changes and update a value previously reported by
+`trace2_cmd_list_config()`.
+
+`void trace2_def_repo(struct repository *repo)`::
+
+ Registers a repository with the Trace2 layer. Assigns a
+ unique "repo-id" to `repo->trace2_repo_id`.
++
+Emits a "worktree" messages containing the repo-id and the worktree
+pathname.
++
+Region and data messages (described later) may refer to this repo-id.
++
+The main/top-level repository will have repo-id value 1 (aka "r1").
++
+The repo-id field is in anticipation of future in-proc submodule
+repositories.
+
+=== Child Process Messages
+
+These are concerned with the various spawned child processes,
+including shell scripts, git commands, editors, pagers, and hooks.
+
+`void trace2_child_start(struct child_process *cmd)`::
+
+ Emits a "child_start" message containing the "child-id",
+ "child-argv", and "child-classification".
++
+Before calling this, set `cmd->trace2_child_class` to a name
+describing the type of child process, for example "editor".
++
+This function assigns a unique "child-id" to `cmd->trace2_child_id`.
+This field is used later during the "child_exit" message to associate
+it with the "child_start" message.
++
+This function should be called before spawning the child process.
+
+`void trace2_child_exit(struct child_proess *cmd, int child_exit_code)`::
+
+ Emits a "child_exit" message containing the "child-id",
+ the child's elapsed time and exit-code.
++
+The reported elapsed time includes the process creation overhead and
+time spend waiting for it to exit, so it may be slightly longer than
+the time reported by the child itself.
++
+This function should be called after reaping the child process.
+
+`int trace2_exec(const char *exe, const char **argv)`::
+
+ Emits a "exec" message containing the "exec-id" and the
+ argv of the new process.
++
+This function should be called before calling one of the `exec()`
+variants, such as `execvp()`.
++
+This function returns a unique "exec-id". This value is used later
+if the exec() fails and a "exec-result" message is necessary.
+
+`void trace2_exec_result(int exec_id, int error_code)`::
+
+ Emits a "exec_result" message containing the "exec-id"
+ and the error code.
++
+On Unix-based systems, `exec()` does not return if successful.
+This message is used to indicate that the `exec()` failed and
+that the current program is continuing.
+
+=== Git Thread Messages
+
+These messages are concerned with Git thread usage.
+
+`void trace2_thread_start(const char *thread_name)`::
+
+ Emits a "thread_start" message.
++
+The `thread_name` field should be a descriptive name, such as the
+unique name of the thread-proc. A unique "thread-id" will be added
+to the name to uniquely identify thread instances.
++
+Region and data messages (described later) may refer to this thread
+name.
++
+This function must be called by the thread-proc of the new thread
+(so that TLS data is properly initialized) and not by the caller
+of `pthread_create()`.
+
+`void trace2_thread_exit()`::
+
+ Emits a "thread_exit" message containing the thread name
+ and the thread elapsed time.
++
+This function must be called by the thread-proc before it returns
+(so that the coorect TLS data is used and cleaned up. It should
+not be called by the caller of `pthread_join()`.
+
+=== Region and Data Messages
+
+These are concerned with recording performance data
+over regions or spans of code.
+
+`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`::
+
+`void trace2_region_enter_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
+
+`void trace2_region_enter_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
+
+ Emits a thread-relative "region_enter" message with optional
+ printf string.
++
+This function pushes a new region nesting stack level on the current
+thread and starts a clock for the new stack frame.
++
+The `category` field is an arbitrary category name used to classify
+regions by feature area, such as "status" or "index". At this time
+it is only just printed along with the rest of the message. It may
+be used in the future to filter messages.
++
+The `label` field is an arbitrary label used to describe the activity
+being started, such as "read_recursive" or "do_read_index".
++
+The `repo` field, if set, will be used to get the "repo-id", so that
+recursive oerations can be attributed to the correct repository.
+
+`void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`::
+
+`void trace2_region_leave_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
+
+`void trace2_region_leave_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
+
+ Emits a thread-relative "region_leave" message with optional
+ printf string.
++
+This function pops the region nesting stack on the current thread
+and reports the elapsed time of the stack frame.
++
+The `category`, `label`, and `repo` fields are the same as above.
+The `category` and `label` do not need to match the correpsonding
+"region_enter" message, but it makes the data stream easier to
+understand.
+
+`void trace2_data_string(const char *category, const struct repository *repo, const char *key, const char * value)`::
+
+`void trace2_data_intmax(const char *category, const struct repository *repo, const char *key, intmax value)`::
+
+`void trace2_data_json(const char *category, const struct repository *repo, const char *key, const struct json_writer *jw)`::
+
+ Emits a region- and thread-relative "data" or "data_json" message.
++
+This is a key/value pair message containing information about the
+current thread, region stack, and repository. This could be used
+to print the number of files in a directory during a multi-threaded
+recursive tree walk.
+
+`void trace2_printf(const char *fmt, ...)`::
+
+`void trace2_printf_va(const char *fmt, va_list ap)`::
+
+ Emits a region- and thread-relative "printf" message.
+
+== Trace2 Target Formats
+
+=== NORMAL Format
+
+Events are written as lines of the form:
+
+------------
+[<time> SP <filename>:<line> SP+] <event-name> [[SP] <event-message>] LF
+------------
+
+`<event-name>`::
+
+ is the event name.
+
+`<event-message>`::
+ is a free-form printf message intended for human consumption.
++
+Note that this may contain embedded LF or CRLF characters that are
+not escaped, so the event may spill across multiple lines.
+
+If `GIT_TRACE2_BRIEF` or `trace2.normalBrief` is true, the `time`, `filename`,
+and `line` fields are omitted.
+
+This target is intended to be more of a summary (like GIT_TRACE) and
+less detailed than the other targets. It ignores thread, region, and
+data messages, for example.
+
+=== PERF Format
+
+Events are written as lines of the form:
+
+------------
+[<time> SP <filename>:<line> SP+
+ BAR SP] d<depth> SP
+ BAR SP <thread-name> SP+
+ BAR SP <event-name> SP+
+ BAR SP [r<repo-id>] SP+
+ BAR SP [<t_abs>] SP+
+ BAR SP [<t_rel>] SP+
+ BAR SP [<category>] SP+
+ BAR SP DOTS* <perf-event-message>
+ LF
+------------
+
+`<depth>`::
+ is the git process depth. This is the number of parent
+ git processes. A top-level git command has depth value "d0".
+ A child of it has depth value "d1". A second level child
+ has depth value "d2" and so on.
+
+`<thread-name>`::
+ is a unique name for the thread. The primary thread
+ is called "main". Other thread names are of the form "th%d:%s"
+ and include a unique number and the name of the thread-proc.
+
+`<event-name>`::
+ is the event name.
+
+`<repo-id>`::
+ when present, is a number indicating the repository
+ in use. A `def_repo` event is emitted when a repository is
+ opened. This defines the repo-id and associated worktree.
+ Subsequent repo-specific events will reference this repo-id.
++
+Currently, this is always "r1" for the main repository.
+This field is in anticipation of in-proc submodules in the future.
+
+`<t_abs>`::
+ when present, is the absolute time in seconds since the
+ program started.
+
+`<t_rel>`::
+ when present, is time in seconds relative to the start of
+ the current region. For a thread-exit event, it is the elapsed
+ time of the thread.
+
+`<category>`::
+ is present on region and data events and is used to
+ indicate a broad category, such as "index" or "status".
+
+`<perf-event-message>`::
+ is a free-form printf message intended for human consumption.
+
+------------
+15:33:33.532712 wt-status.c:2310 | d0 | main | region_enter | r1 | 0.126064 | | status | label:print
+15:33:33.532712 wt-status.c:2331 | d0 | main | region_leave | r1 | 0.127568 | 0.001504 | status | label:print
+------------
+
+If `GIT_TRACE2_PERF_BRIEF` or `trace2.perfBrief` is true, the `time`, `file`,
+and `line` fields are omitted.
+
+------------
+d0 | main | region_leave | r1 | 0.011717 | 0.009122 | index | label:preload
+------------
+
+The PERF target is intended for interactive performance analysis
+during development and is quite noisy.
+
+=== EVENT Format
+
+Each event is a JSON-object containing multiple key/value pairs
+written as a single line and followed by a LF.
+
+------------
+'{' <key> ':' <value> [',' <key> ':' <value>]* '}' LF
+------------
+
+Some key/value pairs are common to all events and some are
+event-specific.
+
+==== Common Key/Value Pairs
+
+The following key/value pairs are common to all events:
+
+------------
+{
+ "event":"version",
+ "sid":"20190408T191827.272759Z-H9b68c35f-P00003510",
+ "thread":"main",
+ "time":"2019-04-08T19:18:27.282761Z",
+ "file":"common-main.c",
+ "line":42,
+ ...
+}
+------------
+
+`"event":<event>`::
+ is the event name.
+
+`"sid":<sid>`::
+ is the session-id. This is a unique string to identify the
+ process instance to allow all events emitted by a process to
+ be identified. A session-id is used instead of a PID because
+ PIDs are recycled by the OS. For child git processes, the
+ session-id is prepended with the session-id of the parent git
+ process to allow parent-child relationships to be identified
+ during post-processing.
+
+`"thread":<thread>`::
+ is the thread name.
+
+`"time":<time>`::
+ is the UTC time of the event.
+
+`"file":<filename>`::
+ is source file generating the event.
+
+`"line":<line-number>`::
+ is the integer source line number generating the event.
+
+`"repo":<repo-id>`::
+ when present, is the integer repo-id as described previously.
+
+If `GIT_TRACE2_EVENT_BRIEF` or `trace2.eventBrief` is true, the `file`
+and `line` fields are omitted from all events and the `time` field is
+only present on the "start" and "atexit" events.
+
+==== Event-Specific Key/Value Pairs
+
+`"version"`::
+ This event gives the version of the executable and the EVENT format.
++
+------------
+{
+ "event":"version",
+ ...
+ "evt":"1", # EVENT format version
+ "exe":"2.20.1.155.g426c96fcdb" # git version
+}
+------------
+
+`"start"`::
+ This event contains the complete argv received by main().
++
+------------
+{
+ "event":"start",
+ ...
+ "t_abs":0.001227, # elapsed time in seconds
+ "argv":["git","version"]
+}
+------------
+
+`"exit"`::
+ This event is emitted when git calls `exit()`.
++
+------------
+{
+ "event":"exit",
+ ...
+ "t_abs":0.001227, # elapsed time in seconds
+ "code":0 # exit code
+}
+------------
+
+`"atexit"`::
+ This event is emitted by the Trace2 `atexit` routine during
+ final shutdown. It should be the last event emitted by the
+ process.
++
+(The elapsed time reported here is greater than the time reported in
+the "exit" event because it runs after all other atexit tasks have
+completed.)
++
+------------
+{
+ "event":"atexit",
+ ...
+ "t_abs":0.001227, # elapsed time in seconds
+ "code":0 # exit code
+}
+------------
+
+`"signal"`::
+ This event is emitted when the program is terminated by a user
+ signal. Depending on the platform, the signal event may
+ prevent the "atexit" event from being generated.
++
+------------
+{
+ "event":"signal",
+ ...
+ "t_abs":0.001227, # elapsed time in seconds
+ "signo":13 # SIGTERM, SIGINT, etc.
+}
+------------
+
+`"error"`::
+ This event is emitted when one of the `error()`, `die()`,
+ or `usage()` functions are called.
++
+------------
+{
+ "event":"error",
+ ...
+ "msg":"invalid option: --cahced", # formatted error message
+ "fmt":"invalid option: %s" # error format string
+}
+------------
++
+The error event may be emitted more than once. The format string
+allows post-processors to group errors by type without worrying
+about specific error arguments.
+
+`"cmd_path"`::
+ This event contains the discovered full path of the git
+ executable (on platforms that are configured to resolve it).
++
+------------
+{
+ "event":"cmd_path",
+ ...
+ "path":"C:/work/gfw/git.exe"
+}
+------------
+
+`"cmd_name"`::
+ This event contains the command name for this git process
+ and the hierarchy of commands from parent git processes.
++
+------------
+{
+ "event":"cmd_name",
+ ...
+ "name":"pack-objects",
+ "hierarchy":"push/pack-objects"
+}
+------------
++
+Normally, the "name" field contains the canonical name of the
+command. When a canonical name is not available, one of
+these special values are used:
++
+------------
+"_query_" # "git --html-path"
+"_run_dashed_" # when "git foo" tries to run "git-foo"
+"_run_shell_alias_" # alias expansion to a shell command
+"_run_git_alias_" # alias expansion to a git command
+"_usage_" # usage error
+------------
+
+`"cmd_mode"`::
+ This event, when present, describes the command variant This
+ event may be emitted more than once.
++
+------------
+{
+ "event":"cmd_mode",
+ ...
+ "name":"branch"
+}
+------------
++
+The "name" field is an arbitrary string to describe the command mode.
+For example, checkout can checkout a branch or an individual file.
+And these variations typically have different performance
+characteristics that are not comparable.
+
+`"alias"`::
+ This event is present when an alias is expanded.
++
+------------
+{
+ "event":"alias",
+ ...
+ "alias":"l", # registered alias
+ "argv":["log","--graph"] # alias expansion
+}
+------------
+
+`"child_start"`::
+ This event describes a child process that is about to be
+ spawned.
++
+------------
+{
+ "event":"child_start",
+ ...
+ "child_id":2,
+ "child_class":"?",
+ "use_shell":false,
+ "argv":["git","rev-list","--objects","--stdin","--not","--all","--quiet"]
+
+ "hook_name":"<hook_name>" # present when child_class is "hook"
+ "cd":"<path>" # present when cd is required
+}
+------------
++
+The "child_id" field can be used to match this child_start with the
+corresponding child_exit event.
++
+The "child_class" field is a rough classification, such as "editor",
+"pager", "transport/*", and "hook". Unclassified children are classified
+with "?".
+
+`"child_exit"`::
+ This event is generated after the current process has returned
+ from the waitpid() and collected the exit information from the
+ child.
++
+------------
+{
+ "event":"child_exit",
+ ...
+ "child_id":2,
+ "pid":14708, # child PID
+ "code":0, # child exit-code
+ "t_rel":0.110605 # observed run-time of child process
+}
+------------
++
+Note that the session-id of the child process is not available to
+the current/spawning process, so the child's PID is reported here as
+a hint for post-processing. (But it is only a hint because the child
+proces may be a shell script which doesn't have a session-id.)
++
+Note that the `t_rel` field contains the observed run time in seconds
+for the child process (starting before the fork/exec/spawn and
+stopping after the waitpid() and includes OS process creation overhead).
+So this time will be slightly larger than the atexit time reported by
+the child process itself.
+
+`"exec"`::
+ This event is generated before git attempts to `exec()`
+ another command rather than starting a child process.
++
+------------
+{
+ "event":"exec",
+ ...
+ "exec_id":0,
+ "exe":"git",
+ "argv":["foo", "bar"]
+}
+------------
++
+The "exec_id" field is a command-unique id and is only useful if the
+`exec()` fails and a corresponding exec_result event is generated.
+
+`"exec_result"`::
+ This event is generated if the `exec()` fails and control
+ returns to the current git command.
++
+------------
+{
+ "event":"exec_result",
+ ...
+ "exec_id":0,
+ "code":1 # error code (errno) from exec()
+}
+------------
+
+`"thread_start"`::
+ This event is generated when a thread is started. It is
+ generated from *within* the new thread's thread-proc (for TLS
+ reasons).
++
+------------
+{
+ "event":"thread_start",
+ ...
+ "thread":"th02:preload_thread" # thread name
+}
+------------
+
+`"thread_exit"`::
+ This event is generated when a thread exits. It is generated
+ from *within* the thread's thread-proc (for TLS reasons).
++
+------------
+{
+ "event":"thread_exit",
+ ...
+ "thread":"th02:preload_thread", # thread name
+ "t_rel":0.007328 # thread elapsed time
+}
+------------
+
+`"def_param"`::
+ This event is generated to log a global parameter.
++
+------------
+{
+ "event":"def_param",
+ ...
+ "param":"core.abbrev",
+ "value":"7"
+}
+------------
+
+`"def_repo"`::
+ This event defines a repo-id and associates it with the root
+ of the worktree.
++
+------------
+{
+ "event":"def_repo",
+ ...
+ "repo":1,
+ "worktree":"/Users/jeffhost/work/gfw"
+}
+------------
++
+As stated earlier, the repo-id is currently always 1, so there will
+only be one def_repo event. Later, if in-proc submodules are
+supported, a def_repo event should be emitted for each submodule
+visited.
+
+`"region_enter"`::
+ This event is generated when entering a region.
++
+------------
+{
+ "event":"region_enter",
+ ...
+ "repo":1, # optional
+ "nesting":1, # current region stack depth
+ "category":"index", # optional
+ "label":"do_read_index", # optional
+ "msg":".git/index" # optional
+}
+------------
++
+The `category` field may be used in a future enhancement to
+do category-based filtering.
++
+`GIT_TRACE2_EVENT_NESTING` or `trace2.eventNesting` can be used to
+filter deeply nested regions and data events. It defaults to "2".
+
+`"region_leave"`::
+ This event is generated when leaving a region.
++
+------------
+{
+ "event":"region_leave",
+ ...
+ "repo":1, # optional
+ "t_rel":0.002876, # time spent in region in seconds
+ "nesting":1, # region stack depth
+ "category":"index", # optional
+ "label":"do_read_index", # optional
+ "msg":".git/index" # optional
+}
+------------
+
+`"data"`::
+ This event is generated to log a thread- and region-local
+ key/value pair.
++
+------------
+{
+ "event":"data",
+ ...
+ "repo":1, # optional
+ "t_abs":0.024107, # absolute elapsed time
+ "t_rel":0.001031, # elapsed time in region/thread
+ "nesting":2, # region stack depth
+ "category":"index",
+ "key":"read/cache_nr",
+ "value":"3552"
+}
+------------
++
+The "value" field may be an integer or a string.
+
+`"data-json"`::
+ This event is generated to log a pre-formatted JSON string
+ containing structured data.
++
+------------
+{
+ "event":"data_json",
+ ...
+ "repo":1, # optional
+ "t_abs":0.015905,
+ "t_rel":0.015905,
+ "nesting":1,
+ "category":"process",
+ "key":"windows/ancestry",
+ "value":["bash.exe","bash.exe"]
+}
+------------
+
+== Example Trace2 API Usage
+
+Here is a hypothetical usage of the Trace2 API showing the intended
+usage (without worrying about the actual Git details).
+
+Initialization::
+
+ Initialization happens in `main()`. Behind the scenes, an
+ `atexit` and `signal` handler are registered.
++
+----------------
+int main(int argc, const char **argv)
+{
+ int exit_code;
+
+ trace2_initialize();
+ trace2_cmd_start(argv);
+
+ exit_code = cmd_main(argc, argv);
+
+ trace2_cmd_exit(exit_code);
+
+ return exit_code;
+}
+----------------
+
+Command Details::
+
+ After the basics are established, additional command
+ information can be sent to Trace2 as it is discovered.
++
+----------------
+int cmd_checkout(int argc, const char **argv)
+{
+ trace2_cmd_name("checkout");
+ trace2_cmd_mode("branch");
+ trace2_def_repo(the_repository);
+
+ // emit "def_param" messages for "interesting" config settings.
+ trace2_cmd_list_config();
+
+ if (do_something())
+ trace2_cmd_error("Path '%s': cannot do something", path);
+
+ return 0;
+}
+----------------
+
+Child Processes::
+
+ Wrap code spawning child processes.
++
+----------------
+void run_child(...)
+{
+ int child_exit_code;
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ ...
+ cmd.trace2_child_class = "editor";
+
+ trace2_child_start(&cmd);
+ child_exit_code = spawn_child_and_wait_for_it();
+ trace2_child_exit(&cmd, child_exit_code);
+}
+----------------
++
+For example, the following fetch command spawned ssh, index-pack,
+rev-list, and gc. This example also shows that fetch took
+5.199 seconds and of that 4.932 was in ssh.
++
+----------------
+$ export GIT_TRACE2_BRIEF=1
+$ export GIT_TRACE2=~/log.normal
+$ git fetch origin
+...
+----------------
++
+----------------
+$ cat ~/log.normal
+version 2.20.1.vfs.1.1.47.g534dbe1ad1
+start git fetch origin
+worktree /Users/jeffhost/work/gfw
+cmd_name fetch (fetch)
+child_start[0] ssh git@github.com ...
+child_start[1] git index-pack ...
+... (Trace2 events from child processes omitted)
+child_exit[1] pid:14707 code:0 elapsed:0.076353
+child_exit[0] pid:14706 code:0 elapsed:4.931869
+child_start[2] git rev-list ...
+... (Trace2 events from child process omitted)
+child_exit[2] pid:14708 code:0 elapsed:0.110605
+child_start[3] git gc --auto
+... (Trace2 events from child process omitted)
+child_exit[3] pid:14709 code:0 elapsed:0.006240
+exit elapsed:5.198503 code:0
+atexit elapsed:5.198541 code:0
+----------------
++
+When a git process is a (direct or indirect) child of another
+git process, it inherits Trace2 context information. This
+allows the child to print the command hierarchy. This example
+shows gc as child[3] of fetch. When the gc process reports
+its name as "gc", it also reports the hierarchy as "fetch/gc".
+(In this example, trace2 messages from the child process is
+indented for clarity.)
++
+----------------
+$ export GIT_TRACE2_BRIEF=1
+$ export GIT_TRACE2=~/log.normal
+$ git fetch origin
+...
+----------------
++
+----------------
+$ cat ~/log.normal
+version 2.20.1.160.g5676107ecd.dirty
+start git fetch official
+worktree /Users/jeffhost/work/gfw
+cmd_name fetch (fetch)
+...
+child_start[3] git gc --auto
+ version 2.20.1.160.g5676107ecd.dirty
+ start /Users/jeffhost/work/gfw/git gc --auto
+ worktree /Users/jeffhost/work/gfw
+ cmd_name gc (fetch/gc)
+ exit elapsed:0.001959 code:0
+ atexit elapsed:0.001997 code:0
+child_exit[3] pid:20303 code:0 elapsed:0.007564
+exit elapsed:3.868938 code:0
+atexit elapsed:3.868970 code:0
+----------------
+
+Regions::
+
+ Regions can be use to time an interesting section of code.
++
+----------------
+void wt_status_collect(struct wt_status *s)
+{
+ trace2_region_enter("status", "worktrees", s->repo);
+ wt_status_collect_changes_worktree(s);
+ trace2_region_leave("status", "worktrees", s->repo);
+
+ trace2_region_enter("status", "index", s->repo);
+ wt_status_collect_changes_index(s);
+ trace2_region_leave("status", "index", s->repo);
+
+ trace2_region_enter("status", "untracked", s->repo);
+ wt_status_collect_untracked(s);
+ trace2_region_leave("status", "untracked", s->repo);
+}
+
+void wt_status_print(struct wt_status *s)
+{
+ trace2_region_enter("status", "print", s->repo);
+ switch (s->status_format) {
+ ...
+ }
+ trace2_region_leave("status", "print", s->repo);
+}
+----------------
++
+In this example, scanning for untracked files ran from +0.012568 to
++0.027149 (since the process started) and took 0.014581 seconds.
++
+----------------
+$ export GIT_TRACE2_PERF_BRIEF=1
+$ export GIT_TRACE2_PERF=~/log.perf
+$ git status
+...
+
+$ cat ~/log.perf
+d0 | main | version | | | | | 2.20.1.160.g5676107ecd.dirty
+d0 | main | start | | 0.001173 | | | git status
+d0 | main | def_repo | r1 | | | | worktree:/Users/jeffhost/work/gfw
+d0 | main | cmd_name | | | | | status (status)
+...
+d0 | main | region_enter | r1 | 0.010988 | | status | label:worktrees
+d0 | main | region_leave | r1 | 0.011236 | 0.000248 | status | label:worktrees
+d0 | main | region_enter | r1 | 0.011260 | | status | label:index
+d0 | main | region_leave | r1 | 0.012542 | 0.001282 | status | label:index
+d0 | main | region_enter | r1 | 0.012568 | | status | label:untracked
+d0 | main | region_leave | r1 | 0.027149 | 0.014581 | status | label:untracked
+d0 | main | region_enter | r1 | 0.027411 | | status | label:print
+d0 | main | region_leave | r1 | 0.028741 | 0.001330 | status | label:print
+d0 | main | exit | | 0.028778 | | | code:0
+d0 | main | atexit | | 0.028809 | | | code:0
+----------------
++
+Regions may be nested. This causes messages to be indented in the
+PERF target, for example.
+Elapsed times are relative to the start of the correpsonding nesting
+level as expected. For example, if we add region message to:
++
+----------------
+static enum path_treatment read_directory_recursive(struct dir_struct *dir,
+ struct index_state *istate, const char *base, int baselen,
+ struct untracked_cache_dir *untracked, int check_only,
+ int stop_at_first_file, const struct pathspec *pathspec)
+{
+ enum path_treatment state, subdir_state, dir_state = path_none;
+
+ trace2_region_enter_printf("dir", "read_recursive", NULL, "%.*s", baselen, base);
+ ...
+ trace2_region_leave_printf("dir", "read_recursive", NULL, "%.*s", baselen, base);
+ return dir_state;
+}
+----------------
++
+We can further investigate the time spent scanning for untracked files.
++
+----------------
+$ export GIT_TRACE2_PERF_BRIEF=1
+$ export GIT_TRACE2_PERF=~/log.perf
+$ git status
+...
+$ cat ~/log.perf
+d0 | main | version | | | | | 2.20.1.162.gb4ccea44db.dirty
+d0 | main | start | | 0.001173 | | | git status
+d0 | main | def_repo | r1 | | | | worktree:/Users/jeffhost/work/gfw
+d0 | main | cmd_name | | | | | status (status)
+...
+d0 | main | region_enter | r1 | 0.015047 | | status | label:untracked
+d0 | main | region_enter | | 0.015132 | | dir | ..label:read_recursive
+d0 | main | region_enter | | 0.016341 | | dir | ....label:read_recursive vcs-svn/
+d0 | main | region_leave | | 0.016422 | 0.000081 | dir | ....label:read_recursive vcs-svn/
+d0 | main | region_enter | | 0.016446 | | dir | ....label:read_recursive xdiff/
+d0 | main | region_leave | | 0.016522 | 0.000076 | dir | ....label:read_recursive xdiff/
+d0 | main | region_enter | | 0.016612 | | dir | ....label:read_recursive git-gui/
+d0 | main | region_enter | | 0.016698 | | dir | ......label:read_recursive git-gui/po/
+d0 | main | region_enter | | 0.016810 | | dir | ........label:read_recursive git-gui/po/glossary/
+d0 | main | region_leave | | 0.016863 | 0.000053 | dir | ........label:read_recursive git-gui/po/glossary/
+...
+d0 | main | region_enter | | 0.031876 | | dir | ....label:read_recursive builtin/
+d0 | main | region_leave | | 0.032270 | 0.000394 | dir | ....label:read_recursive builtin/
+d0 | main | region_leave | | 0.032414 | 0.017282 | dir | ..label:read_recursive
+d0 | main | region_leave | r1 | 0.032454 | 0.017407 | status | label:untracked
+...
+d0 | main | exit | | 0.034279 | | | code:0
+d0 | main | atexit | | 0.034322 | | | code:0
+----------------
++
+Trace2 regions are similar to the existing trace_performance_enter()
+and trace_performance_leave() routines, but are thread safe and
+maintain per-thread stacks of timers.
+
+Data Messages::
+
+ Data messages added to a region.
++
+----------------
+int read_index_from(struct index_state *istate, const char *path,
+ const char *gitdir)
+{
+ trace2_region_enter_printf("index", "do_read_index", the_repository, "%s", path);
+
+ ...
+
+ trace2_data_intmax("index", the_repository, "read/version", istate->version);
+ trace2_data_intmax("index", the_repository, "read/cache_nr", istate->cache_nr);
+
+ trace2_region_leave_printf("index", "do_read_index", the_repository, "%s", path);
+}
+----------------
++
+This example shows that the index contained 3552 entries.
++
+----------------
+$ export GIT_TRACE2_PERF_BRIEF=1
+$ export GIT_TRACE2_PERF=~/log.perf
+$ git status
+...
+$ cat ~/log.perf
+d0 | main | version | | | | | 2.20.1.156.gf9916ae094.dirty
+d0 | main | start | | 0.001173 | | | git status
+d0 | main | def_repo | r1 | | | | worktree:/Users/jeffhost/work/gfw
+d0 | main | cmd_name | | | | | status (status)
+d0 | main | region_enter | r1 | 0.001791 | | index | label:do_read_index .git/index
+d0 | main | data | r1 | 0.002494 | 0.000703 | index | ..read/version:2
+d0 | main | data | r1 | 0.002520 | 0.000729 | index | ..read/cache_nr:3552
+d0 | main | region_leave | r1 | 0.002539 | 0.000748 | index | label:do_read_index .git/index
+...
+----------------
+
+Thread Events::
+
+ Thread messages added to a thread-proc.
++
+For example, the multithreaded preload-index code can be
+instrumented with a region around the thread pool and then
+per-thread start and exit events within the threadproc.
++
+----------------
+static void *preload_thread(void *_data)
+{
+ // start the per-thread clock and emit a message.
+ trace2_thread_start("preload_thread");
+
+ // report which chunk of the array this thread was assigned.
+ trace2_data_intmax("index", the_repository, "offset", p->offset);
+ trace2_data_intmax("index", the_repository, "count", nr);
+
+ do {
+ ...
+ } while (--nr > 0);
+ ...
+
+ // report elapsed time taken by this thread.
+ trace2_thread_exit();
+ return NULL;
+}
+
+void preload_index(struct index_state *index,
+ const struct pathspec *pathspec,
+ unsigned int refresh_flags)
+{
+ trace2_region_enter("index", "preload", the_repository);
+
+ for (i = 0; i < threads; i++) {
+ ... /* create thread */
+ }
+
+ for (i = 0; i < threads; i++) {
+ ... /* join thread */
+ }
+
+ trace2_region_leave("index", "preload", the_repository);
+}
+----------------
++
+In this example preload_index() was executed by the `main` thread
+and started the `preload` region. Seven threads, named
+`th01:preload_thread` through `th07:preload_thread`, were started.
+Events from each thread are atomically appended to the shared target
+stream as they occur so they may appear in random order with respect
+other threads. Finally, the main thread waits for the threads to
+finish and leaves the region.
++
+Data events are tagged with the active thread name. They are used
+to report the per-thread parameters.
++
+----------------
+$ export GIT_TRACE2_PERF_BRIEF=1
+$ export GIT_TRACE2_PERF=~/log.perf
+$ git status
+...
+$ cat ~/log.perf
+...
+d0 | main | region_enter | r1 | 0.002595 | | index | label:preload
+d0 | th01:preload_thread | thread_start | | 0.002699 | | |
+d0 | th02:preload_thread | thread_start | | 0.002721 | | |
+d0 | th01:preload_thread | data | r1 | 0.002736 | 0.000037 | index | offset:0
+d0 | th02:preload_thread | data | r1 | 0.002751 | 0.000030 | index | offset:2032
+d0 | th03:preload_thread | thread_start | | 0.002711 | | |
+d0 | th06:preload_thread | thread_start | | 0.002739 | | |
+d0 | th01:preload_thread | data | r1 | 0.002766 | 0.000067 | index | count:508
+d0 | th06:preload_thread | data | r1 | 0.002856 | 0.000117 | index | offset:2540
+d0 | th03:preload_thread | data | r1 | 0.002824 | 0.000113 | index | offset:1016
+d0 | th04:preload_thread | thread_start | | 0.002710 | | |
+d0 | th02:preload_thread | data | r1 | 0.002779 | 0.000058 | index | count:508
+d0 | th06:preload_thread | data | r1 | 0.002966 | 0.000227 | index | count:508
+d0 | th07:preload_thread | thread_start | | 0.002741 | | |
+d0 | th07:preload_thread | data | r1 | 0.003017 | 0.000276 | index | offset:3048
+d0 | th05:preload_thread | thread_start | | 0.002712 | | |
+d0 | th05:preload_thread | data | r1 | 0.003067 | 0.000355 | index | offset:1524
+d0 | th05:preload_thread | data | r1 | 0.003090 | 0.000378 | index | count:508
+d0 | th07:preload_thread | data | r1 | 0.003037 | 0.000296 | index | count:504
+d0 | th03:preload_thread | data | r1 | 0.002971 | 0.000260 | index | count:508
+d0 | th04:preload_thread | data | r1 | 0.002983 | 0.000273 | index | offset:508
+d0 | th04:preload_thread | data | r1 | 0.007311 | 0.004601 | index | count:508
+d0 | th05:preload_thread | thread_exit | | 0.008781 | 0.006069 | |
+d0 | th01:preload_thread | thread_exit | | 0.009561 | 0.006862 | |
+d0 | th03:preload_thread | thread_exit | | 0.009742 | 0.007031 | |
+d0 | th06:preload_thread | thread_exit | | 0.009820 | 0.007081 | |
+d0 | th02:preload_thread | thread_exit | | 0.010274 | 0.007553 | |
+d0 | th07:preload_thread | thread_exit | | 0.010477 | 0.007736 | |
+d0 | th04:preload_thread | thread_exit | | 0.011657 | 0.008947 | |
+d0 | main | region_leave | r1 | 0.011717 | 0.009122 | index | label:preload
+...
+d0 | main | exit | | 0.029996 | | | code:0
+d0 | main | atexit | | 0.030027 | | | code:0
+----------------
++
+In this example, the preload region took 0.009122 seconds. The 7 threads
+took between 0.006069 and 0.008947 seconds to work on their portion of
+the index. Thread "th01" worked on 508 items at offset 0. Thread "th02"
+worked on 508 items at offset 2032. Thread "th04" worked on 508 itemts
+at offset 508.
++
+This example also shows that thread names are assigned in a racy manner
+as each thread starts and allocates TLS storage.
+
+== Future Work
+
+=== Relationship to the Existing Trace Api (api-trace.txt)
+
+There are a few issues to resolve before we can completely
+switch to Trace2.
+
+* Updating existing tests that assume GIT_TRACE format messages.
+
+* How to best handle custom GIT_TRACE_<key> messages?
+
+** The GIT_TRACE_<key> mechanism allows each <key> to write to a
+different file (in addition to just stderr).
+
+** Do we want to maintain that ability or simply write to the existing
+Trace2 targets (and convert <key> to a "category").
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt
index bde1862..7962e32 100644
--- a/Documentation/technical/api-tree-walking.txt
+++ b/Documentation/technical/api-tree-walking.txt
@@ -62,9 +62,7 @@
`setup_traverse_info`::
Initialize a `traverse_info` given the pathname of the tree to start
- traversing from. The `base` argument is assumed to be the `path`
- member of the `name_entry` being recursed into unless the tree is a
- top-level tree in which case the empty string ("") is used.
+ traversing from.
Walking
-------
@@ -140,6 +138,10 @@
This utilizes the memory structure of a tree entry to avoid the
overhead of using a generic strlen().
+`strbuf_make_traverse_path`::
+
+ Convenience wrapper to `make_traverse_path` into a strbuf.
+
Authors
-------
diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index 16452a0..a4f1744 100644
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -44,8 +44,9 @@
1-byte number (C) of "chunks"
- 1-byte (reserved for later use)
- Current clients should ignore this value.
+ 1-byte number (B) of base commit-graphs
+ We infer the length (H*B) of the Base Graphs chunk
+ from this value.
CHUNK LOOKUP:
@@ -92,6 +93,12 @@
positions for the parents until reaching a value with the most-significant
bit on. The other bits correspond to the position of the last parent.
+ Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional]
+ This list of H-byte hashes describe a set of B commit-graph files that
+ form a commit-graph chain. The graph position for the ith commit in this
+ file's OID Lookup chunk is equal to i plus the number of commits in all
+ base graphs. If B is non-zero, this chunk must exist.
+
TRAILER:
H-byte HASH-checksum of all of the above.
diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt
index 7805b09..729fbcb 100644
--- a/Documentation/technical/commit-graph.txt
+++ b/Documentation/technical/commit-graph.txt
@@ -127,22 +127,196 @@
helpful for these clones, anyway. The commit-graph will not be read or
written when shallow commits are present.
-Future Work
------------
+Commit Graphs Chains
+--------------------
-- After computing and storing generation numbers, we must make graph
- walks aware of generation numbers to gain the performance benefits they
- enable. This will mostly be accomplished by swapping a commit-date-ordered
- priority queue with one ordered by generation number. The following
- operations are important candidates:
+Typically, repos grow with near-constant velocity (commits per day). Over time,
+the number of commits added by a fetch operation is much smaller than the
+number of commits in the full history. By creating a "chain" of commit-graphs,
+we enable fast writes of new commit data without rewriting the entire commit
+history -- at least, most of the time.
- - 'log --topo-order'
- - 'tag --merged'
+## File Layout
-- A server could provide a commit-graph file as part of the network protocol
- to avoid extra calculations by clients. This feature is only of benefit if
- the user is willing to trust the file, because verifying the file is correct
- is as hard as computing it from scratch.
+A commit-graph chain uses multiple files, and we use a fixed naming convention
+to organize these files. Each commit-graph file has a name
+`$OBJDIR/info/commit-graphs/graph-{hash}.graph` where `{hash}` is the hex-
+valued hash stored in the footer of that file (which is a hash of the file's
+contents before that hash). For a chain of commit-graph files, a plain-text
+file at `$OBJDIR/info/commit-graphs/commit-graph-chain` contains the
+hashes for the files in order from "lowest" to "highest".
+
+For example, if the `commit-graph-chain` file contains the lines
+
+```
+ {hash0}
+ {hash1}
+ {hash2}
+```
+
+then the commit-graph chain looks like the following diagram:
+
+ +-----------------------+
+ | graph-{hash2}.graph |
+ +-----------------------+
+ |
+ +-----------------------+
+ | |
+ | graph-{hash1}.graph |
+ | |
+ +-----------------------+
+ |
+ +-----------------------+
+ | |
+ | |
+ | |
+ | graph-{hash0}.graph |
+ | |
+ | |
+ | |
+ +-----------------------+
+
+Let X0 be the number of commits in `graph-{hash0}.graph`, X1 be the number of
+commits in `graph-{hash1}.graph`, and X2 be the number of commits in
+`graph-{hash2}.graph`. If a commit appears in position i in `graph-{hash2}.graph`,
+then we interpret this as being the commit in position (X0 + X1 + i), and that
+will be used as its "graph position". The commits in `graph-{hash2}.graph` use these
+positions to refer to their parents, which may be in `graph-{hash1}.graph` or
+`graph-{hash0}.graph`. We can navigate to an arbitrary commit in position j by checking
+its containment in the intervals [0, X0), [X0, X0 + X1), [X0 + X1, X0 + X1 +
+X2).
+
+Each commit-graph file (except the base, `graph-{hash0}.graph`) contains data
+specifying the hashes of all files in the lower layers. In the above example,
+`graph-{hash1}.graph` contains `{hash0}` while `graph-{hash2}.graph` contains
+`{hash0}` and `{hash1}`.
+
+## Merging commit-graph files
+
+If we only added a new commit-graph file on every write, we would run into a
+linear search problem through many commit-graph files. Instead, we use a merge
+strategy to decide when the stack should collapse some number of levels.
+
+The diagram below shows such a collapse. As a set of new commits are added, it
+is determined by the merge strategy that the files should collapse to
+`graph-{hash1}`. Thus, the new commits, the commits in `graph-{hash2}` and
+the commits in `graph-{hash1}` should be combined into a new `graph-{hash3}`
+file.
+
+ +---------------------+
+ | |
+ | (new commits) |
+ | |
+ +---------------------+
+ | |
+ +-----------------------+ +---------------------+
+ | graph-{hash2} |->| |
+ +-----------------------+ +---------------------+
+ | | |
+ +-----------------------+ +---------------------+
+ | | | |
+ | graph-{hash1} |->| |
+ | | | |
+ +-----------------------+ +---------------------+
+ | tmp_graphXXX
+ +-----------------------+
+ | |
+ | |
+ | |
+ | graph-{hash0} |
+ | |
+ | |
+ | |
+ +-----------------------+
+
+During this process, the commits to write are combined, sorted and we write the
+contents to a temporary file, all while holding a `commit-graph-chain.lock`
+lock-file. When the file is flushed, we rename it to `graph-{hash3}`
+according to the computed `{hash3}`. Finally, we write the new chain data to
+`commit-graph-chain.lock`:
+
+```
+ {hash3}
+ {hash0}
+```
+
+We then close the lock-file.
+
+## Merge Strategy
+
+When writing a set of commits that do not exist in the commit-graph stack of
+height N, we default to creating a new file at level N + 1. We then decide to
+merge with the Nth level if one of two conditions hold:
+
+ 1. `--size-multiple=<X>` is specified or X = 2, and the number of commits in
+ level N is less than X times the number of commits in level N + 1.
+
+ 2. `--max-commits=<C>` is specified with non-zero C and the number of commits
+ in level N + 1 is more than C commits.
+
+This decision cascades down the levels: when we merge a level we create a new
+set of commits that then compares to the next level.
+
+The first condition bounds the number of levels to be logarithmic in the total
+number of commits. The second condition bounds the total number of commits in
+a `graph-{hashN}` file and not in the `commit-graph` file, preventing
+significant performance issues when the stack merges and another process only
+partially reads the previous stack.
+
+The merge strategy values (2 for the size multiple, 64,000 for the maximum
+number of commits) could be extracted into config settings for full
+flexibility.
+
+## Deleting graph-{hash} files
+
+After a new tip file is written, some `graph-{hash}` files may no longer
+be part of a chain. It is important to remove these files from disk, eventually.
+The main reason to delay removal is that another process could read the
+`commit-graph-chain` file before it is rewritten, but then look for the
+`graph-{hash}` files after they are deleted.
+
+To allow holding old split commit-graphs for a while after they are unreferenced,
+we update the modified times of the files when they become unreferenced. Then,
+we scan the `$OBJDIR/info/commit-graphs/` directory for `graph-{hash}`
+files whose modified times are older than a given expiry window. This window
+defaults to zero, but can be changed using command-line arguments or a config
+setting.
+
+## Chains across multiple object directories
+
+In a repo with alternates, we look for the `commit-graph-chain` file starting
+in the local object directory and then in each alternate. The first file that
+exists defines our chain. As we look for the `graph-{hash}` files for
+each `{hash}` in the chain file, we follow the same pattern for the host
+directories.
+
+This allows commit-graphs to be split across multiple forks in a fork network.
+The typical case is a large "base" repo with many smaller forks.
+
+As the base repo advances, it will likely update and merge its commit-graph
+chain more frequently than the forks. If a fork updates their commit-graph after
+the base repo, then it should "reparent" the commit-graph chain onto the new
+chain in the base repo. When reading each `graph-{hash}` file, we track
+the object directory containing it. During a write of a new commit-graph file,
+we check for any changes in the source object directory and read the
+`commit-graph-chain` file for that source and create a new file based on those
+files. During this "reparent" operation, we necessarily need to collapse all
+levels in the fork, as all of the files are invalid against the new base file.
+
+It is crucial to be careful when cleaning up "unreferenced" `graph-{hash}.graph`
+files in this scenario. It falls to the user to define the proper settings for
+their custom environment:
+
+ 1. When merging levels in the base repo, the unreferenced files may still be
+ referenced by chains from fork repos.
+
+ 2. The expiry time should be set to a length of time such that every fork has
+ time to recompute their commit-graph chain to "reparent" onto the new base
+ file(s).
+
+ 3. If the commit-graph chain is updated in the base, the fork will not have
+ access to the new chain until its chain is updated to reference those files.
+ (This may change in the future [5].)
Related Links
-------------
@@ -170,3 +344,7 @@
[4] https://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
A patch to remove the ahead-behind calculation from 'status'.
+
+[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
+ A discussion of a "two-dimensional graph position" that can allow reading
+ multiple commit-graph chains at the same time.
diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt
index 1c0086e..844629c 100644
--- a/Documentation/technical/directory-rename-detection.txt
+++ b/Documentation/technical/directory-rename-detection.txt
@@ -20,8 +20,8 @@
* one side of history renames x -> z, and the other renames some file to
x/e, causing the need for the merge to do a transitive rename.
- * one side of history renames x -> z, but also renames all files within
- x. For example, x/a -> z/alpha, x/b -> z/bravo, etc.
+ * one side of history renames x -> z, but also renames all files within x.
+ For example, x/a -> z/alpha, x/b -> z/bravo, etc.
* both 'x' and 'y' being merged into a single directory 'z', with a
directory rename being detected for both x->z and y->z.
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index bc2ace2..2ae8fa4 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -456,7 +456,7 @@
below). To avoid the race when writing new objects referring to an
about-to-be-deleted object, code paths that write new objects will
need to copy any objects from UNREACHABLE_GARBAGE packs that they
-refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
+refer to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
indicated by the file's mtime) is long enough ago.
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 7a2375a..c73e72d 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -657,14 +657,14 @@
An example client/server communication might look like this:
----
- S: 007c74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/local\0report-status delete-refs ofs-delta\n
+ S: 006274730d410fcb6603ace96f1dc55ea6196122532d refs/heads/local\0report-status delete-refs ofs-delta\n
S: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe refs/heads/debug\n
S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/master\n
- S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/team\n
+ S: 003d74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/team\n
S: 0000
- C: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe 74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/debug\n
- C: 003e74730d410fcb6603ace96f1dc55ea6196122532d 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a refs/heads/master\n
+ C: 00677d1665144a3a975c05f1f43902ddaf084e784dbe 74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/debug\n
+ C: 006874730d410fcb6603ace96f1dc55ea6196122532d 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a refs/heads/master\n
C: 0000
C: [PACKDATA]
diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index 896c7b3..210373e 100644
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -30,12 +30,20 @@
times and disk usage. Missing objects can later be "demand fetched"
if/when needed.
+A remote that can later provide the missing objects is called a
+promisor remote, as it promises to send the objects when
+requested. Initialy Git supported only one promisor remote, the origin
+remote from which the user cloned and that was configured in the
+"extensions.partialClone" config option. Later support for more than
+one promisor remote has been implemented.
+
Use of partial clone requires that the user be online and the origin
-remote be available for on-demand fetching of missing objects. This may
-or may not be problematic for the user. For example, if the user can
-stay within the pre-selected subset of the source tree, they may not
-encounter any missing objects. Alternatively, the user could try to
-pre-fetch various objects if they know that they are going offline.
+remote or other promisor remotes be available for on-demand fetching
+of missing objects. This may or may not be problematic for the user.
+For example, if the user can stay within the pre-selected subset of
+the source tree, they may not encounter any missing objects.
+Alternatively, the user could try to pre-fetch various objects if they
+know that they are going offline.
Non-Goals
@@ -100,18 +108,18 @@
Handling Missing Objects
------------------------
-- An object may be missing due to a partial clone or fetch, or missing due
- to repository corruption. To differentiate these cases, the local
- repository specially indicates such filtered packfiles obtained from the
- promisor remote as "promisor packfiles".
+- An object may be missing due to a partial clone or fetch, or missing
+ due to repository corruption. To differentiate these cases, the
+ local repository specially indicates such filtered packfiles
+ obtained from promisor remotes as "promisor packfiles".
+
These promisor packfiles consist of a "<name>.promisor" file with
arbitrary contents (like the "<name>.keep" files), in addition to
their "<name>.pack" and "<name>.idx" files.
- The local repository considers a "promisor object" to be an object that
- it knows (to the best of its ability) that the promisor remote has promised
- that it has, either because the local repository has that object in one of
+ it knows (to the best of its ability) that promisor remotes have promised
+ that they have, either because the local repository has that object in one of
its promisor packfiles, or because another promisor object refers to it.
+
When Git encounters a missing object, Git can see if it is a promisor object
@@ -123,12 +131,12 @@
- Since almost all Git code currently expects any referenced object to be
present locally and because we do not want to force every command to do
a dry-run first, a fallback mechanism is added to allow Git to attempt
- to dynamically fetch missing objects from the promisor remote.
+ to dynamically fetch missing objects from promisor remotes.
+
When the normal object lookup fails to find an object, Git invokes
-fetch-object to try to get the object from the server and then retry
-the object lookup. This allows objects to be "faulted in" without
-complicated prediction algorithms.
+promisor_remote_get_direct() to try to get the object from a promisor
+remote and then retry the object lookup. This allows objects to be
+"faulted in" without complicated prediction algorithms.
+
For efficiency reasons, no check as to whether the missing object is
actually a promisor object is performed.
@@ -157,8 +165,7 @@
+
We are not happy with this global variable and would like to remove it,
but that requires significant refactoring of the object code to pass an
-additional flag. We hope that concurrent efforts to add an ODB API can
-encompass this.
+additional flag.
Fetching Missing Objects
@@ -182,21 +189,63 @@
though they are not necessary.
+Using many promisor remotes
+---------------------------
+
+Many promisor remotes can be configured and used.
+
+This allows for example a user to have multiple geographically-close
+cache servers for fetching missing blobs while continuing to do
+filtered `git-fetch` commands from the central server.
+
+When fetching objects, promisor remotes are tried one after the other
+until all the objects have been fetched.
+
+Remotes that are considered "promisor" remotes are those specified by
+the following configuration variables:
+
+- `extensions.partialClone = <name>`
+
+- `remote.<name>.promisor = true`
+
+- `remote.<name>.partialCloneFilter = ...`
+
+Only one promisor remote can be configured using the
+`extensions.partialClone` config variable. This promisor remote will
+be the last one tried when fetching objects.
+
+We decided to make it the last one we try, because it is likely that
+someone using many promisor remotes is doing so because the other
+promisor remotes are better for some reason (maybe they are closer or
+faster for some kind of objects) than the origin, and the origin is
+likely to be the remote specified by extensions.partialClone.
+
+This justification is not very strong, but one choice had to be made,
+and anyway the long term plan should be to make the order somehow
+fully configurable.
+
+For now though the other promisor remotes will be tried in the order
+they appear in the config file.
+
Current Limitations
-------------------
-- The remote used for a partial clone (or the first partial fetch
- following a regular clone) is marked as the "promisor remote".
+- It is not possible to specify the order in which the promisor
+ remotes are tried in other ways than the order in which they appear
+ in the config file.
+
-We are currently limited to a single promisor remote and only that
-remote may be used for subsequent partial fetches.
-+
-We accept this limitation because we believe initial users of this
-feature will be using it on repositories with a strong single central
-server.
+It is also not possible to specify an order to be used when fetching
+from one remote and a different order when fetching from another
+remote.
-- Dynamic object fetching will only ask the promisor remote for missing
- objects. We assume that the promisor remote has a complete view of the
+- It is not possible to push only specific objects to a promisor
+ remote.
++
+It is not possible to push at the same time to multiple promisor
+remote in a specific order.
+
+- Dynamic object fetching will only ask promisor remotes for missing
+ objects. We assume that promisor remotes have a complete view of the
repository and can satisfy all such requests.
- Repack essentially treats promisor and non-promisor packfiles as 2
@@ -218,15 +267,17 @@
Future Work
-----------
-- Allow more than one promisor remote and define a strategy for fetching
- missing objects from specific promisor remotes or of iterating over the
- set of promisor remotes until a missing object is found.
+- Improve the way to specify the order in which promisor remotes are
+ tried.
+
-A user might want to have multiple geographically-close cache servers
-for fetching missing blobs while continuing to do filtered `git-fetch`
-commands from the central server, for example.
+For example this could allow to specify explicitly something like:
+"When fetching from this remote, I want to use these promisor remotes
+in this order, though, when pushing or fetching to that remote, I want
+to use those promisor remotes in that order."
+
+- Allow pushing to promisor remotes.
+
-Or the user might want to work in a triangular work flow with multiple
+The user might want to work in a triangular work flow with multiple
promisor remotes that each have an incomplete view of the repository.
- Allow repack to work on promisor packfiles (while keeping them distinct
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index 332d209..2b267c0 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -1,6 +1,10 @@
Git Protocol Capabilities
=========================
+NOTE: this document describes capabilities for versions 0 and 1 of the pack
+protocol. For version 2, please refer to the link:protocol-v2.html[protocol-v2]
+doc.
+
Servers SHOULD support all capabilities defined in this document.
On the very first line of the initial server response of either
@@ -172,6 +176,20 @@
purposes, and MUST NOT be used to programmatically assume the presence
or absence of particular features.
+symref
+------
+
+This parameterized capability is used to inform the receiver which symbolic ref
+points to which ref; for example, "symref=HEAD:refs/heads/master" tells the
+receiver that HEAD points to master. This capability can be repeated to
+represent multiple symrefs.
+
+Servers SHOULD include this capability for the HEAD symref if it is one of the
+refs being sent.
+
+Clients MAY use the parameters from this capability to select the proper initial
+branch when cloning a repository.
+
shallow
-------
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index ead85ce..40f91f6 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -1,5 +1,5 @@
- Git Wire Protocol, Version 2
-==============================
+Git Wire Protocol, Version 2
+============================
This document presents a specification for a version 2 of Git's wire
protocol. Protocol v2 will improve upon v1 in the following ways:
@@ -22,8 +22,8 @@
has completed, a client can reuse the connection and request that other
commands be executed.
- Packet-Line Framing
----------------------
+Packet-Line Framing
+-------------------
All communication is done using packet-line framing, just as in v1. See
`Documentation/technical/pack-protocol.txt` and
@@ -34,8 +34,8 @@
* '0000' Flush Packet (flush-pkt) - indicates the end of a message
* '0001' Delimiter Packet (delim-pkt) - separates sections of a message
- Initial Client Request
-------------------------
+Initial Client Request
+----------------------
In general a client can request to speak protocol v2 by sending
`version=2` through the respective side-channel for the transport being
@@ -43,22 +43,22 @@
found in `pack-protocol.txt` and `http-protocol.txt`. In all cases the
response from the server is the capability advertisement.
- Git Transport
-~~~~~~~~~~~~~~~
+Git Transport
+~~~~~~~~~~~~~
When using the git:// transport, you can request to use protocol v2 by
sending "version=2" as an extra parameter:
003egit-upload-pack /project.git\0host=myserver.com\0\0version=2\0
- SSH and File Transport
-~~~~~~~~~~~~~~~~~~~~~~~~
+SSH and File Transport
+~~~~~~~~~~~~~~~~~~~~~~
When using either the ssh:// or file:// transport, the GIT_PROTOCOL
environment variable must be set explicitly to include "version=2".
- HTTP Transport
-~~~~~~~~~~~~~~~~
+HTTP Transport
+~~~~~~~~~~~~~~
When using the http:// or https:// transport a client makes a "smart"
info/refs request as described in `http-protocol.txt` and requests that
@@ -79,8 +79,8 @@
Subsequent requests are then made directly to the service
`$GIT_URL/git-upload-pack`. (This works the same for git-receive-pack).
- Capability Advertisement
---------------------------
+Capability Advertisement
+------------------------
A server which decides to communicate (based on a request from a client)
using protocol version 2, notifies the client by sending a version string
@@ -101,8 +101,8 @@
key = 1*(ALPHA | DIGIT | "-_")
value = 1*(ALPHA | DIGIT | " -_.,?\/{}[]()<>!@#$%^&*+=:;")
- Command Request
------------------
+Command Request
+---------------
After receiving the capability advertisement, a client can then issue a
request to select the command it wants with any particular capabilities
@@ -137,11 +137,11 @@
optionally send an empty request consisting of just a flush-pkt to
indicate that no more requests will be made.
- Capabilities
---------------
+Capabilities
+------------
There are two different types of capabilities: normal capabilities,
-which can be used to to convey information or alter the behavior of a
+which can be used to convey information or alter the behavior of a
request, and commands, which are the core actions that a client wants to
perform (fetch, push, etc).
@@ -153,8 +153,8 @@
permits simple round-robin load-balancing on the server side, without
needing to worry about state management.
- agent
-~~~~~~~
+agent
+~~~~~
The server can advertise the `agent` capability with a value `X` (in the
form `agent=X`) to notify the client that the server is running version
@@ -168,8 +168,8 @@
and debugging purposes, and MUST NOT be used to programmatically assume
the presence or absence of particular features.
- ls-refs
-~~~~~~~~~
+ls-refs
+~~~~~~~
`ls-refs` is the command used to request a reference advertisement in v2.
Unlike the current reference advertisement, ls-refs takes in arguments
@@ -199,8 +199,8 @@
symref = "symref-target:" symref-target
peeled = "peeled:" obj-id
- fetch
-~~~~~~~
+fetch
+~~~~~
`fetch` is the command used to fetch a packfile in v2. It can be looked
at as a modified version of the v1 fetch where the ref-advertisement is
@@ -444,8 +444,8 @@
2 - progress messages
3 - fatal error message just before stream aborts
- server-option
-~~~~~~~~~~~~~~~
+server-option
+~~~~~~~~~~~~~
If advertised, indicates that any number of server specific options can be
included in a request. This is done by sending each option as a
diff --git a/Documentation/trace2-target-values.txt b/Documentation/trace2-target-values.txt
new file mode 100644
index 0000000..27d3c64
--- /dev/null
+++ b/Documentation/trace2-target-values.txt
@@ -0,0 +1,10 @@
+--
+* `0` or `false` - Disables the target.
+* `1` or `true` - Writes to `STDERR`.
+* `[2-9]` - Writes to the already opened file descriptor.
+* `<absolute-pathname>` - Writes to the file in append mode.
+* `af_unix:[<socket_type>:]<absolute-pathname>` - Write to a
+Unix DomainSocket (on platforms that support them). Socket
+type can be either `stream` or `dgram`; if omitted Git will
+try both.
+--
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index b05da95..bc354fe 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -62,7 +62,7 @@
where <address> may be a path, a server and path, or an arbitrary
URL-like string recognized by the specific remote helper being
-invoked. See linkgit:gitremote-helpers[1] for details.
+invoked. See linkgit:gitremote-helpers[7] for details.
If there are a large number of similarly-named remote repositories and
you want to use a different format for them (such that the URLs you
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index eff7890..06bd899 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,5 +1,4 @@
-Git User Manual
-===============
+= Git User Manual
Git is a fast distributed revision control system.
@@ -41,12 +40,10 @@
[[repositories-and-branches]]
-Repositories and Branches
-=========================
+== Repositories and Branches
[[how-to-get-a-git-repository]]
-How to get a Git repository
----------------------------
+=== How to get a Git repository
It will be useful to have a Git repository to experiment with as you
read this manual.
@@ -73,8 +70,7 @@
about the history of the project.
[[how-to-check-out]]
-How to check out a different version of a project
--------------------------------------------------
+=== How to check out a different version of a project
Git is best thought of as a tool for storing the history of a collection
of files. It stores the history as a compressed collection of
@@ -122,10 +118,10 @@
while heads are expected to advance as development progresses.
Create a new branch head pointing to one of these versions and check it
-out using linkgit:git-checkout[1]:
+out using linkgit:git-switch[1]:
------------------------------------------------
-$ git checkout -b new v2.6.13
+$ git switch -c new v2.6.13
------------------------------------------------
The working directory then reflects the contents that the project had
@@ -151,8 +147,7 @@
carefully.
[[understanding-commits]]
-Understanding History: Commits
-------------------------------
+=== Understanding History: Commits
Every change in the history of a project is represented by a commit.
The linkgit:git-show[1] command shows the most recent commit on the
@@ -202,8 +197,7 @@
with a name that is a hash of its contents.
[[understanding-reachability]]
-Understanding history: commits, parents, and reachability
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: commits, parents, and reachability
Every commit (except the very first commit in a project) also has a
parent commit which shows what happened before this commit.
@@ -227,8 +221,7 @@
leading from commit Y to commit X.
[[history-diagrams]]
-Understanding history: History diagrams
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: History diagrams
We will sometimes represent Git history using diagrams like the one
below. Commits are shown as "o", and the links between them with
@@ -247,8 +240,7 @@
be replaced with another letter or number.
[[what-is-a-branch]]
-Understanding history: What is a branch?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Understanding history: What is a branch?
When we need to be precise, we will use the word "branch" to mean a line
of development, and "branch head" (or just "head") to mean a reference
@@ -261,8 +253,7 @@
"branch" both for branches and for branch heads.
[[manipulating-branches]]
-Manipulating branches
----------------------
+=== Manipulating branches
Creating, deleting, and modifying branches is quick and easy; here's
a summary of the commands:
@@ -282,10 +273,10 @@
this command will fail with a warning.
`git branch -D <branch>`::
delete the branch `<branch>` irrespective of its merged status.
-`git checkout <branch>`::
+`git switch <branch>`::
make the current branch `<branch>`, updating the working
directory to reflect the version referenced by `<branch>`.
-`git checkout -b <new> <start-point>`::
+`git switch -c <new> <start-point>`::
create a new branch `<new>` referencing `<start-point>`, and
check it out.
@@ -299,25 +290,24 @@
------------------------------------------------
[[detached-head]]
-Examining an old version without creating a new branch
-------------------------------------------------------
+=== Examining an old version without creating a new branch
-The `git checkout` command normally expects a branch head, but will also
-accept an arbitrary commit; for example, you can check out the commit
-referenced by a tag:
+The `git switch` command normally expects a branch head, but will also
+accept an arbitrary commit when invoked with --detach; for example,
+you can check out the commit referenced by a tag:
------------------------------------------------
-$ git checkout v2.6.17
+$ git switch --detach v2.6.17
Note: checking out 'v2.6.17'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+state without impacting any branches by performing another switch.
If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+do so (now or later) by using -c with the switch command again. Example:
- git checkout -b new_branch_name
+ git switch -c new_branch_name
HEAD is now at 427abfa Linux v2.6.17
------------------------------------------------
@@ -340,8 +330,7 @@
(or tag) for this version later if you decide to.
[[examining-remote-branches]]
-Examining branches from a remote repository
--------------------------------------------
+=== Examining branches from a remote repository
The "master" branch that was created at the time you cloned is a copy
of the HEAD in the repository that you cloned from. That repository
@@ -373,7 +362,7 @@
on a branch of your own, just as you would for a tag:
------------------------------------------------
-$ git checkout -b my-todo-copy origin/todo
+$ git switch -c my-todo-copy origin/todo
------------------------------------------------
You can also check out `origin/todo` directly to examine it or
@@ -383,8 +372,7 @@
to refer to the repository that you cloned from.
[[how-git-stores-references]]
-Naming branches, tags, and other references
--------------------------------------------
+=== Naming branches, tags, and other references
Branches, remote-tracking branches, and tags are all references to
commits. All references are named with a slash-separated path name
@@ -413,8 +401,7 @@
REVISIONS" section of linkgit:gitrevisions[7].
[[Updating-a-repository-With-git-fetch]]
-Updating a repository with git fetch
-------------------------------------
+=== Updating a repository with git fetch
After you clone a repository and commit a few changes of your own, you
may wish to check the original repository for updates.
@@ -425,8 +412,7 @@
"master" branch that was created for you on clone.
[[fetching-branches]]
-Fetching branches from other repositories
------------------------------------------
+=== Fetching branches from other repositories
You can also track branches from repositories other than the one you
cloned from, using linkgit:git-remote[1]:
@@ -474,8 +460,7 @@
linkgit:git-config[1] for details.)
[[exploring-git-history]]
-Exploring Git history
-=====================
+== Exploring Git history
Git is best thought of as a tool for storing the history of a
collection of files. It does this by storing compressed snapshots of
@@ -489,8 +474,7 @@
commit that introduced a bug into a project.
[[using-bisect]]
-How to use bisect to find a regression
---------------------------------------
+=== How to use bisect to find a regression
Suppose version 2.6.18 of your project worked, but the version at
"master" crashes. Sometimes the best way to find the cause of such a
@@ -572,8 +556,7 @@
bisect` features.
[[naming-commits]]
-Naming commits
---------------
+=== Naming commits
We have seen several ways of naming commits already:
@@ -637,8 +620,7 @@
-------------------------------------------------
[[creating-tags]]
-Creating tags
--------------
+=== Creating tags
We can also create a tag to refer to a particular commit; after
running
@@ -655,8 +637,7 @@
for details.
[[browsing-revisions]]
-Browsing revisions
-------------------
+=== Browsing revisions
The linkgit:git-log[1] command can show lists of commits. On its
own, it shows all commits reachable from the parent commit; but you
@@ -697,8 +678,7 @@
commits are listed in may be somewhat arbitrary.
[[generating-diffs]]
-Generating diffs
-----------------
+=== Generating diffs
You can generate diffs between any two versions using
linkgit:git-diff[1]:
@@ -726,8 +706,7 @@
but not from master.
[[viewing-old-file-versions]]
-Viewing old file versions
--------------------------
+=== Viewing old file versions
You can always view an old version of a file by just checking out the
correct revision first. But sometimes it is more convenient to be
@@ -742,12 +721,10 @@
may be any path to a file tracked by Git.
[[history-examples]]
-Examples
---------
+=== Examples
[[counting-commits-on-a-branch]]
-Counting the number of commits on a branch
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Counting the number of commits on a branch
Suppose you want to know how many commits you've made on `mybranch`
since it diverged from `origin`:
@@ -765,8 +742,7 @@
-------------------------------------------------
[[checking-for-equal-branches]]
-Check whether two branches point at the same history
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Check whether two branches point at the same history
Suppose you want to check whether two branches point at the same point
in history.
@@ -798,8 +774,7 @@
will return no commits when the two branches are equal.
[[finding-tagged-descendants]]
-Find first tagged version including a given fix
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Find first tagged version including a given fix
Suppose you know that the commit e05db0fd fixed a certain problem.
You'd like to find the earliest tagged release that contains that
@@ -883,8 +858,7 @@
and from v1.5.0-rc2, and not from v1.5.0-rc0.
[[showing-commits-unique-to-a-branch]]
-Showing commits unique to a given branch
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Showing commits unique to a given branch
Suppose you would like to see all the commits reachable from the branch
head named `master` but not from any other head in your repository.
@@ -931,8 +905,7 @@
syntax such as `--not`.)
[[making-a-release]]
-Creating a changelog and tarball for a software release
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Creating a changelog and tarball for a software release
The linkgit:git-archive[1] command can create a tar or zip archive from
any version of a project; for example:
@@ -983,8 +956,7 @@
they look OK.
[[Finding-commits-With-given-Content]]
-Finding commits referencing a file with given content
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Finding commits referencing a file with given content
Somebody hands you a copy of a file, and asks which commits modified a
file such that it contained the given content either before or after the
@@ -1000,12 +972,10 @@
linkgit:git-hash-object[1] man pages may prove helpful.
[[Developing-With-git]]
-Developing with Git
-===================
+== Developing with Git
[[telling-git-your-name]]
-Telling Git your name
----------------------
+=== Telling Git your name
Before creating any commits, you should introduce yourself to Git.
The easiest way to do so is to use linkgit:git-config[1]:
@@ -1030,8 +1000,7 @@
[[creating-a-new-repository]]
-Creating a new repository
--------------------------
+=== Creating a new repository
Creating a new repository from scratch is very easy:
@@ -1052,8 +1021,7 @@
-------------------------------------------------
[[how-to-make-a-commit]]
-How to make a commit
---------------------
+=== How to make a commit
Creating a new commit takes three steps:
@@ -1148,8 +1116,7 @@
choosing "Stage Hunk For Commit").
[[creating-good-commit-messages]]
-Creating good commit messages
------------------------------
+=== Creating good commit messages
Though not required, it's a good idea to begin the commit message
with a single short (less than 50 character) line summarizing the
@@ -1162,8 +1129,7 @@
[[ignoring-files]]
-Ignoring files
---------------
+=== Ignoring files
A project will often generate files that you do 'not' want to track with Git.
This typically includes files generated by a build process or temporary
@@ -1205,8 +1171,7 @@
command line. See linkgit:gitignore[5] for the details.
[[how-to-merge]]
-How to merge
-------------
+=== How to merge
You can rejoin two diverging branches of development using
linkgit:git-merge[1]:
@@ -1254,8 +1219,7 @@
one to the top of the other branch.
[[resolving-a-merge]]
-Resolving a merge
------------------
+=== Resolving a merge
When a merge isn't resolved automatically, Git leaves the index and
the working tree in a special state that gives you all the
@@ -1297,8 +1261,7 @@
also provides more information to help resolve conflicts:
[[conflict-resolution]]
-Getting conflict-resolution help during a merge
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Getting conflict-resolution help during a merge
All of the changes that Git was able to merge automatically are
already added to the index file, so linkgit:git-diff[1] shows only
@@ -1401,14 +1364,13 @@
`git diff` will (by default) no longer show diffs for that file.
[[undoing-a-merge]]
-Undoing a merge
----------------
+=== Undoing a merge
If you get stuck and decide to just give up and throw the whole mess
away, you can always return to the pre-merge state with
-------------------------------------------------
-$ git reset --hard HEAD
+$ git merge --abort
-------------------------------------------------
Or, if you've already committed the merge that you want to throw away,
@@ -1423,8 +1385,7 @@
further merges.
[[fast-forwards]]
-Fast-forward merges
--------------------
+=== Fast-forward merges
There is one special case not mentioned above, which is treated
differently. Normally, a merge results in a merge commit, with two
@@ -1438,15 +1399,14 @@
created.
[[fixing-mistakes]]
-Fixing mistakes
----------------
+=== Fixing mistakes
If you've messed up the working tree, but haven't yet committed your
mistake, you can return the entire working tree to the last committed
state with
-------------------------------------------------
-$ git reset --hard HEAD
+$ git restore --staged --worktree :/
-------------------------------------------------
If you make a commit that you later wish you hadn't, there are two
@@ -1463,8 +1423,7 @@
a branch that has had its history changed.
[[reverting-a-commit]]
-Fixing a mistake with a new commit
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Fixing a mistake with a new commit
Creating a new commit that reverts an earlier change is very easy;
just pass the linkgit:git-revert[1] command a reference to the bad
@@ -1490,8 +1449,7 @@
resolving a merge>>.
[[fixing-a-mistake-by-rewriting-history]]
-Fixing a mistake by rewriting history
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Fixing a mistake by rewriting history
If the problematic commit is the most recent commit, and you have not
yet made that commit public, then you may just
@@ -1518,17 +1476,14 @@
<<cleaning-up-history,another chapter>>.
[[checkout-of-path]]
-Checking out an old version of a file
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Checking out an old version of a file
In the process of undoing a previous bad change, you may find it
useful to check out an older version of a particular file using
-linkgit:git-checkout[1]. We've used `git checkout` before to switch
-branches, but it has quite different behavior if it is given a path
-name: the command
+linkgit:git-restore[1]. The command
-------------------------------------------------
-$ git checkout HEAD^ path/to/file
+$ git restore --source=HEAD^ path/to/file
-------------------------------------------------
replaces path/to/file by the contents it had in the commit HEAD^, and
@@ -1545,8 +1500,7 @@
which will display the given version of the file.
[[interrupted-work]]
-Temporarily setting aside work in progress
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Temporarily setting aside work in progress
While you are in the middle of working on something complicated, you
find an unrelated but obvious and trivial bug. You would like to fix it
@@ -1577,8 +1531,7 @@
[[ensuring-good-performance]]
-Ensuring good performance
--------------------------
+=== Ensuring good performance
On large repositories, Git depends on compression to keep the history
information from taking up too much space on disk or in memory. Some
@@ -1589,12 +1542,10 @@
[[ensuring-reliability]]
-Ensuring reliability
---------------------
+=== Ensuring reliability
[[checking-for-corruption]]
-Checking the repository for corruption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Checking the repository for corruption
The linkgit:git-fsck[1] command runs a number of self-consistency checks
on the repository, and reports on any problems. This may take some
@@ -1620,12 +1571,10 @@
view real errors.
[[recovering-lost-changes]]
-Recovering lost changes
-~~~~~~~~~~~~~~~~~~~~~~~
+==== Recovering lost changes
[[reflogs]]
-Reflogs
-^^^^^^^
+===== Reflogs
Say you modify a branch with <<fixing-mistakes,`git reset --hard`>>,
and then realize that the branch was the only reference you had to
@@ -1672,8 +1621,7 @@
how the branches in your local repository have changed over time.
[[dangling-object-recovery]]
-Examining dangling objects
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+===== Examining dangling objects
In some situations the reflog may not be able to save you. For example,
suppose you delete a branch, then realize you need the history it
@@ -1717,12 +1665,10 @@
[[sharing-development]]
-Sharing development with others
-===============================
+== Sharing development with others
[[getting-updates-With-git-pull]]
-Getting updates with git pull
------------------------------
+=== Getting updates with git pull
After you clone a repository and commit a few changes of your own, you
may wish to check the original repository for updates and merge them
@@ -1785,8 +1731,7 @@
are roughly equivalent.
[[submitting-patches]]
-Submitting patches to a project
--------------------------------
+=== Submitting patches to a project
If you just have a few changes, the simplest way to submit them may
just be to send them as patches in email:
@@ -1814,8 +1759,7 @@
their requirements for submitting patches.
[[importing-patches]]
-Importing patches to a project
-------------------------------
+=== Importing patches to a project
Git also provides a tool called linkgit:git-am[1] (am stands for
"apply mailbox"), for importing such an emailed series of patches.
@@ -1847,8 +1791,7 @@
taken from the message containing each patch.
[[public-repositories]]
-Public Git repositories
------------------------
+=== Public Git repositories
Another way to submit changes to a project is to tell the maintainer
of that project to pull the changes from your repository using
@@ -1888,21 +1831,22 @@
where there is one other developer with a public repository, looks
like this:
- you push
- your personal repo ------------------> your public repo
- ^ |
- | |
- | you pull | they pull
- | |
- | |
- | they push V
- their public repo <------------------- their repo
+....
+ you push
+your personal repo ------------------> your public repo
+ ^ |
+ | |
+ | you pull | they pull
+ | |
+ | |
+ | they push V
+their public repo <------------------- their repo
+....
We explain how to do this in the following sections.
[[setting-up-a-public-repository]]
-Setting up a public repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Setting up a public repository
Assume your personal repository is in the directory `~/proj`. We
first create a new clone of the repository and tell `git daemon` that it
@@ -1922,8 +1866,7 @@
convenient.
[[exporting-via-git]]
-Exporting a Git repository via the Git protocol
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Exporting a Git repository via the Git protocol
This is the preferred method.
@@ -1944,8 +1887,7 @@
examples section.)
[[exporting-via-http]]
-Exporting a git repository via HTTP
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Exporting a git repository via HTTP
The Git protocol gives better performance and reliability, but on a
host with a web server set up, HTTP exports may be simpler to set up.
@@ -1977,8 +1919,7 @@
allows pushing over HTTP.)
[[pushing-changes-to-a-public-repository]]
-Pushing changes to a public repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Pushing changes to a public repository
Note that the two techniques outlined above (exporting via
<<exporting-via-http,http>> or <<exporting-via-git,git>>) allow other
@@ -2037,8 +1978,7 @@
linkgit:git-config[1] for details.
[[forcing-push]]
-What to do when a push fails
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== What to do when a push fails
If a push would not result in a <<fast-forwards,fast-forward>> of the
remote branch, then it will fail with an error like:
@@ -2092,8 +2032,7 @@
linkgit:gitcvs-migration[7] for more.
[[setting-up-a-shared-repository]]
-Setting up a shared repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Setting up a shared repository
Another way to collaborate is by using a model similar to that
commonly used in CVS, where several developers with special rights
@@ -2123,8 +2062,7 @@
"out".
[[setting-up-gitweb]]
-Allowing web browsing of a repository
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Allowing web browsing of a repository
The gitweb cgi script provides users an easy way to browse your
project's revisions, file contents and logs without having to install
@@ -2140,8 +2078,7 @@
installation with a CGI or Perl capable server.
[[how-to-get-a-git-repository-with-minimal-history]]
-How to get a Git repository with minimal history
-------------------------------------------------
+=== How to get a Git repository with minimal history
A <<def_shallow_clone,shallow clone>>, with its truncated
history, is useful when one is interested only in recent history
@@ -2160,12 +2097,10 @@
a repository unsuitable to be used in merge based workflows.
[[sharing-development-examples]]
-Examples
---------
+=== Examples
[[maintaining-topic-branches]]
-Maintaining topic branches for a Linux subsystem maintainer
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Maintaining topic branches for a Linux subsystem maintainer
This describes how Tony Luck uses Git in his role as maintainer of the
IA64 architecture for the Linux kernel.
@@ -2211,8 +2146,8 @@
These can be easily kept up to date using linkgit:git-pull[1].
-------------------------------------------------
-$ git checkout test && git pull
-$ git checkout release && git pull
+$ git switch test && git pull
+$ git switch release && git pull
-------------------------------------------------
Important note! If you have any local changes in these branches, then
@@ -2264,7 +2199,7 @@
2) help future bug hunters that use `git bisect` to find problems
-------------------------------------------------
-$ git checkout -b speed-up-spinlocks v2.6.35
+$ git switch -c speed-up-spinlocks v2.6.35
-------------------------------------------------
Now you apply the patch(es), run some tests, and commit the change(s). If
@@ -2279,7 +2214,7 @@
"test" branch in preparation to make it public:
-------------------------------------------------
-$ git checkout test && git merge speed-up-spinlocks
+$ git switch test && git merge speed-up-spinlocks
-------------------------------------------------
It is unlikely that you would have any conflicts here ... but you might if you
@@ -2291,7 +2226,7 @@
means that the patches can be moved into the `release` tree in any order.
-------------------------------------------------
-$ git checkout release && git merge speed-up-spinlocks
+$ git switch release && git merge speed-up-spinlocks
-------------------------------------------------
After a while, you will have a number of branches, and despite the
@@ -2461,8 +2396,7 @@
[[cleaning-up-history]]
-Rewriting history and maintaining patch series
-==============================================
+== Rewriting history and maintaining patch series
Normally commits are only added to a project, never taken away or
replaced. Git is designed with this assumption, and violating it will
@@ -2472,8 +2406,7 @@
assumption.
[[patch-series]]
-Creating the perfect patch series
----------------------------------
+=== Creating the perfect patch series
Suppose you are a contributor to a large project, and you want to add a
complicated feature, and to present it to the other developers in a way
@@ -2505,14 +2438,13 @@
you are rewriting history.
[[using-git-rebase]]
-Keeping a patch series up to date using git rebase
---------------------------------------------------
+=== Keeping a patch series up to date using git rebase
Suppose that you create a branch `mywork` on a remote-tracking branch
`origin`, and create some commits on top of it:
-------------------------------------------------
-$ git checkout -b mywork origin
+$ git switch -c mywork origin
$ vi file.txt
$ git commit
$ vi otherfile.txt
@@ -2552,7 +2484,7 @@
linkgit:git-rebase[1]:
-------------------------------------------------
-$ git checkout mywork
+$ git switch mywork
$ git rebase origin
-------------------------------------------------
@@ -2593,8 +2525,7 @@
<<reordering-patch-series>> for alternatives.
[[rewriting-one-commit]]
-Rewriting a single commit
--------------------------
+=== Rewriting a single commit
We saw in <<fixing-a-mistake-by-rewriting-history>> that you can replace the
most recent commit using
@@ -2612,8 +2543,7 @@
use <<interactive-rebase,interactive rebase's `edit` instruction>>.
[[reordering-patch-series]]
-Reordering or selecting from a patch series
--------------------------------------------
+=== Reordering or selecting from a patch series
Sometimes you want to edit a commit deeper in your history. One
approach is to use `git format-patch` to create a series of patches
@@ -2632,8 +2562,7 @@
-------------------------------------------------
[[interactive-rebase]]
-Using interactive rebases
--------------------------
+=== Using interactive rebases
You can also edit a patch series with an interactive rebase. This is
the same as <<reordering-patch-series,reordering a patch series using
@@ -2690,16 +2619,14 @@
see the "INTERACTIVE MODE" section of linkgit:git-rebase[1].
[[patch-series-tools]]
-Other tools
------------
+=== Other tools
There are numerous other tools, such as StGit, which exist for the
purpose of maintaining a patch series. These are outside of the scope of
this manual.
[[problems-With-rewriting-history]]
-Problems with rewriting history
--------------------------------
+=== Problems with rewriting history
The primary problem with rewriting the history of a branch has to do
with merging. Suppose somebody fetches your branch and merges it into
@@ -2747,8 +2674,7 @@
published branches should never be rewritten.
[[bisect-merges]]
-Why bisecting merge commits can be harder than bisecting linear history
------------------------------------------------------------------------
+=== Why bisecting merge commits can be harder than bisecting linear history
The linkgit:git-bisect[1] command correctly handles history that
includes merge commits. However, when the commit that it finds is a
@@ -2813,12 +2739,10 @@
publishing.
[[advanced-branch-management]]
-Advanced branch management
-==========================
+== Advanced branch management
[[fetching-individual-branches]]
-Fetching individual branches
-----------------------------
+=== Fetching individual branches
Instead of using linkgit:git-remote[1], you can also choose just
to update one branch at a time, and to store it locally under an
@@ -2846,8 +2770,7 @@
master branch. In more detail:
[[fetch-fast-forwards]]
-git fetch and fast-forwards
----------------------------
+=== git fetch and fast-forwards
In the previous example, when updating an existing branch, `git fetch`
checks to make sure that the most recent commit on the remote
@@ -2884,8 +2807,7 @@
them.
[[forcing-fetch]]
-Forcing git fetch to do non-fast-forward updates
-------------------------------------------------
+=== Forcing git fetch to do non-fast-forward updates
If git fetch fails because the new head of a branch is not a
descendant of the old head, you may force the update with:
@@ -2905,8 +2827,7 @@
may be lost, as we saw in the previous section.
[[remote-branch-configuration]]
-Configuring remote-tracking branches
-------------------------------------
+=== Configuring remote-tracking branches
We saw above that `origin` is just a shortcut to refer to the
repository that you originally cloned from. This information is
@@ -2957,8 +2878,7 @@
[[git-concepts]]
-Git concepts
-============
+== Git concepts
Git is built on a small number of simple but powerful ideas. While it
is possible to get things done without understanding them, you will find
@@ -2968,8 +2888,7 @@
database>> and the <<def_index,index>>.
[[the-object-database]]
-The Object Database
--------------------
+=== The Object Database
We already saw in <<understanding-commits>> that all commits are stored
@@ -3013,8 +2932,7 @@
The object types in some more detail:
[[commit-object]]
-Commit Object
-~~~~~~~~~~~~~
+==== Commit Object
The "commit" object links a physical state of a tree with a description
of how we got there and why. Use the `--pretty=raw` option to
@@ -3066,8 +2984,7 @@
taken from the content currently stored in the index.
[[tree-object]]
-Tree Object
-~~~~~~~~~~~
+==== Tree Object
The ever-versatile linkgit:git-show[1] command can also be used to
examine tree objects, but linkgit:git-ls-tree[1] will give you more
@@ -3106,8 +3023,7 @@
attention to the executable bit.
[[blob-object]]
-Blob Object
-~~~~~~~~~~~
+==== Blob Object
You can use linkgit:git-show[1] to examine the contents of a blob; take,
for example, the blob in the entry for `COPYING` from the tree above:
@@ -3136,8 +3052,7 @@
currently checked out.
[[trust]]
-Trust
-~~~~~
+==== Trust
If you receive the SHA-1 name of a blob from one source, and its contents
from another (possibly untrusted) source, you can still trust that those
@@ -3166,8 +3081,7 @@
To assist in this, Git also provides the tag object...
[[tag-object]]
-Tag Object
-~~~~~~~~~~
+==== Tag Object
A tag object contains an object, object type, tag name, the name of the
person ("tagger") who created the tag, and a message, which may contain
@@ -3196,8 +3110,7 @@
references whose names begin with `refs/tags/`).
[[pack-files]]
-How Git stores objects efficiently: pack files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== How Git stores objects efficiently: pack files
Newly created objects are initially created in a file named after the
object's SHA-1 hash (stored in `.git/objects`).
@@ -3255,8 +3168,7 @@
you, so is normally the only high-level command you need.
[[dangling-objects]]
-Dangling objects
-~~~~~~~~~~~~~~~~
+==== Dangling objects
The linkgit:git-fsck[1] command will sometimes complain about dangling
objects. They are not a problem.
@@ -3336,8 +3248,7 @@
accesses to a repository but you might receive confusing or scary messages.)
[[recovering-from-repository-corruption]]
-Recovering from repository corruption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== Recovering from repository corruption
By design, Git treats data trusted to it with caution. However, even in
the absence of bugs in Git itself, it is still possible that hardware or
@@ -3454,8 +3365,7 @@
just missing one particular blob version.
[[the-index]]
-The index
----------
+=== The index
The index is a binary file (generally kept in `.git/index`) containing a
sorted list of path names, each with permissions and the SHA-1 of a blob
@@ -3513,8 +3423,7 @@
information as long as you have the name of the tree that it described.
[[submodules]]
-Submodules
-==========
+== Submodules
Large projects are often composed of smaller, self-contained modules. For
example, an embedded Linux distribution's source tree would include every
@@ -3668,13 +3577,13 @@
new commit:
-------------------------------------------------
-$ git checkout master
+$ git switch master
-------------------------------------------------
or
-------------------------------------------------
-$ git checkout -b fix-up
+$ git switch -c fix-up
-------------------------------------------------
then
@@ -3700,8 +3609,8 @@
You have to run `git submodule update` after `git pull` if you want to update
submodules, too.
-Pitfalls with submodules
-------------------------
+[[pitfalls-with-submodules]]
+=== Pitfalls with submodules
Always publish the submodule change before publishing the change to the
superproject that references it. If you forget to publish the submodule change,
@@ -3770,8 +3679,7 @@
warning about not being able switch from a dirty branch.
[[low-level-operations]]
-Low-level Git operations
-========================
+== Low-level Git operations
Many of the higher-level commands were originally implemented as shell
scripts using a smaller core of low-level Git commands. These can still
@@ -3779,8 +3687,7 @@
understand its inner workings.
[[object-manipulation]]
-Object access and manipulation
-------------------------------
+=== Object access and manipulation
The linkgit:git-cat-file[1] command can show the contents of any object,
though the higher-level linkgit:git-show[1] is usually more useful.
@@ -3797,11 +3704,10 @@
use linkgit:git-tag[1] for both.
[[the-workflow]]
-The Workflow
-------------
+=== The Workflow
-High-level operations such as linkgit:git-commit[1],
-linkgit:git-checkout[1] and linkgit:git-reset[1] work by moving data
+High-level operations such as linkgit:git-commit[1] and
+linkgit:git-restore[1] work by moving data
between the working tree, the index, and the object database. Git
provides low-level operations which perform each of these steps
individually.
@@ -3813,8 +3719,7 @@
combinations:
[[working-directory-to-index]]
-working directory -> index
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== working directory -> index
The linkgit:git-update-index[1] command updates the index with
information from the working directory. You generally update the
@@ -3850,8 +3755,7 @@
linkgit:git-update-index[1].
[[index-to-object-database]]
-index -> object database
-~~~~~~~~~~~~~~~~~~~~~~~~
+==== index -> object database
You write your current index file to a "tree" object with the program
@@ -3866,8 +3770,7 @@
other direction:
[[object-database-to-index]]
-object database -> index
-~~~~~~~~~~~~~~~~~~~~~~~~
+==== object database -> index
You read a "tree" file from the object database, and use that to
populate (and overwrite--don't do this if your index contains any
@@ -3883,8 +3786,7 @@
directory contents have not been modified.
[[index-to-working-directory]]
-index -> working directory
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== index -> working directory
You update your working directory from the index by "checking out"
files. This is not a very common operation, since normally you'd just
@@ -3913,8 +3815,7 @@
from one representation to the other:
[[tying-it-all-together]]
-Tying it all together
-~~~~~~~~~~~~~~~~~~~~~
+==== Tying it all together
To commit a tree you have instantiated with `git write-tree`, you'd
create a "commit" object that refers to that tree and the history
@@ -3988,8 +3889,7 @@
[[examining-the-data]]
-Examining the data
-------------------
+=== Examining the data
You can examine the data represented in the object database and the
index with various helper tools. For every object, you can use
@@ -4024,8 +3924,7 @@
to see what the top commit was.
[[merging-multiple-trees]]
-Merging multiple trees
-----------------------
+=== Merging multiple trees
Git can help you perform a three-way merge, which can in turn be
used for a many-way merge by repeating the merge procedure several
@@ -4075,8 +3974,7 @@
[[merging-multiple-trees-2]]
-Merging multiple trees, continued
----------------------------------
+=== Merging multiple trees, continued
Sadly, many merges aren't trivial. If there are files that have
been added, moved or removed, or if both branches have modified the
@@ -4146,15 +4044,13 @@
and that is what higher level `git merge -s resolve` is implemented with.
[[hacking-git]]
-Hacking Git
-===========
+== Hacking Git
This chapter covers internal details of the Git implementation which
probably only Git developers need to understand.
[[object-details]]
-Object storage format
----------------------
+=== Object storage format
All objects have a statically determined "type" which identifies the
format of the object (i.e. how it is used, and how it can refer to other
@@ -4184,8 +4080,7 @@
to just verifying their superficial consistency through the hash).
[[birdview-on-the-source-code]]
-A birds-eye view of Git's source code
--------------------------------------
+=== A birds-eye view of Git's source code
It is not always easy for new developers to find their way through Git's
source code. This section gives you a little guidance to show where to
@@ -4194,7 +4089,7 @@
A good place to start is with the contents of the initial commit, with:
----------------------------------------------------
-$ git checkout e83c5163
+$ git switch --detach e83c5163
----------------------------------------------------
The initial revision lays the foundation for almost everything Git has
@@ -4394,25 +4289,22 @@
itself!
[[glossary]]
-Git Glossary
-============
+== Git Glossary
[[git-explained]]
-Git explained
--------------
+=== Git explained
include::glossary-content.txt[]
[[git-quick-start]]
-Appendix A: Git Quick Reference
-===============================
+[appendix]
+== Git Quick Reference
This is a quick summary of the major commands; the previous chapters
explain how these work in more detail.
[[quick-creating-a-new-repository]]
-Creating a new repository
--------------------------
+=== Creating a new repository
From a tarball:
@@ -4433,14 +4325,13 @@
-----------------------------------------------
[[managing-branches]]
-Managing branches
------------------
+=== Managing branches
-----------------------------------------------
-$ git branch # list all local branches in this repo
-$ git checkout test # switch working directory to branch "test"
-$ git branch new # create branch "new" starting at current HEAD
-$ git branch -d new # delete branch "new"
+$ git branch # list all local branches in this repo
+$ git switch test # switch working directory to branch "test"
+$ git branch new # create branch "new" starting at current HEAD
+$ git branch -d new # delete branch "new"
-----------------------------------------------
Instead of basing a new branch on current HEAD (the default), use:
@@ -4456,7 +4347,7 @@
Create and switch to a new branch at the same time:
-----------------------------------------------
-$ git checkout -b new v2.6.15
+$ git switch -c new v2.6.15
-----------------------------------------------
Update and examine branches from the repository you cloned from:
@@ -4467,7 +4358,7 @@
origin/master
origin/next
...
-$ git checkout -b masterwork origin/master
+$ git switch -c masterwork origin/master
-----------------------------------------------
Fetch a branch from a different repository, and give it a new
@@ -4498,8 +4389,7 @@
[[exploring-history]]
-Exploring history
------------------
+=== Exploring history
-----------------------------------------------
$ gitk # visualize and browse history
@@ -4534,8 +4424,7 @@
-----------------------------------------------
[[making-changes]]
-Making changes
---------------
+=== Making changes
Make sure Git knows who to blame:
@@ -4565,8 +4454,7 @@
-----------------------------------------------
[[merging]]
-Merging
--------
+=== Merging
-----------------------------------------------
$ git merge test # merge branch "test" into the current branch
@@ -4576,8 +4464,7 @@
-----------------------------------------------
[[sharing-your-changes]]
-Sharing your changes
---------------------
+=== Sharing your changes
Importing or exporting patches:
@@ -4622,8 +4509,7 @@
-----------------------------------------------
[[repository-maintenance]]
-Repository maintenance
-----------------------
+=== Repository maintenance
Check for corruption:
@@ -4639,12 +4525,11 @@
[[todo]]
-Appendix B: Notes and todo list for this manual
-===============================================
+[appendix]
+== Notes and todo list for this manual
[[todo-list]]
-Todo list
----------
+=== Todo list
This is a work in progress.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1d4886b..98f88a2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.21.0-rc0
+DEF_VER=v2.23.GIT
LF='
'
diff --git a/Makefile b/Makefile
index 571160a..f879697 100644
--- a/Makefile
+++ b/Makefile
@@ -259,11 +259,11 @@
# Define OLD_ICONV if your library has an old iconv(), where the second
# (input buffer pointer) parameter is declared with type (const char **).
#
-# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
+# Define ICONV_OMITS_BOM if your iconv implementation does not write a
+# byte-order mark (BOM) when writing UTF-16 or UTF-32 and always writes in
+# big-endian format.
#
-# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
-# that tells runtime paths to dynamic libraries;
-# "-Wl,-rpath=/path/lib" is used instead.
+# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
#
# Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
# as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
@@ -433,6 +433,11 @@
#
# Define HAVE_GETDELIM if your system has the getdelim() function.
#
+# Define FILENO_IS_A_MACRO if fileno() is a macro, not a real function.
+#
+# Define NEED_ACCESS_ROOT_HANDLER if access() under root may success for X_OK
+# even if execution permission isn't granted for any user.
+#
# Define PAGER_ENV to a SP separated VAR=VAL pairs to define
# default environment variables to be passed when a pager is spawned, e.g.
#
@@ -473,7 +478,11 @@
#
# Define DEVELOPER to enable more compiler warnings. Compiler version
# and family are auto detected, but could be overridden by defining
-# COMPILER_FEATURES (see config.mak.dev)
+# COMPILER_FEATURES (see config.mak.dev). You can still set
+# CFLAGS="..." in combination with DEVELOPER enables, whether that's
+# for tweaking something unrelated (e.g. optimization level), or for
+# selectively overriding something DEVELOPER or one of the DEVOPTS
+# (see just below) brings in.
#
# When DEVELOPER is set, DEVOPTS can be used to control compiler
# options. This variable contains keywords separated by
@@ -500,17 +509,8 @@
@$(SHELL_PATH) ./GIT-VERSION-GEN
-include GIT-VERSION-FILE
-# CFLAGS and LDFLAGS are for the users to override from the command line.
-
-CFLAGS = -g -O2 -Wall
-LDFLAGS =
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
-STRIP ?= strip
-
-# Create as necessary, replace existing, make ranlib unneeded.
-ARFLAGS = rcs
-
+# Set our default configuration.
+#
# Among the variables below, these:
# gitexecdir
# template_dir
@@ -555,6 +555,7 @@
export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
+# Set our default programs
CC = cc
AR = ar
RM = rm -f
@@ -567,29 +568,14 @@
XGETTEXT = xgettext
MSGFMT = msgfmt
CURL_CONFIG = curl-config
-PTHREAD_LIBS = -lpthread
-PTHREAD_CFLAGS =
GCOV = gcov
+STRIP = strip
SPATCH = spatch
export TCL_PATH TCLTK_PATH
-# user customisation variable for 'sparse' target
-SPARSE_FLAGS ?=
-# internal/platform customisation variable for 'sparse'
-SP_EXTRA_FLAGS =
-
-SPATCH_FLAGS = --all-includes --patch .
-
-
-
-### --- END CONFIGURATION SECTION ---
-
-# Those must not be GNU-specific; they are shared with perl/ which may
-# be built by a different compiler. (Note that this is an artifact now
-# but it still might be nice to keep that distinction.)
-BASIC_CFLAGS = -I.
-BASIC_LDFLAGS =
+# Set our default LIBS variables
+PTHREAD_LIBS = -lpthread
# Guard against environment variables
BUILTIN_OBJS =
@@ -605,6 +591,7 @@
LIB_OBJS =
PROGRAM_OBJS =
PROGRAMS =
+EXCLUDED_PROGRAMS =
SCRIPT_PERL =
SCRIPT_PYTHON =
SCRIPT_SH =
@@ -626,17 +613,13 @@
SCRIPT_SH += git-merge-resolve.sh
SCRIPT_SH += git-mergetool.sh
SCRIPT_SH += git-quiltimport.sh
-SCRIPT_SH += git-legacy-rebase.sh
-SCRIPT_SH += git-remote-testgit.sh
+SCRIPT_SH += git-legacy-stash.sh
SCRIPT_SH += git-request-pull.sh
-SCRIPT_SH += git-stash.sh
SCRIPT_SH += git-submodule.sh
SCRIPT_SH += git-web--browse.sh
SCRIPT_LIB += git-mergetool--lib
SCRIPT_LIB += git-parse-remote
-SCRIPT_LIB += git-rebase--am
-SCRIPT_LIB += git-rebase--common
SCRIPT_LIB += git-rebase--preserve-merges
SCRIPT_LIB += git-sh-setup
SCRIPT_LIB += git-sh-i18n
@@ -651,17 +634,11 @@
SCRIPT_PYTHON += git-p4.py
-NO_INSTALL += git-remote-testgit
-
# Generated files for scripts
SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
-SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
-SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
-SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
-
# Individual rules to allow e.g.
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
# from subdirectories like contrib/*/
@@ -671,11 +648,11 @@
build-python-script: $(SCRIPT_PYTHON_GEN)
.PHONY: install-perl-script install-sh-script install-python-script
-install-sh-script: $(SCRIPT_SH_INS)
+install-sh-script: $(SCRIPT_SH_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-install-perl-script: $(SCRIPT_PERL_INS)
+install-perl-script: $(SCRIPT_PERL_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-install-python-script: $(SCRIPT_PYTHON_INS)
+install-python-script: $(SCRIPT_PYTHON_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
.PHONY: clean-perl-script clean-sh-script clean-python-script
@@ -686,9 +663,9 @@
clean-python-script:
$(RM) $(SCRIPT_PYTHON_GEN)
-SCRIPTS = $(SCRIPT_SH_INS) \
- $(SCRIPT_PERL_INS) \
- $(SCRIPT_PYTHON_INS) \
+SCRIPTS = $(SCRIPT_SH_GEN) \
+ $(SCRIPT_PERL_GEN) \
+ $(SCRIPT_PYTHON_GEN) \
git-instaweb
ETAGS_TARGET = TAGS
@@ -727,6 +704,7 @@
TEST_BUILTINS_OBJS += test-ctype.o
TEST_BUILTINS_OBJS += test-date.o
TEST_BUILTINS_OBJS += test-delta.o
+TEST_BUILTINS_OBJS += test-dir-iterator.o
TEST_BUILTINS_OBJS += test-drop-caches.o
TEST_BUILTINS_OBJS += test-dump-cache-tree.o
TEST_BUILTINS_OBJS += test-dump-fsmonitor.o
@@ -734,6 +712,7 @@
TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
TEST_BUILTINS_OBJS += test-example-decorate.o
TEST_BUILTINS_OBJS += test-genrandom.o
+TEST_BUILTINS_OBJS += test-genzeros.o
TEST_BUILTINS_OBJS += test-hash.o
TEST_BUILTINS_OBJS += test-hashmap.o
TEST_BUILTINS_OBJS += test-hash-speed.o
@@ -743,6 +722,7 @@
TEST_BUILTINS_OBJS += test-match-trees.o
TEST_BUILTINS_OBJS += test-mergesort.o
TEST_BUILTINS_OBJS += test-mktemp.o
+TEST_BUILTINS_OBJS += test-oidmap.o
TEST_BUILTINS_OBJS += test-online-cpus.o
TEST_BUILTINS_OBJS += test-parse-options.o
TEST_BUILTINS_OBJS += test-path-utils.o
@@ -757,6 +737,7 @@
TEST_BUILTINS_OBJS += test-revision-walking.o
TEST_BUILTINS_OBJS += test-run-command.o
TEST_BUILTINS_OBJS += test-scrap-cache-tree.o
+TEST_BUILTINS_OBJS += test-serve-v2.o
TEST_BUILTINS_OBJS += test-sha1.o
TEST_BUILTINS_OBJS += test-sha1-array.o
TEST_BUILTINS_OBJS += test-sha256.o
@@ -766,6 +747,7 @@
TEST_BUILTINS_OBJS += test-submodule-config.o
TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o
TEST_BUILTINS_OBJS += test-subprocess.o
+TEST_BUILTINS_OBJS += test-trace2.o
TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
TEST_BUILTINS_OBJS += test-xml-encode.o
TEST_BUILTINS_OBJS += test-wildmatch.o
@@ -791,9 +773,11 @@
BUILT_INS += git-fsck-objects$X
BUILT_INS += git-init$X
BUILT_INS += git-merge-subtree$X
+BUILT_INS += git-restore$X
BUILT_INS += git-show$X
BUILT_INS += git-stage$X
BUILT_INS += git-status$X
+BUILT_INS += git-switch$X
BUILT_INS += git-whatchanged$X
# what 'all' will build and 'install' will install in gitexecdir,
@@ -834,11 +818,12 @@
GENERATED_H += command-list.h
-LIB_H = $(shell $(FIND) . \
+LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
+ $(FIND) . \
-name .git -prune -o \
-name t -prune -o \
-name Documentation -prune -o \
- -name '*.h' -print)
+ -name '*.h' -print))
LIB_OBJS += abspath.o
LIB_OBJS += advice.o
@@ -899,7 +884,6 @@
LIB_OBJS += ewah/ewah_rlw.o
LIB_OBJS += exec-cmd.o
LIB_OBJS += fetch-negotiator.o
-LIB_OBJS += fetch-object.o
LIB_OBJS += fetch-pack.o
LIB_OBJS += fsck.o
LIB_OBJS += fsmonitor.o
@@ -963,6 +947,7 @@
LIB_OBJS += pretty.o
LIB_OBJS += prio-queue.o
LIB_OBJS += progress.o
+LIB_OBJS += promisor-remote.o
LIB_OBJS += prompt.o
LIB_OBJS += protocol.o
LIB_OBJS += quote.o
@@ -980,6 +965,7 @@
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
LIB_OBJS += replace-object.o
+LIB_OBJS += repo-settings.o
LIB_OBJS += repository.o
LIB_OBJS += rerere.o
LIB_OBJS += resolve-undo.o
@@ -1010,6 +996,17 @@
LIB_OBJS += thread-utils.o
LIB_OBJS += tmp-objdir.o
LIB_OBJS += trace.o
+LIB_OBJS += trace2.o
+LIB_OBJS += trace2/tr2_cfg.o
+LIB_OBJS += trace2/tr2_cmd_name.o
+LIB_OBJS += trace2/tr2_dst.o
+LIB_OBJS += trace2/tr2_sid.o
+LIB_OBJS += trace2/tr2_sysenv.o
+LIB_OBJS += trace2/tr2_tbuf.o
+LIB_OBJS += trace2/tr2_tgt_event.o
+LIB_OBJS += trace2/tr2_tgt_normal.o
+LIB_OBJS += trace2/tr2_tgt_perf.o
+LIB_OBJS += trace2/tr2_tls.o
LIB_OBJS += trailer.o
LIB_OBJS += transport.o
LIB_OBJS += transport-helper.o
@@ -1067,6 +1064,7 @@
BUILTIN_OBJS += builtin/diff-tree.o
BUILTIN_OBJS += builtin/diff.o
BUILTIN_OBJS += builtin/difftool.o
+BUILTIN_OBJS += builtin/env--helper.o
BUILTIN_OBJS += builtin/fast-export.o
BUILTIN_OBJS += builtin/fetch-pack.o
BUILTIN_OBJS += builtin/fetch.o
@@ -1111,7 +1109,6 @@
BUILTIN_OBJS += builtin/range-diff.o
BUILTIN_OBJS += builtin/read-tree.o
BUILTIN_OBJS += builtin/rebase.o
-BUILTIN_OBJS += builtin/rebase--interactive.o
BUILTIN_OBJS += builtin/receive-pack.o
BUILTIN_OBJS += builtin/reflog.o
BUILTIN_OBJS += builtin/remote.o
@@ -1126,11 +1123,11 @@
BUILTIN_OBJS += builtin/revert.o
BUILTIN_OBJS += builtin/rm.o
BUILTIN_OBJS += builtin/send-pack.o
-BUILTIN_OBJS += builtin/serve.o
BUILTIN_OBJS += builtin/shortlog.o
BUILTIN_OBJS += builtin/show-branch.o
BUILTIN_OBJS += builtin/show-index.o
BUILTIN_OBJS += builtin/show-ref.o
+BUILTIN_OBJS += builtin/stash.o
BUILTIN_OBJS += builtin/stripspace.o
BUILTIN_OBJS += builtin/submodule--helper.o
BUILTIN_OBJS += builtin/symbolic-ref.o
@@ -1158,6 +1155,29 @@
DC_SHA1_SUBMODULE = auto
endif
+# Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
+# tweaked by config.* below as well as the command-line, both of
+# which'll override these defaults.
+CFLAGS = -g -O2 -Wall
+LDFLAGS =
+CC_LD_DYNPATH = -Wl,-rpath,
+BASIC_CFLAGS = -I.
+BASIC_LDFLAGS =
+
+# library flags
+ARFLAGS = rcs
+PTHREAD_CFLAGS =
+
+# For the 'sparse' target
+SPARSE_FLAGS ?=
+SP_EXTRA_FLAGS =
+
+# For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will
+# usually result in less CPU usage at the cost of higher peak memory.
+# Setting it to 0 will feed all files in a single spatch invocation.
+SPATCH_FLAGS = --all-includes --patch .
+SPATCH_BATCH_SIZE = 1
+
include config.mak.uname
-include config.mak.autogen
-include config.mak
@@ -1166,6 +1186,9 @@
include config.mak.dev
endif
+ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ALL_LDFLAGS = $(LDFLAGS)
+
comma := ,
empty :=
space := $(empty) $(empty)
@@ -1176,6 +1199,7 @@
BASIC_CFLAGS += -fno-omit-frame-pointer
ifneq ($(filter undefined,$(SANITIZERS)),)
BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
+BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
endif
ifneq ($(filter leak,$(SANITIZERS)),)
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
@@ -1217,7 +1241,7 @@
ifdef SANE_TOOL_PATH
SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
-BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix $(SANE_TOOL_PATH_SQ)|'
+BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
PATH := $(SANE_TOOL_PATH):${PATH}
else
BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
@@ -1267,16 +1291,6 @@
PTHREAD_LIBS =
endif
-ifndef CC_LD_DYNPATH
- ifdef NO_R_TO_GCC_LINKER
- # Some gcc does not accept and pass -R to the linker to specify
- # the runtime dynamic library path.
- CC_LD_DYNPATH = -Wl,-rpath,
- else
- CC_LD_DYNPATH = -R
- endif
-endif
-
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
@@ -1319,6 +1333,7 @@
REMOTE_CURL_PRIMARY =
REMOTE_CURL_ALIASES =
REMOTE_CURL_NAMES =
+ EXCLUDED_PROGRAMS += git-http-fetch git-http-push
else
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -1343,7 +1358,11 @@
ifeq "$(curl_check)" "070908"
ifndef NO_EXPAT
PROGRAM_OBJS += http-push.o
+ else
+ EXCLUDED_PROGRAMS += git-http-push
endif
+ else
+ EXCLUDED_PROGRAMS += git-http-push
endif
curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
ifeq "$(curl_check)" "072200"
@@ -1415,6 +1434,9 @@
EXTLIBS += $(ICONV_LINK) -liconv
endif
endif
+ifdef ICONV_OMITS_BOM
+ BASIC_CFLAGS += -DICONV_OMITS_BOM
+endif
ifdef NEEDS_LIBGEN
EXTLIBS += -lgen
endif
@@ -1586,7 +1608,10 @@
LIB_OBJS += compat/inet_pton.o
BASIC_CFLAGS += -DNO_INET_PTON
endif
-ifndef NO_UNIX_SOCKETS
+ifdef NO_UNIX_SOCKETS
+ BASIC_CFLAGS += -DNO_UNIX_SOCKETS
+ EXCLUDED_PROGRAMS += git-credential-cache git-credential-cache--daemon
+else
LIB_OBJS += unix-socket.o
PROGRAM_OBJS += credential-cache.o
PROGRAM_OBJS += credential-cache--daemon.o
@@ -1800,6 +1825,16 @@
BASIC_CFLAGS += -DHAVE_WPGMPTR
endif
+ifdef FILENO_IS_A_MACRO
+ COMPAT_CFLAGS += -DFILENO_IS_A_MACRO
+ COMPAT_OBJS += compat/fileno.o
+endif
+
+ifdef NEED_ACCESS_ROOT_HANDLER
+ COMPAT_CFLAGS += -DNEED_ACCESS_ROOT_HANDLER
+ COMPAT_OBJS += compat/access.o
+endif
+
ifeq ($(TCLTK_PATH),)
NO_TCLTK = NoThanks
endif
@@ -2100,7 +2135,9 @@
command-list.h: generate-cmdlist.sh command-list.txt
command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
- $(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
+ $(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
+ $(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
+ command-list.txt >$@+ && mv $@+ $@
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
@@ -2348,7 +2385,7 @@
# should _not_ be included here, since they are necessary even when
# building an object for the first time.
-$(OBJECTS): $(LIB_H)
+$(OBJECTS): $(LIB_H) $(GENERATED_H)
endif
exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX
@@ -2433,6 +2470,14 @@
export DEFAULT_EDITOR DEFAULT_PAGER
+Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
+ @EXCLUDED='EXCLUDED_PROGRAMS := $(EXCLUDED_PROGRAMS)'; \
+ if test x"$$EXCLUDED" != \
+ x"`cat Documentation/GIT-EXCLUDED-PROGRAMS 2>/dev/null`" ; then \
+ echo >&2 " * new documentation flags"; \
+ echo "$$EXCLUDED" >Documentation/GIT-EXCLUDED-PROGRAMS; \
+ fi
+
.PHONY: doc man man-perl html info pdf
doc: man-perl
$(MAKE) -C Documentation all
@@ -2671,13 +2716,12 @@
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
-all:: $(NO_INSTALL)
bin-wrappers/%: wrap-for-bin.sh
@mkdir -p bin-wrappers
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
- -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
+ -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%$(X),$(@F))$(patsubst git%,$(X),$(filter $(@F),$(BINDIR_PROGRAMS_NEED_X)))|' < $< > $@ && \
chmod +x $@
# GNU make supports exporting all variables by "export" without parameters.
@@ -2721,7 +2765,10 @@
sparse: $(SP_OBJ)
GEN_HDRS := command-list.h unicode-width.h
-EXCEPT_HDRS := $(GEN_HDRS) compat% xdiff%
+EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
+ifndef GCRYPT_SHA256
+ EXCEPT_HDRS += sha256/gcrypt.h
+endif
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
@@ -2754,12 +2801,14 @@
%.cocci.patch: %.cocci $(COCCI_SOURCES)
@echo ' ' SPATCH $<; \
- ret=0; \
- for f in $(COCCI_SOURCES); do \
- $(SPATCH) --sp-file $< $$f $(SPATCH_FLAGS) || \
- { ret=$$?; break; }; \
- done >$@+ 2>$@.log; \
- if test $$ret != 0; \
+ if test $(SPATCH_BATCH_SIZE) = 0; then \
+ limit=; \
+ else \
+ limit='-n $(SPATCH_BATCH_SIZE)'; \
+ fi; \
+ if ! echo $(COCCI_SOURCES) | xargs $$limit \
+ $(SPATCH) --sp-file $< $(SPATCH_FLAGS) \
+ >$@+ 2>$@.log; \
then \
cat $@.log; \
exit 1; \
@@ -2815,6 +2864,33 @@
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+ifdef MSVC
+ # We DO NOT install the individual foo.o.pdb files because they
+ # have already been rolled up into the exe's pdb file.
+ # We DO NOT have pdb files for the builtin commands (like git-status.exe)
+ # because it is just a copy/hardlink of git.exe, rather than a unique binary.
+ $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ifndef DEBUG
+ $(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+else
+ $(INSTALL) $(vcpkg_dbg_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(vcpkg_dbg_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+endif
+endif
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
@@ -2955,7 +3031,7 @@
artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
- $(NO_INSTALL) $(MOFILES)
+ $(MOFILES)
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
test -n "$(ARTIFACTS_DIRECTORY)"
@@ -3004,7 +3080,7 @@
$(RM) $(OBJECTS)
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
- $(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
+ $(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS)
$(RM) -r bin-wrappers $(dep_dirs)
$(RM) -r po/build/
@@ -3013,6 +3089,7 @@
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
$(MAKE) -C Documentation/ clean
+ $(RM) Documentation/GIT-EXCLUDED-PROGRAMS
ifndef NO_PERL
$(MAKE) -C gitweb clean
$(RM) -r perl/build/
@@ -3026,6 +3103,19 @@
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
$(RM) GIT-USER-AGENT GIT-PREFIX
$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-VARS
+ifdef MSVC
+ $(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS))
+ $(RM) $(patsubst %.exe,%.pdb,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.pdb,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.pdb,$(TEST_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(TEST_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(TEST_PROGRAMS))
+ $(RM) compat/vcbuild/MSVC-DEFS-GEN
+endif
.PHONY: all install profile-clean cocciclean clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
@@ -3042,13 +3132,13 @@
.PHONY: check-docs
check-docs::
$(MAKE) -C Documentation lint-docs
- @(for v in $(ALL_COMMANDS); \
+ @(for v in $(patsubst %$X,%,$(ALL_COMMANDS)); \
do \
case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
git-merge-resolve | git-merge-subtree | \
git-fsck-objects | git-init-db | \
- git-remote-* | git-stage | \
+ git-remote-* | git-stage | git-legacy-* | \
git-?*--?* ) continue ;; \
esac ; \
test -f "Documentation/$$v.txt" || \
@@ -3063,15 +3153,16 @@
( \
sed -e '1,/^### command list/d' \
-e '/^#/d' \
+ -e '/guide$$/d' \
-e 's/[ ].*//' \
-e 's/^/listed /' command-list.txt; \
$(MAKE) -C Documentation print-man1 | \
grep '\.txt$$' | \
- sed -e 's|Documentation/|documented |' \
+ sed -e 's|^|documented |' \
-e 's/\.txt//'; \
) | while read how cmd; \
do \
- case " $(ALL_COMMANDS) " in \
+ case " $(patsubst %$X,%,$(ALL_COMMANDS) $(EXCLUDED_PROGRAMS)) " in \
*" $$cmd "*) ;; \
*) echo "removed but $$how: $$cmd" ;; \
esac; \
@@ -3114,6 +3205,11 @@
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
DEFAULT_TEST_TARGET=test -j1 test
+coverage-prove: coverage-clean-results coverage-compile
+ $(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
+ DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="$(GIT_PROVE_OPTS) -j1" \
+ -j1 test
+
coverage-report:
$(QUIET_GCOV)for dir in $(object_dirs); do \
$(GCOV) $(GCOVFLAGS) --object-directory=$$dir $$dir*.c || exit; \
diff --git a/README.md b/README.md
index 764c480..e1d2b82 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://dev.azure.com/git/git/_build/latest?definitionId=2)
+[](https://dev.azure.com/git/git/_build/latest?definitionId=11)
Git - fast, scalable, distributed revision control system
=========================================================
@@ -19,7 +19,7 @@
See [Documentation/gittutorial.txt][] to get started, then see
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and
-Documentation/git-<commandname>.txt for documentation of each command.
+`Documentation/git-<commandname>.txt` for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with `man gittutorial` or `git help tutorial`, and the
documentation of each command with `man git-<commandname>` or `git help
diff --git a/RelNotes b/RelNotes
index 31e2135..fc657e7 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.21.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.24.0.txt
\ No newline at end of file
diff --git a/advice.c b/advice.c
index 567209a..3ee0ee2 100644
--- a/advice.c
+++ b/advice.c
@@ -3,6 +3,7 @@
#include "color.h"
#include "help.h"
+int advice_fetch_show_forced_updates = 1;
int advice_push_update_rejected = 1;
int advice_push_non_ff_current = 1;
int advice_push_non_ff_matching = 1;
@@ -12,9 +13,11 @@
int advice_push_unqualified_ref_name = 1;
int advice_status_hints = 1;
int advice_status_u_option = 1;
+int advice_status_ahead_behind_warning = 1;
int advice_commit_before_merge = 1;
int advice_reset_quiet_warning = 1;
int advice_resolve_conflict = 1;
+int advice_sequencer_in_use = 1;
int advice_implicit_identity = 1;
int advice_detached_head = 1;
int advice_set_upstream_failure = 1;
@@ -26,6 +29,7 @@
int advice_waiting_for_editor = 1;
int advice_graft_file_deprecated = 1;
int advice_checkout_ambiguous_remote_branch_name = 1;
+int advice_nested_tag = 1;
static int advice_use_color = -1;
static char advice_colors[][COLOR_MAXLEN] = {
@@ -58,6 +62,7 @@
const char *name;
int *preference;
} advice_config[] = {
+ { "fetchShowForcedUpdates", &advice_fetch_show_forced_updates },
{ "pushUpdateRejected", &advice_push_update_rejected },
{ "pushNonFFCurrent", &advice_push_non_ff_current },
{ "pushNonFFMatching", &advice_push_non_ff_matching },
@@ -67,9 +72,11 @@
{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
{ "statusHints", &advice_status_hints },
{ "statusUoption", &advice_status_u_option },
+ { "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
{ "commitBeforeMerge", &advice_commit_before_merge },
{ "resetQuiet", &advice_reset_quiet_warning },
{ "resolveConflict", &advice_resolve_conflict },
+ { "sequencerInUse", &advice_sequencer_in_use },
{ "implicitIdentity", &advice_implicit_identity },
{ "detachedHead", &advice_detached_head },
{ "setupStreamFailure", &advice_set_upstream_failure },
@@ -81,6 +88,7 @@
{ "waitingForEditor", &advice_waiting_for_editor },
{ "graftFileDeprecated", &advice_graft_file_deprecated },
{ "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
+ { "nestedTag", &advice_nested_tag },
/* make this an alias for backward compatibility */
{ "pushNonFastForward", &advice_push_update_rejected }
@@ -191,13 +199,22 @@
void detach_advice(const char *new_name)
{
const char *fmt =
- _("Note: checking out '%s'.\n\n"
+ _("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 performing another checkout.\n\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 -b with the checkout command again. Example:\n\n"
- " git checkout -b <new-branch-name>\n\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");
fprintf(stderr, fmt, new_name);
}
diff --git a/advice.h b/advice.h
index f875f8c..d015404 100644
--- a/advice.h
+++ b/advice.h
@@ -3,6 +3,7 @@
#include "git-compat-util.h"
+extern int advice_fetch_show_forced_updates;
extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_matching;
@@ -12,9 +13,11 @@
extern int advice_push_unqualified_ref_name;
extern int advice_status_hints;
extern int advice_status_u_option;
+extern int advice_status_ahead_behind_warning;
extern int advice_commit_before_merge;
extern int advice_reset_quiet_warning;
extern int advice_resolve_conflict;
+extern int advice_sequencer_in_use;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
@@ -26,12 +29,13 @@
extern int advice_waiting_for_editor;
extern int advice_graft_file_deprecated;
extern int advice_checkout_ambiguous_remote_branch_name;
+extern int advice_nested_tag;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
-extern void NORETURN die_resolve_conflict(const char *me);
+void NORETURN die_resolve_conflict(const char *me);
void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);
diff --git a/apply.c b/apply.c
index 892ede5..57a61f2 100644
--- a/apply.c
+++ b/apply.c
@@ -22,6 +22,12 @@
#include "rerere.h"
#include "apply.h"
+struct gitdiff_data {
+ struct strbuf *root;
+ int linenr;
+ int p_value;
+};
+
static void git_apply_config(void)
{
git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
@@ -56,6 +62,10 @@
state->ws_error_action = correct_ws_error;
return 0;
}
+ /*
+ * Please update $__git_whitespacelist in git-completion.bash
+ * when you add new options.
+ */
return error(_("unrecognized whitespace option '%s'"), option);
}
@@ -197,40 +207,6 @@
#define BINARY_DELTA_DEFLATED 1
#define BINARY_LITERAL_DEFLATED 2
-/*
- * This represents a "patch" to a file, both metainfo changes
- * such as creation/deletion, filemode and content changes represented
- * as a series of fragments.
- */
-struct patch {
- char *new_name, *old_name, *def_name;
- unsigned int old_mode, new_mode;
- int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
- int rejected;
- unsigned ws_rule;
- int lines_added, lines_deleted;
- int score;
- int extension_linenr; /* first line specifying delete/new/rename/copy */
- unsigned int is_toplevel_relative:1;
- unsigned int inaccurate_eof:1;
- unsigned int is_binary:1;
- unsigned int is_copy:1;
- unsigned int is_rename:1;
- unsigned int recount:1;
- unsigned int conflicted_threeway:1;
- unsigned int direct_to_threeway:1;
- unsigned int crlf_in_old:1;
- struct fragment *fragments;
- char *result;
- size_t resultsize;
- char old_oid_prefix[GIT_MAX_HEXSZ + 1];
- char new_oid_prefix[GIT_MAX_HEXSZ + 1];
- struct patch *next;
-
- /* three-way fallback result */
- struct object_id threeway_stage[3];
-};
-
static void free_fragment_list(struct fragment *list)
{
while (list) {
@@ -465,7 +441,7 @@
return name;
}
-static char *find_name_gnu(struct apply_state *state,
+static char *find_name_gnu(struct strbuf *root,
const char *line,
int p_value)
{
@@ -474,7 +450,7 @@
/*
* Proposed "new-style" GNU patch/diff format; see
- * http://marc.info/?l=git&m=112927316408690&w=2
+ * https://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
*/
if (unquote_c_style(&name, line, NULL)) {
strbuf_release(&name);
@@ -491,8 +467,8 @@
}
strbuf_remove(&name, 0, cp - name.buf);
- if (state->root.len)
- strbuf_insert(&name, 0, state->root.buf, state->root.len);
+ if (root->len)
+ strbuf_insert(&name, 0, root->buf, root->len);
return squash_slash(strbuf_detach(&name, NULL));
}
@@ -655,7 +631,7 @@
return line + len - end;
}
-static char *find_name_common(struct apply_state *state,
+static char *find_name_common(struct strbuf *root,
const char *line,
const char *def,
int p_value,
@@ -698,30 +674,30 @@
return squash_slash(xstrdup(def));
}
- if (state->root.len) {
- char *ret = xstrfmt("%s%.*s", state->root.buf, len, start);
+ if (root->len) {
+ char *ret = xstrfmt("%s%.*s", root->buf, len, start);
return squash_slash(ret);
}
return squash_slash(xmemdupz(start, len));
}
-static char *find_name(struct apply_state *state,
+static char *find_name(struct strbuf *root,
const char *line,
char *def,
int p_value,
int terminate)
{
if (*line == '"') {
- char *name = find_name_gnu(state, line, p_value);
+ char *name = find_name_gnu(root, line, p_value);
if (name)
return name;
}
- return find_name_common(state, line, def, p_value, NULL, terminate);
+ return find_name_common(root, line, def, p_value, NULL, terminate);
}
-static char *find_name_traditional(struct apply_state *state,
+static char *find_name_traditional(struct strbuf *root,
const char *line,
char *def,
int p_value)
@@ -730,7 +706,7 @@
size_t date_len;
if (*line == '"') {
- char *name = find_name_gnu(state, line, p_value);
+ char *name = find_name_gnu(root, line, p_value);
if (name)
return name;
}
@@ -738,10 +714,10 @@
len = strchrnul(line, '\n') - line;
date_len = diff_timestamp_len(line, len);
if (!date_len)
- return find_name_common(state, line, def, p_value, NULL, TERM_TAB);
+ return find_name_common(root, line, def, p_value, NULL, TERM_TAB);
len -= date_len;
- return find_name_common(state, line, def, p_value, line + len, 0);
+ return find_name_common(root, line, def, p_value, line + len, 0);
}
/*
@@ -755,7 +731,7 @@
if (is_dev_null(nameline))
return -1;
- name = find_name_traditional(state, nameline, NULL, 0);
+ name = find_name_traditional(&state->root, nameline, NULL, 0);
if (!name)
return -1;
cp = strchr(name, '/');
@@ -879,17 +855,17 @@
if (is_dev_null(first)) {
patch->is_new = 1;
patch->is_delete = 0;
- name = find_name_traditional(state, second, NULL, state->p_value);
+ name = find_name_traditional(&state->root, second, NULL, state->p_value);
patch->new_name = name;
} else if (is_dev_null(second)) {
patch->is_new = 0;
patch->is_delete = 1;
- name = find_name_traditional(state, first, NULL, state->p_value);
+ name = find_name_traditional(&state->root, first, NULL, state->p_value);
patch->old_name = name;
} else {
char *first_name;
- first_name = find_name_traditional(state, first, NULL, state->p_value);
- name = find_name_traditional(state, second, first_name, state->p_value);
+ first_name = find_name_traditional(&state->root, first, NULL, state->p_value);
+ name = find_name_traditional(&state->root, second, first_name, state->p_value);
free(first_name);
if (has_epoch_timestamp(first)) {
patch->is_new = 1;
@@ -910,7 +886,7 @@
return 0;
}
-static int gitdiff_hdrend(struct apply_state *state,
+static int gitdiff_hdrend(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -929,14 +905,14 @@
#define DIFF_OLD_NAME 0
#define DIFF_NEW_NAME 1
-static int gitdiff_verify_name(struct apply_state *state,
+static int gitdiff_verify_name(struct gitdiff_data *state,
const char *line,
int isnull,
char **name,
int side)
{
if (!*name && !isnull) {
- *name = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ *name = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
return 0;
}
@@ -945,7 +921,7 @@
if (isnull)
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr);
- another = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ another = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
if (!another || strcmp(another, *name)) {
free(another);
return error((side == DIFF_NEW_NAME) ?
@@ -961,7 +937,7 @@
return 0;
}
-static int gitdiff_oldname(struct apply_state *state,
+static int gitdiff_oldname(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -970,7 +946,7 @@
DIFF_OLD_NAME);
}
-static int gitdiff_newname(struct apply_state *state,
+static int gitdiff_newname(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -988,21 +964,21 @@
return 0;
}
-static int gitdiff_oldmode(struct apply_state *state,
+static int gitdiff_oldmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->old_mode);
}
-static int gitdiff_newmode(struct apply_state *state,
+static int gitdiff_newmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->new_mode);
}
-static int gitdiff_delete(struct apply_state *state,
+static int gitdiff_delete(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1012,7 +988,7 @@
return gitdiff_oldmode(state, line, patch);
}
-static int gitdiff_newfile(struct apply_state *state,
+static int gitdiff_newfile(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1022,47 +998,47 @@
return gitdiff_newmode(state, line, patch);
}
-static int gitdiff_copysrc(struct apply_state *state,
+static int gitdiff_copysrc(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_copy = 1;
free(patch->old_name);
- patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_copydst(struct apply_state *state,
+static int gitdiff_copydst(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_copy = 1;
free(patch->new_name);
- patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamesrc(struct apply_state *state,
+static int gitdiff_renamesrc(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_rename = 1;
free(patch->old_name);
- patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamedst(struct apply_state *state,
+static int gitdiff_renamedst(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_rename = 1;
free(patch->new_name);
- patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_similarity(struct apply_state *state,
+static int gitdiff_similarity(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1072,7 +1048,7 @@
return 0;
}
-static int gitdiff_dissimilarity(struct apply_state *state,
+static int gitdiff_dissimilarity(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1082,7 +1058,7 @@
return 0;
}
-static int gitdiff_index(struct apply_state *state,
+static int gitdiff_index(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1122,7 +1098,7 @@
* This is normal for a diff that doesn't change anything: we'll fall through
* into the next diff. Tell the parser to break out.
*/
-static int gitdiff_unrecognized(struct apply_state *state,
+static int gitdiff_unrecognized(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
@@ -1133,17 +1109,17 @@
* Skip p_value leading components from "line"; as we do not accept
* absolute paths, return NULL in that case.
*/
-static const char *skip_tree_prefix(struct apply_state *state,
+static const char *skip_tree_prefix(int p_value,
const char *line,
int llen)
{
int nslash;
int i;
- if (!state->p_value)
+ if (!p_value)
return (llen && line[0] == '/') ? NULL : line;
- nslash = state->p_value;
+ nslash = p_value;
for (i = 0; i < llen; i++) {
int ch = line[i];
if (ch == '/' && --nslash <= 0)
@@ -1160,7 +1136,7 @@
* creation or deletion of an empty file. In any of these cases,
* both sides are the same name under a/ and b/ respectively.
*/
-static char *git_header_name(struct apply_state *state,
+static char *git_header_name(int p_value,
const char *line,
int llen)
{
@@ -1180,7 +1156,7 @@
goto free_and_fail1;
/* strip the a/b prefix including trailing slash */
- cp = skip_tree_prefix(state, first.buf, first.len);
+ cp = skip_tree_prefix(p_value, first.buf, first.len);
if (!cp)
goto free_and_fail1;
strbuf_remove(&first, 0, cp - first.buf);
@@ -1197,7 +1173,7 @@
if (*second == '"') {
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail1;
- cp = skip_tree_prefix(state, sp.buf, sp.len);
+ cp = skip_tree_prefix(p_value, sp.buf, sp.len);
if (!cp)
goto free_and_fail1;
/* They must match, otherwise ignore */
@@ -1208,7 +1184,7 @@
}
/* unquoted second */
- cp = skip_tree_prefix(state, second, line + llen - second);
+ cp = skip_tree_prefix(p_value, second, line + llen - second);
if (!cp)
goto free_and_fail1;
if (line + llen - cp != first.len ||
@@ -1223,7 +1199,7 @@
}
/* unquoted first name */
- name = skip_tree_prefix(state, line, llen);
+ name = skip_tree_prefix(p_value, line, llen);
if (!name)
return NULL;
@@ -1239,7 +1215,7 @@
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail2;
- np = skip_tree_prefix(state, sp.buf, sp.len);
+ np = skip_tree_prefix(p_value, sp.buf, sp.len);
if (!np)
goto free_and_fail2;
@@ -1283,7 +1259,7 @@
*/
if (!name[len + 1])
return NULL; /* no postimage name */
- second = skip_tree_prefix(state, name + len + 1,
+ second = skip_tree_prefix(p_value, name + len + 1,
line_len - (len + 1));
if (!second)
return NULL;
@@ -1298,26 +1274,28 @@
}
}
-static int check_header_line(struct apply_state *state, struct patch *patch)
+static int check_header_line(int linenr, struct patch *patch)
{
int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +
(patch->is_rename == 1) + (patch->is_copy == 1);
if (extensions > 1)
return error(_("inconsistent header lines %d and %d"),
- patch->extension_linenr, state->linenr);
+ patch->extension_linenr, linenr);
if (extensions && !patch->extension_linenr)
- patch->extension_linenr = state->linenr;
+ patch->extension_linenr = linenr;
return 0;
}
-/* Verify that we recognize the lines following a git header */
-static int parse_git_header(struct apply_state *state,
- const char *line,
- int len,
- unsigned int size,
- struct patch *patch)
+int parse_git_diff_header(struct strbuf *root,
+ int *linenr,
+ int p_value,
+ const char *line,
+ int len,
+ unsigned int size,
+ struct patch *patch)
{
unsigned long offset;
+ struct gitdiff_data parse_hdr_state;
/* A git diff has explicit new/delete information, so we don't guess */
patch->is_new = 0;
@@ -1329,20 +1307,24 @@
* or removing or adding empty files), so we get
* the default name from the header.
*/
- patch->def_name = git_header_name(state, line, len);
- if (patch->def_name && state->root.len) {
- char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);
+ patch->def_name = git_header_name(p_value, line, len);
+ if (patch->def_name && root->len) {
+ char *s = xstrfmt("%s%s", root->buf, patch->def_name);
free(patch->def_name);
patch->def_name = s;
}
line += len;
size -= len;
- state->linenr++;
- for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {
+ (*linenr)++;
+ parse_hdr_state.root = root;
+ parse_hdr_state.linenr = *linenr;
+ parse_hdr_state.p_value = p_value;
+
+ for (offset = len ; size > 0 ; offset += len, size -= len, line += len, (*linenr)++) {
static const struct opentry {
const char *str;
- int (*fn)(struct apply_state *, const char *, struct patch *);
+ int (*fn)(struct gitdiff_data *, const char *, struct patch *);
} optable[] = {
{ "@@ -", gitdiff_hdrend },
{ "--- ", gitdiff_oldname },
@@ -1373,10 +1355,10 @@
int res;
if (len < oplen || memcmp(p->str, line, oplen))
continue;
- res = p->fn(state, line + oplen, patch);
+ res = p->fn(&parse_hdr_state, line + oplen, patch);
if (res < 0)
return -1;
- if (check_header_line(state, patch))
+ if (check_header_line(*linenr, patch))
return -1;
if (res > 0)
return offset;
@@ -1557,7 +1539,9 @@
* or mode change, so we handle that specially
*/
if (!memcmp("diff --git ", line, 11)) {
- int git_hdr_len = parse_git_header(state, line, len, size, patch);
+ int git_hdr_len = parse_git_diff_header(&state->root, &state->linenr,
+ state->p_value, line, len,
+ size, patch);
if (git_hdr_len < 0)
return -128;
if (git_hdr_len <= len)
@@ -4306,7 +4290,7 @@
"created file '%s'"),
path);
}
- fill_stat_cache_info(ce, &st);
+ fill_stat_cache_info(state->repo->index, ce, &st);
}
if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
discard_cache_entry(ce);
@@ -4659,6 +4643,7 @@
struct patch *list = NULL, **listp = &list;
int skipped_patch = 0;
int res = 0;
+ int flush_attributes = 0;
state->patch_input_file = filename;
if (read_patch_file(&buf, fd) < 0)
@@ -4686,6 +4671,14 @@
patch_stats(state, patch);
*listp = patch;
listp = &patch->next;
+
+ if ((patch->new_name &&
+ ends_with_path_components(patch->new_name,
+ GITATTRIBUTES_FILE)) ||
+ (patch->old_name &&
+ ends_with_path_components(patch->old_name,
+ GITATTRIBUTES_FILE)))
+ flush_attributes = 1;
}
else {
if (state->apply_verbosity > verbosity_normal)
@@ -4762,6 +4755,8 @@
if (state->summary && state->apply_verbosity > verbosity_silent)
summary_patch_list(list);
+ if (flush_attributes)
+ reset_parsed_attributes();
end:
free_patch_list(list);
strbuf_release(&buf);
diff --git a/apply.h b/apply.h
index 5948348..a795193 100644
--- a/apply.h
+++ b/apply.h
@@ -117,6 +117,40 @@
int applied_after_fixing_ws;
};
+/*
+ * This represents a "patch" to a file, both metainfo changes
+ * such as creation/deletion, filemode and content changes represented
+ * as a series of fragments.
+ */
+struct patch {
+ char *new_name, *old_name, *def_name;
+ unsigned int old_mode, new_mode;
+ int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
+ int rejected;
+ unsigned ws_rule;
+ int lines_added, lines_deleted;
+ int score;
+ int extension_linenr; /* first line specifying delete/new/rename/copy */
+ unsigned int is_toplevel_relative:1;
+ unsigned int inaccurate_eof:1;
+ unsigned int is_binary:1;
+ unsigned int is_copy:1;
+ unsigned int is_rename:1;
+ unsigned int recount:1;
+ unsigned int conflicted_threeway:1;
+ unsigned int direct_to_threeway:1;
+ unsigned int crlf_in_old:1;
+ struct fragment *fragments;
+ char *result;
+ size_t resultsize;
+ char old_oid_prefix[GIT_MAX_HEXSZ + 1];
+ char new_oid_prefix[GIT_MAX_HEXSZ + 1];
+ struct patch *next;
+
+ /* three-way fallback result */
+ struct object_id threeway_stage[3];
+};
+
int apply_parse_options(int argc, const char **argv,
struct apply_state *state,
int *force_apply, int *options,
@@ -128,6 +162,20 @@
int check_apply_state(struct apply_state *state, int force_apply);
/*
+ * Parse a git diff header, starting at line. Fills the relevant
+ * metadata information in 'struct patch'.
+ *
+ * Returns -1 on failure, the length of the parsed header otherwise.
+ */
+int parse_git_diff_header(struct strbuf *root,
+ int *linenr,
+ int p_value,
+ const char *line,
+ int len,
+ unsigned int size,
+ struct patch *patch);
+
+/*
* Some aspects of the apply behavior are controlled by the following
* bits in the "options" parameter passed to apply_all_patches().
*/
diff --git a/archive-tar.c b/archive-tar.c
index 4aabd56..e16d3f7 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -142,19 +142,25 @@
* string and appends it to a struct strbuf.
*/
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
- const char *value, unsigned int valuelen)
+ const char *value, size_t valuelen)
{
- int len, tmp;
+ size_t orig_len = sb->len;
+ size_t len, tmp;
/* "%u %s=%s\n" */
len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
- for (tmp = len; tmp > 9; tmp /= 10)
+ for (tmp = 1; len / 10 >= tmp; tmp *= 10)
len++;
strbuf_grow(sb, len);
- strbuf_addf(sb, "%u %s=", len, keyword);
+ strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);
strbuf_add(sb, value, valuelen);
strbuf_addch(sb, '\n');
+
+ if (len != sb->len - orig_len)
+ BUG("pax extended header length miscalculated as %"PRIuMAX
+ ", should be %"PRIuMAX,
+ (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
}
/*
@@ -326,14 +332,15 @@
static void write_global_extended_header(struct archiver_args *args)
{
- const unsigned char *sha1 = args->commit_sha1;
+ const struct object_id *oid = args->commit_oid;
struct strbuf ext_header = STRBUF_INIT;
struct ustar_header header;
unsigned int mode;
- if (sha1)
+ if (oid)
strbuf_append_ext_header(&ext_header, "comment",
- sha1_to_hex(sha1), 40);
+ oid_to_hex(oid),
+ the_hash_algo->hexsz);
if (args->time > USTAR_MAX_MTIME) {
strbuf_append_ext_header_uint(&ext_header, "mtime",
args->time);
diff --git a/archive-zip.c b/archive-zip.c
index 155ee4a..4d66b5b 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -577,7 +577,7 @@
write_or_die(1, &locator64, ZIP64_DIR_TRAILER_LOCATOR_SIZE);
}
-static void write_zip_trailer(const unsigned char *sha1)
+static void write_zip_trailer(const struct object_id *oid)
{
struct zip_dir_trailer trailer;
int clamped = 0;
@@ -590,14 +590,14 @@
copy_le16_clamp(trailer.entries, zip_dir_entries, &clamped);
copy_le32(trailer.size, zip_dir.len);
copy_le32_clamp(trailer.offset, zip_offset, &clamped);
- copy_le16(trailer.comment_length, sha1 ? GIT_SHA1_HEXSZ : 0);
+ copy_le16(trailer.comment_length, oid ? the_hash_algo->hexsz : 0);
write_or_die(1, zip_dir.buf, zip_dir.len);
if (clamped)
write_zip64_trailer();
write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE);
- if (sha1)
- write_or_die(1, sha1_to_hex(sha1), GIT_SHA1_HEXSZ);
+ if (oid)
+ write_or_die(1, oid_to_hex(oid), the_hash_algo->hexsz);
}
static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
@@ -635,7 +635,7 @@
err = write_archive_entries(args, write_zip_entry);
if (!err)
- write_zip_trailer(args->commit_sha1);
+ write_zip_trailer(args->commit_oid);
strbuf_release(&zip_dir);
diff --git a/archive.c b/archive.c
index 1f98324..a8da0fc 100644
--- a/archive.c
+++ b/archive.c
@@ -380,7 +380,7 @@
int remote)
{
const char *name = argv[0];
- const unsigned char *commit_sha1;
+ const struct object_id *commit_oid;
time_t archive_time;
struct tree *tree;
const struct commit *commit;
@@ -402,10 +402,10 @@
commit = lookup_commit_reference_gently(ar_args->repo, &oid, 1);
if (commit) {
- commit_sha1 = commit->object.oid.hash;
+ commit_oid = &commit->object.oid;
archive_time = commit->date;
} else {
- commit_sha1 = NULL;
+ commit_oid = NULL;
archive_time = time(NULL);
}
@@ -415,10 +415,12 @@
if (prefix) {
struct object_id tree_oid;
- unsigned int mode;
+ unsigned short mode;
int err;
- err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,
+ err = get_tree_entry(ar_args->repo,
+ &tree->object.oid,
+ prefix, &tree_oid,
&mode);
if (err || !S_ISDIR(mode))
die(_("current working directory is untracked"));
@@ -426,7 +428,7 @@
tree = parse_tree_indirect(&tree_oid);
}
ar_args->tree = tree;
- ar_args->commit_sha1 = commit_sha1;
+ ar_args->commit_oid = commit_oid;
ar_args->commit = commit;
ar_args->time = archive_time;
}
diff --git a/archive.h b/archive.h
index 21ac010..e60e3dd 100644
--- a/archive.h
+++ b/archive.h
@@ -11,7 +11,7 @@
const char *base;
size_t baselen;
struct tree *tree;
- const unsigned char *commit_sha1;
+ const struct object_id *commit_oid;
const struct commit *commit;
timestamp_t time;
struct pathspec pathspec;
@@ -23,9 +23,9 @@
/* main api */
-extern int write_archive(int argc, const char **argv, const char *prefix,
- struct repository *repo,
- const char *name_hint, int remote);
+int write_archive(int argc, const char **argv, const char *prefix,
+ struct repository *repo,
+ const char *name_hint, int remote);
const char *archive_format_from_filename(const char *filename);
@@ -39,21 +39,21 @@
unsigned flags;
void *data;
};
-extern void register_archiver(struct archiver *);
+void register_archiver(struct archiver *);
-extern void init_tar_archiver(void);
-extern void init_zip_archiver(void);
-extern void init_archivers(void);
+void init_tar_archiver(void);
+void init_zip_archiver(void);
+void init_archivers(void);
typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
const struct object_id *oid,
const char *path, size_t pathlen,
unsigned int mode);
-extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-extern void *object_file_to_archive(const struct archiver_args *args,
- const char *path, const struct object_id *oid,
- unsigned int mode, enum object_type *type,
- unsigned long *sizep);
+int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
+void *object_file_to_archive(const struct archiver_args *args,
+ const char *path, const struct object_id *oid,
+ unsigned int mode, enum object_type *type,
+ unsigned long *sizep);
#endif /* ARCHIVE_H */
diff --git a/attr.c b/attr.c
index fdd110b..d02d081 100644
--- a/attr.c
+++ b/attr.c
@@ -259,7 +259,7 @@
const char *pattern;
int patternlen;
int nowildcardlen;
- unsigned flags; /* EXC_FLAG_* */
+ unsigned flags; /* PATTERN_FLAG_* */
};
/*
@@ -400,11 +400,11 @@
char *p = (char *)&(res->state[num_attr]);
memcpy(p, name, namelen);
res->u.pat.pattern = p;
- parse_exclude_pattern(&res->u.pat.pattern,
+ parse_path_pattern(&res->u.pat.pattern,
&res->u.pat.patternlen,
&res->u.pat.flags,
&res->u.pat.nowildcardlen);
- if (res->u.pat.flags & EXC_FLAG_NEGATIVE) {
+ if (res->u.pat.flags & PATTERN_FLAG_NEGATIVE) {
warning(_("Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."));
goto fail_return;
@@ -431,14 +431,14 @@
* Like info/exclude and .gitignore, the attribute information can
* come from many places.
*
- * (1) .gitattribute file of the same directory;
- * (2) .gitattribute file of the parent directory if (1) does not have
+ * (1) .gitattributes file of the same directory;
+ * (2) .gitattributes file of the parent directory if (1) does not have
* any match; this goes recursively upwards, just like .gitignore.
* (3) $GIT_DIR/info/attributes, which overrides both of the above.
*
* In the same file, later entries override the earlier match, so in the
* global list, we would have entries from info/attributes the earliest
- * (reading the file from top to bottom), .gitattribute of the root
+ * (reading the file from top to bottom), .gitattributes of the root
* directory (again, reading the file from top to bottom) down to the
* current directory, and then scan the list backwards to find the first match.
* This is exactly the same as what is_excluded() does in dir.c to deal with
@@ -899,7 +899,7 @@
* set of attribute definitions, followed by the contents
* of $(prefix)/etc/gitattributes and a file specified by
* core.attributesfile. Then, contents from
- * .gitattribute files from directories closer to the
+ * .gitattributes files from directories closer to the
* root to the ones in deeper directories are pushed
* to the stack. Finally, at the very top of the stack
* we always keep the contents of $GIT_DIR/info/attributes.
@@ -991,10 +991,10 @@
int prefix = pat->nowildcardlen;
int isdir = (pathlen && pathname[pathlen - 1] == '/');
- if ((pat->flags & EXC_FLAG_MUSTBEDIR) && !isdir)
+ if ((pat->flags & PATTERN_FLAG_MUSTBEDIR) && !isdir)
return 0;
- if (pat->flags & EXC_FLAG_NODIR) {
+ if (pat->flags & PATTERN_FLAG_NODIR) {
return match_basename(pathname + basename_offset,
pathlen - basename_offset - isdir,
pattern, prefix,
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c329b72..34031b1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -374,7 +374,7 @@
test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
sudo apt-get update &&
- sudo apt-get install -y asciidoc xmlto asciidoctor &&
+ sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns &&
export ALREADY_HAVE_ASCIIDOCTOR=yes. &&
export jobname=Documentation &&
diff --git a/banned.h b/banned.h
index 447af24..60a18d4 100644
--- a/banned.h
+++ b/banned.h
@@ -26,7 +26,7 @@
#define vsprintf(...) BANNED(vsprintf)
#else
#define sprintf(buf,fmt,arg) BANNED(sprintf)
-#define vsprintf(buf,fmt,arg) BANNED(sprintf)
+#define vsprintf(buf,fmt,arg) BANNED(vsprintf)
#endif
#endif /* BANNED_H */
diff --git a/bisect.c b/bisect.c
index 3af955c..e87ac29 100644
--- a/bisect.c
+++ b/bisect.c
@@ -896,24 +896,15 @@
const char *prefix,
struct commit *commit)
{
+ const char *argv[] = {
+ "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
+ };
struct rev_info opt;
- /* diff-tree init */
+ git_config(git_diff_ui_config, NULL);
repo_init_revisions(r, &opt, prefix);
- git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
- opt.abbrev = 0;
- opt.diff = 1;
- /* This is what "--pretty" does */
- opt.verbose_header = 1;
- opt.use_terminator = 0;
- opt.commit_format = CMIT_FMT_DEFAULT;
-
- /* diff-tree init */
- if (!opt.diffopt.output_format)
- opt.diffopt.output_format = DIFF_FORMAT_RAW;
-
- setup_revisions(0, NULL, &opt, NULL);
+ setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
log_tree_commit(&opt, commit);
}
diff --git a/bisect.h b/bisect.h
index 821d16e..4e69a11 100644
--- a/bisect.h
+++ b/bisect.h
@@ -11,14 +11,14 @@
* Otherwise, it will be either all non-SAMETREE commits or the single
* best commit, as chosen by `find_all`.
*/
-extern void find_bisection(struct commit_list **list, int *reaches, int *all,
- int find_all);
+void find_bisection(struct commit_list **list, int *reaches, int *all,
+ int find_all);
-extern struct commit_list *filter_skipped(struct commit_list *list,
- struct commit_list **tried,
- int show_all,
- int *count,
- int *skipped_first);
+struct commit_list *filter_skipped(struct commit_list *list,
+ struct commit_list **tried,
+ int show_all,
+ int *count,
+ int *skipped_first);
#define BISECT_SHOW_ALL (1<<0)
#define REV_LIST_QUIET (1<<1)
@@ -31,14 +31,14 @@
const char *header_prefix;
};
-extern int bisect_next_all(struct repository *r,
- const char *prefix,
- int no_checkout);
+int bisect_next_all(struct repository *r,
+ const char *prefix,
+ int no_checkout);
-extern int estimate_bisect_steps(int all);
+int estimate_bisect_steps(int all);
-extern void read_bisect_terms(const char **bad, const char **good);
+void read_bisect_terms(const char **bad, const char **good);
-extern int bisect_clean_state(void);
+int bisect_clean_state(void);
#endif
diff --git a/blame.c b/blame.c
index da57233..36a2e7e 100644
--- a/blame.c
+++ b/blame.c
@@ -99,9 +99,9 @@
for (parents = work_tree->parents; parents; parents = parents->next) {
const struct object_id *commit_oid = &parents->item->object.oid;
struct object_id blob_oid;
- unsigned mode;
+ unsigned short mode;
- if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
+ if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode) &&
oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)
return;
}
@@ -204,7 +204,8 @@
origin = make_origin(commit, path);
- ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
+ ident = fmt_ident("Not Committed Yet", "not.committed.yet",
+ WANT_BLANK_IDENT, NULL, 0);
strbuf_addstr(&msg, "tree 0000000000000000000000000000000000000000\n");
for (parent = commit->parents; parent; parent = parent->next)
strbuf_addf(&msg, "parent %s\n",
@@ -310,12 +311,707 @@
return xdi_diff(file_a, file_b, &xpp, &xecfg, &ecb);
}
+static const char *get_next_line(const char *start, const char *end)
+{
+ const char *nl = memchr(start, '\n', end - start);
+
+ return nl ? nl + 1 : end;
+}
+
+static int find_line_starts(int **line_starts, const char *buf,
+ unsigned long len)
+{
+ const char *end = buf + len;
+ const char *p;
+ int *lineno;
+ int num = 0;
+
+ for (p = buf; p < end; p = get_next_line(p, end))
+ num++;
+
+ ALLOC_ARRAY(*line_starts, num + 1);
+ lineno = *line_starts;
+
+ for (p = buf; p < end; p = get_next_line(p, end))
+ *lineno++ = p - buf;
+
+ *lineno = len;
+
+ return num;
+}
+
+struct fingerprint_entry;
+
+/* A fingerprint is intended to loosely represent a string, such that two
+ * fingerprints can be quickly compared to give an indication of the similarity
+ * of the strings that they represent.
+ *
+ * A fingerprint is represented as a multiset of the lower-cased byte pairs in
+ * the string that it represents. Whitespace is added at each end of the
+ * string. Whitespace pairs are ignored. Whitespace is converted to '\0'.
+ * For example, the string "Darth Radar" will be converted to the following
+ * fingerprint:
+ * {"\0d", "da", "da", "ar", "ar", "rt", "th", "h\0", "\0r", "ra", "ad", "r\0"}
+ *
+ * The similarity between two fingerprints is the size of the intersection of
+ * their multisets, including repeated elements. See fingerprint_similarity for
+ * examples.
+ *
+ * For ease of implementation, the fingerprint is implemented as a map
+ * of byte pairs to the count of that byte pair in the string, instead of
+ * allowing repeated elements in a set.
+ */
+struct fingerprint {
+ struct hashmap map;
+ /* As we know the maximum number of entries in advance, it's
+ * convenient to store the entries in a single array instead of having
+ * the hashmap manage the memory.
+ */
+ struct fingerprint_entry *entries;
+};
+
+/* A byte pair in a fingerprint. Stores the number of times the byte pair
+ * occurs in the string that the fingerprint represents.
+ */
+struct fingerprint_entry {
+ /* The hashmap entry - the hash represents the byte pair in its
+ * entirety so we don't need to store the byte pair separately.
+ */
+ struct hashmap_entry entry;
+ /* The number of times the byte pair occurs in the string that the
+ * fingerprint represents.
+ */
+ int count;
+};
+
+/* See `struct fingerprint` for an explanation of what a fingerprint is.
+ * \param result the fingerprint of the string is stored here. This must be
+ * freed later using free_fingerprint.
+ * \param line_begin the start of the string
+ * \param line_end the end of the string
+ */
+static void get_fingerprint(struct fingerprint *result,
+ const char *line_begin,
+ const char *line_end)
+{
+ unsigned int hash, c0 = 0, c1;
+ const char *p;
+ int max_map_entry_count = 1 + line_end - line_begin;
+ struct fingerprint_entry *entry = xcalloc(max_map_entry_count,
+ sizeof(struct fingerprint_entry));
+ struct fingerprint_entry *found_entry;
+
+ hashmap_init(&result->map, NULL, NULL, max_map_entry_count);
+ result->entries = entry;
+ for (p = line_begin; p <= line_end; ++p, c0 = c1) {
+ /* Always terminate the string with whitespace.
+ * Normalise whitespace to 0, and normalise letters to
+ * lower case. This won't work for multibyte characters but at
+ * worst will match some unrelated characters.
+ */
+ if ((p == line_end) || isspace(*p))
+ c1 = 0;
+ else
+ c1 = tolower(*p);
+ hash = c0 | (c1 << 8);
+ /* Ignore whitespace pairs */
+ if (hash == 0)
+ continue;
+ hashmap_entry_init(entry, hash);
+
+ found_entry = hashmap_get(&result->map, entry, NULL);
+ if (found_entry) {
+ found_entry->count += 1;
+ } else {
+ entry->count = 1;
+ hashmap_add(&result->map, entry);
+ ++entry;
+ }
+ }
+}
+
+static void free_fingerprint(struct fingerprint *f)
+{
+ hashmap_free(&f->map, 0);
+ free(f->entries);
+}
+
+/* Calculates the similarity between two fingerprints as the size of the
+ * intersection of their multisets, including repeated elements. See
+ * `struct fingerprint` for an explanation of the fingerprint representation.
+ * The similarity between "cat mat" and "father rather" is 2 because "at" is
+ * present twice in both strings while the similarity between "tim" and "mit"
+ * is 0.
+ */
+static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b)
+{
+ int intersection = 0;
+ struct hashmap_iter iter;
+ const struct fingerprint_entry *entry_a, *entry_b;
+
+ hashmap_iter_init(&b->map, &iter);
+
+ while ((entry_b = hashmap_iter_next(&iter))) {
+ if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+ intersection += entry_a->count < entry_b->count ?
+ entry_a->count : entry_b->count;
+ }
+ }
+ return intersection;
+}
+
+/* Subtracts byte-pair elements in B from A, modifying A in place.
+ */
+static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b)
+{
+ struct hashmap_iter iter;
+ struct fingerprint_entry *entry_a;
+ const struct fingerprint_entry *entry_b;
+
+ hashmap_iter_init(&b->map, &iter);
+
+ while ((entry_b = hashmap_iter_next(&iter))) {
+ if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+ if (entry_a->count <= entry_b->count)
+ hashmap_remove(&a->map, entry_b, NULL);
+ else
+ entry_a->count -= entry_b->count;
+ }
+ }
+}
+
+/* Calculate fingerprints for a series of lines.
+ * Puts the fingerprints in the fingerprints array, which must have been
+ * preallocated to allow storing line_count elements.
+ */
+static void get_line_fingerprints(struct fingerprint *fingerprints,
+ const char *content, const int *line_starts,
+ long first_line, long line_count)
+{
+ int i;
+ const char *linestart, *lineend;
+
+ line_starts += first_line;
+ for (i = 0; i < line_count; ++i) {
+ linestart = content + line_starts[i];
+ lineend = content + line_starts[i + 1];
+ get_fingerprint(fingerprints + i, linestart, lineend);
+ }
+}
+
+static void free_line_fingerprints(struct fingerprint *fingerprints,
+ int nr_fingerprints)
+{
+ int i;
+
+ for (i = 0; i < nr_fingerprints; i++)
+ free_fingerprint(&fingerprints[i]);
+}
+
+/* This contains the data necessary to linearly map a line number in one half
+ * of a diff chunk to the line in the other half of the diff chunk that is
+ * closest in terms of its position as a fraction of the length of the chunk.
+ */
+struct line_number_mapping {
+ int destination_start, destination_length,
+ source_start, source_length;
+};
+
+/* Given a line number in one range, offset and scale it to map it onto the
+ * other range.
+ * Essentially this mapping is a simple linear equation but the calculation is
+ * more complicated to allow performing it with integer operations.
+ * Another complication is that if a line could map onto many lines in the
+ * destination range then we want to choose the line at the center of those
+ * possibilities.
+ * Example: if the chunk is 2 lines long in A and 10 lines long in B then the
+ * first 5 lines in B will map onto the first line in the A chunk, while the
+ * last 5 lines will all map onto the second line in the A chunk.
+ * Example: if the chunk is 10 lines long in A and 2 lines long in B then line
+ * 0 in B will map onto line 2 in A, and line 1 in B will map onto line 7 in A.
+ */
+static int map_line_number(int line_number,
+ const struct line_number_mapping *mapping)
+{
+ return ((line_number - mapping->source_start) * 2 + 1) *
+ mapping->destination_length /
+ (mapping->source_length * 2) +
+ mapping->destination_start;
+}
+
+/* Get a pointer to the element storing the similarity between a line in A
+ * and a line in B.
+ *
+ * The similarities are stored in a 2-dimensional array. Each "row" in the
+ * array contains the similarities for a line in B. The similarities stored in
+ * a row are the similarities between the line in B and the nearby lines in A.
+ * To keep the length of each row the same, it is padded out with values of -1
+ * where the search range extends beyond the lines in A.
+ * For example, if max_search_distance_a is 2 and the two sides of a diff chunk
+ * look like this:
+ * a | m
+ * b | n
+ * c | o
+ * d | p
+ * e | q
+ * Then the similarity array will contain:
+ * [-1, -1, am, bm, cm,
+ * -1, an, bn, cn, dn,
+ * ao, bo, co, do, eo,
+ * bp, cp, dp, ep, -1,
+ * cq, dq, eq, -1, -1]
+ * Where similarities are denoted either by -1 for invalid, or the
+ * concatenation of the two lines in the diff being compared.
+ *
+ * \param similarities array of similarities between lines in A and B
+ * \param line_a the index of the line in A, in the same frame of reference as
+ * closest_line_a.
+ * \param local_line_b the index of the line in B, relative to the first line
+ * in B that similarities represents.
+ * \param closest_line_a the index of the line in A that is deemed to be
+ * closest to local_line_b. This must be in the same
+ * frame of reference as line_a. This value defines
+ * where similarities is centered for the line in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ */
+static int *get_similarity(int *similarities,
+ int line_a, int local_line_b,
+ int closest_line_a, int max_search_distance_a)
+{
+ assert(abs(line_a - closest_line_a) <=
+ max_search_distance_a);
+ return similarities + line_a - closest_line_a +
+ max_search_distance_a +
+ local_line_b * (max_search_distance_a * 2 + 1);
+}
+
+#define CERTAIN_NOTHING_MATCHES -2
+#define CERTAINTY_NOT_CALCULATED -1
+
+/* Given a line in B, first calculate its similarities with nearby lines in A
+ * if not already calculated, then identify the most similar and second most
+ * similar lines. The "certainty" is calculated based on those two
+ * similarities.
+ *
+ * \param start_a the index of the first line of the chunk in A
+ * \param length_a the length in lines of the chunk in A
+ * \param local_line_b the index of the line in B, relative to the first line
+ * in the chunk.
+ * \param fingerprints_a array of fingerprints for the chunk in A
+ * \param fingerprints_b array of fingerprints for the chunk in B
+ * \param similarities 2-dimensional array of similarities between lines in A
+ * and B. See get_similarity() for more details.
+ * \param certainties array of values indicating how strongly a line in B is
+ * matched with some line in A.
+ * \param second_best_result array of absolute indices in A for the second
+ * closest match of a line in B.
+ * \param result array of absolute indices in A for the closest match of a line
+ * in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ * \param map_line_number_in_b_to_a parameter to map_line_number().
+ */
+static void find_best_line_matches(
+ int start_a,
+ int length_a,
+ int start_b,
+ int local_line_b,
+ struct fingerprint *fingerprints_a,
+ struct fingerprint *fingerprints_b,
+ int *similarities,
+ int *certainties,
+ int *second_best_result,
+ int *result,
+ const int max_search_distance_a,
+ const struct line_number_mapping *map_line_number_in_b_to_a)
+{
+
+ int i, search_start, search_end, closest_local_line_a, *similarity,
+ best_similarity = 0, second_best_similarity = 0,
+ best_similarity_index = 0, second_best_similarity_index = 0;
+
+ /* certainty has already been calculated so no need to redo the work */
+ if (certainties[local_line_b] != CERTAINTY_NOT_CALCULATED)
+ return;
+
+ closest_local_line_a = map_line_number(
+ local_line_b + start_b, map_line_number_in_b_to_a) - start_a;
+
+ search_start = closest_local_line_a - max_search_distance_a;
+ if (search_start < 0)
+ search_start = 0;
+
+ search_end = closest_local_line_a + max_search_distance_a + 1;
+ if (search_end > length_a)
+ search_end = length_a;
+
+ for (i = search_start; i < search_end; ++i) {
+ similarity = get_similarity(similarities,
+ i, local_line_b,
+ closest_local_line_a,
+ max_search_distance_a);
+ if (*similarity == -1) {
+ /* This value will never exceed 10 but assert just in
+ * case
+ */
+ assert(abs(i - closest_local_line_a) < 1000);
+ /* scale the similarity by (1000 - distance from
+ * closest line) to act as a tie break between lines
+ * that otherwise are equally similar.
+ */
+ *similarity = fingerprint_similarity(
+ fingerprints_b + local_line_b,
+ fingerprints_a + i) *
+ (1000 - abs(i - closest_local_line_a));
+ }
+ if (*similarity > best_similarity) {
+ second_best_similarity = best_similarity;
+ second_best_similarity_index = best_similarity_index;
+ best_similarity = *similarity;
+ best_similarity_index = i;
+ } else if (*similarity > second_best_similarity) {
+ second_best_similarity = *similarity;
+ second_best_similarity_index = i;
+ }
+ }
+
+ if (best_similarity == 0) {
+ /* this line definitely doesn't match with anything. Mark it
+ * with this special value so it doesn't get invalidated and
+ * won't be recalculated.
+ */
+ certainties[local_line_b] = CERTAIN_NOTHING_MATCHES;
+ result[local_line_b] = -1;
+ } else {
+ /* Calculate the certainty with which this line matches.
+ * If the line matches well with two lines then that reduces
+ * the certainty. However we still want to prioritise matching
+ * a line that matches very well with two lines over matching a
+ * line that matches poorly with one line, hence doubling
+ * best_similarity.
+ * This means that if we have
+ * line X that matches only one line with a score of 3,
+ * line Y that matches two lines equally with a score of 5,
+ * and line Z that matches only one line with a score or 2,
+ * then the lines in order of certainty are X, Y, Z.
+ */
+ certainties[local_line_b] = best_similarity * 2 -
+ second_best_similarity;
+
+ /* We keep both the best and second best results to allow us to
+ * check at a later stage of the matching process whether the
+ * result needs to be invalidated.
+ */
+ result[local_line_b] = start_a + best_similarity_index;
+ second_best_result[local_line_b] =
+ start_a + second_best_similarity_index;
+ }
+}
+
+/*
+ * This finds the line that we can match with the most confidence, and
+ * uses it as a partition. It then calls itself on the lines on either side of
+ * that partition. In this way we avoid lines appearing out of order, and
+ * retain a sensible line ordering.
+ * \param start_a index of the first line in A with which lines in B may be
+ * compared.
+ * \param start_b index of the first line in B for which matching should be
+ * done.
+ * \param length_a number of lines in A with which lines in B may be compared.
+ * \param length_b number of lines in B for which matching should be done.
+ * \param fingerprints_a mutable array of fingerprints in A. The first element
+ * corresponds to the line at start_a.
+ * \param fingerprints_b array of fingerprints in B. The first element
+ * corresponds to the line at start_b.
+ * \param similarities 2-dimensional array of similarities between lines in A
+ * and B. See get_similarity() for more details.
+ * \param certainties array of values indicating how strongly a line in B is
+ * matched with some line in A.
+ * \param second_best_result array of absolute indices in A for the second
+ * closest match of a line in B.
+ * \param result array of absolute indices in A for the closest match of a line
+ * in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ * \param max_search_distance_b an upper bound on the greatest possible
+ * distance between lines in B such that they will
+ * both be compared with the same line in A
+ * according to max_search_distance_a.
+ * \param map_line_number_in_b_to_a parameter to map_line_number().
+ */
+static void fuzzy_find_matching_lines_recurse(
+ int start_a, int start_b,
+ int length_a, int length_b,
+ struct fingerprint *fingerprints_a,
+ struct fingerprint *fingerprints_b,
+ int *similarities,
+ int *certainties,
+ int *second_best_result,
+ int *result,
+ int max_search_distance_a,
+ int max_search_distance_b,
+ const struct line_number_mapping *map_line_number_in_b_to_a)
+{
+ int i, invalidate_min, invalidate_max, offset_b,
+ second_half_start_a, second_half_start_b,
+ second_half_length_a, second_half_length_b,
+ most_certain_line_a, most_certain_local_line_b = -1,
+ most_certain_line_certainty = -1,
+ closest_local_line_a;
+
+ for (i = 0; i < length_b; ++i) {
+ find_best_line_matches(start_a,
+ length_a,
+ start_b,
+ i,
+ fingerprints_a,
+ fingerprints_b,
+ similarities,
+ certainties,
+ second_best_result,
+ result,
+ max_search_distance_a,
+ map_line_number_in_b_to_a);
+
+ if (certainties[i] > most_certain_line_certainty) {
+ most_certain_line_certainty = certainties[i];
+ most_certain_local_line_b = i;
+ }
+ }
+
+ /* No matches. */
+ if (most_certain_local_line_b == -1)
+ return;
+
+ most_certain_line_a = result[most_certain_local_line_b];
+
+ /*
+ * Subtract the most certain line's fingerprint in B from the matched
+ * fingerprint in A. This means that other lines in B can't also match
+ * the same parts of the line in A.
+ */
+ fingerprint_subtract(fingerprints_a + most_certain_line_a - start_a,
+ fingerprints_b + most_certain_local_line_b);
+
+ /* Invalidate results that may be affected by the choice of most
+ * certain line.
+ */
+ invalidate_min = most_certain_local_line_b - max_search_distance_b;
+ invalidate_max = most_certain_local_line_b + max_search_distance_b + 1;
+ if (invalidate_min < 0)
+ invalidate_min = 0;
+ if (invalidate_max > length_b)
+ invalidate_max = length_b;
+
+ /* As the fingerprint in A has changed, discard previously calculated
+ * similarity values with that fingerprint.
+ */
+ for (i = invalidate_min; i < invalidate_max; ++i) {
+ closest_local_line_a = map_line_number(
+ i + start_b, map_line_number_in_b_to_a) - start_a;
+
+ /* Check that the lines in A and B are close enough that there
+ * is a similarity value for them.
+ */
+ if (abs(most_certain_line_a - start_a - closest_local_line_a) >
+ max_search_distance_a) {
+ continue;
+ }
+
+ *get_similarity(similarities, most_certain_line_a - start_a,
+ i, closest_local_line_a,
+ max_search_distance_a) = -1;
+ }
+
+ /* More invalidating of results that may be affected by the choice of
+ * most certain line.
+ * Discard the matches for lines in B that are currently matched with a
+ * line in A such that their ordering contradicts the ordering imposed
+ * by the choice of most certain line.
+ */
+ for (i = most_certain_local_line_b - 1; i >= invalidate_min; --i) {
+ /* In this loop we discard results for lines in B that are
+ * before most-certain-line-B but are matched with a line in A
+ * that is after most-certain-line-A.
+ */
+ if (certainties[i] >= 0 &&
+ (result[i] >= most_certain_line_a ||
+ second_best_result[i] >= most_certain_line_a)) {
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+ }
+ for (i = most_certain_local_line_b + 1; i < invalidate_max; ++i) {
+ /* In this loop we discard results for lines in B that are
+ * after most-certain-line-B but are matched with a line in A
+ * that is before most-certain-line-A.
+ */
+ if (certainties[i] >= 0 &&
+ (result[i] <= most_certain_line_a ||
+ second_best_result[i] <= most_certain_line_a)) {
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+ }
+
+ /* Repeat the matching process for lines before the most certain line.
+ */
+ if (most_certain_local_line_b > 0) {
+ fuzzy_find_matching_lines_recurse(
+ start_a, start_b,
+ most_certain_line_a + 1 - start_a,
+ most_certain_local_line_b,
+ fingerprints_a, fingerprints_b, similarities,
+ certainties, second_best_result, result,
+ max_search_distance_a,
+ max_search_distance_b,
+ map_line_number_in_b_to_a);
+ }
+ /* Repeat the matching process for lines after the most certain line.
+ */
+ if (most_certain_local_line_b + 1 < length_b) {
+ second_half_start_a = most_certain_line_a;
+ offset_b = most_certain_local_line_b + 1;
+ second_half_start_b = start_b + offset_b;
+ second_half_length_a =
+ length_a + start_a - second_half_start_a;
+ second_half_length_b =
+ length_b + start_b - second_half_start_b;
+ fuzzy_find_matching_lines_recurse(
+ second_half_start_a, second_half_start_b,
+ second_half_length_a, second_half_length_b,
+ fingerprints_a + second_half_start_a - start_a,
+ fingerprints_b + offset_b,
+ similarities +
+ offset_b * (max_search_distance_a * 2 + 1),
+ certainties + offset_b,
+ second_best_result + offset_b, result + offset_b,
+ max_search_distance_a,
+ max_search_distance_b,
+ map_line_number_in_b_to_a);
+ }
+}
+
+/* Find the lines in the parent line range that most closely match the lines in
+ * the target line range. This is accomplished by matching fingerprints in each
+ * blame_origin, and choosing the best matches that preserve the line ordering.
+ * See struct fingerprint for details of fingerprint matching, and
+ * fuzzy_find_matching_lines_recurse for details of preserving line ordering.
+ *
+ * The performance is believed to be O(n log n) in the typical case and O(n^2)
+ * in a pathological case, where n is the number of lines in the target range.
+ */
+static int *fuzzy_find_matching_lines(struct blame_origin *parent,
+ struct blame_origin *target,
+ int tlno, int parent_slno, int same,
+ int parent_len)
+{
+ /* We use the terminology "A" for the left hand side of the diff AKA
+ * parent, and "B" for the right hand side of the diff AKA target. */
+ int start_a = parent_slno;
+ int length_a = parent_len;
+ int start_b = tlno;
+ int length_b = same - tlno;
+
+ struct line_number_mapping map_line_number_in_b_to_a = {
+ start_a, length_a, start_b, length_b
+ };
+
+ struct fingerprint *fingerprints_a = parent->fingerprints;
+ struct fingerprint *fingerprints_b = target->fingerprints;
+
+ int i, *result, *second_best_result,
+ *certainties, *similarities, similarity_count;
+
+ /*
+ * max_search_distance_a means that given a line in B, compare it to
+ * the line in A that is closest to its position, and the lines in A
+ * that are no greater than max_search_distance_a lines away from the
+ * closest line in A.
+ *
+ * max_search_distance_b is an upper bound on the greatest possible
+ * distance between lines in B such that they will both be compared
+ * with the same line in A according to max_search_distance_a.
+ */
+ int max_search_distance_a = 10, max_search_distance_b;
+
+ if (length_a <= 0)
+ return NULL;
+
+ if (max_search_distance_a >= length_a)
+ max_search_distance_a = length_a ? length_a - 1 : 0;
+
+ max_search_distance_b = ((2 * max_search_distance_a + 1) * length_b
+ - 1) / length_a;
+
+ result = xcalloc(sizeof(int), length_b);
+ second_best_result = xcalloc(sizeof(int), length_b);
+ certainties = xcalloc(sizeof(int), length_b);
+
+ /* See get_similarity() for details of similarities. */
+ similarity_count = length_b * (max_search_distance_a * 2 + 1);
+ similarities = xcalloc(sizeof(int), similarity_count);
+
+ for (i = 0; i < length_b; ++i) {
+ result[i] = -1;
+ second_best_result[i] = -1;
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+
+ for (i = 0; i < similarity_count; ++i)
+ similarities[i] = -1;
+
+ fuzzy_find_matching_lines_recurse(start_a, start_b,
+ length_a, length_b,
+ fingerprints_a + start_a,
+ fingerprints_b + start_b,
+ similarities,
+ certainties,
+ second_best_result,
+ result,
+ max_search_distance_a,
+ max_search_distance_b,
+ &map_line_number_in_b_to_a);
+
+ free(similarities);
+ free(certainties);
+ free(second_best_result);
+
+ return result;
+}
+
+static void fill_origin_fingerprints(struct blame_origin *o)
+{
+ int *line_starts;
+
+ if (o->fingerprints)
+ return;
+ o->num_lines = find_line_starts(&line_starts, o->file.ptr,
+ o->file.size);
+ o->fingerprints = xcalloc(sizeof(struct fingerprint), o->num_lines);
+ get_line_fingerprints(o->fingerprints, o->file.ptr, line_starts,
+ 0, o->num_lines);
+ free(line_starts);
+}
+
+static void drop_origin_fingerprints(struct blame_origin *o)
+{
+ if (o->fingerprints) {
+ free_line_fingerprints(o->fingerprints, o->num_lines);
+ o->num_lines = 0;
+ FREE_AND_NULL(o->fingerprints);
+ }
+}
+
/*
* Given an origin, prepare mmfile_t structure to be used by the
* diff machinery
*/
static void fill_origin_blob(struct diff_options *opt,
- struct blame_origin *o, mmfile_t *file, int *num_read_blob)
+ struct blame_origin *o, mmfile_t *file,
+ int *num_read_blob, int fill_fingerprints)
{
if (!o->file.ptr) {
enum object_type type;
@@ -339,11 +1035,14 @@
}
else
*file = o->file;
+ if (fill_fingerprints)
+ fill_origin_fingerprints(o);
}
static void drop_origin_blob(struct blame_origin *o)
{
FREE_AND_NULL(o->file.ptr);
+ drop_origin_fingerprints(o);
}
/*
@@ -479,7 +1178,9 @@
for (ent = sb->ent; ent && (next = ent->next); ent = next) {
if (ent->suspect == next->suspect &&
- ent->s_lno + ent->num_lines == next->s_lno) {
+ ent->s_lno + ent->num_lines == next->s_lno &&
+ ent->ignored == next->ignored &&
+ ent->unblamable == next->unblamable) {
ent->num_lines += next->num_lines;
ent->next = next->next;
blame_origin_decref(next->suspect);
@@ -531,7 +1232,7 @@
{
if (!is_null_oid(&origin->blob_oid))
return 0;
- if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
+ if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
goto error_out;
if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
goto error_out;
@@ -729,8 +1430,14 @@
struct blame_origin *parent)
{
int chunk_end_lno;
+ int i;
memset(split, 0, sizeof(struct blame_entry [3]));
+ for (i = 0; i < 3; i++) {
+ split[i].ignored = e->ignored;
+ split[i].unblamable = e->unblamable;
+ }
+
if (e->s_lno < tlno) {
/* there is a pre-chunk part not blamed on parent */
split[0].suspect = blame_origin_incref(e->suspect);
@@ -839,6 +1546,164 @@
}
/*
+ * Splits a blame entry into two entries at 'len' lines. The original 'e'
+ * consists of len lines, i.e. [e->lno, e->lno + len), and the second part,
+ * which is returned, consists of the remainder: [e->lno + len, e->lno +
+ * e->num_lines). The caller needs to sort out the reference counting for the
+ * new entry's suspect.
+ */
+static struct blame_entry *split_blame_at(struct blame_entry *e, int len,
+ struct blame_origin *new_suspect)
+{
+ struct blame_entry *n = xcalloc(1, sizeof(struct blame_entry));
+
+ n->suspect = new_suspect;
+ n->ignored = e->ignored;
+ n->unblamable = e->unblamable;
+ n->lno = e->lno + len;
+ n->s_lno = e->s_lno + len;
+ n->num_lines = e->num_lines - len;
+ e->num_lines = len;
+ e->score = 0;
+ return n;
+}
+
+struct blame_line_tracker {
+ int is_parent;
+ int s_lno;
+};
+
+static int are_lines_adjacent(struct blame_line_tracker *first,
+ struct blame_line_tracker *second)
+{
+ return first->is_parent == second->is_parent &&
+ first->s_lno + 1 == second->s_lno;
+}
+
+static int scan_parent_range(struct fingerprint *p_fps,
+ struct fingerprint *t_fps, int t_idx,
+ int from, int nr_lines)
+{
+ int sim, p_idx;
+ #define FINGERPRINT_FILE_THRESHOLD 10
+ int best_sim_val = FINGERPRINT_FILE_THRESHOLD;
+ int best_sim_idx = -1;
+
+ for (p_idx = from; p_idx < from + nr_lines; p_idx++) {
+ sim = fingerprint_similarity(&t_fps[t_idx], &p_fps[p_idx]);
+ if (sim < best_sim_val)
+ continue;
+ /* Break ties with the closest-to-target line number */
+ if (sim == best_sim_val && best_sim_idx != -1 &&
+ abs(best_sim_idx - t_idx) < abs(p_idx - t_idx))
+ continue;
+ best_sim_val = sim;
+ best_sim_idx = p_idx;
+ }
+ return best_sim_idx;
+}
+
+/*
+ * The first pass checks the blame entry (from the target) against the parent's
+ * diff chunk. If that fails for a line, the second pass tries to match that
+ * line to any part of parent file. That catches cases where a change was
+ * broken into two chunks by 'context.'
+ */
+static void guess_line_blames(struct blame_origin *parent,
+ struct blame_origin *target,
+ int tlno, int offset, int same, int parent_len,
+ struct blame_line_tracker *line_blames)
+{
+ int i, best_idx, target_idx;
+ int parent_slno = tlno + offset;
+ int *fuzzy_matches;
+
+ fuzzy_matches = fuzzy_find_matching_lines(parent, target,
+ tlno, parent_slno, same,
+ parent_len);
+ for (i = 0; i < same - tlno; i++) {
+ target_idx = tlno + i;
+ if (fuzzy_matches && fuzzy_matches[i] >= 0) {
+ best_idx = fuzzy_matches[i];
+ } else {
+ best_idx = scan_parent_range(parent->fingerprints,
+ target->fingerprints,
+ target_idx, 0,
+ parent->num_lines);
+ }
+ if (best_idx >= 0) {
+ line_blames[i].is_parent = 1;
+ line_blames[i].s_lno = best_idx;
+ } else {
+ line_blames[i].is_parent = 0;
+ line_blames[i].s_lno = target_idx;
+ }
+ }
+ free(fuzzy_matches);
+}
+
+/*
+ * This decides which parts of a blame entry go to the parent (added to the
+ * ignoredp list) and which stay with the target (added to the diffp list). The
+ * actual decision was made in a separate heuristic function, and those answers
+ * for the lines in 'e' are in line_blames. This consumes e, essentially
+ * putting it on a list.
+ *
+ * Note that the blame entries on the ignoredp list are not necessarily sorted
+ * with respect to the parent's line numbers yet.
+ */
+static void ignore_blame_entry(struct blame_entry *e,
+ struct blame_origin *parent,
+ struct blame_entry **diffp,
+ struct blame_entry **ignoredp,
+ struct blame_line_tracker *line_blames)
+{
+ int entry_len, nr_lines, i;
+
+ /*
+ * We carve new entries off the front of e. Each entry comes from a
+ * contiguous chunk of lines: adjacent lines from the same origin
+ * (either the parent or the target).
+ */
+ entry_len = 1;
+ nr_lines = e->num_lines; /* e changes in the loop */
+ for (i = 0; i < nr_lines; i++) {
+ struct blame_entry *next = NULL;
+
+ /*
+ * We are often adjacent to the next line - only split the blame
+ * entry when we have to.
+ */
+ if (i + 1 < nr_lines) {
+ if (are_lines_adjacent(&line_blames[i],
+ &line_blames[i + 1])) {
+ entry_len++;
+ continue;
+ }
+ next = split_blame_at(e, entry_len,
+ blame_origin_incref(e->suspect));
+ }
+ if (line_blames[i].is_parent) {
+ e->ignored = 1;
+ blame_origin_decref(e->suspect);
+ e->suspect = blame_origin_incref(parent);
+ e->s_lno = line_blames[i - entry_len + 1].s_lno;
+ e->next = *ignoredp;
+ *ignoredp = e;
+ } else {
+ e->unblamable = 1;
+ /* e->s_lno is already in the target's address space. */
+ e->next = *diffp;
+ *diffp = e;
+ }
+ assert(e->num_lines == entry_len);
+ e = next;
+ entry_len = 1;
+ }
+ assert(!e);
+}
+
+/*
* Process one hunk from the patch between the current suspect for
* blame_entry e and its parent. This first blames any unfinished
* entries before the chunk (which is where target and parent start
@@ -847,13 +1712,20 @@
* -C options may lead to overlapping/duplicate source line number
* ranges, all we can rely on from sorting/merging is the order of the
* first suspect line number.
+ *
+ * tlno: line number in the target where this chunk begins
+ * same: line number in the target where this chunk ends
+ * offset: add to tlno to get the chunk starting point in the parent
+ * parent_len: number of lines in the parent chunk
*/
static void blame_chunk(struct blame_entry ***dstq, struct blame_entry ***srcq,
- int tlno, int offset, int same,
- struct blame_origin *parent)
+ int tlno, int offset, int same, int parent_len,
+ struct blame_origin *parent,
+ struct blame_origin *target, int ignore_diffs)
{
struct blame_entry *e = **srcq;
- struct blame_entry *samep = NULL, *diffp = NULL;
+ struct blame_entry *samep = NULL, *diffp = NULL, *ignoredp = NULL;
+ struct blame_line_tracker *line_blames = NULL;
while (e && e->s_lno < tlno) {
struct blame_entry *next = e->next;
@@ -864,14 +1736,9 @@
*/
if (e->s_lno + e->num_lines > tlno) {
/* Move second half to a new record */
- int len = tlno - e->s_lno;
- struct blame_entry *n = xcalloc(1, sizeof (struct blame_entry));
- n->suspect = e->suspect;
- n->lno = e->lno + len;
- n->s_lno = e->s_lno + len;
- n->num_lines = e->num_lines - len;
- e->num_lines = len;
- e->score = 0;
+ struct blame_entry *n;
+
+ n = split_blame_at(e, tlno - e->s_lno, e->suspect);
/* Push new record to diffp */
n->next = diffp;
diffp = n;
@@ -907,6 +1774,14 @@
*/
samep = NULL;
diffp = NULL;
+
+ if (ignore_diffs && same - tlno > 0) {
+ line_blames = xcalloc(sizeof(struct blame_line_tracker),
+ same - tlno);
+ guess_line_blames(parent, target, tlno, offset, same,
+ parent_len, line_blames);
+ }
+
while (e && e->s_lno < same) {
struct blame_entry *next = e->next;
@@ -918,22 +1793,37 @@
* Move second half to a new record to be
* processed by later chunks
*/
- int len = same - e->s_lno;
- struct blame_entry *n = xcalloc(1, sizeof (struct blame_entry));
- n->suspect = blame_origin_incref(e->suspect);
- n->lno = e->lno + len;
- n->s_lno = e->s_lno + len;
- n->num_lines = e->num_lines - len;
- e->num_lines = len;
- e->score = 0;
+ struct blame_entry *n;
+
+ n = split_blame_at(e, same - e->s_lno,
+ blame_origin_incref(e->suspect));
/* Push new record to samep */
n->next = samep;
samep = n;
}
- e->next = diffp;
- diffp = e;
+ if (ignore_diffs) {
+ ignore_blame_entry(e, parent, &diffp, &ignoredp,
+ line_blames + e->s_lno - tlno);
+ } else {
+ e->next = diffp;
+ diffp = e;
+ }
e = next;
}
+ free(line_blames);
+ if (ignoredp) {
+ /*
+ * Note ignoredp is not sorted yet, and thus neither is dstq.
+ * That list must be sorted before we queue_blames(). We defer
+ * sorting until after all diff hunks are processed, so that
+ * guess_line_blames() can pick *any* line in the parent. The
+ * slight drawback is that we end up sorting all blame entries
+ * passed to the parent, including those that are unrelated to
+ * changes made by the ignored commit.
+ */
+ **dstq = reverse_blame(ignoredp, **dstq);
+ *dstq = &ignoredp->next;
+ }
**srcq = reverse_blame(diffp, reverse_blame(samep, e));
/* Move across elements that are in the unblamable portion */
if (diffp)
@@ -942,7 +1832,9 @@
struct blame_chunk_cb_data {
struct blame_origin *parent;
+ struct blame_origin *target;
long offset;
+ int ignore_diffs;
struct blame_entry **dstq;
struct blame_entry **srcq;
};
@@ -955,7 +1847,8 @@
if (start_a - start_b != d->offset)
die("internal error in blame::blame_chunk_cb");
blame_chunk(&d->dstq, &d->srcq, start_b, start_a - start_b,
- start_b + count_b, d->parent);
+ start_b + count_b, count_a, d->parent, d->target,
+ d->ignore_diffs);
d->offset = start_a + count_a - (start_b + count_b);
return 0;
}
@@ -967,7 +1860,7 @@
*/
static void pass_blame_to_parent(struct blame_scoreboard *sb,
struct blame_origin *target,
- struct blame_origin *parent)
+ struct blame_origin *parent, int ignore_diffs)
{
mmfile_t file_p, file_o;
struct blame_chunk_cb_data d;
@@ -977,11 +1870,15 @@
return; /* nothing remains for this target */
d.parent = parent;
+ d.target = target;
d.offset = 0;
+ d.ignore_diffs = ignore_diffs;
d.dstq = &newdest; d.srcq = &target->suspects;
- fill_origin_blob(&sb->revs->diffopt, parent, &file_p, &sb->num_read_blob);
- fill_origin_blob(&sb->revs->diffopt, target, &file_o, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, parent, &file_p,
+ &sb->num_read_blob, ignore_diffs);
+ fill_origin_blob(&sb->revs->diffopt, target, &file_o,
+ &sb->num_read_blob, ignore_diffs);
sb->num_get_patch++;
if (diff_hunks(&file_p, &file_o, blame_chunk_cb, &d, sb->xdl_opts))
@@ -989,8 +1886,13 @@
oid_to_hex(&parent->commit->object.oid),
oid_to_hex(&target->commit->object.oid));
/* The rest are the same as the parent */
- blame_chunk(&d.dstq, &d.srcq, INT_MAX, d.offset, INT_MAX, parent);
+ blame_chunk(&d.dstq, &d.srcq, INT_MAX, d.offset, INT_MAX, 0,
+ parent, target, 0);
*d.dstq = NULL;
+ if (ignore_diffs)
+ newdest = llist_mergesort(newdest, get_next_blame,
+ set_next_blame,
+ compare_blame_suspect);
queue_blames(sb, parent, newdest);
return;
@@ -1187,7 +2089,8 @@
if (!unblamed)
return; /* nothing remains for this target */
- fill_origin_blob(&sb->revs->diffopt, parent, &file_p, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, parent, &file_p,
+ &sb->num_read_blob, 0);
if (!file_p.ptr)
return;
@@ -1316,7 +2219,8 @@
norigin = get_origin(parent, p->one->path);
oidcpy(&norigin->blob_oid, &p->one->oid);
norigin->mode = p->one->mode;
- fill_origin_blob(&sb->revs->diffopt, norigin, &file_p, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, norigin, &file_p,
+ &sb->num_read_blob, 0);
if (!file_p.ptr)
continue;
@@ -1494,12 +2398,35 @@
blame_origin_incref(porigin);
origin->previous = porigin;
}
- pass_blame_to_parent(sb, origin, porigin);
+ pass_blame_to_parent(sb, origin, porigin, 0);
if (!origin->suspects)
goto finish;
}
/*
+ * Pass remaining suspects for ignored commits to their parents.
+ */
+ if (oidset_contains(&sb->ignore_list, &commit->object.oid)) {
+ for (i = 0, sg = first_scapegoat(revs, commit, sb->reverse);
+ i < num_sg && sg;
+ sg = sg->next, i++) {
+ struct blame_origin *porigin = sg_origin[i];
+
+ if (!porigin)
+ continue;
+ pass_blame_to_parent(sb, origin, porigin, 1);
+ /*
+ * Preemptively drop porigin so we can refresh the
+ * fingerprints if we use the parent again, which can
+ * occur if you ignore back-to-back commits.
+ */
+ drop_origin_blob(porigin);
+ if (!origin->suspects)
+ goto finish;
+ }
+ }
+
+ /*
* Optionally find moves in parents' files.
*/
if (opt & PICKAXE_BLAME_MOVE) {
@@ -1561,7 +2488,8 @@
}
for (i = 0; i < num_sg; i++) {
if (sg_origin[i]) {
- drop_origin_blob(sg_origin[i]);
+ if (!sg_origin[i]->suspects)
+ drop_origin_blob(sg_origin[i]);
blame_origin_decref(sg_origin[i]);
}
}
@@ -1638,37 +2566,14 @@
}
}
-static const char *get_next_line(const char *start, const char *end)
-{
- const char *nl = memchr(start, '\n', end - start);
- return nl ? nl + 1 : end;
-}
-
/*
* To allow quick access to the contents of nth line in the
* final image, prepare an index in the scoreboard.
*/
static int prepare_lines(struct blame_scoreboard *sb)
{
- const char *buf = sb->final_buf;
- unsigned long len = sb->final_buf_size;
- const char *end = buf + len;
- const char *p;
- int *lineno;
- int num = 0;
-
- for (p = buf; p < end; p = get_next_line(p, end))
- num++;
-
- ALLOC_ARRAY(sb->lineno, num + 1);
- lineno = sb->lineno;
-
- for (p = buf; p < end; p = get_next_line(p, end))
- *lineno++ = p - buf;
-
- *lineno = len;
-
- sb->num_lines = num;
+ sb->num_lines = find_line_starts(&sb->lineno, sb->final_buf,
+ sb->final_buf_size);
return sb->num_lines;
}
diff --git a/blame.h b/blame.h
index be3a895..4a9e127 100644
--- a/blame.h
+++ b/blame.h
@@ -51,8 +51,10 @@
*/
struct blame_entry *suspects;
mmfile_t file;
+ int num_lines;
+ void *fingerprints;
struct object_id blob_oid;
- unsigned mode;
+ unsigned short mode;
/* guilty gets set when shipping any suspects to the final
* blame list instead of other commits
*/
@@ -92,6 +94,8 @@
* scanning the lines over and over.
*/
unsigned score;
+ int ignored;
+ int unblamable;
};
/*
@@ -117,6 +121,8 @@
/* linked list of blames */
struct blame_entry *ent;
+ struct oidset ignore_list;
+
/* look-up a line in the final buffer */
int num_lines;
int *lineno;
@@ -177,6 +183,6 @@
long start, long end,
struct blame_origin *o);
-extern struct blame_origin *get_blame_suspects(struct commit *commit);
+struct blame_origin *get_blame_suspects(struct commit *commit);
#endif /* BLAME_H */
diff --git a/blob.c b/blob.c
index 342bdbb..36f9abd 100644
--- a/blob.c
+++ b/blob.c
@@ -7,10 +7,9 @@
struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_blob_node(r));
+ return create_object(r, oid, alloc_blob_node(r));
return object_as_type(r, obj, OBJ_BLOB, 0);
}
diff --git a/branch.c b/branch.c
index 28b81a7..5794947 100644
--- a/branch.c
+++ b/branch.c
@@ -5,6 +5,7 @@
#include "refs.h"
#include "refspec.h"
#include "remote.h"
+#include "sequencer.h"
#include "commit.h"
#include "worktree.h"
@@ -268,7 +269,7 @@
}
real_ref = NULL;
- if (get_oid(start_name, &oid)) {
+ if (get_oid_mb(start_name, &oid)) {
if (explicit_tracking) {
if (advice_set_upstream_failure) {
error(_(upstream_missing), start_name);
@@ -337,15 +338,19 @@
free(real_ref);
}
-void remove_branch_state(struct repository *r)
+void remove_merge_branch_state(struct repository *r)
{
- unlink(git_path_cherry_pick_head(r));
- unlink(git_path_revert_head(r));
unlink(git_path_merge_head(r));
unlink(git_path_merge_rr(r));
unlink(git_path_merge_msg(r));
unlink(git_path_merge_mode(r));
+}
+
+void remove_branch_state(struct repository *r, int verbose)
+{
+ sequencer_post_commit_cleanup(r, verbose);
unlink(git_path_squash_msg(r));
+ remove_merge_branch_state(r);
}
void die_if_checked_out(const char *branch, int ignore_current_worktree)
diff --git a/branch.h b/branch.h
index 29c1afa..df0be61 100644
--- a/branch.h
+++ b/branch.h
@@ -50,7 +50,7 @@
* Return 1 if the named branch already exists; return 0 otherwise.
* Fill ref with the full refname for the branch.
*/
-extern int validate_branchname(const char *name, struct strbuf *ref);
+int validate_branchname(const char *name, struct strbuf *ref);
/*
* Check if a branch 'name' can be created as a new branch; die otherwise.
@@ -58,13 +58,19 @@
* Return 1 if the named branch already exists; return 0 otherwise.
* Fill ref with the full refname for the branch.
*/
-extern int validate_new_branchname(const char *name, struct strbuf *ref, int force);
+int validate_new_branchname(const char *name, struct strbuf *ref, int force);
+
+/*
+ * Remove information about the merge state on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_merge_branch_state(struct repository *r);
/*
* Remove information about the state of working on the current
* branch. (E.g., MERGE_HEAD)
*/
-void remove_branch_state(struct repository *r);
+void remove_branch_state(struct repository *r, int verbose);
/*
* Configure local branch "local" as downstream to branch "remote"
@@ -72,26 +78,26 @@
* Returns 0 on success.
*/
#define BRANCH_CONFIG_VERBOSE 01
-extern int install_branch_config(int flag, const char *local, const char *origin, const char *remote);
+int install_branch_config(int flag, const char *local, const char *origin, const char *remote);
/*
* Read branch description
*/
-extern int read_branch_desc(struct strbuf *, const char *branch_name);
+int read_branch_desc(struct strbuf *, const char *branch_name);
/*
* Check if a branch is checked out in the main worktree or any linked
* worktree and die (with a message describing its checkout location) if
* it is.
*/
-extern void die_if_checked_out(const char *branch, int ignore_current_worktree);
+void die_if_checked_out(const char *branch, int ignore_current_worktree);
/*
* Update all per-worktree HEADs pointing at the old ref to point the new ref.
* This will be used when renaming a branch. Returns 0 if successful, non-zero
* otherwise.
*/
-extern int replace_each_worktree_head_symref(const char *oldref, const char *newref,
- const char *logmsg);
+int replace_each_worktree_head_symref(const char *oldref, const char *newref,
+ const char *logmsg);
#endif
diff --git a/builtin.h b/builtin.h
index 6538932..5cf5df6 100644
--- a/builtin.h
+++ b/builtin.h
@@ -102,7 +102,7 @@
#define PRUNE_PACKED_DRY_RUN 01
#define PRUNE_PACKED_VERBOSE 02
-extern void prune_packed_objects(int);
+void prune_packed_objects(int);
struct fmt_merge_msg_opts {
unsigned add_title:1,
@@ -110,8 +110,8 @@
int shortlog_len;
};
-extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
- struct fmt_merge_msg_opts *);
+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+ struct fmt_merge_msg_opts *);
/**
* If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early
@@ -123,131 +123,134 @@
* You should most likely use a default of 0 or 1. "Punt" (-1) could be useful
* to be able to fall back to some historical compatibility name.
*/
-extern void setup_auto_pager(const char *cmd, int def);
+void setup_auto_pager(const char *cmd, int def);
-extern int is_builtin(const char *s);
+int is_builtin(const char *s);
-extern int cmd_add(int argc, const char **argv, const char *prefix);
-extern int cmd_am(int argc, const char **argv, const char *prefix);
-extern int cmd_annotate(int argc, const char **argv, const char *prefix);
-extern int cmd_apply(int argc, const char **argv, const char *prefix);
-extern int cmd_archive(int argc, const char **argv, const char *prefix);
-extern int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
-extern int cmd_blame(int argc, const char **argv, const char *prefix);
-extern int cmd_branch(int argc, const char **argv, const char *prefix);
-extern int cmd_bundle(int argc, const char **argv, const char *prefix);
-extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
-extern int cmd_checkout(int argc, const char **argv, const char *prefix);
-extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
-extern int cmd_check_attr(int argc, const char **argv, const char *prefix);
-extern int cmd_check_ignore(int argc, const char **argv, const char *prefix);
-extern int cmd_check_mailmap(int argc, const char **argv, const char *prefix);
-extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
-extern int cmd_cherry(int argc, const char **argv, const char *prefix);
-extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
-extern int cmd_clone(int argc, const char **argv, const char *prefix);
-extern int cmd_clean(int argc, const char **argv, const char *prefix);
-extern int cmd_column(int argc, const char **argv, const char *prefix);
-extern int cmd_commit(int argc, const char **argv, const char *prefix);
-extern int cmd_commit_graph(int argc, const char **argv, const char *prefix);
-extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_config(int argc, const char **argv, const char *prefix);
-extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
-extern int cmd_credential(int argc, const char **argv, const char *prefix);
-extern int cmd_describe(int argc, const char **argv, const char *prefix);
-extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
-extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
-extern int cmd_diff(int argc, const char **argv, const char *prefix);
-extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_difftool(int argc, const char **argv, const char *prefix);
-extern int cmd_fast_export(int argc, const char **argv, const char *prefix);
-extern int cmd_fetch(int argc, const char **argv, const char *prefix);
-extern int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
-extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
-extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
-extern int cmd_fsck(int argc, const char **argv, const char *prefix);
-extern int cmd_gc(int argc, const char **argv, const char *prefix);
-extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
-extern int cmd_grep(int argc, const char **argv, const char *prefix);
-extern int cmd_hash_object(int argc, const char **argv, const char *prefix);
-extern int cmd_help(int argc, const char **argv, const char *prefix);
-extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_init_db(int argc, const char **argv, const char *prefix);
-extern int cmd_interpret_trailers(int argc, const char **argv, const char *prefix);
-extern int cmd_log(int argc, const char **argv, const char *prefix);
-extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
-extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
-extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_ls_remote(int argc, const char **argv, const char *prefix);
-extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
-extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
-extern int cmd_merge(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_index(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
-extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_mktag(int argc, const char **argv, const char *prefix);
-extern int cmd_mktree(int argc, const char **argv, const char *prefix);
-extern int cmd_multi_pack_index(int argc, const char **argv, const char *prefix);
-extern int cmd_mv(int argc, const char **argv, const char *prefix);
-extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
-extern int cmd_notes(int argc, const char **argv, const char *prefix);
-extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
-extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
-extern int cmd_patch_id(int argc, const char **argv, const char *prefix);
-extern int cmd_prune(int argc, const char **argv, const char *prefix);
-extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
-extern int cmd_pull(int argc, const char **argv, const char *prefix);
-extern int cmd_push(int argc, const char **argv, const char *prefix);
-extern int cmd_range_diff(int argc, const char **argv, const char *prefix);
-extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_rebase(int argc, const char **argv, const char *prefix);
-extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
-extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_reflog(int argc, const char **argv, const char *prefix);
-extern int cmd_remote(int argc, const char **argv, const char *prefix);
-extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
-extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
-extern int cmd_repack(int argc, const char **argv, const char *prefix);
-extern int cmd_rerere(int argc, const char **argv, const char *prefix);
-extern int cmd_reset(int argc, const char **argv, const char *prefix);
-extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
-extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
-extern int cmd_revert(int argc, const char **argv, const char *prefix);
-extern int cmd_rm(int argc, const char **argv, const char *prefix);
-extern int cmd_send_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_serve(int argc, const char **argv, const char *prefix);
-extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
-extern int cmd_show(int argc, const char **argv, const char *prefix);
-extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
-extern int cmd_show_index(int argc, const char **argv, const char *prefix);
-extern int cmd_status(int argc, const char **argv, const char *prefix);
-extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
-extern int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
-extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
-extern int cmd_tag(int argc, const char **argv, const char *prefix);
-extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_unpack_file(int argc, const char **argv, const char *prefix);
-extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
-extern int cmd_update_index(int argc, const char **argv, const char *prefix);
-extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
-extern int cmd_update_server_info(int argc, const char **argv, const char *prefix);
-extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
-extern int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix);
-extern int cmd_upload_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_var(int argc, const char **argv, const char *prefix);
-extern int cmd_verify_commit(int argc, const char **argv, const char *prefix);
-extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
-extern int cmd_version(int argc, const char **argv, const char *prefix);
-extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
-extern int cmd_worktree(int argc, const char **argv, const char *prefix);
-extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
-extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
-extern int cmd_replace(int argc, const char **argv, const char *prefix);
+int cmd_add(int argc, const char **argv, const char *prefix);
+int cmd_am(int argc, const char **argv, const char *prefix);
+int cmd_annotate(int argc, const char **argv, const char *prefix);
+int cmd_apply(int argc, const char **argv, const char *prefix);
+int cmd_archive(int argc, const char **argv, const char *prefix);
+int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
+int cmd_blame(int argc, const char **argv, const char *prefix);
+int cmd_branch(int argc, const char **argv, const char *prefix);
+int cmd_bundle(int argc, const char **argv, const char *prefix);
+int cmd_cat_file(int argc, const char **argv, const char *prefix);
+int cmd_checkout(int argc, const char **argv, const char *prefix);
+int cmd_checkout_index(int argc, const char **argv, const char *prefix);
+int cmd_check_attr(int argc, const char **argv, const char *prefix);
+int cmd_check_ignore(int argc, const char **argv, const char *prefix);
+int cmd_check_mailmap(int argc, const char **argv, const char *prefix);
+int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
+int cmd_cherry(int argc, const char **argv, const char *prefix);
+int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
+int cmd_clone(int argc, const char **argv, const char *prefix);
+int cmd_clean(int argc, const char **argv, const char *prefix);
+int cmd_column(int argc, const char **argv, const char *prefix);
+int cmd_commit(int argc, const char **argv, const char *prefix);
+int cmd_commit_graph(int argc, const char **argv, const char *prefix);
+int cmd_commit_tree(int argc, const char **argv, const char *prefix);
+int cmd_config(int argc, const char **argv, const char *prefix);
+int cmd_count_objects(int argc, const char **argv, const char *prefix);
+int cmd_credential(int argc, const char **argv, const char *prefix);
+int cmd_describe(int argc, const char **argv, const char *prefix);
+int cmd_diff_files(int argc, const char **argv, const char *prefix);
+int cmd_diff_index(int argc, const char **argv, const char *prefix);
+int cmd_diff(int argc, const char **argv, const char *prefix);
+int cmd_diff_tree(int argc, const char **argv, const char *prefix);
+int cmd_difftool(int argc, const char **argv, const char *prefix);
+int cmd_env__helper(int argc, const char **argv, const char *prefix);
+int cmd_fast_export(int argc, const char **argv, const char *prefix);
+int cmd_fetch(int argc, const char **argv, const char *prefix);
+int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
+int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
+int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
+int cmd_format_patch(int argc, const char **argv, const char *prefix);
+int cmd_fsck(int argc, const char **argv, const char *prefix);
+int cmd_gc(int argc, const char **argv, const char *prefix);
+int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
+int cmd_grep(int argc, const char **argv, const char *prefix);
+int cmd_hash_object(int argc, const char **argv, const char *prefix);
+int cmd_help(int argc, const char **argv, const char *prefix);
+int cmd_index_pack(int argc, const char **argv, const char *prefix);
+int cmd_init_db(int argc, const char **argv, const char *prefix);
+int cmd_interpret_trailers(int argc, const char **argv, const char *prefix);
+int cmd_log(int argc, const char **argv, const char *prefix);
+int cmd_log_reflog(int argc, const char **argv, const char *prefix);
+int cmd_ls_files(int argc, const char **argv, const char *prefix);
+int cmd_ls_tree(int argc, const char **argv, const char *prefix);
+int cmd_ls_remote(int argc, const char **argv, const char *prefix);
+int cmd_mailinfo(int argc, const char **argv, const char *prefix);
+int cmd_mailsplit(int argc, const char **argv, const char *prefix);
+int cmd_merge(int argc, const char **argv, const char *prefix);
+int cmd_merge_base(int argc, const char **argv, const char *prefix);
+int cmd_merge_index(int argc, const char **argv, const char *prefix);
+int cmd_merge_ours(int argc, const char **argv, const char *prefix);
+int cmd_merge_file(int argc, const char **argv, const char *prefix);
+int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
+int cmd_merge_tree(int argc, const char **argv, const char *prefix);
+int cmd_mktag(int argc, const char **argv, const char *prefix);
+int cmd_mktree(int argc, const char **argv, const char *prefix);
+int cmd_multi_pack_index(int argc, const char **argv, const char *prefix);
+int cmd_mv(int argc, const char **argv, const char *prefix);
+int cmd_name_rev(int argc, const char **argv, const char *prefix);
+int cmd_notes(int argc, const char **argv, const char *prefix);
+int cmd_pack_objects(int argc, const char **argv, const char *prefix);
+int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
+int cmd_patch_id(int argc, const char **argv, const char *prefix);
+int cmd_prune(int argc, const char **argv, const char *prefix);
+int cmd_prune_packed(int argc, const char **argv, const char *prefix);
+int cmd_pull(int argc, const char **argv, const char *prefix);
+int cmd_push(int argc, const char **argv, const char *prefix);
+int cmd_range_diff(int argc, const char **argv, const char *prefix);
+int cmd_read_tree(int argc, const char **argv, const char *prefix);
+int cmd_rebase(int argc, const char **argv, const char *prefix);
+int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
+int cmd_receive_pack(int argc, const char **argv, const char *prefix);
+int cmd_reflog(int argc, const char **argv, const char *prefix);
+int cmd_remote(int argc, const char **argv, const char *prefix);
+int cmd_remote_ext(int argc, const char **argv, const char *prefix);
+int cmd_remote_fd(int argc, const char **argv, const char *prefix);
+int cmd_repack(int argc, const char **argv, const char *prefix);
+int cmd_rerere(int argc, const char **argv, const char *prefix);
+int cmd_reset(int argc, const char **argv, const char *prefix);
+int cmd_restore(int argc, const char **argv, const char *prefix);
+int cmd_rev_list(int argc, const char **argv, const char *prefix);
+int cmd_rev_parse(int argc, const char **argv, const char *prefix);
+int cmd_revert(int argc, const char **argv, const char *prefix);
+int cmd_rm(int argc, const char **argv, const char *prefix);
+int cmd_send_pack(int argc, const char **argv, const char *prefix);
+int cmd_shortlog(int argc, const char **argv, const char *prefix);
+int cmd_show(int argc, const char **argv, const char *prefix);
+int cmd_show_branch(int argc, const char **argv, const char *prefix);
+int cmd_show_index(int argc, const char **argv, const char *prefix);
+int cmd_status(int argc, const char **argv, const char *prefix);
+int cmd_stash(int argc, const char **argv, const char *prefix);
+int cmd_stripspace(int argc, const char **argv, const char *prefix);
+int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
+int cmd_switch(int argc, const char **argv, const char *prefix);
+int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
+int cmd_tag(int argc, const char **argv, const char *prefix);
+int cmd_tar_tree(int argc, const char **argv, const char *prefix);
+int cmd_unpack_file(int argc, const char **argv, const char *prefix);
+int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
+int cmd_update_index(int argc, const char **argv, const char *prefix);
+int cmd_update_ref(int argc, const char **argv, const char *prefix);
+int cmd_update_server_info(int argc, const char **argv, const char *prefix);
+int cmd_upload_archive(int argc, const char **argv, const char *prefix);
+int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix);
+int cmd_upload_pack(int argc, const char **argv, const char *prefix);
+int cmd_var(int argc, const char **argv, const char *prefix);
+int cmd_verify_commit(int argc, const char **argv, const char *prefix);
+int cmd_verify_tag(int argc, const char **argv, const char *prefix);
+int cmd_version(int argc, const char **argv, const char *prefix);
+int cmd_whatchanged(int argc, const char **argv, const char *prefix);
+int cmd_worktree(int argc, const char **argv, const char *prefix);
+int cmd_write_tree(int argc, const char **argv, const char *prefix);
+int cmd_verify_pack(int argc, const char **argv, const char *prefix);
+int cmd_show_ref(int argc, const char **argv, const char *prefix);
+int cmd_pack_refs(int argc, const char **argv, const char *prefix);
+int cmd_replace(int argc, const char **argv, const char *prefix);
#endif
diff --git a/builtin/add.c b/builtin/add.c
index db2dfa4..dd18e5c 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -374,11 +374,12 @@
}
for (i = 0; i < dir->nr; i++) {
- check_embedded_repo(dir->entries[i]->name);
if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) {
if (!ignore_add_errors)
die(_("adding files failed"));
exit_status = 1;
+ } else {
+ check_embedded_repo(dir->entries[i]->name);
}
}
return exit_status;
diff --git a/builtin/am.c b/builtin/am.c
index 58a2aef..39a70fc 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -453,6 +453,7 @@
cp.in = xopen(am_path(state, "rewritten"), O_RDONLY);
cp.stdout_to_stderr = 1;
+ cp.trace2_hook_name = "post-rewrite";
ret = run_command(&cp);
@@ -485,23 +486,24 @@
while (!strbuf_getline_lf(&sb, fp)) {
struct object_id from_obj, to_obj;
+ const char *p;
- if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {
+ if (sb.len != the_hash_algo->hexsz * 2 + 1) {
ret = error(invalid_line, sb.buf);
goto finish;
}
- if (get_oid_hex(sb.buf, &from_obj)) {
+ if (parse_oid_hex(sb.buf, &from_obj, &p)) {
ret = error(invalid_line, sb.buf);
goto finish;
}
- if (sb.buf[GIT_SHA1_HEXSZ] != ' ') {
+ if (*p != ' ') {
ret = error(invalid_line, sb.buf);
goto finish;
}
- if (get_oid_hex(sb.buf + GIT_SHA1_HEXSZ + 1, &to_obj)) {
+ if (get_oid_hex(p + 1, &to_obj)) {
ret = error(invalid_line, sb.buf);
goto finish;
}
@@ -1070,19 +1072,6 @@
}
/**
- * Refresh and write index.
- */
-static void refresh_and_write_cache(void)
-{
- struct lock_file lock_file = LOCK_INIT;
-
- hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
- refresh_cache(REFRESH_QUIET);
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("unable to write index file"));
-}
-
-/**
* Dies with a user-friendly message on how to proceed after resolving the
* problem. This message can be overridden with state->resolvemsg.
*/
@@ -1270,7 +1259,9 @@
buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding());
ident_line = find_commit_header(buffer, "author", &ident_len);
-
+ if (!ident_line)
+ die(_("missing author line in commit %s"),
+ oid_to_hex(&commit->object.oid));
if (split_ident_line(&id, ident_line, ident_len) < 0)
die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);
@@ -1337,9 +1328,10 @@
struct rev_info rev_info;
FILE *fp;
- if (!get_oid_tree("HEAD", &head))
- tree = lookup_tree(the_repository, &head);
- else
+ if (!get_oid("HEAD", &head)) {
+ struct commit *commit = lookup_commit_or_die(&head, "HEAD");
+ tree = get_commit_tree(commit);
+ } else
tree = lookup_tree(the_repository,
the_repository->hash_algo->empty_tree);
@@ -1500,11 +1492,11 @@
* review them with extra care to spot mismerges.
*/
struct rev_info rev_info;
- const char *diff_filter_str = "--diff-filter=AM";
repo_init_revisions(the_repository, &rev_info, NULL);
rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
- diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
+ rev_info.diffopt.filter |= diff_filter_bit('A');
+ rev_info.diffopt.filter |= diff_filter_bit('M');
add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
diff_setup_done(&rev_info.diffopt);
run_diff_index(&rev_info, 1);
@@ -1579,6 +1571,7 @@
}
author = fmt_ident(state->author_name, state->author_email,
+ WANT_AUTHOR_IDENT,
state->ignore_date ? NULL : state->author_date,
IDENT_STRICT);
@@ -1640,11 +1633,8 @@
{
assert(state->msg);
- if (!isatty(0))
- die(_("cannot be interactive without stdin connected to a terminal."));
-
for (;;) {
- const char *reply;
+ char reply[64];
puts(_("Commit Body is:"));
puts("--------------------------");
@@ -1656,11 +1646,11 @@
* in your translation. The program will only accept English
* input at this point.
*/
- reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
+ printf(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "));
+ if (!fgets(reply, sizeof(reply), stdin))
+ die("unable to read from stdin; aborting");
- if (!reply) {
- continue;
- } else if (*reply == 'y' || *reply == 'Y') {
+ if (*reply == 'y' || *reply == 'Y') {
return 0;
} else if (*reply == 'a' || *reply == 'A') {
state->interactive = 0;
@@ -1702,7 +1692,8 @@
unlink(am_path(state, "dirtyindex"));
- refresh_and_write_cache();
+ if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0)
+ die(_("unable to write index file"));
if (repo_index_has_changes(the_repository, NULL, &sb)) {
write_state_bool(state, "dirtyindex", 1);
@@ -1800,7 +1791,7 @@
*/
if (!state->rebasing) {
am_destroy(state);
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}
@@ -1955,7 +1946,7 @@
if (merge_tree(remote_tree))
return -1;
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return 0;
}
@@ -2119,6 +2110,10 @@
*opt_value = PATCH_FORMAT_HG;
else if (!strcmp(arg, "mboxrd"))
*opt_value = PATCH_FORMAT_MBOXRD;
+ /*
+ * Please update $__git_patchformat in git-completion.bash
+ * when you add new options
+ */
else
return error(_("Invalid value for --patch-format: %s"), arg);
return 0;
@@ -2327,6 +2322,9 @@
argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i]));
}
+ if (state.interactive && !paths.argc)
+ die(_("interactive mode requires patches on the command line"));
+
am_setup(&state, patch_format, paths.argv, keep_cr);
argv_array_clear(&paths);
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1cff32..1fbe156 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -173,7 +173,7 @@
argv_array_clear(&argv);
return error(_("could not check out original"
" HEAD '%s'. Try 'git bisect"
- "reset <commit>'."), branch.buf);
+ " reset <commit>'."), branch.buf);
}
argv_array_clear(&argv);
}
@@ -570,7 +570,10 @@
write_file(git_path_bisect_start(), "%s\n", start_head.buf);
if (no_checkout) {
- get_oid(start_head.buf, &oid);
+ if (get_oid(start_head.buf, &oid) < 0) {
+ retval = error(_("invalid ref: '%s'"), start_head.buf);
+ goto finish;
+ }
if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
UPDATE_REFS_MSG_ON_ERR)) {
retval = -1;
@@ -646,7 +649,7 @@
OPT_BOOL(0, "no-checkout", &no_checkout,
N_("update BISECT_HEAD instead of checking out the current commit")),
OPT_BOOL(0, "no-log", &nolog,
- N_("no log for BISECT_WRITE ")),
+ N_("no log for BISECT_WRITE")),
OPT_END()
};
struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };
diff --git a/builtin/blame.c b/builtin/blame.c
index 581de0d..b6534d4 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,6 +27,7 @@
#include "object-store.h"
#include "blame.h"
#include "string-list.h"
+#include "refs.h"
static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
@@ -52,14 +53,17 @@
static int show_progress;
static char repeated_meta_color[COLOR_MAXLEN];
static int coloring_mode;
+static struct string_list ignore_revs_file_list = STRING_LIST_INIT_NODUP;
+static int mark_unblamable_lines;
+static int mark_ignored_lines;
static struct date_mode blame_date_mode = { DATE_ISO8601 };
static size_t blame_date_width;
static struct string_list mailmap = STRING_LIST_INIT_NODUP;
-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_BLAME
+#define DEBUG_BLAME 0
#endif
static unsigned blame_move_score;
@@ -479,6 +483,14 @@
}
}
+ if (mark_unblamable_lines && ent->unblamable) {
+ length--;
+ putchar('*');
+ }
+ if (mark_ignored_lines && ent->ignored) {
+ length--;
+ putchar('?');
+ }
printf("%.*s", length, hex);
if (opt & OUTPUT_ANNOTATE_COMPAT) {
const char *name;
@@ -695,6 +707,24 @@
parse_date_format(value, &blame_date_mode);
return 0;
}
+ if (!strcmp(var, "blame.ignorerevsfile")) {
+ const char *str;
+ int ret;
+
+ ret = git_config_pathname(&str, var, value);
+ if (ret)
+ return ret;
+ string_list_insert(&ignore_revs_file_list, str);
+ return 0;
+ }
+ if (!strcmp(var, "blame.markunblamablelines")) {
+ mark_unblamable_lines = git_config_bool(var, value);
+ return 0;
+ }
+ if (!strcmp(var, "blame.markignoredlines")) {
+ mark_ignored_lines = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "color.blame.repeatedlines")) {
if (color_parse_mem(value, strlen(value), repeated_meta_color))
warning(_("invalid color '%s' in color.blame.repeatedLines"),
@@ -774,6 +804,27 @@
return OBJ_NONE < oid_object_info(the_repository, &oid, NULL);
}
+static void build_ignorelist(struct blame_scoreboard *sb,
+ struct string_list *ignore_revs_file_list,
+ struct string_list *ignore_rev_list)
+{
+ struct string_list_item *i;
+ struct object_id oid;
+
+ oidset_init(&sb->ignore_list, 0);
+ for_each_string_list_item(i, ignore_revs_file_list) {
+ if (!strcmp(i->string, ""))
+ oidset_clear(&sb->ignore_list);
+ else
+ oidset_parse_file(&sb->ignore_list, i->string);
+ }
+ for_each_string_list_item(i, ignore_rev_list) {
+ if (get_oid_committish(i->string, &oid))
+ die(_("cannot find revision %s to ignore"), i->string);
+ oidset_insert(&sb->ignore_list, &oid);
+ }
+}
+
int cmd_blame(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
@@ -785,6 +836,7 @@
struct progress_info pi = { NULL, 0 };
struct string_list range_list = STRING_LIST_INIT_NODUP;
+ struct string_list ignore_rev_list = STRING_LIST_INIT_NODUP;
int output_option = 0, opt = 0;
int show_stats = 0;
const char *revs_file = NULL;
@@ -806,6 +858,8 @@
OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+ OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("Ignore <rev> when blaming")),
+ OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")),
OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
@@ -814,7 +868,7 @@
* and are only included here to get included in the "-h"
* output:
*/
- { OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, parse_opt_unknown_cb },
+ { OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, NULL, 0, parse_opt_unknown_cb },
OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
@@ -993,12 +1047,27 @@
revs.disable_stdin = 1;
setup_revisions(argc, argv, &revs, NULL);
+ if (!revs.pending.nr && is_bare_repository()) {
+ struct commit *head_commit;
+ struct object_id head_oid;
+
+ if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
+ &head_oid, NULL) ||
+ !(head_commit = lookup_commit_reference_gently(revs.repo,
+ &head_oid, 1)))
+ die("no such ref: HEAD");
+
+ add_pending_object(&revs, &head_commit->object, "HEAD");
+ }
init_scoreboard(&sb);
sb.revs = &revs;
sb.contents_from = contents_from;
sb.reverse = reverse;
sb.repo = the_repository;
+ build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list);
+ string_list_clear(&ignore_revs_file_list, 0);
+ string_list_clear(&ignore_rev_list, 0);
setup_scoreboard(&sb, path, &o);
lno = sb.num_lines;
@@ -1049,7 +1118,7 @@
if (blame_copy_score)
sb.copy_score = blame_copy_score;
- sb.debug = DEBUG;
+ sb.debug = DEBUG_BLAME;
sb.on_sanity_fail = &sanity_check_on_fail;
sb.show_root = show_root;
diff --git a/builtin/branch.c b/builtin/branch.c
index 1be7272..2ef2146 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -47,6 +47,7 @@
GIT_COLOR_NORMAL, /* LOCAL */
GIT_COLOR_GREEN, /* CURRENT */
GIT_COLOR_BLUE, /* UPSTREAM */
+ GIT_COLOR_CYAN, /* WORKTREE */
};
enum color_branch {
BRANCH_COLOR_RESET = 0,
@@ -54,7 +55,8 @@
BRANCH_COLOR_REMOTE = 2,
BRANCH_COLOR_LOCAL = 3,
BRANCH_COLOR_CURRENT = 4,
- BRANCH_COLOR_UPSTREAM = 5
+ BRANCH_COLOR_UPSTREAM = 5,
+ BRANCH_COLOR_WORKTREE = 6
};
static const char *color_branch_slots[] = {
@@ -64,6 +66,7 @@
[BRANCH_COLOR_LOCAL] = "local",
[BRANCH_COLOR_CURRENT] = "current",
[BRANCH_COLOR_UPSTREAM] = "upstream",
+ [BRANCH_COLOR_WORKTREE] = "worktree",
};
static struct string_list output = STRING_LIST_INIT_DUP;
@@ -342,9 +345,10 @@
struct strbuf local = STRBUF_INIT;
struct strbuf remote = STRBUF_INIT;
- strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else) %s%%(end)",
- branch_get_color(BRANCH_COLOR_CURRENT),
- branch_get_color(BRANCH_COLOR_LOCAL));
+ strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else)%%(if)%%(worktreepath)%%(then)+ %s%%(else) %s%%(end)%%(end)",
+ branch_get_color(BRANCH_COLOR_CURRENT),
+ branch_get_color(BRANCH_COLOR_WORKTREE),
+ branch_get_color(BRANCH_COLOR_LOCAL));
strbuf_addf(&remote, " %s",
branch_get_color(BRANCH_COLOR_REMOTE));
@@ -363,9 +367,13 @@
strbuf_addf(&local, " %s ", obname.buf);
if (filter->verbose > 1)
+ {
+ strbuf_addf(&local, "%%(if:notequals=*)%%(HEAD)%%(then)%%(if)%%(worktreepath)%%(then)(%s%%(worktreepath)%s) %%(end)%%(end)",
+ branch_get_color(BRANCH_COLOR_WORKTREE), branch_get_color(BRANCH_COLOR_RESET));
strbuf_addf(&local, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
"%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
branch_get_color(BRANCH_COLOR_UPSTREAM), branch_get_color(BRANCH_COLOR_RESET));
+ }
else
strbuf_addf(&local, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)");
@@ -443,6 +451,21 @@
free(to_free);
}
+static void print_current_branch_name(void)
+{
+ int flags;
+ const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
+ const char *shortname;
+ if (!refname)
+ die(_("could not resolve HEAD"));
+ else if (!(flags & REF_ISSYMREF))
+ return;
+ else if (skip_prefix(refname, "refs/heads/", &shortname))
+ puts(shortname);
+ else
+ die(_("HEAD (%s) points outside of refs/heads/"), refname);
+}
+
static void reject_rebase_or_bisect_branch(const char *target)
{
struct worktree **worktrees = get_worktrees(0);
@@ -581,6 +604,7 @@
int cmd_branch(int argc, const char **argv, const char *prefix)
{
int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
+ int show_current = 0;
int reflog = 0, edit_description = 0;
int quiet = 0, unset_upstream = 0;
const char *new_upstream = NULL;
@@ -620,6 +644,7 @@
OPT_BIT('c', "copy", ©, N_("copy a branch and its reflog"), 1),
OPT_BIT('C', NULL, ©, N_("copy a branch, even if target exists"), 2),
OPT_BOOL('l', "list", &list, N_("list branch names")),
+ OPT_BOOL(0, "show-current", &show_current, N_("show current branch name")),
OPT_BOOL(0, "create-reflog", &reflog, N_("create the branch's reflog")),
OPT_BOOL(0, "edit-description", &edit_description,
N_("edit the description for the branch")),
@@ -627,8 +652,7 @@
OPT_MERGED(&filter, N_("print only branches that are merged")),
OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
- OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
- N_("field name to sort on"), &parse_opt_ref_sorting),
+ OPT_REF_SORT(sorting_tail),
{
OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
N_("print only branches of the object"), 0, parse_opt_object_name
@@ -662,14 +686,15 @@
argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
0);
- if (!delete && !rename && !copy && !edit_description && !new_upstream && !unset_upstream && argc == 0)
+ if (!delete && !rename && !copy && !edit_description && !new_upstream &&
+ !show_current && !unset_upstream && argc == 0)
list = 1;
if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
filter.no_commit)
list = 1;
- if (!!delete + !!rename + !!copy + !!new_upstream +
+ if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
list + unset_upstream > 1)
usage_with_options(builtin_branch_usage, options);
@@ -697,6 +722,9 @@
if (!argc)
die(_("branch name required"));
return delete_branches(argc, argv, delete > 1, filter.kind, quiet);
+ } else if (show_current) {
+ print_current_branch_name();
+ return 0;
} else if (list) {
/* git branch --local also shows HEAD when it is detached */
if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
@@ -810,7 +838,8 @@
strbuf_release(&buf);
} else if (argc > 0 && argc <= 2) {
if (filter.kind != FILTER_REFS_BRANCHES)
- die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
+ die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
+ "Did you mean to use: -a|-r --list <pattern>?"));
if (track == BRANCH_TRACK_OVERRIDE)
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 0f09238..d6a1aa7 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -15,6 +15,7 @@
#include "sha1-array.h"
#include "packfile.h"
#include "object-store.h"
+#include "promisor-remote.h"
struct batch_options {
int enabled;
@@ -172,7 +173,8 @@
* fall-back to the usual case.
*/
}
- buf = read_object_with_reference(&oid, exp_type, &size, NULL);
+ buf = read_object_with_reference(the_repository,
+ &oid, exp_type, &size, NULL);
break;
default:
@@ -523,8 +525,8 @@
if (opt->all_objects) {
struct object_cb_data cb;
- if (repository_format_partial_clone)
- warning("This repository has extensions.partialClone set. Some objects may not be loaded.");
+ if (has_promisor_remote())
+ warning("This repository uses promisor remotes. Some objects may not be loaded.");
cb.opt = opt;
cb.expand = &data;
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 5990973..5a4f923 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -32,19 +32,19 @@
OPT_END()
};
-static void output_exclude(const char *path, struct exclude *exclude)
+static void output_pattern(const char *path, struct path_pattern *pattern)
{
- char *bang = (exclude && exclude->flags & EXC_FLAG_NEGATIVE) ? "!" : "";
- char *slash = (exclude && exclude->flags & EXC_FLAG_MUSTBEDIR) ? "/" : "";
+ char *bang = (pattern && pattern->flags & PATTERN_FLAG_NEGATIVE) ? "!" : "";
+ char *slash = (pattern && pattern->flags & PATTERN_FLAG_MUSTBEDIR) ? "/" : "";
if (!nul_term_line) {
if (!verbose) {
write_name_quoted(path, stdout, '\n');
} else {
- if (exclude) {
- quote_c_style(exclude->el->src, NULL, stdout, 0);
+ if (pattern) {
+ quote_c_style(pattern->pl->src, NULL, stdout, 0);
printf(":%d:%s%s%s\t",
- exclude->srcpos,
- bang, exclude->pattern, slash);
+ pattern->srcpos,
+ bang, pattern->pattern, slash);
}
else {
printf("::\t");
@@ -56,11 +56,11 @@
if (!verbose) {
printf("%s%c", path, '\0');
} else {
- if (exclude)
+ if (pattern)
printf("%s%c%d%c%s%s%s%c%s%c",
- exclude->el->src, '\0',
- exclude->srcpos, '\0',
- bang, exclude->pattern, slash, '\0',
+ pattern->pl->src, '\0',
+ pattern->srcpos, '\0',
+ bang, pattern->pattern, slash, '\0',
path, '\0');
else
printf("%c%c%c%s%c", '\0', '\0', '\0', path, '\0');
@@ -74,7 +74,7 @@
const char *full_path;
char *seen;
int num_ignored = 0, i;
- struct exclude *exclude;
+ struct path_pattern *pattern;
struct pathspec pathspec;
if (!argc) {
@@ -103,15 +103,15 @@
seen = find_pathspecs_matching_against_index(&pathspec, &the_index);
for (i = 0; i < pathspec.nr; i++) {
full_path = pathspec.items[i].match;
- exclude = NULL;
+ pattern = NULL;
if (!seen[i]) {
int dtype = DT_UNKNOWN;
- exclude = last_exclude_matching(dir, &the_index,
+ pattern = last_matching_pattern(dir, &the_index,
full_path, &dtype);
}
- if (!quiet && (exclude || show_non_matching))
- output_exclude(pathspec.items[i].original, exclude);
- if (exclude)
+ if (!quiet && (pattern || show_non_matching))
+ output_pattern(pathspec.items[i].original, pattern);
+ if (pattern)
num_ignored++;
}
free(seen);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ece4eb1..1283727 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1,32 +1,31 @@
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
-#include "config.h"
+#include "advice.h"
+#include "blob.h"
+#include "branch.h"
+#include "cache-tree.h"
#include "checkout.h"
+#include "commit.h"
+#include "config.h"
+#include "diff.h"
+#include "dir.h"
+#include "ll-merge.h"
#include "lockfile.h"
+#include "merge-recursive.h"
+#include "object-store.h"
#include "parse-options.h"
#include "refs.h"
-#include "object-store.h"
-#include "commit.h"
+#include "remote.h"
+#include "resolve-undo.h"
+#include "revision.h"
+#include "run-command.h"
+#include "submodule.h"
+#include "submodule-config.h"
#include "tree.h"
#include "tree-walk.h"
-#include "cache-tree.h"
#include "unpack-trees.h"
-#include "dir.h"
-#include "run-command.h"
-#include "merge-recursive.h"
-#include "branch.h"
-#include "diff.h"
-#include "revision.h"
-#include "remote.h"
-#include "blob.h"
+#include "wt-status.h"
#include "xdiff-interface.h"
-#include "ll-merge.h"
-#include "resolve-undo.h"
-#include "submodule-config.h"
-#include "submodule.h"
-#include "advice.h"
-
-static int checkout_optimize_new_branch;
static const char * const checkout_usage[] = {
N_("git checkout [<options>] <branch>"),
@@ -34,22 +33,43 @@
NULL,
};
+static const char * const switch_branch_usage[] = {
+ N_("git switch [<options>] [<branch>]"),
+ NULL,
+};
+
+static const char * const restore_usage[] = {
+ N_("git restore [<options>] [--source=<branch>] <file>..."),
+ NULL,
+};
+
struct checkout_opts {
int patch_mode;
int quiet;
int merge;
int force;
int force_detach;
+ int implicit_detach;
int writeout_stage;
int overwrite_ignore;
int ignore_skipworktree;
int ignore_other_worktrees;
int show_progress;
int count_checkout_paths;
- /*
- * If new checkout options are added, skip_merge_working_tree
- * should be updated accordingly.
- */
+ int overlay_mode;
+ int dwim_new_local_branch;
+ int discard_changes;
+ int accept_ref;
+ int accept_pathspec;
+ int switch_branch_doing_nothing_is_ok;
+ int only_merge_on_switching_branches;
+ int can_switch_when_in_progress;
+ int orphan_from_empty_tree;
+ int empty_pathspec_ok;
+ int checkout_index;
+ int checkout_worktree;
+ const char *ignore_unmerged_opt;
+ int ignore_unmerged;
const char *new_branch;
const char *new_branch_force;
@@ -57,10 +77,12 @@
int new_branch_log;
enum branch_track track;
struct diff_options diff_options;
+ char *conflict_style;
int branch_exists;
const char *prefix;
struct pathspec pathspec;
+ const char *from_treeish;
struct tree *source_tree;
};
@@ -104,6 +126,7 @@
if (pos >= 0) {
struct cache_entry *old = active_cache[pos];
if (ce->ce_mode == old->ce_mode &&
+ !ce_intent_to_add(old) &&
oideq(&ce->oid, &old->oid)) {
old->ce_flags |= CE_UPDATE;
discard_cache_entry(ce);
@@ -135,7 +158,8 @@
return pos;
}
-static int check_stage(int stage, const struct cache_entry *ce, int pos)
+static int check_stage(int stage, const struct cache_entry *ce, int pos,
+ int overlay_mode)
{
while (pos < active_nr &&
!strcmp(active_cache[pos]->name, ce->name)) {
@@ -143,6 +167,8 @@
return 0;
pos++;
}
+ if (!overlay_mode)
+ return 0;
if (stage == 2)
return error(_("path '%s' does not have our version"), ce->name);
else
@@ -168,7 +194,8 @@
}
static int checkout_stage(int stage, const struct cache_entry *ce, int pos,
- const struct checkout *state, int *nr_checkouts)
+ const struct checkout *state, int *nr_checkouts,
+ int overlay_mode)
{
while (pos < active_nr &&
!strcmp(active_cache[pos]->name, ce->name)) {
@@ -177,6 +204,10 @@
NULL, nr_checkouts);
pos++;
}
+ if (!overlay_mode) {
+ unlink_entry(ce);
+ return 0;
+ }
if (stage == 2)
return error(_("path '%s' does not have our version"), ce->name);
else
@@ -251,122 +282,66 @@
return status;
}
-static int checkout_paths(const struct checkout_opts *opts,
- const char *revision)
+static void mark_ce_for_checkout_overlay(struct cache_entry *ce,
+ char *ps_matched,
+ const struct checkout_opts *opts)
{
- int pos;
- struct checkout state = CHECKOUT_INIT;
- static char *ps_matched;
- struct object_id rev;
- struct commit *head;
- int errs = 0;
- struct lock_file lock_file = LOCK_INIT;
- int nr_checkouts = 0;
-
- if (opts->track != BRANCH_TRACK_UNSPECIFIED)
- die(_("'%s' cannot be used with updating paths"), "--track");
-
- if (opts->new_branch_log)
- die(_("'%s' cannot be used with updating paths"), "-l");
-
- if (opts->force && opts->patch_mode)
- die(_("'%s' cannot be used with updating paths"), "-f");
-
- if (opts->force_detach)
- die(_("'%s' cannot be used with updating paths"), "--detach");
-
- if (opts->merge && opts->patch_mode)
- die(_("'%s' cannot be used with %s"), "--merge", "--patch");
-
- if (opts->force && opts->merge)
- die(_("'%s' cannot be used with %s"), "-f", "-m");
-
- if (opts->new_branch)
- die(_("Cannot update paths and switch to branch '%s' at the same time."),
- opts->new_branch);
-
- if (opts->patch_mode)
- return run_add_interactive(revision, "--patch=checkout",
- &opts->pathspec);
-
- repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
- if (read_cache_preload(&opts->pathspec) < 0)
- return error(_("index file corrupt"));
-
- if (opts->source_tree)
- read_tree_some(opts->source_tree, &opts->pathspec);
-
- ps_matched = xcalloc(opts->pathspec.nr, 1);
-
+ ce->ce_flags &= ~CE_MATCHED;
+ if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
+ return;
+ if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
+ /*
+ * "git checkout tree-ish -- path", but this entry
+ * is in the original index but is not in tree-ish
+ * or does not match the pathspec; it will not be
+ * checked out to the working tree. We will not do
+ * anything to this entry at all.
+ */
+ return;
/*
- * Make sure all pathspecs participated in locating the paths
- * to be checked out.
+ * Either this entry came from the tree-ish we are
+ * checking the paths out of, or we are checking out
+ * of the index.
+ *
+ * If it comes from the tree-ish, we already know it
+ * matches the pathspec and could just stamp
+ * CE_MATCHED to it from update_some(). But we still
+ * need ps_matched and read_tree_recursive (and
+ * eventually tree_entry_interesting) cannot fill
+ * ps_matched yet. Once it can, we can avoid calling
+ * match_pathspec() for _all_ entries when
+ * opts->source_tree != NULL.
*/
- for (pos = 0; pos < active_nr; pos++) {
- struct cache_entry *ce = active_cache[pos];
- ce->ce_flags &= ~CE_MATCHED;
- if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
- continue;
+ if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched))
+ ce->ce_flags |= CE_MATCHED;
+}
+
+static void mark_ce_for_checkout_no_overlay(struct cache_entry *ce,
+ char *ps_matched,
+ const struct checkout_opts *opts)
+{
+ ce->ce_flags &= ~CE_MATCHED;
+ if (!opts->ignore_skipworktree && ce_skip_worktree(ce))
+ return;
+ if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched)) {
+ ce->ce_flags |= CE_MATCHED;
if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
/*
- * "git checkout tree-ish -- path", but this entry
- * is in the original index; it will not be checked
- * out to the working tree and it does not matter
- * if pathspec matched this entry. We will not do
- * anything to this entry at all.
+ * In overlay mode, but the path is not in
+ * tree-ish, which means we should remove it
+ * from the index and the working tree.
*/
- continue;
- /*
- * Either this entry came from the tree-ish we are
- * checking the paths out of, or we are checking out
- * of the index.
- *
- * If it comes from the tree-ish, we already know it
- * matches the pathspec and could just stamp
- * CE_MATCHED to it from update_some(). But we still
- * need ps_matched and read_tree_recursive (and
- * eventually tree_entry_interesting) cannot fill
- * ps_matched yet. Once it can, we can avoid calling
- * match_pathspec() for _all_ entries when
- * opts->source_tree != NULL.
- */
- if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched))
- ce->ce_flags |= CE_MATCHED;
+ ce->ce_flags |= CE_REMOVE | CE_WT_REMOVE;
}
+}
- if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {
- free(ps_matched);
- return 1;
- }
- free(ps_matched);
+static int checkout_worktree(const struct checkout_opts *opts)
+{
+ struct checkout state = CHECKOUT_INIT;
+ int nr_checkouts = 0, nr_unmerged = 0;
+ int errs = 0;
+ int pos;
- /* "checkout -m path" to recreate conflicted state */
- if (opts->merge)
- unmerge_marked_index(&the_index);
-
- /* Any unmerged paths? */
- for (pos = 0; pos < active_nr; pos++) {
- const struct cache_entry *ce = active_cache[pos];
- if (ce->ce_flags & CE_MATCHED) {
- if (!ce_stage(ce))
- continue;
- if (opts->force) {
- warning(_("path '%s' is unmerged"), ce->name);
- } else if (opts->writeout_stage) {
- errs |= check_stage(opts->writeout_stage, ce, pos);
- } else if (opts->merge) {
- errs |= check_stages((1<<2) | (1<<3), ce, pos);
- } else {
- errs = 1;
- error(_("path '%s' is unmerged"), ce->name);
- }
- pos = skip_same_name(ce, pos) - 1;
- }
- }
- if (errs)
- return 1;
-
- /* Now we are committed to check them out */
state.force = 1;
state.refresh_cache = 1;
state.istate = &the_index;
@@ -383,32 +358,192 @@
if (opts->writeout_stage)
errs |= checkout_stage(opts->writeout_stage,
ce, pos,
- &state, &nr_checkouts);
+ &state,
+ &nr_checkouts, opts->overlay_mode);
else if (opts->merge)
errs |= checkout_merged(pos, &state,
- &nr_checkouts);
+ &nr_unmerged);
pos = skip_same_name(ce, pos) - 1;
}
}
+ remove_marked_cache_entries(&the_index, 1);
+ remove_scheduled_dirs();
errs |= finish_delayed_checkout(&state, &nr_checkouts);
if (opts->count_checkout_paths) {
+ if (nr_unmerged)
+ fprintf_ln(stderr, Q_("Recreated %d merge conflict",
+ "Recreated %d merge conflicts",
+ nr_unmerged),
+ nr_unmerged);
if (opts->source_tree)
- fprintf_ln(stderr, Q_("Checked out %d path out of %s",
- "Checked out %d paths out of %s",
+ fprintf_ln(stderr, Q_("Updated %d path from %s",
+ "Updated %d paths from %s",
nr_checkouts),
nr_checkouts,
find_unique_abbrev(&opts->source_tree->object.oid,
DEFAULT_ABBREV));
- else
- fprintf_ln(stderr, Q_("Checked out %d path out of the index",
- "Checked out %d paths out of the index",
+ else if (!nr_unmerged || nr_checkouts)
+ fprintf_ln(stderr, Q_("Updated %d path from the index",
+ "Updated %d paths from the index",
nr_checkouts),
nr_checkouts);
}
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
+ return errs;
+}
+
+static int checkout_paths(const struct checkout_opts *opts,
+ const char *revision)
+{
+ int pos;
+ static char *ps_matched;
+ struct object_id rev;
+ struct commit *head;
+ int errs = 0;
+ struct lock_file lock_file = LOCK_INIT;
+ int checkout_index;
+
+ trace2_cmd_mode(opts->patch_mode ? "patch" : "path");
+
+ if (opts->track != BRANCH_TRACK_UNSPECIFIED)
+ die(_("'%s' cannot be used with updating paths"), "--track");
+
+ if (opts->new_branch_log)
+ die(_("'%s' cannot be used with updating paths"), "-l");
+
+ if (opts->ignore_unmerged && opts->patch_mode)
+ die(_("'%s' cannot be used with updating paths"),
+ opts->ignore_unmerged_opt);
+
+ if (opts->force_detach)
+ die(_("'%s' cannot be used with updating paths"), "--detach");
+
+ if (opts->merge && opts->patch_mode)
+ die(_("'%s' cannot be used with %s"), "--merge", "--patch");
+
+ if (opts->ignore_unmerged && opts->merge)
+ die(_("'%s' cannot be used with %s"),
+ opts->ignore_unmerged_opt, "-m");
+
+ if (opts->new_branch)
+ die(_("Cannot update paths and switch to branch '%s' at the same time."),
+ opts->new_branch);
+
+ if (!opts->checkout_worktree && !opts->checkout_index)
+ die(_("neither '%s' or '%s' is specified"),
+ "--staged", "--worktree");
+
+ if (!opts->checkout_worktree && !opts->from_treeish)
+ die(_("'%s' must be used when '%s' is not specified"),
+ "--worktree", "--source");
+
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->writeout_stage)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--ours", "--theirs", "--staged");
+
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->merge)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--merge", "--conflict", "--staged");
+
+ if (opts->patch_mode) {
+ const char *patch_mode;
+
+ if (opts->checkout_index && opts->checkout_worktree)
+ patch_mode = "--patch=checkout";
+ else if (opts->checkout_index && !opts->checkout_worktree)
+ patch_mode = "--patch=reset";
+ else if (!opts->checkout_index && opts->checkout_worktree)
+ patch_mode = "--patch=worktree";
+ else
+ BUG("either flag must have been set, worktree=%d, index=%d",
+ opts->checkout_worktree, opts->checkout_index);
+ return run_add_interactive(revision, patch_mode, &opts->pathspec);
+ }
+
+ repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
+ if (read_cache_preload(&opts->pathspec) < 0)
+ return error(_("index file corrupt"));
+
+ if (opts->source_tree)
+ read_tree_some(opts->source_tree, &opts->pathspec);
+
+ ps_matched = xcalloc(opts->pathspec.nr, 1);
+
+ /*
+ * Make sure all pathspecs participated in locating the paths
+ * to be checked out.
+ */
+ for (pos = 0; pos < active_nr; pos++)
+ if (opts->overlay_mode)
+ mark_ce_for_checkout_overlay(active_cache[pos],
+ ps_matched,
+ opts);
+ else
+ mark_ce_for_checkout_no_overlay(active_cache[pos],
+ ps_matched,
+ opts);
+
+ if (report_path_error(ps_matched, &opts->pathspec)) {
+ free(ps_matched);
+ return 1;
+ }
+ free(ps_matched);
+
+ /* "checkout -m path" to recreate conflicted state */
+ if (opts->merge)
+ unmerge_marked_index(&the_index);
+
+ /* Any unmerged paths? */
+ for (pos = 0; pos < active_nr; pos++) {
+ const struct cache_entry *ce = active_cache[pos];
+ if (ce->ce_flags & CE_MATCHED) {
+ if (!ce_stage(ce))
+ continue;
+ if (opts->ignore_unmerged) {
+ if (!opts->quiet)
+ warning(_("path '%s' is unmerged"), ce->name);
+ } else if (opts->writeout_stage) {
+ errs |= check_stage(opts->writeout_stage, ce, pos, opts->overlay_mode);
+ } else if (opts->merge) {
+ errs |= check_stages((1<<2) | (1<<3), ce, pos);
+ } else {
+ errs = 1;
+ error(_("path '%s' is unmerged"), ce->name);
+ }
+ pos = skip_same_name(ce, pos) - 1;
+ }
+ }
+ if (errs)
+ return 1;
+
+ /* Now we are committed to check them out */
+ if (opts->checkout_worktree)
+ errs |= checkout_worktree(opts);
+
+ /*
+ * Allow updating the index when checking out from the index.
+ * This is to save new stat info.
+ */
+ if (opts->checkout_worktree && !opts->checkout_index && !opts->source_tree)
+ checkout_index = 1;
+ else
+ checkout_index = opts->checkout_index;
+
+ if (checkout_index) {
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ die(_("unable to write new index file"));
+ } else {
+ /*
+ * NEEDSWORK: if --worktree is not specified, we
+ * should save stat info of checked out files in the
+ * index to avoid the next (potentially costly)
+ * refresh. But it's a bit tricker to do...
+ */
+ rollback_lock_file(&lock_file);
+ }
read_ref_full("HEAD", 0, &rev, NULL);
head = lookup_commit_reference_gently(the_repository, &rev, 1);
@@ -503,107 +638,6 @@
branch->path = strbuf_detach(&buf, NULL);
}
-/*
- * Skip merging the trees, updating the index and working directory if and
- * only if we are creating a new branch via "git checkout -b <new_branch>."
- */
-static int skip_merge_working_tree(const struct checkout_opts *opts,
- const struct branch_info *old_branch_info,
- const struct branch_info *new_branch_info)
-{
- /*
- * Do the merge if sparse checkout is on and the user has not opted in
- * to the optimized behavior
- */
- if (core_apply_sparse_checkout && !checkout_optimize_new_branch)
- return 0;
-
- /*
- * We must do the merge if we are actually moving to a new commit.
- */
- if (!old_branch_info->commit || !new_branch_info->commit ||
- !oideq(&old_branch_info->commit->object.oid,
- &new_branch_info->commit->object.oid))
- return 0;
-
- /*
- * opts->patch_mode cannot be used with switching branches so is
- * not tested here
- */
-
- /*
- * opts->quiet only impacts output so doesn't require a merge
- */
-
- /*
- * Honor the explicit request for a three-way merge or to throw away
- * local changes
- */
- if (opts->merge || opts->force)
- return 0;
-
- /*
- * --detach is documented as "updating the index and the files in the
- * working tree" but this optimization skips those steps so fall through
- * to the regular code path.
- */
- if (opts->force_detach)
- return 0;
-
- /*
- * opts->writeout_stage cannot be used with switching branches so is
- * not tested here
- */
-
- /*
- * Honor the explicit ignore requests
- */
- if (!opts->overwrite_ignore || opts->ignore_skipworktree ||
- opts->ignore_other_worktrees)
- return 0;
-
- /*
- * opts->show_progress only impacts output so doesn't require a merge
- */
-
- /*
- * If we aren't creating a new branch any changes or updates will
- * happen in the existing branch. Since that could only be updating
- * the index and working directory, we don't want to skip those steps
- * or we've defeated any purpose in running the command.
- */
- if (!opts->new_branch)
- return 0;
-
- /*
- * new_branch_force is defined to "create/reset and checkout a branch"
- * so needs to go through the merge to do the reset
- */
- if (opts->new_branch_force)
- return 0;
-
- /*
- * A new orphaned branch requrires the index and the working tree to be
- * adjusted to <start_point>
- */
- if (opts->new_orphan_branch)
- return 0;
-
- /*
- * Remaining variables are not checkout options but used to track state
- */
-
- /*
- * Do the merge if this is the initial checkout. We cannot use
- * is_cache_unborn() here because the index hasn't been loaded yet
- * so cache_nr and timestamp.sec are always zero.
- */
- if (!file_exists(get_index_file()))
- return 0;
-
- return 1;
-}
-
static int merge_working_tree(const struct checkout_opts *opts,
struct branch_info *old_branch_info,
struct branch_info *new_branch_info,
@@ -611,15 +645,21 @@
{
int ret;
struct lock_file lock_file = LOCK_INIT;
+ struct tree *new_tree;
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(NULL) < 0)
return error(_("index file corrupt"));
resolve_undo_clear();
- if (opts->force) {
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
- opts, 1, writeout_error);
+ if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
+ if (new_branch_info->commit)
+ BUG("'switch --orphan' should never accept a commit as starting point");
+ new_tree = parse_tree_indirect(the_hash_algo->empty_tree);
+ } else
+ new_tree = get_commit_tree(new_branch_info->commit);
+ if (opts->discard_changes) {
+ ret = reset_tree(new_tree, opts, 1, writeout_error);
if (ret)
return ret;
} else {
@@ -645,7 +685,7 @@
topts.initial_checkout = is_cache_unborn();
topts.update = 1;
topts.merge = 1;
- topts.gently = opts->merge && old_branch_info->commit;
+ topts.quiet = opts->merge && old_branch_info->commit;
topts.verbose_update = opts->show_progress;
topts.fn = twoway_merge;
if (opts->overwrite_ignore) {
@@ -657,7 +697,8 @@
&old_branch_info->commit->object.oid :
the_hash_algo->empty_tree);
init_tree_desc(&trees[0], tree->buffer, tree->size);
- tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
+ parse_tree(new_tree);
+ tree = new_tree;
init_tree_desc(&trees[1], tree->buffer, tree->size);
ret = unpack_trees(2, trees, &topts);
@@ -670,7 +711,10 @@
*/
struct tree *result;
struct tree *work;
+ struct tree *old_tree;
struct merge_options o;
+ struct strbuf sb = STRBUF_INIT;
+
if (!opts->merge)
return 1;
@@ -680,6 +724,12 @@
*/
if (!old_branch_info->commit)
return 1;
+ old_tree = get_commit_tree(old_branch_info->commit);
+
+ if (repo_index_has_changes(the_repository, old_tree, &sb))
+ die(_("cannot continue with staged changes in "
+ "the following files:\n%s"), sb.buf);
+ strbuf_release(&sb);
/* Do more real merge */
@@ -706,7 +756,7 @@
o.verbosity = 0;
work = write_tree_from_memory(&o);
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
+ ret = reset_tree(new_tree,
opts, 1,
writeout_error);
if (ret)
@@ -715,13 +765,13 @@
o.branch1 = new_branch_info->name;
o.branch2 = "local";
ret = merge_trees(&o,
- get_commit_tree(new_branch_info->commit),
+ new_tree,
work,
- get_commit_tree(old_branch_info->commit),
+ old_tree,
&result);
if (ret < 0)
exit(128);
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
+ ret = reset_tree(new_tree,
opts, 0,
writeout_error);
strbuf_release(&o.obuf);
@@ -739,7 +789,7 @@
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
- if (!opts->force && !opts->quiet)
+ if (!opts->discard_changes && !opts->quiet && new_branch_info->commit)
show_local_changes(&new_branch_info->commit->object, &opts->diff_options);
return 0;
@@ -844,7 +894,7 @@
delete_reflog(old_branch_info->path);
}
}
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, !opts->quiet);
strbuf_release(&msg);
if (!opts->quiet &&
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD"))))
@@ -940,7 +990,10 @@
add_pending_object(&revs, object, oid_to_hex(&object->oid));
for_each_ref(add_pending_uninteresting_ref, &revs);
- add_pending_oid(&revs, "HEAD", &new_commit->object.oid, UNINTERESTING);
+ if (new_commit)
+ add_pending_oid(&revs, "HEAD",
+ &new_commit->object.oid,
+ UNINTERESTING);
if (prepare_revision_walk(&revs))
die(_("internal error in revision walk"));
@@ -961,6 +1014,10 @@
void *path_to_free;
struct object_id rev;
int flag, writeout_error = 0;
+ int do_merge = 1;
+
+ trace2_cmd_mode("branch");
+
memset(&old_branch_info, 0, sizeof(old_branch_info));
old_branch_info.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
if (old_branch_info.path)
@@ -971,22 +1028,26 @@
if (old_branch_info.path)
skip_prefix(old_branch_info.path, "refs/heads/", &old_branch_info.name);
+ if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
+ if (new_branch_info->name)
+ BUG("'switch --orphan' should never accept a commit as starting point");
+ new_branch_info->commit = NULL;
+ new_branch_info->name = "(empty)";
+ do_merge = 1;
+ }
+
if (!new_branch_info->name) {
new_branch_info->name = "HEAD";
new_branch_info->commit = old_branch_info.commit;
if (!new_branch_info->commit)
die(_("You are on a branch yet to be born"));
parse_commit_or_die(new_branch_info->commit);
+
+ if (opts->only_merge_on_switching_branches)
+ do_merge = 0;
}
- /* optimize the "checkout -b <new_branch> path */
- if (skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) {
- if (!checkout_optimize_new_branch && !opts->quiet) {
- if (read_cache_preload(NULL) < 0)
- return error(_("index file corrupt"));
- show_local_changes(&new_branch_info->commit->object, &opts->diff_options);
- }
- } else {
+ if (do_merge) {
ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);
if (ret) {
free(path_to_free);
@@ -1006,11 +1067,6 @@
static int git_checkout_config(const char *var, const char *value, void *cb)
{
- if (!strcmp(var, "checkout.optimizenewbranch")) {
- checkout_optimize_new_branch = git_config_bool(var, value);
- return 0;
- }
-
if (!strcmp(var, "diff.ignoresubmodules")) {
struct checkout_opts *opts = cb;
handle_ignore_submodules_arg(&opts->diff_options, value);
@@ -1023,6 +1079,34 @@
return git_xmerge_config(var, value, NULL);
}
+static void setup_new_branch_info_and_source_tree(
+ struct branch_info *new_branch_info,
+ struct checkout_opts *opts,
+ struct object_id *rev,
+ const char *arg)
+{
+ struct tree **source_tree = &opts->source_tree;
+ struct object_id branch_rev;
+
+ new_branch_info->name = arg;
+ setup_branch_path(new_branch_info);
+
+ if (!check_refname_format(new_branch_info->path, 0) &&
+ !read_ref(new_branch_info->path, &branch_rev))
+ oidcpy(rev, &branch_rev);
+ else
+ new_branch_info->path = NULL; /* not an existing branch */
+
+ new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
+ if (!new_branch_info->commit) {
+ /* not a commit */
+ *source_tree = parse_tree_indirect(rev);
+ } else {
+ parse_commit_or_die(new_branch_info->commit);
+ *source_tree = get_commit_tree(new_branch_info->commit);
+ }
+}
+
static int parse_branchname_arg(int argc, const char **argv,
int dwim_new_local_branch_ok,
struct branch_info *new_branch_info,
@@ -1030,10 +1114,8 @@
struct object_id *rev,
int *dwim_remotes_matched)
{
- struct tree **source_tree = &opts->source_tree;
const char **new_branch = &opts->new_branch;
int argcount = 0;
- struct object_id branch_rev;
const char *arg;
int dash_dash_pos;
int has_dash_dash = 0;
@@ -1083,10 +1165,16 @@
if (!argc)
return 0;
+ if (!opts->accept_pathspec) {
+ if (argc > 1)
+ die(_("only one reference expected"));
+ has_dash_dash = 1; /* helps disambiguate */
+ }
+
arg = argv[0];
dash_dash_pos = -1;
for (i = 0; i < argc; i++) {
- if (!strcmp(argv[i], "--")) {
+ if (opts->accept_pathspec && !strcmp(argv[i], "--")) {
dash_dash_pos = i;
break;
}
@@ -1120,11 +1208,12 @@
recover_with_dwim = 0;
/*
- * Accept "git checkout foo" and "git checkout foo --"
- * as candidates for dwim.
+ * Accept "git checkout foo", "git checkout foo --"
+ * and "git switch foo" as candidates for dwim.
*/
if (!(argc == 1 && !has_dash_dash) &&
- !(argc == 2 && has_dash_dash))
+ !(argc == 2 && has_dash_dash) &&
+ opts->accept_pathspec)
recover_with_dwim = 0;
if (recover_with_dwim) {
@@ -1155,26 +1244,11 @@
argv++;
argc--;
- new_branch_info->name = arg;
- setup_branch_path(new_branch_info);
+ setup_new_branch_info_and_source_tree(new_branch_info, opts, rev, arg);
- if (!check_refname_format(new_branch_info->path, 0) &&
- !read_ref(new_branch_info->path, &branch_rev))
- oidcpy(rev, &branch_rev);
- else
- new_branch_info->path = NULL; /* not an existing branch */
-
- new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
- if (!new_branch_info->commit) {
- /* not a commit */
- *source_tree = parse_tree_indirect(rev);
- } else {
- parse_commit_or_die(new_branch_info->commit);
- *source_tree = get_commit_tree(new_branch_info->commit);
- }
-
- if (!*source_tree) /* case (1): want a tree */
+ if (!opts->source_tree) /* case (1): want a tree */
die(_("reference is not a tree: %s"), arg);
+
if (!has_dash_dash) { /* case (3).(d) -> (1) */
/*
* Do not complain the most common case
@@ -1184,7 +1258,7 @@
*/
if (argc)
verify_non_filename(opts->prefix, arg);
- } else {
+ } else if (opts->accept_pathspec) {
argcount++;
argv++;
argc--;
@@ -1198,6 +1272,8 @@
int status;
struct strbuf branch_ref = STRBUF_INIT;
+ trace2_cmd_mode("unborn");
+
if (!opts->new_branch)
die(_("You are on a branch yet to be born"));
strbuf_addf(&branch_ref, "refs/heads/%s", opts->new_branch);
@@ -1209,6 +1285,60 @@
return status;
}
+static void die_expecting_a_branch(const struct branch_info *branch_info)
+{
+ struct object_id oid;
+ char *to_free;
+
+ if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free) == 1) {
+ const char *ref = to_free;
+
+ if (skip_prefix(ref, "refs/tags/", &ref))
+ die(_("a branch is expected, got tag '%s'"), ref);
+ if (skip_prefix(ref, "refs/remotes/", &ref))
+ die(_("a branch is expected, got remote branch '%s'"), ref);
+ die(_("a branch is expected, got '%s'"), ref);
+ }
+ if (branch_info->commit)
+ die(_("a branch is expected, got commit '%s'"), branch_info->name);
+ /*
+ * This case should never happen because we already die() on
+ * non-commit, but just in case.
+ */
+ die(_("a branch is expected, got '%s'"), branch_info->name);
+}
+
+static void die_if_some_operation_in_progress(void)
+{
+ struct wt_status_state state;
+
+ memset(&state, 0, sizeof(state));
+ wt_status_get_state(the_repository, &state, 0);
+
+ if (state.merge_in_progress)
+ die(_("cannot switch branch while merging\n"
+ "Consider \"git merge --quit\" "
+ "or \"git worktree add\"."));
+ if (state.am_in_progress)
+ die(_("cannot switch branch in the middle of an am session\n"
+ "Consider \"git am --quit\" "
+ "or \"git worktree add\"."));
+ if (state.rebase_interactive_in_progress || state.rebase_in_progress)
+ die(_("cannot switch branch while rebasing\n"
+ "Consider \"git rebase --quit\" "
+ "or \"git worktree add\"."));
+ if (state.cherry_pick_in_progress)
+ die(_("cannot switch branch while cherry-picking\n"
+ "Consider \"git cherry-pick --quit\" "
+ "or \"git worktree add\"."));
+ if (state.revert_in_progress)
+ die(_("cannot switch branch while reverting\n"
+ "Consider \"git revert --quit\" "
+ "or \"git worktree add\"."));
+ if (state.bisect_in_progress)
+ warning(_("you are switching branch while bisecting"));
+}
+
static int checkout_branch(struct checkout_opts *opts,
struct branch_info *new_branch_info)
{
@@ -1219,6 +1349,10 @@
die(_("'%s' cannot be used with switching branches"),
"--patch");
+ if (opts->overlay_mode != -1)
+ die(_("'%s' cannot be used with switching branches"),
+ "--[no]-overlay");
+
if (opts->writeout_stage)
die(_("'%s' cannot be used with switching branches"),
"--ours/--theirs");
@@ -1226,6 +1360,9 @@
if (opts->force && opts->merge)
die(_("'%s' cannot be used with '%s'"), "-f", "-m");
+ if (opts->discard_changes && opts->merge)
+ die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge");
+
if (opts->force_detach && opts->new_branch)
die(_("'%s' cannot be used with '%s'"),
"--detach", "-b/-B/--orphan");
@@ -1233,6 +1370,8 @@
if (opts->new_orphan_branch) {
if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
+ if (opts->orphan_from_empty_tree && new_branch_info->name)
+ die(_("'%s' cannot take <start-point>"), "--orphan");
} else if (opts->force_detach) {
if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
@@ -1243,6 +1382,23 @@
die(_("Cannot switch branch to a non-commit '%s'"),
new_branch_info->name);
+ if (!opts->switch_branch_doing_nothing_is_ok &&
+ !new_branch_info->name &&
+ !opts->new_branch &&
+ !opts->force_detach)
+ die(_("missing branch or commit argument"));
+
+ if (!opts->implicit_detach &&
+ !opts->force_detach &&
+ !opts->new_branch &&
+ !opts->new_branch_force &&
+ new_branch_info->name &&
+ !new_branch_info->path)
+ die_expecting_a_branch(new_branch_info);
+
+ if (!opts->can_switch_when_in_progress)
+ die_if_some_operation_in_progress();
+
if (new_branch_info->path && !opts->force_detach && !opts->new_branch &&
!opts->ignore_other_worktrees) {
int flag;
@@ -1264,94 +1420,148 @@
return switch_branches(opts, new_branch_info);
}
-int cmd_checkout(int argc, const char **argv, const char *prefix)
+static struct option *add_common_options(struct checkout_opts *opts,
+ struct option *prevopts)
{
- struct checkout_opts opts;
- struct branch_info new_branch_info;
- char *conflict_style = NULL;
- int dwim_new_local_branch, no_dwim_new_local_branch = 0;
- int dwim_remotes_matched = 0;
struct option options[] = {
- OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
- OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
- N_("create and checkout a new branch")),
- OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
- N_("create/reset and checkout a branch")),
- OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
- OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")),
- OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
- BRANCH_TRACK_EXPLICIT),
- OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
- OPT_SET_INT_F('2', "ours", &opts.writeout_stage,
- N_("checkout our version for unmerged files"),
- 2, PARSE_OPT_NONEG),
- OPT_SET_INT_F('3', "theirs", &opts.writeout_stage,
- N_("checkout their version for unmerged files"),
- 3, PARSE_OPT_NONEG),
- OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"),
- PARSE_OPT_NOCOMPLETE),
- OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
- OPT_BOOL_F(0, "overwrite-ignore", &opts.overwrite_ignore,
- N_("update ignored files (default)"),
- PARSE_OPT_NOCOMPLETE),
- OPT_STRING(0, "conflict", &conflict_style, N_("style"),
- N_("conflict style (merge or diff3)")),
- OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
- OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
- N_("do not limit pathspecs to sparse entries only")),
- OPT_BOOL(0, "no-guess", &no_dwim_new_local_branch,
- N_("do not second guess 'git checkout <no-such-branch>'")),
- OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
- N_("do not check if another worktree is holding the given ref")),
+ OPT__QUIET(&opts->quiet, N_("suppress progress reporting")),
{ OPTION_CALLBACK, 0, "recurse-submodules", NULL,
"checkout", "control recursive updating of submodules",
PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
- OPT_BOOL(0, "progress", &opts.show_progress, N_("force progress reporting")),
- OPT_END(),
+ OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")),
+ OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")),
+ OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"),
+ N_("conflict style (merge or diff3)")),
+ OPT_END()
};
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
- memset(&opts, 0, sizeof(opts));
+static struct option *add_common_switch_branch_options(
+ struct checkout_opts *opts, struct option *prevopts)
+{
+ struct option options[] = {
+ OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),
+ OPT_SET_INT('t', "track", &opts->track, N_("set upstream info for new branch"),
+ BRANCH_TRACK_EXPLICIT),
+ OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"),
+ PARSE_OPT_NOCOMPLETE),
+ OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
+ OPT_BOOL_F(0, "overwrite-ignore", &opts->overwrite_ignore,
+ N_("update ignored files (default)"),
+ PARSE_OPT_NOCOMPLETE),
+ OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees,
+ N_("do not check if another worktree is holding the given ref")),
+ OPT_END()
+ };
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
+
+static struct option *add_checkout_path_options(struct checkout_opts *opts,
+ struct option *prevopts)
+{
+ struct option options[] = {
+ OPT_SET_INT_F('2', "ours", &opts->writeout_stage,
+ N_("checkout our version for unmerged files"),
+ 2, PARSE_OPT_NONEG),
+ OPT_SET_INT_F('3', "theirs", &opts->writeout_stage,
+ N_("checkout their version for unmerged files"),
+ 3, PARSE_OPT_NONEG),
+ OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
+ OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
+ N_("do not limit pathspecs to sparse entries only")),
+ OPT_END()
+ };
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
+
+static int checkout_main(int argc, const char **argv, const char *prefix,
+ struct checkout_opts *opts, struct option *options,
+ const char * const usagestr[])
+{
+ struct branch_info new_branch_info;
+ int dwim_remotes_matched = 0;
+ int parseopt_flags = 0;
+
memset(&new_branch_info, 0, sizeof(new_branch_info));
- opts.overwrite_ignore = 1;
- opts.prefix = prefix;
- opts.show_progress = -1;
+ opts->overwrite_ignore = 1;
+ opts->prefix = prefix;
+ opts->show_progress = -1;
- git_config(git_checkout_config, &opts);
+ git_config(git_checkout_config, opts);
- opts.track = BRANCH_TRACK_UNSPECIFIED;
+ opts->track = BRANCH_TRACK_UNSPECIFIED;
- argc = parse_options(argc, argv, prefix, options, checkout_usage,
- PARSE_OPT_KEEP_DASHDASH);
+ if (!opts->accept_pathspec && !opts->accept_ref)
+ BUG("make up your mind, you need to take _something_");
+ if (opts->accept_pathspec && opts->accept_ref)
+ parseopt_flags = PARSE_OPT_KEEP_DASHDASH;
- dwim_new_local_branch = !no_dwim_new_local_branch;
- if (opts.show_progress < 0) {
- if (opts.quiet)
- opts.show_progress = 0;
+ argc = parse_options(argc, argv, prefix, options,
+ usagestr, parseopt_flags);
+
+ if (opts->show_progress < 0) {
+ if (opts->quiet)
+ opts->show_progress = 0;
else
- opts.show_progress = isatty(2);
+ opts->show_progress = isatty(2);
}
- if (conflict_style) {
- opts.merge = 1; /* implied */
- git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
+ if (opts->conflict_style) {
+ opts->merge = 1; /* implied */
+ git_xmerge_config("merge.conflictstyle", opts->conflict_style, NULL);
+ }
+ if (opts->force) {
+ opts->discard_changes = 1;
+ opts->ignore_unmerged_opt = "--force";
+ opts->ignore_unmerged = 1;
}
- if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
+ if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)
die(_("-b, -B and --orphan are mutually exclusive"));
+ if (opts->overlay_mode == 1 && opts->patch_mode)
+ die(_("-p and --overlay are mutually exclusive"));
+
+ if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) {
+ if (opts->checkout_index < 0)
+ opts->checkout_index = 0;
+ if (opts->checkout_worktree < 0)
+ opts->checkout_worktree = 0;
+ } else {
+ if (opts->checkout_index < 0)
+ opts->checkout_index = -opts->checkout_index - 1;
+ if (opts->checkout_worktree < 0)
+ opts->checkout_worktree = -opts->checkout_worktree - 1;
+ }
+ if (opts->checkout_index < 0 || opts->checkout_worktree < 0)
+ BUG("these flags should be non-negative by now");
+ /*
+ * convenient shortcut: "git restore --staged" equals
+ * "git restore --staged --source HEAD"
+ */
+ if (!opts->from_treeish && opts->checkout_index && !opts->checkout_worktree)
+ opts->from_treeish = "HEAD";
+
/*
* From here on, new_branch will contain the branch to be checked out,
* and new_branch_force and new_orphan_branch will tell us which one of
* -b/-B/--orphan is being used.
*/
- if (opts.new_branch_force)
- opts.new_branch = opts.new_branch_force;
+ if (opts->new_branch_force)
+ opts->new_branch = opts->new_branch_force;
- if (opts.new_orphan_branch)
- opts.new_branch = opts.new_orphan_branch;
+ if (opts->new_orphan_branch)
+ opts->new_branch = opts->new_orphan_branch;
/* --track without -b/-B/--orphan should DWIM */
- if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
+ if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {
const char *argv0 = argv[0];
if (!argc || !strcmp(argv0, "--"))
die(_("--track needs a branch name"));
@@ -1360,7 +1570,7 @@
argv0 = strchr(argv0, '/');
if (!argv0 || !argv0[1])
die(_("missing branch name; try -b"));
- opts.new_branch = argv0 + 1;
+ opts->new_branch = argv0 + 1;
}
/*
@@ -1376,59 +1586,75 @@
* including "last branch" syntax and DWIM-ery for names of
* remote branches, erroring out for invalid or ambiguous cases.
*/
- if (argc) {
+ if (argc && opts->accept_ref) {
struct object_id rev;
int dwim_ok =
- !opts.patch_mode &&
- dwim_new_local_branch &&
- opts.track == BRANCH_TRACK_UNSPECIFIED &&
- !opts.new_branch;
+ !opts->patch_mode &&
+ opts->dwim_new_local_branch &&
+ opts->track == BRANCH_TRACK_UNSPECIFIED &&
+ !opts->new_branch;
int n = parse_branchname_arg(argc, argv, dwim_ok,
- &new_branch_info, &opts, &rev,
+ &new_branch_info, opts, &rev,
&dwim_remotes_matched);
argv += n;
argc -= n;
+ } else if (!opts->accept_ref && opts->from_treeish) {
+ struct object_id rev;
+
+ if (get_oid_mb(opts->from_treeish, &rev))
+ die(_("could not resolve %s"), opts->from_treeish);
+
+ setup_new_branch_info_and_source_tree(&new_branch_info,
+ opts, &rev,
+ opts->from_treeish);
+
+ if (!opts->source_tree)
+ die(_("reference is not a tree: %s"), opts->from_treeish);
}
+ if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc &&
+ !opts->patch_mode) /* patch mode is special */
+ die(_("you must specify path(s) to restore"));
+
if (argc) {
- parse_pathspec(&opts.pathspec, 0,
- opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
+ parse_pathspec(&opts->pathspec, 0,
+ opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
prefix, argv);
- if (!opts.pathspec.nr)
+ if (!opts->pathspec.nr)
die(_("invalid path specification"));
/*
* Try to give more helpful suggestion.
* new_branch && argc > 1 will be caught later.
*/
- if (opts.new_branch && argc == 1)
+ if (opts->new_branch && argc == 1)
die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
- argv[0], opts.new_branch);
+ argv[0], opts->new_branch);
- if (opts.force_detach)
+ if (opts->force_detach)
die(_("git checkout: --detach does not take a path argument '%s'"),
argv[0]);
- if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
+ if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)
die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."));
}
- if (opts.new_branch) {
+ if (opts->new_branch) {
struct strbuf buf = STRBUF_INIT;
- if (opts.new_branch_force)
- opts.branch_exists = validate_branchname(opts.new_branch, &buf);
+ if (opts->new_branch_force)
+ opts->branch_exists = validate_branchname(opts->new_branch, &buf);
else
- opts.branch_exists =
- validate_new_branchname(opts.new_branch, &buf, 0);
+ opts->branch_exists =
+ validate_new_branchname(opts->new_branch, &buf, 0);
strbuf_release(&buf);
}
UNLEAK(opts);
- if (opts.patch_mode || opts.pathspec.nr) {
- int ret = checkout_paths(&opts, new_branch_info.name);
+ if (opts->patch_mode || opts->pathspec.nr) {
+ int ret = checkout_paths(opts, new_branch_info.name);
if (ret && dwim_remotes_matched > 1 &&
advice_checkout_ambiguous_remote_branch_name)
advise(_("'%s' matched more than one remote tracking branch.\n"
@@ -1447,6 +1673,132 @@
dwim_remotes_matched);
return ret;
} else {
- return checkout_branch(&opts, &new_branch_info);
+ return checkout_branch(opts, &new_branch_info);
}
}
+
+int cmd_checkout(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options;
+ struct option checkout_options[] = {
+ OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
+ N_("create and checkout a new branch")),
+ OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
+ N_("create/reset and checkout a branch")),
+ OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
+ OPT_BOOL(0, "guess", &opts.dwim_new_local_branch,
+ N_("second guess 'git checkout <no-such-branch>' (default)")),
+ OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.dwim_new_local_branch = 1;
+ opts.switch_branch_doing_nothing_is_ok = 1;
+ opts.only_merge_on_switching_branches = 0;
+ opts.accept_ref = 1;
+ opts.accept_pathspec = 1;
+ opts.implicit_detach = 1;
+ opts.can_switch_when_in_progress = 1;
+ opts.orphan_from_empty_tree = 0;
+ opts.empty_pathspec_ok = 1;
+ opts.overlay_mode = -1;
+ opts.checkout_index = -2; /* default on */
+ opts.checkout_worktree = -2; /* default on */
+
+ if (argc == 3 && !strcmp(argv[1], "-b")) {
+ /*
+ * User ran 'git checkout -b <branch>' and expects
+ * the same behavior as 'git switch -c <branch>'.
+ */
+ opts.switch_branch_doing_nothing_is_ok = 0;
+ opts.only_merge_on_switching_branches = 1;
+ }
+
+ options = parse_options_dup(checkout_options);
+ options = add_common_options(&opts, options);
+ options = add_common_switch_branch_options(&opts, options);
+ options = add_checkout_path_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, checkout_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
+
+int cmd_switch(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options = NULL;
+ struct option switch_options[] = {
+ OPT_STRING('c', "create", &opts.new_branch, N_("branch"),
+ N_("create and switch to a new branch")),
+ OPT_STRING('C', "force-create", &opts.new_branch_force, N_("branch"),
+ N_("create/reset and switch to a branch")),
+ OPT_BOOL(0, "guess", &opts.dwim_new_local_branch,
+ N_("second guess 'git switch <no-such-branch>'")),
+ OPT_BOOL(0, "discard-changes", &opts.discard_changes,
+ N_("throw away local modifications")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.dwim_new_local_branch = 1;
+ opts.accept_ref = 1;
+ opts.accept_pathspec = 0;
+ opts.switch_branch_doing_nothing_is_ok = 0;
+ opts.only_merge_on_switching_branches = 1;
+ opts.implicit_detach = 0;
+ opts.can_switch_when_in_progress = 0;
+ opts.orphan_from_empty_tree = 1;
+ opts.overlay_mode = -1;
+
+ options = parse_options_dup(switch_options);
+ options = add_common_options(&opts, options);
+ options = add_common_switch_branch_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, switch_branch_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
+
+int cmd_restore(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options;
+ struct option restore_options[] = {
+ OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>",
+ N_("which tree-ish to checkout from")),
+ OPT_BOOL('S', "staged", &opts.checkout_index,
+ N_("restore the index")),
+ OPT_BOOL('W', "worktree", &opts.checkout_worktree,
+ N_("restore the working tree (default)")),
+ OPT_BOOL(0, "ignore-unmerged", &opts.ignore_unmerged,
+ N_("ignore unmerged entries")),
+ OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.accept_ref = 0;
+ opts.accept_pathspec = 1;
+ opts.empty_pathspec_ok = 0;
+ opts.overlay_mode = 0;
+ opts.checkout_index = -1; /* default off */
+ opts.checkout_worktree = -2; /* default on */
+ opts.ignore_unmerged_opt = "--ignore-unmerged";
+
+ options = parse_options_dup(restore_options);
+ options = add_common_options(&opts, options);
+ options = add_checkout_path_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, restore_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
diff --git a/builtin/clean.c b/builtin/clean.c
index aaba4af..851beb7 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -34,6 +34,7 @@
static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
static const char *msg_warn_remove_failed = N_("failed to remove %s");
+static const char *msg_warn_lstat_failed = N_("could not lstat %s\n");
enum color_clean {
CLEAN_COLOR_RESET = 0,
@@ -194,7 +195,7 @@
strbuf_setlen(path, len);
strbuf_addstr(path, e->d_name);
if (lstat(path->buf, &st))
- ; /* fall thru */
+ warning_errno(_(msg_warn_lstat_failed), path->buf);
else if (S_ISDIR(st.st_mode)) {
if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone))
ret = 1;
@@ -647,7 +648,7 @@
struct strbuf confirm = STRBUF_INIT;
struct strbuf **ignore_list;
struct string_list_item *item;
- struct exclude_list *el;
+ struct pattern_list *pl;
int changed = -1, i;
for (;;) {
@@ -670,7 +671,7 @@
break;
memset(&dir, 0, sizeof(dir));
- el = add_exclude_list(&dir, EXC_CMDL, "manual exclude");
+ pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
ignore_list = strbuf_split_max(&confirm, ' ', 0);
for (i = 0; ignore_list[i]; i++) {
@@ -678,7 +679,7 @@
if (!ignore_list[i]->len)
continue;
- add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1));
+ add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1));
}
changed = 0;
@@ -900,7 +901,7 @@
struct pathspec pathspec;
struct strbuf buf = STRBUF_INIT;
struct string_list exclude_list = STRING_LIST_INIT_NODUP;
- struct exclude_list *el;
+ struct pattern_list *pl;
struct string_list_item *item;
const char *qname;
struct option options[] = {
@@ -957,9 +958,9 @@
if (!ignored)
setup_standard_excludes(&dir);
- el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
+ pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
for (i = 0; i < exclude_list.nr; i++)
- add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1));
+ add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1));
parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD,
diff --git a/builtin/clone.c b/builtin/clone.c
index 50bde99..2048b67 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -23,6 +23,8 @@
#include "transport.h"
#include "strbuf.h"
#include "dir.h"
+#include "dir-iterator.h"
+#include "iterator.h"
#include "sigchain.h"
#include "branch.h"
#include "remote.h"
@@ -66,6 +68,8 @@
static int max_jobs = -1;
static struct string_list option_recurse_submodules = STRING_LIST_INIT_NODUP;
static struct list_objects_filter_options filter_options;
+static struct string_list server_options = STRING_LIST_INIT_NODUP;
+static int option_remote_submodules;
static int recurse_submodules_cb(const struct option *opt,
const char *arg, int unset)
@@ -98,10 +102,7 @@
N_("don't use local hardlinks, always copy")),
OPT_BOOL('s', "shared", &option_shared,
N_("setup as shared repository")),
- { OPTION_CALLBACK, 0, "recursive", &option_recurse_submodules,
- N_("pathspec"), N_("initialize submodules in the clone"),
- PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, recurse_submodules_cb,
- (intptr_t)"." },
+ OPT_ALIAS(0, "recursive", "recurse-submodules"),
{ OPTION_CALLBACK, 0, "recurse-submodules", &option_recurse_submodules,
N_("pathspec"), N_("initialize submodules in the clone"),
PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)"." },
@@ -137,11 +138,15 @@
N_("separate git dir from working tree")),
OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
N_("set config inside the new repository")),
+ OPT_STRING_LIST(0, "server-option", &server_options,
+ N_("server-specific"), N_("option to transmit")),
OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
TRANSPORT_FAMILY_IPV4),
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
TRANSPORT_FAMILY_IPV6),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_BOOL(0, "remote-submodules", &option_remote_submodules,
+ N_("any cloned submodules will use their remote-tracking branch")),
OPT_END()
};
@@ -354,8 +359,7 @@
add_one_reference, &required);
}
-static void copy_alternates(struct strbuf *src, struct strbuf *dst,
- const char *src_repo)
+static void copy_alternates(struct strbuf *src, const char *src_repo)
{
/*
* Read from the source objects/info/alternates file
@@ -392,58 +396,63 @@
fclose(in);
}
-static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
- const char *src_repo, int src_baselen)
+static void mkdir_if_missing(const char *pathname, mode_t mode)
{
- struct dirent *de;
- struct stat buf;
+ struct stat st;
+
+ if (!mkdir(pathname, mode))
+ return;
+
+ if (errno != EEXIST)
+ die_errno(_("failed to create directory '%s'"), pathname);
+ else if (stat(pathname, &st))
+ die_errno(_("failed to stat '%s'"), pathname);
+ else if (!S_ISDIR(st.st_mode))
+ die(_("%s exists and is not a directory"), pathname);
+}
+
+static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
+ const char *src_repo)
+{
int src_len, dest_len;
- DIR *dir;
+ struct dir_iterator *iter;
+ int iter_status;
+ unsigned int flags;
- dir = opendir(src->buf);
- if (!dir)
- die_errno(_("failed to open '%s'"), src->buf);
+ mkdir_if_missing(dest->buf, 0777);
- if (mkdir(dest->buf, 0777)) {
- if (errno != EEXIST)
- die_errno(_("failed to create directory '%s'"), dest->buf);
- else if (stat(dest->buf, &buf))
- die_errno(_("failed to stat '%s'"), dest->buf);
- else if (!S_ISDIR(buf.st_mode))
- die(_("%s exists and is not a directory"), dest->buf);
- }
+ flags = DIR_ITERATOR_PEDANTIC | DIR_ITERATOR_FOLLOW_SYMLINKS;
+ iter = dir_iterator_begin(src->buf, flags);
+
+ if (!iter)
+ die_errno(_("failed to start iterator over '%s'"), src->buf);
strbuf_addch(src, '/');
src_len = src->len;
strbuf_addch(dest, '/');
dest_len = dest->len;
- while ((de = readdir(dir)) != NULL) {
+ while ((iter_status = dir_iterator_advance(iter)) == ITER_OK) {
strbuf_setlen(src, src_len);
- strbuf_addstr(src, de->d_name);
+ strbuf_addstr(src, iter->relative_path);
strbuf_setlen(dest, dest_len);
- strbuf_addstr(dest, de->d_name);
- if (stat(src->buf, &buf)) {
- warning (_("failed to stat %s\n"), src->buf);
- continue;
- }
- if (S_ISDIR(buf.st_mode)) {
- if (de->d_name[0] != '.')
- copy_or_link_directory(src, dest,
- src_repo, src_baselen);
+ strbuf_addstr(dest, iter->relative_path);
+
+ if (S_ISDIR(iter->st.st_mode)) {
+ mkdir_if_missing(dest->buf, 0777);
continue;
}
/* Files that cannot be copied bit-for-bit... */
- if (!strcmp(src->buf + src_baselen, "/info/alternates")) {
- copy_alternates(src, dest, src_repo);
+ if (!fspathcmp(iter->relative_path, "info/alternates")) {
+ copy_alternates(src, src_repo);
continue;
}
if (unlink(dest->buf) && errno != ENOENT)
die_errno(_("failed to unlink '%s'"), dest->buf);
if (!option_no_hardlinks) {
- if (!link(src->buf, dest->buf))
+ if (!link(real_path(src->buf), dest->buf))
continue;
if (option_local > 0)
die_errno(_("failed to create link '%s'"), dest->buf);
@@ -452,7 +461,11 @@
if (copy_file_with_time(dest->buf, src->buf, 0666))
die_errno(_("failed to copy file to '%s'"), dest->buf);
}
- closedir(dir);
+
+ if (iter_status != ITER_DONE) {
+ strbuf_setlen(src, src_len);
+ die(_("failed to iterate over '%s'"), src->buf);
+ }
}
static void clone_local(const char *src_repo, const char *dest_repo)
@@ -470,7 +483,7 @@
get_common_dir(&dest, dest_repo);
strbuf_addstr(&src, "/objects");
strbuf_addstr(&dest, "/objects");
- copy_or_link_directory(&src, &dest, src_repo, src.len);
+ copy_or_link_directory(&src, &dest, src_repo);
strbuf_release(&src);
strbuf_release(&dest);
}
@@ -492,7 +505,7 @@
static const char junk_leave_repo_msg[] =
N_("Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
- "and retry the checkout with 'git checkout -f HEAD'\n");
+ "and retry with 'git restore --source=HEAD :/'\n");
static void remove_junk(void)
{
@@ -657,7 +670,8 @@
const char *branch_top,
const char *msg,
struct transport *transport,
- int check_connectivity)
+ int check_connectivity,
+ int check_refs_only)
{
const struct ref *rm = mapped_refs;
@@ -666,6 +680,7 @@
opt.transport = transport;
opt.progress = transport->progress;
+ opt.check_refs_only = !!check_refs_only;
if (check_connected(iterate_ref_map, &rm, &opt))
die(_("remote did not send all necessary objects"));
@@ -789,6 +804,11 @@
if (option_verbosity < 0)
argv_array_push(&args, "--quiet");
+ if (option_remote_submodules) {
+ argv_array_push(&args, "--remote");
+ argv_array_push(&args, "--no-fetch");
+ }
+
err = run_command_v_opt(args.argv, RUN_GIT_CMD);
argv_array_clear(&args);
}
@@ -1136,14 +1156,15 @@
transport_set_option(transport, TRANS_OPT_UPLOADPACK,
option_upload_pack);
+ if (server_options.nr)
+ transport->server_options = &server_options;
+
if (filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
transport_set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
- expanded_filter_spec.buf);
+ spec);
transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- strbuf_release(&expanded_filter_spec);
}
if (transport->smart_options && !deepen && !filter_options.choice)
@@ -1215,7 +1236,7 @@
remote_head_points_at, &branch_top);
if (filter_options.choice)
- partial_clone_register("origin", &filter_options);
+ partial_clone_register(option_origin, &filter_options);
if (is_local)
clone_local(path, git_dir);
@@ -1224,7 +1245,7 @@
update_remote_refs(refs, mapped_refs, remote_head_points_at,
branch_top.buf, reflog_msg.buf, transport,
- !is_local);
+ !is_local, filter_options.choice);
update_head(our_head_points_at, remote_head, reflog_msg.buf);
@@ -1240,7 +1261,7 @@
transport_disconnect(transport);
if (option_dissociate) {
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
dissociate_from_references();
}
diff --git a/builtin/column.c b/builtin/column.c
index 5228ccf..e815e14 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -43,7 +43,7 @@
memset(&copts, 0, sizeof(copts));
copts.padding = 1;
- argc = parse_options(argc, argv, "", options, builtin_column_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0);
if (argc)
usage_with_options(builtin_column_usage, options);
if (real_command || command) {
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 4ae5027..052696f 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -5,17 +5,18 @@
#include "parse-options.h"
#include "repository.h"
#include "commit-graph.h"
+#include "object-store.h"
static char const * const builtin_commit_graph_usage[] = {
N_("git commit-graph [--object-dir <objdir>]"),
N_("git commit-graph read [--object-dir <objdir>]"),
- N_("git commit-graph verify [--object-dir <objdir>]"),
- N_("git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"),
+ N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
NULL
};
static const char * const builtin_commit_graph_verify_usage[] = {
- N_("git commit-graph verify [--object-dir <objdir>]"),
+ N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
NULL
};
@@ -25,7 +26,7 @@
};
static const char * const builtin_commit_graph_write_usage[] = {
- N_("git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
NULL
};
@@ -35,18 +36,25 @@
int stdin_packs;
int stdin_commits;
int append;
+ int split;
+ int shallow;
} opts;
-
static int graph_verify(int argc, const char **argv)
{
struct commit_graph *graph = NULL;
char *graph_name;
+ int open_ok;
+ int fd;
+ struct stat st;
+ int flags = 0;
static struct option builtin_commit_graph_verify_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
N_("dir"),
N_("The object directory to store the graph")),
+ OPT_BOOL(0, "shallow", &opts.shallow,
+ N_("if the commit-graph is split, only verify the tip file")),
OPT_END(),
};
@@ -56,22 +64,36 @@
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
+ if (opts.shallow)
+ flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
graph_name = get_commit_graph_filename(opts.obj_dir);
- graph = load_commit_graph_one(graph_name);
+ open_ok = open_commit_graph(graph_name, &fd, &st);
+ if (!open_ok && errno != ENOENT)
+ die_errno(_("Could not open commit-graph '%s'"), graph_name);
+
FREE_AND_NULL(graph_name);
+ if (open_ok)
+ graph = load_commit_graph_one_fd_st(fd, &st);
+ else
+ graph = read_commit_graph_one(the_repository, opts.obj_dir);
+
+ /* Return failure if open_ok predicted success */
if (!graph)
- return 0;
+ return !!open_ok;
UNLEAK(graph);
- return verify_commit_graph(the_repository, graph);
+ return verify_commit_graph(the_repository, graph, flags);
}
static int graph_read(int argc, const char **argv)
{
struct commit_graph *graph = NULL;
char *graph_name;
+ int open_ok;
+ int fd;
+ struct stat st;
static struct option builtin_commit_graph_read_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
@@ -88,10 +110,14 @@
opts.obj_dir = get_object_directory();
graph_name = get_commit_graph_filename(opts.obj_dir);
- graph = load_commit_graph_one(graph_name);
+ open_ok = open_commit_graph(graph_name, &fd, &st);
+ if (!open_ok)
+ die_errno(_("Could not open commit-graph '%s'"), graph_name);
+
+ graph = load_commit_graph_one_fd_st(fd, &st);
if (!graph)
- die("graph file %s does not exist", graph_name);
+ return 1;
FREE_AND_NULL(graph_name);
@@ -120,12 +146,15 @@
}
extern int read_replace_refs;
+static struct split_commit_graph_opts split_opts;
static int graph_write(int argc, const char **argv)
{
struct string_list *pack_indexes = NULL;
struct string_list *commit_hex = NULL;
struct string_list lines;
+ int result = 0;
+ enum commit_graph_write_flags flags = COMMIT_GRAPH_WRITE_PROGRESS;
static struct option builtin_commit_graph_write_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
@@ -139,9 +168,21 @@
N_("start walk at commits listed by stdin")),
OPT_BOOL(0, "append", &opts.append,
N_("include all commits already in the commit-graph file")),
+ OPT_BOOL(0, "split", &opts.split,
+ N_("allow writing an incremental commit-graph file")),
+ OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
+ N_("maximum number of commits in a non-base split commit-graph")),
+ OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
+ N_("maximum ratio between two levels of a split commit-graph")),
+ OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
+ N_("maximum number of commits in a non-base split commit-graph")),
OPT_END(),
};
+ split_opts.size_multiple = 2;
+ split_opts.max_commits = 0;
+ split_opts.expire_time = 0;
+
argc = parse_options(argc, argv, NULL,
builtin_commit_graph_write_options,
builtin_commit_graph_write_usage, 0);
@@ -150,11 +191,16 @@
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
+ if (opts.append)
+ flags |= COMMIT_GRAPH_WRITE_APPEND;
+ if (opts.split)
+ flags |= COMMIT_GRAPH_WRITE_SPLIT;
read_replace_refs = 0;
if (opts.reachable) {
- write_commit_graph_reachable(opts.obj_dir, opts.append, 1);
+ if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts))
+ return 1;
return 0;
}
@@ -167,20 +213,23 @@
if (opts.stdin_packs)
pack_indexes = &lines;
- if (opts.stdin_commits)
+ if (opts.stdin_commits) {
commit_hex = &lines;
+ flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+ }
UNLEAK(buf);
}
- write_commit_graph(opts.obj_dir,
- pack_indexes,
- commit_hex,
- opts.append,
- 1);
+ if (write_commit_graph(opts.obj_dir,
+ pack_indexes,
+ commit_hex,
+ flags,
+ &split_opts))
+ result = 1;
UNLEAK(lines);
- return 0;
+ return result;
}
int cmd_commit_graph(int argc, const char **argv, const char *prefix)
@@ -202,6 +251,8 @@
builtin_commit_graph_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
+ save_commit_buffer = 0;
+
if (argc > 0) {
if (!strcmp(argv[0], "read"))
return graph_read(argc, argv);
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 12cc403..b866d83 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -12,8 +12,13 @@
#include "builtin.h"
#include "utf8.h"
#include "gpg-interface.h"
+#include "parse-options.h"
-static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1>";
+static const char * const commit_tree_usage[] = {
+ N_("git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] "
+ "[(-F <file>)...] <tree>"),
+ NULL
+};
static const char *sign_commit;
@@ -23,7 +28,7 @@
struct commit_list *parents;
for (parents = *parents_p; parents; parents = parents->next) {
if (parents->item == parent) {
- error("duplicate parent %s ignored", oid_to_hex(oid));
+ error(_("duplicate parent %s ignored"), oid_to_hex(oid));
return;
}
parents_p = &parents->next;
@@ -39,91 +44,100 @@
return git_default_config(var, value, cb);
}
+static int parse_parent_arg_callback(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct object_id oid;
+ struct commit_list **parents = opt->value;
+
+ BUG_ON_OPT_NEG_NOARG(unset, arg);
+
+ if (get_oid_commit(arg, &oid))
+ die(_("not a valid object name %s"), arg);
+
+ assert_oid_type(&oid, OBJ_COMMIT);
+ new_parent(lookup_commit(the_repository, &oid), parents);
+ return 0;
+}
+
+static int parse_message_arg_callback(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct strbuf *buf = opt->value;
+
+ BUG_ON_OPT_NEG_NOARG(unset, arg);
+
+ if (buf->len)
+ strbuf_addch(buf, '\n');
+ strbuf_addstr(buf, arg);
+ strbuf_complete_line(buf);
+
+ return 0;
+}
+
+static int parse_file_arg_callback(const struct option *opt,
+ const char *arg, int unset)
+{
+ int fd;
+ struct strbuf *buf = opt->value;
+
+ BUG_ON_OPT_NEG_NOARG(unset, arg);
+
+ if (buf->len)
+ strbuf_addch(buf, '\n');
+ if (!strcmp(arg, "-"))
+ fd = 0;
+ else {
+ fd = open(arg, O_RDONLY);
+ if (fd < 0)
+ die_errno(_("git commit-tree: failed to open '%s'"), arg);
+ }
+ if (strbuf_read(buf, fd, 0) < 0)
+ die_errno(_("git commit-tree: failed to read '%s'"), arg);
+ if (fd && close(fd))
+ die_errno(_("git commit-tree: failed to close '%s'"), arg);
+
+ return 0;
+}
+
int cmd_commit_tree(int argc, const char **argv, const char *prefix)
{
- int i, got_tree = 0;
+ static struct strbuf buffer = STRBUF_INIT;
struct commit_list *parents = NULL;
struct object_id tree_oid;
struct object_id commit_oid;
- struct strbuf buffer = STRBUF_INIT;
+
+ struct option options[] = {
+ { OPTION_CALLBACK, 'p', NULL, &parents, N_("parent"),
+ N_("id of a parent commit object"), PARSE_OPT_NONEG,
+ parse_parent_arg_callback },
+ { OPTION_CALLBACK, 'm', NULL, &buffer, N_("message"),
+ N_("commit message"), PARSE_OPT_NONEG,
+ parse_message_arg_callback },
+ { OPTION_CALLBACK, 'F', NULL, &buffer, N_("file"),
+ N_("read commit log message from file"), PARSE_OPT_NONEG,
+ parse_file_arg_callback },
+ { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
+ N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+ OPT_END()
+ };
git_config(commit_tree_config, NULL);
if (argc < 2 || !strcmp(argv[1], "-h"))
- usage(commit_tree_usage);
+ usage_with_options(commit_tree_usage, options);
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (!strcmp(arg, "-p")) {
- struct object_id oid;
- if (argc <= ++i)
- usage(commit_tree_usage);
- if (get_oid_commit(argv[i], &oid))
- die("Not a valid object name %s", argv[i]);
- assert_oid_type(&oid, OBJ_COMMIT);
- new_parent(lookup_commit(the_repository, &oid),
- &parents);
- continue;
- }
+ argc = parse_options(argc, argv, prefix, options, commit_tree_usage, 0);
- if (!strcmp(arg, "--gpg-sign")) {
- sign_commit = "";
- continue;
- }
+ if (argc != 1)
+ die(_("must give exactly one tree"));
- if (skip_prefix(arg, "-S", &sign_commit) ||
- skip_prefix(arg, "--gpg-sign=", &sign_commit))
- continue;
-
- if (!strcmp(arg, "--no-gpg-sign")) {
- sign_commit = NULL;
- continue;
- }
-
- if (!strcmp(arg, "-m")) {
- if (argc <= ++i)
- usage(commit_tree_usage);
- if (buffer.len)
- strbuf_addch(&buffer, '\n');
- strbuf_addstr(&buffer, argv[i]);
- strbuf_complete_line(&buffer);
- continue;
- }
-
- if (!strcmp(arg, "-F")) {
- int fd;
-
- if (argc <= ++i)
- usage(commit_tree_usage);
- if (buffer.len)
- strbuf_addch(&buffer, '\n');
- if (!strcmp(argv[i], "-"))
- fd = 0;
- else {
- fd = open(argv[i], O_RDONLY);
- if (fd < 0)
- die_errno("git commit-tree: failed to open '%s'",
- argv[i]);
- }
- if (strbuf_read(&buffer, fd, 0) < 0)
- die_errno("git commit-tree: failed to read '%s'",
- argv[i]);
- if (fd && close(fd))
- die_errno("git commit-tree: failed to close '%s'",
- argv[i]);
- continue;
- }
-
- if (get_oid_tree(arg, &tree_oid))
- die("Not a valid object name %s", arg);
- if (got_tree)
- die("Cannot give more than one trees");
- got_tree = 1;
- }
+ if (get_oid_tree(argv[0], &tree_oid))
+ die(_("not a valid object name %s"), argv[0]);
if (!buffer.len) {
if (strbuf_read(&buffer, 0, 0) < 0)
- die_errno("git commit-tree: failed to read");
+ die_errno(_("git commit-tree: failed to read"));
}
if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
diff --git a/builtin/commit.c b/builtin/commit.c
index 2986553..ae7aaf6 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -60,15 +60,18 @@
"\n");
static const char empty_cherry_pick_advice_single[] =
-N_("Otherwise, please use 'git reset'\n");
+N_("Otherwise, please use 'git cherry-pick --skip'\n");
static const char empty_cherry_pick_advice_multi[] =
-N_("If you wish to skip this commit, use:\n"
+N_("and then use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\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");
static const char *color_status_slots[] = {
[WT_STATUS_HEADER] = "header",
@@ -235,7 +238,7 @@
* and return the paths that match the given pattern in list.
*/
static int list_paths(struct string_list *list, const char *with_tree,
- const char *prefix, const struct pathspec *pattern)
+ const struct pathspec *pattern)
{
int i, ret;
char *m;
@@ -264,7 +267,7 @@
item->util = item; /* better a valid pointer than a fake one */
}
- ret = report_path_error(m, pattern, prefix);
+ ret = report_path_error(m, pattern);
free(m);
return ret;
}
@@ -454,7 +457,7 @@
die(_("cannot do a partial commit during a cherry-pick."));
}
- if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
+ if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
exit(1);
discard_cache();
@@ -609,7 +612,8 @@
set_ident_var(&date, strbuf_detach(&date_buf, NULL));
}
- strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT));
+ strbuf_addstr(author_ident, fmt_ident(name, email, WANT_AUTHOR_IDENT, date,
+ IDENT_STRICT));
assert_split_ident(&author, author_ident);
export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
@@ -667,6 +671,7 @@
const char *hook_arg2 = NULL;
int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
int old_display_comment_prefix;
+ int merge_contains_scissors = 0;
/* This checks and barfs if author is badly specified */
determine_author_info(author_ident);
@@ -727,6 +732,8 @@
strbuf_addbuf(&sb, &message);
hook_arg1 = "message";
} else if (!stat(git_path_merge_msg(the_repository), &statbuf)) {
+ size_t merge_msg_start;
+
/*
* prepend SQUASH_MSG here if it exists and a
* "merge --squash" was originally performed
@@ -737,8 +744,16 @@
hook_arg1 = "squash";
} else
hook_arg1 = "merge";
+
+ merge_msg_start = sb.len;
if (strbuf_read_file(&sb, git_path_merge_msg(the_repository), 0) < 0)
die_errno(_("could not read MERGE_MSG"));
+
+ if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
+ wt_status_locate_end(sb.buf + merge_msg_start,
+ sb.len - merge_msg_start) <
+ sb.len - merge_msg_start)
+ merge_contains_scissors = 1;
} else if (!stat(git_path_squash_msg(the_repository), &statbuf)) {
if (strbuf_read_file(&sb, git_path_squash_msg(the_repository), 0) < 0)
die_errno(_("could not read SQUASH_MSG"));
@@ -806,7 +821,8 @@
struct ident_split ci, ai;
if (whence != FROM_COMMIT) {
- if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
+ if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
+ !merge_contains_scissors)
wt_status_add_cut_line(s->fp);
status_printf_ln(s, GIT_COLOR_NORMAL,
whence == FROM_MERGE
@@ -831,10 +847,10 @@
_("Please enter the commit message for your changes."
" Lines starting\nwith '%c' will be ignored, and an empty"
" message aborts the commit.\n"), comment_line_char);
- else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
- whence == FROM_COMMIT)
- wt_status_add_cut_line(s->fp);
- else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
+ else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
+ if (whence == FROM_COMMIT && !merge_contains_scissors)
+ wt_status_add_cut_line(s->fp);
+ } else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
status_printf(s, GIT_COLOR_NORMAL,
_("Please enter the commit message for your changes."
" Lines starting\n"
@@ -1038,6 +1054,10 @@
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
else if (!strcmp(untracked_files_arg, "all"))
s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
+ /*
+ * Please update $__git_untracked_file_modes in
+ * git-completion.bash when you add new options
+ */
else
die(_("Invalid untracked files mode '%s'"), untracked_files_arg);
}
@@ -1061,9 +1081,11 @@
static struct status_deferred_config {
enum wt_status_format status_format;
int show_branch;
+ enum ahead_behind_flags ahead_behind;
} status_deferred_config = {
STATUS_FORMAT_UNSPECIFIED,
- -1 /* unspecified */
+ -1, /* unspecified */
+ AHEAD_BEHIND_UNSPECIFIED,
};
static void finalize_deferred_config(struct wt_status *s)
@@ -1090,6 +1112,17 @@
if (s->show_branch < 0)
s->show_branch = 0;
+ /*
+ * If the user did not give a "--[no]-ahead-behind" command
+ * line argument *AND* we will print in a human-readable format
+ * (short, long etc.) then we inherit from the status.aheadbehind
+ * config setting. In all other cases (and porcelain V[12] formats
+ * in particular), we inherit _FULL for backwards compatibility.
+ */
+ if (use_deferred_config &&
+ s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
+ s->ahead_behind_flags = status_deferred_config.ahead_behind;
+
if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
s->ahead_behind_flags = AHEAD_BEHIND_FULL;
}
@@ -1167,25 +1200,13 @@
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
if (argc == 0 && (also || (only && !amend && !allow_empty)))
die(_("No paths with --include/--only does not make sense."));
- if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
- cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_ALL :
- COMMIT_MSG_CLEANUP_SPACE;
- else if (!strcmp(cleanup_arg, "verbatim"))
- cleanup_mode = COMMIT_MSG_CLEANUP_NONE;
- else if (!strcmp(cleanup_arg, "whitespace"))
- cleanup_mode = COMMIT_MSG_CLEANUP_SPACE;
- else if (!strcmp(cleanup_arg, "strip"))
- cleanup_mode = COMMIT_MSG_CLEANUP_ALL;
- else if (!strcmp(cleanup_arg, "scissors"))
- cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
- COMMIT_MSG_CLEANUP_SPACE;
- else
- die(_("Invalid cleanup mode %s"), cleanup_arg);
+ cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor);
handle_untracked_files_arg(s);
if (all && argc > 0)
- die(_("Paths with -a does not make sense."));
+ die(_("paths '%s ...' with -a does not make sense"),
+ argv[0]);
if (status_format != STATUS_FORMAT_NONE)
dry_run = 1;
@@ -1241,6 +1262,10 @@
status_deferred_config.show_branch = git_config_bool(k, v);
return 0;
}
+ if (!strcmp(k, "status.aheadbehind")) {
+ status_deferred_config.ahead_behind = git_config_bool(k, v);
+ return 0;
+ }
if (!strcmp(k, "status.showstash")) {
s->show_stash = git_config_bool(k, v);
return 0;
@@ -1481,7 +1506,7 @@
OPT_BOOL('s', "signoff", &signoff, N_("add Signed-off-by:")),
OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
- OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
+ OPT_CLEANUP(&cleanup_arg),
OPT_BOOL(0, "status", &include_status, N_("include status in commit message template")),
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
@@ -1617,11 +1642,7 @@
die(_("could not read commit message: %s"), strerror(saved_errno));
}
- if (verbose || /* Truncate the message just before the diff, if any. */
- cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
- strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len));
- if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE)
- strbuf_stripspace(&sb, cleanup_mode == COMMIT_MSG_CLEANUP_ALL);
+ cleanup_message(&sb, cleanup_mode, verbose);
if (message_is_empty(&sb, cleanup_mode) && !allow_empty_message) {
rollback_index_files();
@@ -1657,8 +1678,7 @@
die("%s", err.buf);
}
- unlink(git_path_cherry_pick_head(the_repository));
- unlink(git_path_revert_head(the_repository));
+ sequencer_post_commit_cleanup(the_repository, 0);
unlink(git_path_merge_head(the_repository));
unlink(git_path_merge_msg(the_repository));
unlink(git_path_merge_mode(the_repository));
@@ -1667,10 +1687,11 @@
if (commit_index_files())
die(_("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 reset HEAD\" to recover."));
+ "not exceeded, and then \"git restore --staged :/\" to recover."));
- if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
- write_commit_graph_reachable(get_object_directory(), 0, 0);
+ if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
+ write_commit_graph_reachable(get_object_directory(), 0, NULL))
+ return 1;
repo_rerere(the_repository, 0);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
diff --git a/builtin/describe.c b/builtin/describe.c
index 1409ced..e048f85 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -76,7 +76,7 @@
static inline struct commit_name *find_commit_name(const struct object_id *peeled)
{
- return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled->hash);
+ return hashmap_get_from_hash(&names, oidhash(peeled), peeled);
}
static int replace_name(struct commit_name *e,
@@ -123,7 +123,7 @@
if (!e) {
e = xmalloc(sizeof(struct commit_name));
oidcpy(&e->peeled, peeled);
- hashmap_entry_init(e, sha1hash(peeled->hash));
+ hashmap_entry_init(e, oidhash(peeled));
hashmap_add(&names, e);
e->path = NULL;
}
@@ -313,7 +313,7 @@
*/
append_name(n, dst);
if (longformat)
- append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst);
+ append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
if (suffix)
strbuf_addstr(dst, suffix);
return;
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index a90681b..cb9ea79 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -83,9 +83,13 @@
}
static const char diff_tree_usage[] =
-"git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"git diff-tree [--stdin] [-m] [-c | --cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
"[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
" -r diff recursively\n"
+" -c show combined diff for merge commits\n"
+" --cc show combined diff for merge commits removing uninteresting hunks\n"
+" --combined-all-paths\n"
+" show name of file in all parents for combined diffs\n"
" --root include the initial commit as diff against /dev/null\n"
COMMON_DIFF_OPTIONS_HELP;
diff --git a/builtin/diff.c b/builtin/diff.c
index 9f61092..42ac803 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -321,38 +321,24 @@
repo_init_revisions(the_repository, &rev, prefix);
- if (no_index && argc != i + 2) {
- if (no_index == DIFF_NO_INDEX_IMPLICIT) {
- /*
- * There was no --no-index and there were not two
- * paths. It is possible that the user intended
- * to do an inside-repository operation.
- */
- fprintf(stderr, "Not a git repository\n");
- fprintf(stderr,
- "To compare two paths outside a working tree:\n");
- }
- /* Give the usage message for non-repository usage and exit. */
- usagef("git diff %s <path> <path>",
- no_index == DIFF_NO_INDEX_EXPLICIT ?
- "--no-index" : "[--no-index]");
-
- }
- if (no_index)
- /* If this is a no-index diff, just run it and exit there. */
- diff_no_index(the_repository, &rev, argc, argv);
-
- /* Otherwise, we are doing the usual "git" diff */
- rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
-
- /* Scale to real terminal size and respect statGraphWidth config */
+ /* Set up defaults that will apply to both no-index and regular diffs. */
rev.diffopt.stat_width = -1;
rev.diffopt.stat_graph_width = -1;
-
- /* Default to let external and textconv be used */
rev.diffopt.flags.allow_external = 1;
rev.diffopt.flags.allow_textconv = 1;
+ /* If this is a no-index diff, just run it and exit there. */
+ if (no_index)
+ exit(diff_no_index(&rev, no_index == DIFF_NO_INDEX_IMPLICIT,
+ argc, argv));
+
+
+ /*
+ * Otherwise, we are doing the usual "git" diff; set up any
+ * further defaults that apply to regular diffs.
+ */
+ rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
+
/*
* Default to intent-to-add entries invisible in the
* index. This makes them show up as new files in diff-files
diff --git a/builtin/difftool.c b/builtin/difftool.c
index a3ea60e..16eb8b7 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -24,7 +24,6 @@
#include "object-store.h"
#include "dir.h"
-static char *diff_gui_tool;
static int trust_exit_code;
static const char *const builtin_difftool_usage[] = {
@@ -34,11 +33,6 @@
static int difftool_config(const char *var, const char *value, void *cb)
{
- if (!strcmp(var, "diff.guitool")) {
- diff_gui_tool = xstrdup(value);
- return 0;
- }
-
if (!strcmp(var, "difftool.trustexitcode")) {
trust_exit_code = git_config_bool(var, value);
return 0;
@@ -65,14 +59,12 @@
*mode2 = (int)strtol(p + 1, &p, 8);
if (*p != ' ')
return error("expected ' ', got '%c'", *p);
- if (get_oid_hex(++p, oid1))
- return error("expected object ID, got '%s'", p + 1);
- p += GIT_SHA1_HEXSZ;
+ if (parse_oid_hex(++p, oid1, (const char **)&p))
+ return error("expected object ID, got '%s'", p);
if (*p != ' ')
return error("expected ' ', got '%c'", *p);
- if (get_oid_hex(++p, oid2))
- return error("expected object ID, got '%s'", p + 1);
- p += GIT_SHA1_HEXSZ;
+ if (parse_oid_hex(++p, oid2, (const char **)&p))
+ return error("expected object ID, got '%s'", p);
if (*p != ' ')
return error("expected ' ', got '%c'", *p);
*status = *++p;
@@ -690,7 +682,7 @@
int cmd_difftool(int argc, const char **argv, const char *prefix)
{
int use_gui_tool = 0, dir_diff = 0, prompt = -1, symlinks = 0,
- tool_help = 0;
+ tool_help = 0, no_index = 0;
static char *difftool_cmd = NULL, *extcmd = NULL;
struct option builtin_difftool_options[] = {
OPT_BOOL('g', "gui", &use_gui_tool,
@@ -714,6 +706,7 @@
"tool returns a non - zero exit code")),
OPT_STRING('x', "extcmd", &extcmd, N_("command"),
N_("specify a custom command for viewing diffs")),
+ OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
OPT_END()
};
@@ -727,12 +720,21 @@
if (tool_help)
return print_tool_help();
- /* NEEDSWORK: once we no longer spawn anything, remove this */
- setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
- setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
+ if (!no_index && !startup_info->have_repository)
+ die(_("difftool requires worktree or --no-index"));
- if (use_gui_tool && diff_gui_tool && *diff_gui_tool)
- setenv("GIT_DIFF_TOOL", diff_gui_tool, 1);
+ if (!no_index){
+ setup_work_tree();
+ setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
+ setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
+ } else if (dir_diff)
+ die(_("--dir-diff is incompatible with --no-index"));
+
+ if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
+ die(_("--gui, --tool and --extcmd are mutually exclusive"));
+
+ if (use_gui_tool)
+ setenv("GIT_MERGETOOL_GUI", "true", 1);
else if (difftool_cmd) {
if (*difftool_cmd)
setenv("GIT_DIFF_TOOL", difftool_cmd, 1);
diff --git a/builtin/env--helper.c b/builtin/env--helper.c
new file mode 100644
index 0000000..23c214f
--- /dev/null
+++ b/builtin/env--helper.c
@@ -0,0 +1,95 @@
+#include "builtin.h"
+#include "config.h"
+#include "parse-options.h"
+
+static char const * const env__helper_usage[] = {
+ N_("git env--helper --type=[bool|ulong] <options> <env-var>"),
+ NULL
+};
+
+static enum {
+ ENV_HELPER_TYPE_BOOL = 1,
+ ENV_HELPER_TYPE_ULONG
+} cmdmode = 0;
+
+static int option_parse_type(const struct option *opt, const char *arg,
+ int unset)
+{
+ if (!strcmp(arg, "bool"))
+ cmdmode = ENV_HELPER_TYPE_BOOL;
+ else if (!strcmp(arg, "ulong"))
+ cmdmode = ENV_HELPER_TYPE_ULONG;
+ else
+ die(_("unrecognized --type argument, %s"), arg);
+
+ return 0;
+}
+
+int cmd_env__helper(int argc, const char **argv, const char *prefix)
+{
+ int exit_code = 0;
+ const char *env_variable = NULL;
+ const char *env_default = NULL;
+ int ret;
+ int ret_int, default_int;
+ unsigned long ret_ulong, default_ulong;
+ struct option opts[] = {
+ OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
+ N_("value is given this type"), PARSE_OPT_NONEG,
+ option_parse_type),
+ OPT_STRING(0, "default", &env_default, N_("value"),
+ N_("default for git_env_*(...) to fall back on")),
+ OPT_BOOL(0, "exit-code", &exit_code,
+ N_("be quiet only use git_env_*() value as exit code")),
+ OPT_END(),
+ };
+
+ argc = parse_options(argc, argv, prefix, opts, env__helper_usage,
+ PARSE_OPT_KEEP_UNKNOWN);
+ if (env_default && !*env_default)
+ usage_with_options(env__helper_usage, opts);
+ if (!cmdmode)
+ usage_with_options(env__helper_usage, opts);
+ if (argc != 1)
+ usage_with_options(env__helper_usage, opts);
+ env_variable = argv[0];
+
+ switch (cmdmode) {
+ case ENV_HELPER_TYPE_BOOL:
+ if (env_default) {
+ default_int = git_parse_maybe_bool(env_default);
+ if (default_int == -1) {
+ error(_("option `--default' expects a boolean value with `--type=bool`, not `%s`"),
+ env_default);
+ usage_with_options(env__helper_usage, opts);
+ }
+ } else {
+ default_int = 0;
+ }
+ ret_int = git_env_bool(env_variable, default_int);
+ if (!exit_code)
+ puts(ret_int ? "true" : "false");
+ ret = ret_int;
+ break;
+ case ENV_HELPER_TYPE_ULONG:
+ if (env_default) {
+ if (!git_parse_ulong(env_default, &default_ulong)) {
+ error(_("option `--default' expects an unsigned long value with `--type=ulong`, not `%s`"),
+ env_default);
+ usage_with_options(env__helper_usage, opts);
+ }
+ } else {
+ default_ulong = 0;
+ }
+ ret_ulong = git_env_ulong(env_variable, default_ulong);
+ if (!exit_code)
+ printf("%lu\n", ret_ulong);
+ ret = ret_ulong;
+ break;
+ default:
+ BUG("unknown <type> value");
+ break;
+ }
+
+ return !ret;
+}
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9e28348..f541f55 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -33,6 +33,7 @@
static int progress;
static enum { SIGNED_TAG_ABORT, VERBATIM, WARN, WARN_STRIP, STRIP } signed_tag_mode = SIGNED_TAG_ABORT;
static enum { TAG_FILTERING_ABORT, DROP, REWRITE } tag_of_filtered_mode = TAG_FILTERING_ABORT;
+static enum { REENCODE_ABORT, REENCODE_YES, REENCODE_NO } reencode_mode = REENCODE_ABORT;
static int fake_missing_tagger;
static int use_done_feature;
static int no_data;
@@ -77,6 +78,31 @@
return 0;
}
+static int parse_opt_reencode_mode(const struct option *opt,
+ const char *arg, int unset)
+{
+ if (unset) {
+ reencode_mode = REENCODE_ABORT;
+ return 0;
+ }
+
+ switch (git_parse_maybe_bool(arg)) {
+ case 0:
+ reencode_mode = REENCODE_NO;
+ break;
+ case 1:
+ reencode_mode = REENCODE_YES;
+ break;
+ default:
+ if (!strcasecmp(arg, "abort"))
+ reencode_mode = REENCODE_ABORT;
+ else
+ return error("Unknown reencoding mode: %s", arg);
+ }
+
+ return 0;
+}
+
static struct decoration idnums;
static uint32_t last_idnum;
@@ -249,7 +275,7 @@
if (is_null_oid(oid))
return;
- object = lookup_object(the_repository, oid->hash);
+ object = lookup_object(the_repository, oid);
if (object && object->flags & SHOWN)
return;
@@ -427,7 +453,7 @@
&spec->oid));
else {
struct object *object = lookup_object(the_repository,
- spec->oid.hash);
+ &spec->oid);
printf("M %06o :%d ", spec->mode,
get_object_mark(object));
}
@@ -453,7 +479,7 @@
bol = memmem(begin, end ? end - begin : strlen(begin),
needle, strlen(needle));
if (!bol)
- return git_commit_encoding;
+ return NULL;
bol += strlen(needle);
eol = strchrnul(bol, '\n');
*eol = '\0';
@@ -633,18 +659,32 @@
}
mark_next_object(&commit->object);
- if (anonymize)
+ if (anonymize) {
reencoded = anonymize_commit_message(message);
- else if (!is_encoding_utf8(encoding))
- reencoded = reencode_string(message, "UTF-8", encoding);
+ } else if (encoding) {
+ switch(reencode_mode) {
+ case REENCODE_YES:
+ reencoded = reencode_string(message, "UTF-8", encoding);
+ break;
+ case REENCODE_NO:
+ break;
+ case REENCODE_ABORT:
+ die("Encountered commit-specific encoding %s in commit "
+ "%s; use --reencode=[yes|no] to handle it",
+ encoding, oid_to_hex(&commit->object.oid));
+ }
+ }
if (!commit->parents)
printf("reset %s\n", refname);
printf("commit %s\nmark :%"PRIu32"\n", refname, last_idnum);
if (show_original_ids)
printf("original-oid %s\n", oid_to_hex(&commit->object.oid));
- printf("%.*s\n%.*s\ndata %u\n%s",
+ printf("%.*s\n%.*s\n",
(int)(author_end - author), author,
- (int)(committer_end - committer), committer,
+ (int)(committer_end - committer), committer);
+ if (!reencoded && encoding)
+ printf("encoding %s\n", encoding);
+ printf("data %u\n%s",
(unsigned)(reencoded
? strlen(reencoded) : message
? strlen(message) : 0),
@@ -1088,6 +1128,9 @@
OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, N_("mode"),
N_("select handling of tags that tag filtered objects"),
parse_opt_tag_of_filtered_mode),
+ OPT_CALLBACK(0, "reencode", &reencode_mode, N_("mode"),
+ N_("select handling of commit messages in an alternate encoding"),
+ parse_opt_reencode_mode),
OPT_STRING(0, "export-marks", &export_filename, N_("file"),
N_("Dump marks to this file")),
OPT_STRING(0, "import-marks", &import_filename, N_("file"),
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 153a2bd..dc1485c 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -234,7 +234,7 @@
BUG("unknown protocol version");
}
- ref = fetch_pack(&args, fd, conn, ref, dest, sought, nr_sought,
+ ref = fetch_pack(&args, fd, ref, sought, nr_sought,
&shallow, pack_lockfile_ptr, version);
if (pack_lockfile) {
printf("lock %s\n", pack_lockfile);
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5a09fe2..67c0eb8 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -23,6 +23,11 @@
#include "packfile.h"
#include "list-objects-filter-options.h"
#include "commit-reach.h"
+#include "branch.h"
+#include "promisor-remote.h"
+#include "commit-graph.h"
+
+#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
static const char * const builtin_fetch_usage[] = {
N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -39,6 +44,8 @@
};
static int fetch_prune_config = -1; /* unspecified */
+static int fetch_show_forced_updates = 1;
+static uint64_t forced_updates_ms = 0;
static int prune = -1; /* unspecified */
#define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
@@ -46,8 +53,10 @@
static int prune_tags = -1; /* unspecified */
#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
-static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
+static int all, append, dry_run, force, keep, multiple, update_head_ok;
+static int verbosity, deepen_relative, set_upstream;
static int progress = -1;
+static int enable_auto_gc = 1;
static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
static int max_children = 1;
static enum transport_family family;
@@ -79,6 +88,11 @@
return 0;
}
+ if (!strcmp(k, "fetch.showforcedupdates")) {
+ fetch_show_forced_updates = git_config_bool(k, v);
+ return 0;
+ }
+
if (!strcmp(k, "submodule.recurse")) {
int r = git_config_bool(k, v) ?
RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
@@ -113,6 +127,8 @@
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "all", &all,
N_("fetch from all remotes")),
+ OPT_BOOL(0, "set-upstream", &set_upstream,
+ N_("set upstream for git pull/fetch")),
OPT_BOOL('a', "append", &append,
N_("append to .git/FETCH_HEAD instead of overwriting")),
OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
@@ -169,6 +185,10 @@
OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
N_("report that we have only objects reachable from this object")),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_BOOL(0, "auto-gc", &enable_auto_gc,
+ N_("run 'gc --auto' after fetching")),
+ OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
+ N_("check for forced-updates on all updated branches")),
OPT_END()
};
@@ -239,6 +259,7 @@
struct refname_hash_entry {
struct hashmap_entry ent; /* must be the first member */
struct object_id oid;
+ int ignore;
char refname[FLEX_ARRAY];
};
@@ -287,6 +308,11 @@
return !!hashmap_get_from_hash(map, strhash(refname), refname);
}
+static void clear_item(struct refname_hash_entry *item)
+{
+ item->ignore = 1;
+}
+
static void find_non_local_tags(const struct ref *refs,
struct ref **head,
struct ref ***tail)
@@ -319,7 +345,7 @@
!will_fetch(head, ref->old_oid.hash) &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash))
- oidclr(&item->oid);
+ clear_item(item);
item = NULL;
continue;
}
@@ -333,7 +359,7 @@
if (item &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash))
- oidclr(&item->oid);
+ clear_item(item);
item = NULL;
@@ -354,7 +380,7 @@
if (item &&
!has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
!will_fetch(head, item->oid.hash))
- oidclr(&item->oid);
+ clear_item(item);
/*
* For all the tags in the remote_refs_list,
@@ -362,19 +388,21 @@
*/
for_each_string_list_item(remote_ref_item, &remote_refs_list) {
const char *refname = remote_ref_item->string;
+ struct ref *rm;
item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
if (!item)
BUG("unseen remote ref?");
/* Unless we have already decided to ignore this item... */
- if (!is_null_oid(&item->oid)) {
- struct ref *rm = alloc_ref(item->refname);
- rm->peer_ref = alloc_ref(item->refname);
- oidcpy(&rm->old_oid, &item->oid);
- **tail = rm;
- *tail = &rm->next;
- }
+ if (item->ignore)
+ continue;
+
+ rm = alloc_ref(item->refname);
+ rm->peer_ref = alloc_ref(item->refname);
+ oidcpy(&rm->old_oid, &item->oid);
+ **tail = rm;
+ *tail = &rm->next;
}
hashmap_free(&remote_refs, 1);
string_list_clear(&remote_refs_list, 0);
@@ -699,6 +727,7 @@
enum object_type type;
struct branch *current_branch = branch_get(NULL);
const char *pretty_ref = prettify_refname(ref->name);
+ int fast_forward = 0;
type = oid_object_info(the_repository, &ref->new_oid, NULL);
if (type < 0)
@@ -773,9 +802,18 @@
return r;
}
- if (in_merge_bases(current, updated)) {
+ if (fetch_show_forced_updates) {
+ uint64_t t_before = getnanotime();
+ fast_forward = in_merge_bases(current, updated);
+ forced_updates_ms += (getnanotime() - t_before) / 1000000;
+ } else {
+ fast_forward = 1;
+ }
+
+ if (fast_forward) {
struct strbuf quickref = STRBUF_INIT;
int r;
+
strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
strbuf_addstr(&quickref, "..");
strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
@@ -818,6 +856,15 @@
return 0;
}
+static const char warn_show_forced_updates[] =
+N_("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'.");
+static const char warn_time_show_forced_updates[] =
+N_("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");
+
static int store_updated_refs(const char *raw_url, const char *remote_name,
int connectivity_checked, struct ref *ref_map)
{
@@ -971,6 +1018,15 @@
" 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name);
+ if (advice_fetch_show_forced_updates) {
+ if (!fetch_show_forced_updates) {
+ warning(_(warn_show_forced_updates));
+ } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
+ warning(_(warn_time_show_forced_updates),
+ forced_updates_ms / 1000.0);
+ }
+ }
+
abort:
strbuf_release(¬e);
free(url);
@@ -1188,13 +1244,10 @@
if (update_shallow)
set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
if (filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
- set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
- expanded_filter_spec.buf);
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
+ set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec);
set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- strbuf_release(&expanded_filter_spec);
}
if (negotiation_tip.nr) {
if (transport->smart_options)
@@ -1317,6 +1370,51 @@
retcode = 1;
goto cleanup;
}
+
+ if (set_upstream) {
+ struct branch *branch = branch_get("HEAD");
+ struct ref *rm;
+ struct ref *source_ref = NULL;
+
+ /*
+ * We're setting the upstream configuration for the
+ * current branch. The relevent upstream is the
+ * fetched branch that is meant to be merged with the
+ * current one, i.e. the one fetched to FETCH_HEAD.
+ *
+ * When there are several such branches, consider the
+ * request ambiguous and err on the safe side by doing
+ * nothing and just emit a warning.
+ */
+ for (rm = ref_map; rm; rm = rm->next) {
+ if (!rm->peer_ref) {
+ if (source_ref) {
+ warning(_("multiple branch detected, incompatible with --set-upstream"));
+ goto skip;
+ } else {
+ source_ref = rm;
+ }
+ }
+ }
+ if (source_ref) {
+ if (!strcmp(source_ref->name, "HEAD") ||
+ starts_with(source_ref->name, "refs/heads/"))
+ install_branch_config(0,
+ branch->name,
+ transport->remote->name,
+ source_ref->name);
+ else if (starts_with(source_ref->name, "refs/remotes/"))
+ warning(_("not setting upstream for a remote remote-tracking branch"));
+ else if (starts_with(source_ref->name, "refs/tags/"))
+ warning(_("not setting upstream for a remote tag"));
+ else
+ warning(_("unknown branch type"));
+ } else {
+ warning(_("no source branch found.\n"
+ "you need to specify exactly one branch with the --set-upstream option."));
+ }
+ }
+ skip:
free_refs(ref_map);
/* if neither --no-tags nor --tags was specified, do automated tag
@@ -1424,7 +1522,7 @@
return errcode;
}
- argv_array_pushl(&argv, "fetch", "--append", NULL);
+ argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
add_options_to_argv(&argv);
for (i = 0; i < list->nr; i++) {
@@ -1460,37 +1558,27 @@
* If no prior partial clone/fetch and the current fetch DID NOT
* request a partial-fetch, do a normal fetch.
*/
- if (!repository_format_partial_clone && !filter_options.choice)
+ if (!has_promisor_remote() && !filter_options.choice)
return;
/*
- * If this is the FIRST partial-fetch request, we enable partial
- * on this repo and remember the given filter-spec as the default
- * for subsequent fetches to this remote.
+ * If this is a partial-fetch request, we enable partial on
+ * this repo if not already enabled and remember the given
+ * filter-spec as the default for subsequent fetches to this
+ * remote.
*/
- if (!repository_format_partial_clone && filter_options.choice) {
+ if (filter_options.choice) {
partial_clone_register(remote->name, &filter_options);
return;
}
/*
- * We are currently limited to only ONE promisor remote and only
- * allow partial-fetches from the promisor remote.
- */
- if (strcmp(remote->name, repository_format_partial_clone)) {
- if (filter_options.choice)
- die(_("--filter can only be used with the remote "
- "configured in extensions.partialclone"));
- return;
- }
-
- /*
* Do a partial-fetch from the promisor remote using either the
* explicitly given filter-spec or inherit the filter-spec from
* the config.
*/
if (!filter_options.choice)
- partial_clone_get_default_filter_spec(&filter_options);
+ partial_clone_get_default_filter_spec(&filter_options, remote->name);
return;
}
@@ -1556,7 +1644,9 @@
sigchain_push_common(unlock_pack_on_signal);
atexit(unlock_pack);
+ sigchain_push(SIGPIPE, SIG_IGN);
exit_code = do_fetch(gtransport, &rs);
+ sigchain_pop(SIGPIPE);
refspec_clear(&rs);
transport_disconnect(gtransport);
gtransport = NULL;
@@ -1609,7 +1699,7 @@
if (depth || deepen_since || deepen_not.nr)
deepen = 1;
- if (filter_options.choice && !repository_format_partial_clone)
+ if (filter_options.choice && !has_promisor_remote())
die("--filter can only be used when extensions.partialClone is set");
if (all) {
@@ -1643,7 +1733,7 @@
}
if (remote) {
- if (filter_options.choice || repository_format_partial_clone)
+ if (filter_options.choice || has_promisor_remote())
fetch_one_setup_partial(remote);
result = fetch_one(remote, argc, argv, prune_tags_ok);
} else {
@@ -1670,13 +1760,29 @@
string_list_clear(&list, 0);
- close_all_packs(the_repository->objects);
+ prepare_repo_settings(the_repository);
+ if (the_repository->settings.fetch_write_commit_graph) {
+ int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
+ struct split_commit_graph_opts split_opts;
+ memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
- argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
- if (verbosity < 0)
- argv_array_push(&argv_gc_auto, "--quiet");
- run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
- argv_array_clear(&argv_gc_auto);
+ if (progress)
+ commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+
+ write_commit_graph_reachable(get_object_directory(),
+ commit_graph_flags,
+ &split_opts);
+ }
+
+ close_object_store(the_repository->objects);
+
+ if (enable_auto_gc) {
+ argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
+ if (verbosity < 0)
+ argv_array_push(&argv_gc_auto, "--quiet");
+ run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv_gc_auto);
+ }
return result;
}
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index e931be9..465153e 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -37,8 +37,7 @@
OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")),
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
OPT__COLOR(&format.use_color, N_("respect format colors")),
- OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
- N_("field name to sort on"), &parse_opt_ref_sorting),
+ OPT_REF_SORT(sorting_tail),
OPT_CALLBACK(0, "points-at", &filter.points_at,
N_("object"), N_("print only refs which points at the given object"),
parse_opt_object_name),
diff --git a/builtin/fsck.c b/builtin/fsck.c
index bb4227b..18403a9 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -235,6 +235,48 @@
return 0;
}
+static void mark_unreachable_referents(const struct object_id *oid)
+{
+ struct fsck_options options = FSCK_OPTIONS_DEFAULT;
+ struct object *obj = lookup_object(the_repository, oid);
+
+ if (!obj || !(obj->flags & HAS_OBJ))
+ return; /* not part of our original set */
+ if (obj->flags & REACHABLE)
+ return; /* reachable objects already traversed */
+
+ /*
+ * Avoid passing OBJ_NONE to fsck_walk, which will parse the object
+ * (and we want to avoid parsing blobs).
+ */
+ if (obj->type == OBJ_NONE) {
+ enum object_type type = oid_object_info(the_repository,
+ &obj->oid, NULL);
+ if (type > 0)
+ object_as_type(the_repository, obj, type, 0);
+ }
+
+ options.walk = mark_used;
+ fsck_walk(obj, NULL, &options);
+}
+
+static int mark_loose_unreachable_referents(const struct object_id *oid,
+ const char *path,
+ void *data)
+{
+ mark_unreachable_referents(oid);
+ return 0;
+}
+
+static int mark_packed_unreachable_referents(const struct object_id *oid,
+ struct packed_git *pack,
+ uint32_t pos,
+ void *data)
+{
+ mark_unreachable_referents(oid);
+ return 0;
+}
+
/*
* Check a single reachable object
*/
@@ -347,6 +389,26 @@
/* Traverse the pending reachable objects */
traverse_reachable();
+ /*
+ * With --connectivity-only, we won't have actually opened and marked
+ * unreachable objects with USED. Do that now to make --dangling, etc
+ * accurate.
+ */
+ if (connectivity_only && (show_dangling || write_lost_and_found)) {
+ /*
+ * Even though we already have a "struct object" for each of
+ * these in memory, we must not iterate over the internal
+ * object hash as we do below. Our loop would potentially
+ * resize the hash, making our iteration invalid.
+ *
+ * Instead, we'll just go back to the source list of objects,
+ * and ignore any that weren't present in our earlier
+ * traversal.
+ */
+ for_each_loose_object(mark_loose_unreachable_referents, NULL, 0);
+ for_each_packed_object(mark_packed_unreachable_referents, NULL, 0);
+ }
+
/* Look up all the requirements, warn about missing objects.. */
max = get_max_object_index();
if (verbose)
@@ -435,7 +497,7 @@
struct object *obj;
if (!is_null_oid(oid)) {
- obj = lookup_object(the_repository, oid->hash);
+ obj = lookup_object(the_repository, oid);
if (obj && (obj->flags & HAS_OBJ)) {
if (timestamp && name_objects)
add_decoration(fsck_walk_options.object_names,
@@ -694,7 +756,7 @@
static void mark_object_for_connectivity(const struct object_id *oid)
{
- struct object *obj = lookup_unknown_object(oid->hash);
+ struct object *obj = lookup_unknown_object(oid);
obj->flags |= HAS_OBJ;
}
@@ -817,7 +879,7 @@
struct object_id oid;
if (!get_oid(arg, &oid)) {
struct object *obj = lookup_object(the_repository,
- oid.hash);
+ &oid);
if (!obj || !(obj->flags & HAS_OBJ)) {
if (is_promisor_object(&oid))
diff --git a/builtin/gc.c b/builtin/gc.c
index 020f725..fadb454 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -27,6 +27,7 @@
#include "pack-objects.h"
#include "blob.h"
#include "tree.h"
+#include "promisor-remote.h"
#define FAILED_RUN "failed to run %s"
@@ -41,7 +42,6 @@
static int aggressive_window = 250;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;
-static int gc_write_commit_graph;
static int detach_auto = 1;
static timestamp_t gc_log_expire_time;
static const char *gc_log_expire = "1.day.ago";
@@ -116,6 +116,19 @@
raise(signo);
}
+static int gc_config_is_timestamp_never(const char *var)
+{
+ const char *value;
+ timestamp_t expire;
+
+ if (!git_config_get_value(var, &value) && value) {
+ if (parse_expiry_date(value, &expire))
+ die(_("failed to parse '%s' value '%s'"), var, value);
+ return expire == 0;
+ }
+ return 0;
+}
+
static void gc_config(void)
{
const char *value;
@@ -127,11 +140,14 @@
pack_refs = git_config_bool("gc.packrefs", value);
}
+ if (gc_config_is_timestamp_never("gc.reflogexpire") &&
+ gc_config_is_timestamp_never("gc.reflogexpireunreachable"))
+ prune_reflogs = 0;
+
git_config_get_int("gc.aggressivewindow", &aggressive_window);
git_config_get_int("gc.aggressivedepth", &aggressive_depth);
git_config_get_int("gc.auto", &gc_auto_threshold);
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
- git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph);
git_config_get_bool("gc.autodetach", &detach_auto);
git_config_get_expiry("gc.pruneexpire", &prune_expire);
git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
@@ -156,9 +172,7 @@
int auto_threshold;
int num_loose = 0;
int needed = 0;
-
- if (gc_auto_threshold <= 0)
- return 0;
+ const unsigned hexsz_loose = the_hash_algo->hexsz - 2;
dir = opendir(git_path("objects/17"));
if (!dir)
@@ -166,8 +180,8 @@
auto_threshold = DIV_ROUND_UP(gc_auto_threshold, 256);
while ((ent = readdir(dir)) != NULL) {
- if (strspn(ent->d_name, "0123456789abcdef") != 38 ||
- ent->d_name[38] != '\0')
+ if (strspn(ent->d_name, "0123456789abcdef") != hexsz_loose ||
+ ent->d_name[hexsz_loose] != '\0')
continue;
if (++num_loose > auto_threshold) {
needed = 1;
@@ -491,14 +505,20 @@
static void gc_before_repack(void)
{
+ /*
+ * We may be called twice, as both the pre- and
+ * post-daemonized phases will call us, but running these
+ * commands more than once is pointless and wasteful.
+ */
+ static int done = 0;
+ if (done++)
+ return;
+
if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
die(FAILED_RUN, pack_refs_cmd.argv[0]);
if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD))
die(FAILED_RUN, reflog.argv[0]);
-
- pack_refs = 0;
- prune_reflogs = 0;
}
int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -632,7 +652,7 @@
gc_before_repack();
if (!repository_format_precious_objects) {
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
die(FAILED_RUN, repack.argv[0]);
@@ -640,7 +660,7 @@
argv_array_push(&prune, prune_expire);
if (quiet)
argv_array_push(&prune, "--no-progress");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&prune,
"--exclude-promisor-objects");
if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
@@ -660,13 +680,15 @@
report_garbage = report_pack_garbage;
reprepare_packed_git(the_repository);
if (pack_garbage.nr > 0) {
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
clean_pack_garbage();
}
- if (gc_write_commit_graph)
- write_commit_graph_reachable(get_object_directory(), 0,
- !quiet && !daemonized);
+ prepare_repo_settings(the_repository);
+ if (the_repository->settings.gc_write_commit_graph == 1)
+ write_commit_graph_reachable(get_object_directory(),
+ !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
+ NULL);
if (auto_gc && too_many_loose_objects())
warning(_("There are too many unreachable loose objects; "
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index 2706fcf..491af92 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -21,6 +21,8 @@
char *content = buffer + RECORDSIZE;
const char *comment;
ssize_t n;
+ long len;
+ char *end;
if (argc != 1)
usage(builtin_get_tar_commit_id_usage);
@@ -32,10 +34,18 @@
die_errno("git get-tar-commit-id: EOF before reading tar header");
if (header->typeflag[0] != 'g')
return 1;
- if (!skip_prefix(content, "52 comment=", &comment))
+
+ len = strtol(content, &end, 10);
+ if (errno == ERANGE || end == content || len < 0)
+ return 1;
+ if (!skip_prefix(end, " comment=", &comment))
+ return 1;
+ len -= comment - content;
+ if (len < 1 || !(len % 2) ||
+ hash_algo_by_length((len - 1) / 2) == GIT_HASH_UNKNOWN)
return 1;
- if (write_in_full(1, comment, 41) < 0)
+ if (write_in_full(1, comment, len) < 0)
die_errno("git get-tar-commit-id: write error");
return 0;
diff --git a/builtin/grep.c b/builtin/grep.c
index 580fd38..69ac053 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -403,7 +403,7 @@
static int grep_submodule(struct grep_opt *opt,
const struct pathspec *pathspec,
const struct object_id *oid,
- const char *filename, const char *path)
+ const char *filename, const char *path, int cached)
{
struct repository subrepo;
struct repository *superproject = opt->repo;
@@ -458,7 +458,8 @@
object = parse_object_or_die(oid, oid_to_hex(oid));
grep_read_lock();
- data = read_object_with_reference(&object->oid, tree_type,
+ data = read_object_with_reference(&subrepo,
+ &object->oid, tree_type,
&size, NULL);
grep_read_unlock();
@@ -474,7 +475,7 @@
strbuf_release(&base);
free(data);
} else {
- hit = grep_cache(&subopt, pathspec, 1);
+ hit = grep_cache(&subopt, pathspec, cached);
}
repo_clear(&subrepo);
@@ -522,7 +523,8 @@
}
} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
submodule_path_match(repo->index, pathspec, name.buf, NULL)) {
- hit |= grep_submodule(opt, pathspec, NULL, ce->name, ce->name);
+ hit |= grep_submodule(opt, pathspec, NULL, ce->name,
+ ce->name, cached);
} else {
continue;
}
@@ -597,7 +599,8 @@
free(data);
} else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
hit |= grep_submodule(opt, pathspec, &entry.oid,
- base->buf, base->buf + tn_len);
+ base->buf, base->buf + tn_len,
+ 1); /* ignored */
}
strbuf_setlen(base, old_baselen);
@@ -623,7 +626,8 @@
int hit, len;
grep_read_lock();
- data = read_object_with_reference(&obj->oid, tree_type,
+ data = read_object_with_reference(opt->repo,
+ &obj->oid, tree_type,
&size, NULL);
grep_read_unlock();
@@ -1106,8 +1110,8 @@
strbuf_addf(&buf, "+/%s%s",
strcmp("less", pager) ? "" : "*",
opt.pattern_list->pattern);
- string_list_append(&path_list, buf.buf);
- strbuf_detach(&buf, NULL);
+ string_list_append(&path_list,
+ strbuf_detach(&buf, NULL));
}
}
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index e055c11..640ef4d 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -108,7 +108,7 @@
int i;
const char *errstr = NULL;
- argc = parse_options(argc, argv, NULL, hash_object_options,
+ argc = parse_options(argc, argv, prefix, hash_object_options,
hash_object_usage, 0);
if (flags & HASH_WRITE_OBJECT)
diff --git a/builtin/help.c b/builtin/help.c
index 7739a5c..e5590d7 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -70,6 +70,10 @@
return HELP_FORMAT_INFO;
if (!strcmp(format, "web") || !strcmp(format, "html"))
return HELP_FORMAT_WEB;
+ /*
+ * Please update _git_config() in git-completion.bash when you
+ * add new help formats.
+ */
die(_("unrecognized help format '%s'"), format);
}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 31046c7..a23454d 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -14,6 +14,7 @@
#include "thread-utils.h"
#include "packfile.h"
#include "object-store.h"
+#include "promisor-remote.h"
static const char index_pack_usage[] =
"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
@@ -219,8 +220,16 @@
unsigned i, max, foreign_nr = 0;
max = get_max_object_index();
- for (i = 0; i < max; i++)
+
+ if (verbose)
+ progress = start_delayed_progress(_("Checking objects"), max);
+
+ for (i = 0; i < max; i++) {
foreign_nr += check_object(get_indexed_object(i));
+ display_progress(progress, i + 1);
+ }
+
+ stop_progress(&progress);
return foreign_nr;
}
@@ -1343,6 +1352,25 @@
sorted_by_pos[i] = &ref_deltas[i];
QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
+ if (has_promisor_remote()) {
+ /*
+ * Prefetch the delta bases.
+ */
+ struct oid_array to_fetch = OID_ARRAY_INIT;
+ for (i = 0; i < nr_ref_deltas; i++) {
+ struct ref_delta_entry *d = sorted_by_pos[i];
+ if (!oid_object_info_extended(the_repository, &d->oid,
+ NULL,
+ OBJECT_INFO_FOR_PREFETCH))
+ continue;
+ oid_array_append(&to_fetch, &d->oid);
+ }
+ if (to_fetch.nr)
+ promisor_remote_get_direct(the_repository,
+ to_fetch.oid, to_fetch.nr);
+ oid_array_clear(&to_fetch);
+ }
+
for (i = 0; i < nr_ref_deltas; i++) {
struct ref_delta_entry *d = sorted_by_pos[i];
enum object_type type;
@@ -1642,8 +1670,10 @@
int report_end_of_input = 0;
/*
- * index-pack never needs to fetch missing objects, since it only
- * accesses the repo to do hash collision checks
+ * index-pack never needs to fetch missing objects except when
+ * REF_DELTA bases are missing (which are explicitly handled). It only
+ * accesses the repo to do hash collision checks and to check which
+ * REF_DELTA bases need to be fetched.
*/
fetch_if_missing = 0;
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 93eff76..944ec77 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -96,7 +96,7 @@
struct strbuf path = STRBUF_INIT;
struct strbuf template_path = STRBUF_INIT;
size_t template_len;
- struct repository_format template_format;
+ struct repository_format template_format = REPOSITORY_FORMAT_INIT;
struct strbuf err = STRBUF_INIT;
DIR *dir;
char *to_free = NULL;
@@ -148,6 +148,7 @@
free(to_free);
strbuf_release(&path);
strbuf_release(&template_path);
+ clear_repository_format(&template_format);
}
static int git_init_db_config(const char *k, const char *v, void *cb)
@@ -155,6 +156,9 @@
if (!strcmp(k, "init.templatedir"))
return git_config_pathname(&init_db_template_dir, k, v);
+ if (starts_with(k, "core."))
+ return platform_core_config(k, v, cb);
+
return 0;
}
@@ -185,6 +189,7 @@
struct strbuf err = STRBUF_INIT;
/* Just look for `init.templatedir` */
+ init_db_template_dir = NULL; /* re-set in case it was set before */
git_config(git_init_db_config, NULL);
/*
@@ -361,6 +366,9 @@
}
startup_info->have_repository = 1;
+ /* Just look for `core.hidedotfiles` */
+ git_config(git_init_db_config, NULL);
+
safe_create_dir(git_dir, 0);
init_is_bare_repository = is_bare_repository();
@@ -494,6 +502,9 @@
if (real_git_dir && !is_absolute_path(real_git_dir))
real_git_dir = real_pathdup(real_git_dir, 1);
+ if (template_dir && *template_dir && !is_absolute_path(template_dir))
+ template_dir = absolute_pathdup(template_dir);
+
if (argc == 1) {
int mkdir_tried = 0;
retry:
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 8ae40de..f101d09 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -10,6 +10,7 @@
#include "parse-options.h"
#include "string-list.h"
#include "trailer.h"
+#include "config.h"
static const char * const git_interpret_trailers_usage[] = {
N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
@@ -112,6 +113,8 @@
OPT_END()
};
+ git_config(git_default_config, NULL);
+
argc = parse_options(argc, argv, prefix, options,
git_interpret_trailers_usage, 0);
diff --git a/builtin/log.c b/builtin/log.c
index 5786926..c4b35fd 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -47,7 +47,7 @@
static int default_show_signature;
static int decoration_style;
static int decoration_given;
-static int use_mailmap_config;
+static int use_mailmap_config = 1;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
@@ -63,9 +63,14 @@
struct string_list args;
};
+static int session_is_interactive(void)
+{
+ return isatty(1) || pager_in_use();
+}
+
static int auto_decoration_style(void)
{
- return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+ return session_is_interactive() ? DECORATE_SHORT_REFS : 0;
}
static int parse_decoration_style(const char *value)
@@ -84,6 +89,10 @@
return DECORATE_SHORT_REFS;
else if (!strcmp(value, "auto"))
return auto_decoration_style();
+ /*
+ * Please update _git_log() in git-completion.bash when you
+ * add new decoration styles.
+ */
return -1;
}
@@ -151,7 +160,7 @@
struct rev_info *rev, struct setup_revision_opt *opt)
{
struct userformat_want w;
- int quiet = 0, source = 0, mailmap = 0;
+ int quiet = 0, source = 0, mailmap;
static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
@@ -247,7 +256,7 @@
* This gives a rough estimate for how many commits we
* will print out in the list.
*/
-static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
+static int estimate_commit_count(struct commit_list *list)
{
int n = 0;
@@ -285,7 +294,7 @@
switch (simplify_commit(revs, commit)) {
case commit_show:
if (show_header) {
- int n = estimate_commit_count(revs, list);
+ int n = estimate_commit_count(list);
show_early_header(revs, "incomplete", n);
show_header = 0;
}
@@ -329,7 +338,7 @@
show_early_output = log_show_early;
}
-static void setup_early_output(struct rev_info *rev)
+static void setup_early_output(void)
{
struct sigaction sa;
@@ -360,7 +369,7 @@
static void finish_early_output(struct rev_info *rev)
{
- int n = estimate_commit_count(rev, rev->commits);
+ int n = estimate_commit_count(rev->commits);
signal(SIGALRM, SIG_IGN);
show_early_header(rev, "done", n);
}
@@ -372,7 +381,7 @@
int saved_dcctc = 0, close_file = rev->diffopt.close_file;
if (rev->early_output)
- setup_early_output(rev);
+ setup_early_output();
if (prepare_revision_walk(rev))
die(_("revision walk setup failed"));
@@ -486,7 +495,7 @@
return cmd_log_walk(&rev);
}
-static void show_tagger(char *buf, int len, struct rev_info *rev)
+static void show_tagger(const char *buf, struct rev_info *rev)
{
struct strbuf out = STRBUF_INIT;
struct pretty_print_context pp = {0};
@@ -513,7 +522,7 @@
if (get_oid_with_context(the_repository, obj_name,
GET_OID_RECORD_PATH,
&oidc, &obj_context))
- die(_("Not a valid object name %s"), obj_name);
+ die(_("not a valid object name %s"), obj_name);
if (!obj_context.path ||
!textconv_object(the_repository, obj_context.path,
obj_context.mode, &oidc, 1, &buf, &size)) {
@@ -537,16 +546,16 @@
int offset = 0;
if (!buf)
- return error(_("Could not read object %s"), oid_to_hex(oid));
+ return error(_("could not read object %s"), oid_to_hex(oid));
assert(type == OBJ_TAG);
while (offset < size && buf[offset] != '\n') {
int new_offset = offset + 1;
+ const char *ident;
while (new_offset < size && buf[new_offset++] != '\n')
; /* do nothing */
- if (starts_with(buf + offset, "tagger "))
- show_tagger(buf + offset + 7,
- new_offset - offset - 7, rev);
+ if (skip_prefix(buf + offset, "tagger ", &ident))
+ show_tagger(ident, rev);
offset = new_offset;
}
@@ -618,6 +627,7 @@
break;
case OBJ_TAG: {
struct tag *t = (struct tag *)o;
+ struct object_id *oid = get_tagged_oid(t);
if (rev.shown_one)
putchar('\n');
@@ -629,10 +639,10 @@
rev.shown_one = 1;
if (ret)
break;
- o = parse_object(the_repository, &t->tagged->oid);
+ o = parse_object(the_repository, oid);
if (!o)
- ret = error(_("Could not read object %s"),
- oid_to_hex(&t->tagged->oid));
+ ret = error(_("could not read object %s"),
+ oid_to_hex(oid));
objects[i].item = o;
i--;
break;
@@ -656,7 +666,7 @@
ret = cmd_log_walk(&rev);
break;
default:
- ret = error(_("Unknown type: %d"), o->type);
+ ret = error(_("unknown type: %d"), o->type);
}
}
free(objects);
@@ -775,6 +785,8 @@
static int git_format_config(const char *var, const char *value, void *cb)
{
+ struct rev_info *rev = cb;
+
if (!strcmp(var, "format.headers")) {
if (!value)
die(_("format.headers without value"));
@@ -860,6 +872,22 @@
from = NULL;
return 0;
}
+ if (!strcmp(var, "format.notes")) {
+ struct strbuf buf = STRBUF_INIT;
+ int b = git_parse_maybe_bool(value);
+ if (!b)
+ return 0;
+ rev->show_notes = 1;
+ if (b < 0) {
+ strbuf_addstr(&buf, value);
+ expand_notes_ref(&buf);
+ string_list_append(&rev->notes_opt.extra_notes_refs,
+ strbuf_detach(&buf, NULL));
+ } else {
+ rev->notes_opt.use_default_notes = 1;
+ }
+ return 0;
+ }
return git_log_config(var, value, cb);
}
@@ -894,7 +922,7 @@
printf("%s\n", filename.buf + outdir_offset);
if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) {
- error_errno(_("Cannot open patch file %s"), filename.buf);
+ error_errno(_("cannot open patch file %s"), filename.buf);
strbuf_release(&filename);
return -1;
}
@@ -911,7 +939,7 @@
unsigned flags1, flags2;
if (rev->pending.nr != 2)
- die(_("Need exactly one range."));
+ die(_("need exactly one range"));
o1 = rev->pending.objects[0].item;
o2 = rev->pending.objects[1].item;
@@ -921,7 +949,7 @@
c2 = lookup_commit_reference(the_repository, &o2->oid);
if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
- die(_("Not a range."));
+ die(_("not a range"));
init_patch_ids(the_repository, ids);
@@ -1044,13 +1072,13 @@
struct commit *head = list[0];
if (!cmit_fmt_is_mail(rev->commit_format))
- die(_("Cover letter needs email format"));
+ die(_("cover letter needs email format"));
committer = git_committer_info(0);
if (!use_stdout &&
open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
- return;
+ die(_("failed to create cover-letter file"));
log_write_email_headers(rev, head, &pp.after_subject, &need_8bit_cte, 0);
@@ -1214,7 +1242,7 @@
const char **dir = (const char **)opt->value;
BUG_ON_OPT_NEG(unset);
if (*dir)
- die(_("Two output directories?"));
+ die(_("two output directories?"));
*dir = arg;
return 0;
}
@@ -1228,6 +1256,10 @@
*thread = THREAD_SHALLOW;
else if (!strcmp(arg, "deep"))
*thread = THREAD_DEEP;
+ /*
+ * Please update _git_formatpatch() in git-completion.bash
+ * when you add new options.
+ */
else
return 1;
return 0;
@@ -1321,7 +1353,7 @@
if (base_commit && strcmp(base_commit, "auto")) {
base = lookup_commit_reference_by_name(base_commit);
if (!base)
- die(_("Unknown commit %s"), base_commit);
+ die(_("unknown commit %s"), base_commit);
} else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
struct branch *curr_branch = branch_get(NULL);
const char *upstream = branch_get_upstream(curr_branch, NULL);
@@ -1331,18 +1363,18 @@
struct object_id oid;
if (get_oid(upstream, &oid))
- die(_("Failed to resolve '%s' as a valid ref."), upstream);
+ die(_("failed to resolve '%s' as a valid ref"), upstream);
commit = lookup_commit_or_die(&oid, "upstream base");
base_list = get_merge_bases_many(commit, total, list);
/* There should be one and only one merge base. */
if (!base_list || base_list->next)
- die(_("Could not find exact merge base."));
+ die(_("could not find exact merge base"));
base = base_list->item;
free_commit_list(base_list);
} else {
- die(_("Failed to get upstream, if you want to record base commit automatically,\n"
+ die(_("failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
- "Or you could specify base commit by --base=<base-commit-id> manually."));
+ "Or you could specify base commit by --base=<base-commit-id> manually"));
}
}
@@ -1360,7 +1392,7 @@
struct commit_list *merge_base;
merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
if (!merge_base || merge_base->next)
- die(_("Failed to find exact merge base"));
+ die(_("failed to find exact merge base"));
rev[i] = merge_base->item;
}
@@ -1427,7 +1459,7 @@
struct object_id *patch_id;
if (*commit_base_at(&commit_base, commit))
continue;
- if (commit_patch_id(commit, &diffopt, &oid, 0))
+ if (commit_patch_id(commit, &diffopt, &oid, 0, 1))
die(_("cannot get patch id"));
ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
patch_id = bases->patch_id + bases->nr_patch_id;
@@ -1609,8 +1641,8 @@
extra_to.strdup_strings = 1;
extra_cc.strdup_strings = 1;
init_log_defaults();
- git_config(git_format_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(git_format_config, &rev);
rev.commit_format = CMIT_FMT_EMAIL;
rev.expand_tabs_in_log_default = 0;
rev.verbose_header = 1;
@@ -1739,7 +1771,7 @@
if (use_stdout)
die(_("standard output, or directory, which one?"));
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
- die_errno(_("Could not create directory '%s'"),
+ die_errno(_("could not create directory '%s'"),
output_directory);
}
@@ -1941,7 +1973,7 @@
if (!use_stdout &&
open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
- die(_("Failed to create output files"));
+ die(_("failed to create output files"));
shown = log_tree_commit(&rev, commit);
free_commit_buffer(the_repository->parsed_objects,
commit);
@@ -2065,9 +2097,9 @@
revs.max_parents = 1;
if (add_pending_commit(head, &revs, 0))
- die(_("Unknown commit %s"), head);
+ die(_("unknown commit %s"), head);
if (add_pending_commit(upstream, &revs, UNINTERESTING))
- die(_("Unknown commit %s"), upstream);
+ die(_("unknown commit %s"), upstream);
/* Don't say anything if head and upstream are the same. */
if (revs.pending.nr == 2) {
@@ -2079,7 +2111,7 @@
get_patch_ids(&revs, &ids);
if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
- die(_("Unknown commit %s"), limit);
+ die(_("unknown commit %s"), limit);
/* reverse the list of commits */
if (prepare_revision_walk(&revs))
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 29a8762..f069a02 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -112,11 +112,11 @@
if (debug_mode) {
const struct stat_data *sd = &ce->ce_stat_data;
- printf(" ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
- printf(" mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
- printf(" dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
- printf(" uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
- printf(" size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
+ printf(" ctime: %u:%u\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
+ printf(" mtime: %u:%u\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
+ printf(" dev: %u\tino: %u\n", sd->sd_dev, sd->sd_ino);
+ printf(" uid: %u\tgid: %u\n", sd->sd_uid, sd->sd_gid);
+ printf(" size: %u\tflags: %x\n", sd->sd_size, ce->ce_flags);
}
}
@@ -373,7 +373,7 @@
first = pos;
last = istate->cache_nr;
while (last > first) {
- int next = (last + first) >> 1;
+ int next = first + ((last - first) >> 1);
const struct cache_entry *ce = istate->cache[next];
if (!strncmp(ce->name, prefix, prefixlen)) {
first = next+1;
@@ -492,7 +492,7 @@
BUG_ON_OPT_NEG(unset);
exc_given = 1;
- add_excludes_from_file(dir, arg);
+ add_patterns_from_file(dir, arg);
return 0;
}
@@ -516,7 +516,7 @@
int require_work_tree = 0, show_tag = 0, i;
const char *max_prefix;
struct dir_struct dir;
- struct exclude_list *el;
+ struct pattern_list *pl;
struct string_list exclude_list = STRING_LIST_INIT_NODUP;
struct option builtin_ls_files_options[] = {
/* Think twice before adding "--nul" synonym to this */
@@ -594,9 +594,9 @@
argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
ls_files_usage, 0);
- el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
+ pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
for (i = 0; i < exclude_list.nr; i++) {
- add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
+ add_pattern(exclude_list.items[i].string, "", 0, pl, --exclude_args);
}
if (show_tag || show_valid_bit || show_fsmonitor_bit) {
tag_cached = "H ";
@@ -680,7 +680,7 @@
if (ps_matched) {
int bad;
- bad = report_path_error(ps_matched, &pathspec, prefix);
+ bad = report_path_error(ps_matched, &pathspec);
if (bad)
fprintf(stderr, "Did you forget to 'git add'?\n");
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 1d7f1f5..6ef5195 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -67,8 +67,7 @@
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
OPT_BOOL(0, "get-url", &get_url,
N_("take url.<base>.insteadOf into account")),
- OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
- N_("field name to sort on"), &parse_opt_ref_sorting),
+ OPT_REF_SORT(sorting_tail),
OPT_SET_INT_F(0, "exit-code", &status,
N_("exit with exit code 2 if no matching refs are found"),
2, PARSE_OPT_NOCOMPLETE),
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 34ca025..e72714a 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -180,8 +180,9 @@
static char *traverse_path(const struct traverse_info *info, const struct name_entry *n)
{
- char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz);
- return make_traverse_path(path, info, n);
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_make_traverse_path(&buf, info, n->path, n->pathlen);
+ return strbuf_detach(&buf, NULL);
}
static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result)
@@ -205,6 +206,7 @@
static void unresolved_directory(const struct traverse_info *info,
struct name_entry n[3])
{
+ struct repository *r = the_repository;
char *newbase;
struct name_entry *p;
struct tree_desc t[3];
@@ -220,9 +222,9 @@
newbase = traverse_path(info, p);
#define ENTRY_OID(e) (((e)->mode && S_ISDIR((e)->mode)) ? &(e)->oid : NULL)
- buf0 = fill_tree_descriptor(t + 0, ENTRY_OID(n + 0));
- buf1 = fill_tree_descriptor(t + 1, ENTRY_OID(n + 1));
- buf2 = fill_tree_descriptor(t + 2, ENTRY_OID(n + 2));
+ buf0 = fill_tree_descriptor(r, t + 0, ENTRY_OID(n + 0));
+ buf1 = fill_tree_descriptor(r, t + 1, ENTRY_OID(n + 1));
+ buf2 = fill_tree_descriptor(r, t + 2, ENTRY_OID(n + 2));
#undef ENTRY_OID
merge_trees(t, newbase);
@@ -351,14 +353,16 @@
traverse_trees(&the_index, 3, t, &info);
}
-static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
+static void *get_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const char *rev)
{
struct object_id oid;
void *buf;
- if (get_oid(rev, &oid))
+ if (repo_get_oid(r, rev, &oid))
die("unknown rev %s", rev);
- buf = fill_tree_descriptor(desc, &oid);
+ buf = fill_tree_descriptor(r, desc, &oid);
if (!buf)
die("%s is not a tree", rev);
return buf;
@@ -366,15 +370,16 @@
int cmd_merge_tree(int argc, const char **argv, const char *prefix)
{
+ struct repository *r = the_repository;
struct tree_desc t[3];
void *buf1, *buf2, *buf3;
if (argc != 4)
usage(merge_tree_usage);
- buf1 = get_tree_descriptor(t+0, argv[1]);
- buf2 = get_tree_descriptor(t+1, argv[2]);
- buf3 = get_tree_descriptor(t+2, argv[3]);
+ buf1 = get_tree_descriptor(r, t+0, argv[1]);
+ buf2 = get_tree_descriptor(r, t+1, argv[2]);
+ buf3 = get_tree_descriptor(r, t+2, argv[3]);
merge_trees(t, "");
free(buf1);
free(buf2);
diff --git a/builtin/merge.c b/builtin/merge.c
index e47d77b..062e911 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -37,7 +37,9 @@
#include "packfile.h"
#include "tag.h"
#include "alias.h"
+#include "branch.h"
#include "commit-reach.h"
+#include "wt-status.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)
@@ -57,7 +59,7 @@
};
static int show_diffstat = 1, shortlog_len = -1, squash;
-static int option_commit = 1;
+static int option_commit = -1;
static int option_edit = -1;
static int allow_trivial = 1, have_message, verify_signatures;
static int overwrite_ignore = 1;
@@ -72,13 +74,14 @@
static int verbosity;
static int allow_rerere_auto;
static int abort_current_merge;
+static int quit_current_merge;
static int continue_current_merge;
static int allow_unrelated_histories;
static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
-static int verify_msg = 1;
+static int no_verify;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -98,6 +101,9 @@
static enum ff_type fast_forward = FF_ALLOW;
+static const char *cleanup_arg;
+static enum commit_msg_cleanup_mode cleanup_mode;
+
static int option_parse_message(const struct option *opt,
const char *arg, int unset)
{
@@ -113,12 +119,15 @@
return 0;
}
-static int option_read_message(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result option_read_message(struct parse_opt_ctx_t *ctx,
+ const struct option *opt,
+ const char *arg_not_used,
+ int unset)
{
struct strbuf *buf = opt->value;
const char *arg;
+ BUG_ON_OPT_ARG(arg_not_used);
if (unset)
BUG("-F cannot be negated");
@@ -246,6 +255,7 @@
N_("perform a commit if the merge succeeds (default)")),
OPT_BOOL('e', "edit", &option_edit,
N_("edit message before committing")),
+ OPT_CLEANUP(&cleanup_arg),
OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW),
OPT_SET_INT_F(0, "ff-only", &fast_forward,
N_("abort if fast-forward is not possible"),
@@ -262,10 +272,12 @@
option_parse_message),
{ OPTION_LOWLEVEL_CALLBACK, 'F', "file", &merge_msg, N_("path"),
N_("read message from file"), PARSE_OPT_NONEG,
- (parse_opt_cb *) option_read_message },
+ NULL, 0, option_read_message },
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "abort", &abort_current_merge,
N_("abort the current in-progress merge")),
+ OPT_BOOL(0, "quit", &quit_current_merge,
+ N_("--abort but leave index and working tree alone")),
OPT_BOOL(0, "continue", &continue_current_merge,
N_("continue the current in-progress merge")),
OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
@@ -275,18 +287,10 @@
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
- OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
+ OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
OPT_END()
};
-/* Cleans up metadata that is uninteresting after a succeeded merge. */
-static void drop_save(void)
-{
- unlink(git_path_merge_head(the_repository));
- unlink(git_path_merge_msg(the_repository));
- unlink(git_path_merge_mode(the_repository));
-}
-
static int save_state(struct object_id *stash)
{
int len;
@@ -380,7 +384,7 @@
{
if (verbosity >= 0)
printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
- drop_save();
+ remove_merge_branch_state(the_repository);
}
static void squash_message(struct commit *commit, struct commit_list *remoteheads)
@@ -449,7 +453,7 @@
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}
@@ -609,6 +613,8 @@
return git_config_string(&pull_twohead, k, v);
else if (!strcmp(k, "pull.octopus"))
return git_config_string(&pull_octopus, k, v);
+ else if (!strcmp(k, "commit.cleanup"))
+ return git_config_string(&cleanup_arg, k, v);
else if (!strcmp(k, "merge.renormalize"))
option_renormalize = git_config_bool(k, v);
else if (!strcmp(k, "merge.ff")) {
@@ -682,16 +688,13 @@
struct commit_list *remoteheads,
struct commit *head)
{
- struct lock_file lock = LOCK_INIT;
const char *head_arg = "HEAD";
- hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
- refresh_cache(REFRESH_QUIET);
- if (write_locked_index(&the_index, &lock,
- COMMIT_LOCK | SKIP_IF_UNCHANGED))
+ if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0)
return error(_("Unable to write index."));
if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
+ struct lock_file lock = LOCK_INIT;
int clean, x;
struct commit *result;
struct commit_list *reversed = NULL;
@@ -797,20 +800,45 @@
static const char merge_editor_comment[] =
N_("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"
- "Lines starting with '%c' will be ignored, and an empty message aborts\n"
+ "\n");
+
+static const char scissors_editor_comment[] =
+N_("An empty message aborts the commit.\n");
+
+static const char no_scissors_editor_comment[] =
+N_("Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n");
static void write_merge_heads(struct commit_list *);
static void prepare_to_commit(struct commit_list *remoteheads)
{
struct strbuf msg = STRBUF_INIT;
+ const char *index_file = get_index_file();
+
+ if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL))
+ abort_commit(remoteheads, NULL);
+ /*
+ * Re-read the index as pre-merge-commit hook could have updated it,
+ * and write it out as a tree. We must do this before we invoke
+ * the editor and after we invoke run_status above.
+ */
+ if (find_hook("pre-merge-commit"))
+ discard_cache();
+ read_cache_from(index_file);
strbuf_addbuf(&msg, &merge_msg);
- strbuf_addch(&msg, '\n');
if (squash)
BUG("the control must not reach here under --squash");
- if (0 < option_edit)
- strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
+ if (0 < option_edit) {
+ strbuf_addch(&msg, '\n');
+ if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
+ wt_status_append_cut_line(&msg);
+ strbuf_commented_addf(&msg, "\n");
+ }
+ strbuf_commented_addf(&msg, _(merge_editor_comment));
+ strbuf_commented_addf(&msg, _(cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS ?
+ scissors_editor_comment :
+ no_scissors_editor_comment), comment_line_char);
+ }
if (signoff)
append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
write_merge_heads(remoteheads);
@@ -823,13 +851,13 @@
abort_commit(remoteheads, NULL);
}
- if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
"commit-msg",
git_path_merge_msg(the_repository), NULL))
abort_commit(remoteheads, NULL);
read_merge_msg(&msg);
- strbuf_stripspace(&msg, 0 < option_edit);
+ cleanup_message(&msg, cleanup_mode, 0);
if (!msg.len)
abort_commit(remoteheads, _("Empty commit message."));
strbuf_release(&merge_msg);
@@ -841,12 +869,8 @@
{
struct object_id result_tree, result_commit;
struct commit_list *parents, **pptr = &parents;
- struct lock_file lock = LOCK_INIT;
- hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
- refresh_cache(REFRESH_QUIET);
- if (write_locked_index(&the_index, &lock,
- COMMIT_LOCK | SKIP_IF_UNCHANGED))
+ if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0)
return error(_("Unable to write index."));
write_tree_trivial(&result_tree);
@@ -858,7 +882,7 @@
&result_commit, NULL, sign_commit))
die(_("failed to write commit object"));
finish(head, remoteheads, &result_commit, "In-index merge");
- drop_save();
+ remove_merge_branch_state(the_repository);
return 0;
}
@@ -873,11 +897,11 @@
struct strbuf buf = STRBUF_INIT;
struct object_id result_commit;
+ write_tree_trivial(result_tree);
free_commit_list(common);
parents = remoteheads;
if (!head_subsumed || fast_forward == FF_NO)
commit_list_insert(head, &parents);
- strbuf_addch(&merge_msg, '\n');
prepare_to_commit(remoteheads);
if (commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents,
&result_commit, NULL, sign_commit))
@@ -885,7 +909,7 @@
strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
finish(head, remoteheads, &result_commit, buf.buf);
strbuf_release(&buf);
- drop_save();
+ remove_merge_branch_state(the_repository);
return 0;
}
@@ -898,7 +922,15 @@
filename = git_path_merge_msg(the_repository);
fp = xfopen(filename, "a");
- append_conflicts_hint(&the_index, &msgbuf);
+ /*
+ * We can't use cleanup_mode because if we're not using the editor,
+ * get_cleanup_mode will return COMMIT_MSG_CLEANUP_SPACE instead, even
+ * though the message is meant to be processed later by git-commit.
+ * Thus, we will get the cleanup mode which is returned when we _are_
+ * using an editor.
+ */
+ append_conflicts_hint(&the_index, &msgbuf,
+ get_cleanup_mode(cleanup_arg, 1));
fputs(msgbuf.buf, fp);
strbuf_release(&msgbuf);
fclose(fp);
@@ -1259,6 +1291,16 @@
goto done;
}
+ if (quit_current_merge) {
+ if (orig_argc != 2)
+ usage_msg_opt(_("--quit expects no arguments"),
+ builtin_merge_usage,
+ builtin_merge_options);
+
+ remove_merge_branch_state(the_repository);
+ goto done;
+ }
+
if (continue_current_merge) {
int nargc = 1;
const char *nargv[] = {"commit", NULL};
@@ -1298,15 +1340,30 @@
}
resolve_undo_clear();
+ if (option_edit < 0)
+ option_edit = default_edit_option();
+
+ cleanup_mode = get_cleanup_mode(cleanup_arg, 0 < option_edit);
+
if (verbosity < 0)
show_diffstat = 0;
if (squash) {
if (fast_forward == FF_NO)
die(_("You cannot combine --squash with --no-ff."));
+ if (option_commit > 0)
+ die(_("You cannot combine --squash with --commit."));
+ /*
+ * squash can now silently disable option_commit - this is not
+ * a problem as it is only overriding the default, not a user
+ * supplied option.
+ */
option_commit = 0;
}
+ if (option_commit < 0)
+ option_commit = 1;
+
if (!argc) {
if (default_to_upstream)
argc = setup_with_upstream(&argv);
@@ -1383,9 +1440,6 @@
fast_forward = FF_NO;
}
- if (option_edit < 0)
- option_edit = default_edit_option();
-
if (!use_strategies) {
if (!remoteheads)
; /* already up-to-date */
@@ -1463,7 +1517,7 @@
}
finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
- drop_save();
+ remove_merge_branch_state(the_repository);
goto done;
} else if (!remoteheads->next && common->next)
;
@@ -1538,8 +1592,8 @@
save_state(&stash))
oidclr(&stash);
- for (i = 0; i < use_strategies_nr; i++) {
- int ret;
+ for (i = 0; !merge_was_ok && i < use_strategies_nr; i++) {
+ int ret, cnt;
if (i) {
printf(_("Rewinding the tree to pristine...\n"));
restore_state(&head_commit->object.oid, &stash);
@@ -1556,40 +1610,26 @@
ret = try_merge_strategy(use_strategies[i]->name,
common, remoteheads,
head_commit);
- if (!option_commit && !ret) {
- merge_was_ok = 1;
- /*
- * This is necessary here just to avoid writing
- * the tree, but later we will *not* exit with
- * status code 1 because merge_was_ok is set.
- */
- ret = 1;
- }
-
- if (ret) {
- /*
- * The backend exits with 1 when conflicts are
- * left to be resolved, with 2 when it does not
- * handle the given merge at all.
- */
- if (ret == 1) {
- int cnt = evaluate_result();
-
- if (best_cnt <= 0 || cnt <= best_cnt) {
- best_strategy = use_strategies[i]->name;
- best_cnt = cnt;
+ /*
+ * The backend exits with 1 when conflicts are
+ * left to be resolved, with 2 when it does not
+ * handle the given merge at all.
+ */
+ if (ret < 2) {
+ if (!ret) {
+ if (option_commit) {
+ /* Automerge succeeded. */
+ automerge_was_ok = 1;
+ break;
}
+ merge_was_ok = 1;
}
- if (merge_was_ok)
- break;
- else
- continue;
+ cnt = evaluate_result();
+ if (best_cnt <= 0 || cnt <= best_cnt) {
+ best_strategy = use_strategies[i]->name;
+ best_cnt = cnt;
+ }
}
-
- /* Automerge succeeded. */
- write_tree_trivial(&result_tree);
- automerge_was_ok = 1;
- break;
}
/*
diff --git a/builtin/mktree.c b/builtin/mktree.c
index 94e82b8..891991b 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -67,7 +67,7 @@
NULL
};
-static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)
+static void mktree_line(char *buf, int nul_term_line, int allow_missing)
{
char *ptr, *ntr;
const char *p;
@@ -172,7 +172,7 @@
break;
die("input format error: (blank line only valid in batch mode)");
}
- mktree_line(sb.buf, sb.len, nul_term_line, allow_missing);
+ mktree_line(sb.buf, nul_term_line, allow_missing);
}
if (is_batch_mode && got_eof && used < 1) {
/*
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index fca70f8..b1ea1a6 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -3,14 +3,16 @@
#include "config.h"
#include "parse-options.h"
#include "midx.h"
+#include "trace2.h"
static char const * const builtin_multi_pack_index_usage[] = {
- N_("git multi-pack-index [--object-dir=<dir>] (write|verify)"),
+ N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"),
NULL
};
static struct opts_multi_pack_index {
const char *object_dir;
+ unsigned long batch_size;
} opts;
int cmd_multi_pack_index(int argc, const char **argv,
@@ -19,6 +21,8 @@
static struct option builtin_multi_pack_index_options[] = {
OPT_FILENAME(0, "object-dir", &opts.object_dir,
N_("object directory containing set of packfile and pack-index pairs")),
+ OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
+ N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
OPT_END(),
};
@@ -40,10 +44,19 @@
return 1;
}
+ trace2_cmd_mode(argv[0]);
+
+ if (!strcmp(argv[0], "repack"))
+ return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size);
+ if (opts.batch_size)
+ die(_("--batch-size option is only for 'repack' subcommand"));
+
if (!strcmp(argv[0], "write"))
return write_midx_file(opts.object_dir);
if (!strcmp(argv[0], "verify"))
- return verify_midx_file(opts.object_dir);
+ return verify_midx_file(the_repository, opts.object_dir);
+ if (!strcmp(argv[0], "expire"))
+ return expire_midx_packs(the_repository, opts.object_dir);
- die(_("unrecognized verb: %s"), argv[0]);
+ die(_("unrecognized subcommand: %s"), argv[0]);
}
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index f1cb45c..c785fe1 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -40,9 +40,7 @@
}
static int is_better_name(struct rev_name *name,
- const char *tip_name,
timestamp_t taggerdate,
- int generation,
int distance,
int from_tag)
{
@@ -103,8 +101,7 @@
name = xmalloc(sizeof(rev_name));
set_commit_rev_name(commit, name);
goto copy_data;
- } else if (is_better_name(name, tip_name, taggerdate,
- generation, distance, from_tag)) {
+ } else if (is_better_name(name, taggerdate, distance, from_tag)) {
copy_data:
name->tip_name = tip_name;
name->taggerdate = taggerdate;
@@ -361,26 +358,27 @@
static void name_rev_line(char *p, struct name_ref_data *data)
{
struct strbuf buf = STRBUF_INIT;
- int forty = 0;
+ int counter = 0;
char *p_start;
+ const unsigned hexsz = the_hash_algo->hexsz;
+
for (p_start = p; *p; p++) {
#define ishex(x) (isdigit((x)) || ((x) >= 'a' && (x) <= 'f'))
if (!ishex(*p))
- forty = 0;
- else if (++forty == GIT_SHA1_HEXSZ &&
+ counter = 0;
+ else if (++counter == hexsz &&
!ishex(*(p+1))) {
struct object_id oid;
const char *name = NULL;
char c = *(p+1);
int p_len = p - p_start + 1;
- forty = 0;
+ counter = 0;
*(p+1) = 0;
- if (!get_oid(p - (GIT_SHA1_HEXSZ - 1), &oid)) {
+ if (!get_oid(p - (hexsz - 1), &oid)) {
struct object *o =
- lookup_object(the_repository,
- oid.hash);
+ lookup_object(the_repository, &oid);
if (o)
name = get_rev_name(o, &buf);
}
@@ -390,7 +388,7 @@
continue;
if (data->name_only)
- printf("%.*s%s", p_len - GIT_SHA1_HEXSZ, p_start, name);
+ printf("%.*s%s", p_len - hexsz, p_start, name);
else
printf("%.*s (%s)", p_len, p_start, name);
p_start = p + 1;
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a9fac7c..5876583 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -33,6 +33,7 @@
#include "object-store.h"
#include "dir.h"
#include "midx.h"
+#include "trace2.h"
#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
#define SIZE(obj) oe_size(&to_pack, obj)
@@ -95,8 +96,12 @@
static int use_bitmap_index_default = 1;
static int use_bitmap_index = -1;
-static int write_bitmap_index;
-static uint16_t write_bitmap_options;
+static enum {
+ WRITE_BITMAP_FALSE = 0,
+ WRITE_BITMAP_QUIET,
+ WRITE_BITMAP_TRUE,
+} write_bitmap_index;
+static uint16_t write_bitmap_options = BITMAP_OPT_HASH_CACHE;
static int exclude_promisor_objects;
@@ -605,12 +610,12 @@
void *cb_data)
{
struct object_id peeled;
- struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
+ struct object_entry *entry = packlist_find(&to_pack, oid);
if (entry)
entry->tagged = 1;
if (!peel_ref(path, &peeled)) {
- entry = packlist_find(&to_pack, peeled.hash, NULL);
+ entry = packlist_find(&to_pack, &peeled);
if (entry)
entry->tagged = 1;
}
@@ -891,7 +896,8 @@
nr_written, oid.hash, offset);
close(fd);
if (write_bitmap_index) {
- warning(_(no_split_warning));
+ if (write_bitmap_index != WRITE_BITMAP_QUIET)
+ warning(_(no_split_warning));
write_bitmap_index = 0;
}
}
@@ -963,6 +969,8 @@
if (written != nr_result)
die(_("wrote %"PRIu32" objects while expecting %"PRIu32),
written, nr_result);
+ trace2_data_intmax("pack-objects", the_repository,
+ "write_pack_file/wrote", nr_result);
}
static int no_try_delta(const char *path)
@@ -988,12 +996,11 @@
* few lines later when we want to add the new entry.
*/
static int have_duplicate_entry(const struct object_id *oid,
- int exclude,
- uint32_t *index_pos)
+ int exclude)
{
struct object_entry *entry;
- entry = packlist_find(&to_pack, oid->hash, index_pos);
+ entry = packlist_find(&to_pack, oid);
if (!entry)
return 0;
@@ -1077,7 +1084,7 @@
for (m = get_multi_pack_index(the_repository); m; m = m->next) {
struct pack_entry e;
- if (fill_midx_entry(oid, &e, m)) {
+ if (fill_midx_entry(the_repository, oid, &e, m)) {
struct packed_git *p = e.p;
off_t offset;
@@ -1133,13 +1140,12 @@
uint32_t hash,
int exclude,
int no_try_delta,
- uint32_t index_pos,
struct packed_git *found_pack,
off_t found_offset)
{
struct object_entry *entry;
- entry = packlist_alloc(&to_pack, oid->hash, index_pos);
+ entry = packlist_alloc(&to_pack, oid);
entry->hash = hash;
oe_set_type(entry, type);
if (exclude)
@@ -1163,17 +1169,17 @@
{
struct packed_git *found_pack = NULL;
off_t found_offset = 0;
- uint32_t index_pos;
display_progress(progress_state, ++nr_seen);
- if (have_duplicate_entry(oid, exclude, &index_pos))
+ if (have_duplicate_entry(oid, exclude))
return 0;
if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
/* The pack is missing an object, so it will not have closure */
if (write_bitmap_index) {
- warning(_(no_closure_warning));
+ if (write_bitmap_index != WRITE_BITMAP_QUIET)
+ warning(_(no_closure_warning));
write_bitmap_index = 0;
}
return 0;
@@ -1181,7 +1187,7 @@
create_object_entry(oid, type, pack_name_hash(name),
exclude, name && no_try_delta(name),
- index_pos, found_pack, found_offset);
+ found_pack, found_offset);
return 1;
}
@@ -1190,17 +1196,15 @@
int flags, uint32_t name_hash,
struct packed_git *pack, off_t offset)
{
- uint32_t index_pos;
-
display_progress(progress_state, ++nr_seen);
- if (have_duplicate_entry(oid, 0, &index_pos))
+ if (have_duplicate_entry(oid, 0))
return 0;
if (!want_object_in_pack(oid, 0, &pack, &offset))
return 0;
- create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
+ create_object_entry(oid, type, name_hash, 0, 0, pack, offset);
return 1;
}
@@ -1425,7 +1429,8 @@
if (window <= num_preferred_base++)
return;
- data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
+ data = read_object_with_reference(the_repository, oid,
+ tree_type, &size, &tree_oid);
if (!data)
return;
@@ -1486,15 +1491,18 @@
struct object_entry **base_out)
{
struct object_entry *base;
+ struct object_id base_oid;
if (!base_sha1)
return 0;
+ oidread(&base_oid, base_sha1);
+
/*
* First see if we're already sending the base (or it's explicitly in
* our "excluded" list).
*/
- base = packlist_find(&to_pack, base_sha1, NULL);
+ base = packlist_find(&to_pack, &base_oid);
if (base) {
if (!in_same_island(&delta->idx.oid, &base->idx.oid))
return 0;
@@ -1507,10 +1515,8 @@
* even if it was buried too deep in history to make it into the
* packing list.
*/
- if (thin && bitmap_has_sha1_in_uninteresting(bitmap_git, base_sha1)) {
+ if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) {
if (use_delta_islands) {
- struct object_id base_oid;
- hashcpy(base_oid.hash, base_sha1);
if (!in_same_island(&delta->idx.oid, &base_oid))
return 0;
}
@@ -2331,15 +2337,6 @@
free(array);
}
-static void try_to_free_from_threads(size_t size)
-{
- packing_data_lock(&to_pack);
- release_pack_memory(size);
- packing_data_unlock(&to_pack);
-}
-
-static try_to_free_t old_try_to_free_routine;
-
/*
* The main object list is split into smaller lists, each is handed to
* one worker.
@@ -2380,12 +2377,10 @@
pthread_mutex_init(&cache_mutex, NULL);
pthread_mutex_init(&progress_mutex, NULL);
pthread_cond_init(&progress_cond, NULL);
- old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
}
static void cleanup_threaded_search(void)
{
- set_try_to_free_routine(old_try_to_free_routine);
pthread_cond_destroy(&progress_cond);
pthread_mutex_destroy(&cache_mutex);
pthread_mutex_destroy(&progress_mutex);
@@ -2568,7 +2563,7 @@
* it was included via bitmaps, we would not have parsed it
* previously).
*/
- if (packlist_find(&to_pack, oid->hash, NULL))
+ if (packlist_find(&to_pack, oid))
return;
tag = lookup_tag(the_repository, oid);
@@ -2592,7 +2587,7 @@
if (starts_with(path, "refs/tags/") && /* is a tag? */
!peel_ref(path, &peeled) && /* peelable? */
- packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */
+ packlist_find(&to_pack, &peeled)) /* object packed? */
add_tag_chain(oid);
return 0;
}
@@ -2704,10 +2699,6 @@
use_bitmap_index_default = git_config_bool(k, v);
return 0;
}
- if (!strcmp(k, "pack.usesparse")) {
- sparse = git_config_bool(k, v);
- return 0;
- }
if (!strcmp(k, "pack.threads")) {
delta_search_threads = git_config_int(k, v);
if (delta_search_threads < 0)
@@ -2792,7 +2783,7 @@
for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
depth++;
- ent = packlist_find(&to_pack, obj->oid.hash, NULL);
+ ent = packlist_find(&to_pack, &obj->oid);
if (ent && depth > oe_tree_depth(&to_pack, ent))
oe_set_tree_depth(&to_pack, ent, depth);
}
@@ -2896,7 +2887,7 @@
return oidcmp(&a->object->oid, &b->object->oid);
}
-static void add_objects_in_unpacked_packs(struct rev_info *revs)
+static void add_objects_in_unpacked_packs(void)
{
struct packed_git *p;
struct in_pack in_pack;
@@ -2919,7 +2910,7 @@
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
- o = lookup_unknown_object(oid.hash);
+ o = lookup_unknown_object(&oid);
if (!(o->flags & OBJECT_ADDED))
mark_in_pack_object(o, p, &in_pack);
o->flags |= OBJECT_ADDED;
@@ -3008,7 +2999,7 @@
return 1;
}
-static void loosen_unused_packed_objects(struct rev_info *revs)
+static void loosen_unused_packed_objects(void)
{
struct packed_git *p;
uint32_t i;
@@ -3023,7 +3014,7 @@
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
- if (!packlist_find(&to_pack, oid.hash, NULL) &&
+ if (!packlist_find(&to_pack, &oid) &&
!has_sha1_pack_kept_or_nonlocal(&oid) &&
!loosened_object_can_be_discarded(&oid, p->mtime))
if (force_object_loose(&oid, p->mtime))
@@ -3131,7 +3122,7 @@
return;
if (use_delta_islands)
- load_delta_islands(the_repository);
+ load_delta_islands(the_repository, progress);
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
@@ -3155,11 +3146,11 @@
}
if (keep_unreachable)
- add_objects_in_unpacked_packs(&revs);
+ add_objects_in_unpacked_packs();
if (pack_loose_unreachable)
add_unreachable_loose_objects();
if (unpack_unreachable)
- loosen_unused_packed_objects(&revs);
+ loosen_unused_packed_objects();
oid_array_clear(&recent_objects);
}
@@ -3308,8 +3299,13 @@
N_("do not hide commits by grafts"), 0),
OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
N_("use a bitmap index if available to speed up counting objects")),
- OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
- N_("write a bitmap index together with the pack index")),
+ OPT_SET_INT(0, "write-bitmap-index", &write_bitmap_index,
+ N_("write a bitmap index together with the pack index"),
+ WRITE_BITMAP_TRUE),
+ OPT_SET_INT_F(0, "write-bitmap-index-quiet",
+ &write_bitmap_index,
+ N_("write a bitmap index if possible"),
+ WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
{ OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
N_("handling for missing objects"), PARSE_OPT_NONEG,
@@ -3327,6 +3323,10 @@
read_replace_refs = 0;
sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
+ prepare_repo_settings(the_repository);
+ if (!sparse && the_repository->settings.pack_use_sparse != -1)
+ sparse = the_repository->settings.pack_use_sparse;
+
reset_pack_idx_option(&pack_idx_opts);
git_config(git_pack_config, NULL);
@@ -3473,6 +3473,8 @@
}
}
+ trace2_region_enter("pack-objects", "enumerate-objects",
+ the_repository);
prepare_packing_data(the_repository, &to_pack);
if (progress)
@@ -3487,12 +3489,23 @@
if (include_tag && nr_result)
for_each_ref(add_ref_tag, NULL);
stop_progress(&progress_state);
+ trace2_region_leave("pack-objects", "enumerate-objects",
+ the_repository);
if (non_empty && !nr_result)
return 0;
- if (nr_result)
+ if (nr_result) {
+ trace2_region_enter("pack-objects", "prepare-pack",
+ the_repository);
prepare_pack(window, depth);
+ trace2_region_leave("pack-objects", "prepare-pack",
+ the_repository);
+ }
+
+ trace2_region_enter("pack-objects", "write-pack-file", the_repository);
write_pack_file();
+ trace2_region_leave("pack-objects", "write-pack-file", the_repository);
+
if (progress)
fprintf_ln(stderr,
_("Total %"PRIu32" (delta %"PRIu32"),"
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 11bc514..178e340 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -32,14 +32,10 @@
struct pack_list *next;
struct packed_git *pack;
struct llist *unique_objects;
- struct llist *all_objects;
+ struct llist *remaining_objects;
+ size_t all_objects_size;
} *local_packs = NULL, *altodb_packs = NULL;
-struct pll {
- struct pll *next;
- struct pack_list *pl;
-};
-
static struct llist_item *free_nodes;
static inline void llist_item_put(struct llist_item *item)
@@ -63,15 +59,6 @@
return new_item;
}
-static void llist_free(struct llist *list)
-{
- while ((list->back = list->front)) {
- list->front = list->front->next;
- llist_item_put(list->back);
- }
- free(list);
-}
-
static inline void llist_init(struct llist **list)
{
*list = xmalloc(sizeof(struct llist));
@@ -254,6 +241,11 @@
struct llist_item *p1_hint = NULL, *p2_hint = NULL;
const unsigned int hashsz = the_hash_algo->rawsz;
+ if (!p1->unique_objects)
+ p1->unique_objects = llist_copy(p1->remaining_objects);
+ if (!p2->unique_objects)
+ p2->unique_objects = llist_copy(p2->remaining_objects);
+
p1_base = p1->pack->index_data;
p2_base = p2->pack->index_data;
p1_base += 256 * 4 + ((p1->pack->index_version < 2) ? 4 : 8);
@@ -285,78 +277,6 @@
}
}
-static void pll_free(struct pll *l)
-{
- struct pll *old;
- struct pack_list *opl;
-
- while (l) {
- old = l;
- while (l->pl) {
- opl = l->pl;
- l->pl = opl->next;
- free(opl);
- }
- l = l->next;
- free(old);
- }
-}
-
-/* all the permutations have to be free()d at the same time,
- * since they refer to each other
- */
-static struct pll * get_permutations(struct pack_list *list, int n)
-{
- struct pll *subset, *ret = NULL, *new_pll = NULL;
-
- if (list == NULL || pack_list_size(list) < n || n == 0)
- return NULL;
-
- if (n == 1) {
- while (list) {
- new_pll = xmalloc(sizeof(*new_pll));
- new_pll->pl = NULL;
- pack_list_insert(&new_pll->pl, list);
- new_pll->next = ret;
- ret = new_pll;
- list = list->next;
- }
- return ret;
- }
-
- while (list->next) {
- subset = get_permutations(list->next, n - 1);
- while (subset) {
- new_pll = xmalloc(sizeof(*new_pll));
- new_pll->pl = subset->pl;
- pack_list_insert(&new_pll->pl, list);
- new_pll->next = ret;
- ret = new_pll;
- subset = subset->next;
- }
- list = list->next;
- }
- return ret;
-}
-
-static int is_superset(struct pack_list *pl, struct llist *list)
-{
- struct llist *diff;
-
- diff = llist_copy(list);
-
- while (pl) {
- llist_sorted_difference_inplace(diff, pl->all_objects);
- if (diff->size == 0) { /* we're done */
- llist_free(diff);
- return 1;
- }
- pl = pl->next;
- }
- llist_free(diff);
- return 0;
-}
-
static size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
{
size_t ret = 0;
@@ -421,14 +341,58 @@
return ret;
}
+static int cmp_remaining_objects(const void *a, const void *b)
+{
+ struct pack_list *pl_a = *((struct pack_list **)a);
+ struct pack_list *pl_b = *((struct pack_list **)b);
+
+ if (pl_a->remaining_objects->size == pl_b->remaining_objects->size) {
+ /* have the same remaining_objects, big pack first */
+ if (pl_a->all_objects_size == pl_b->all_objects_size)
+ return 0;
+ else if (pl_a->all_objects_size < pl_b->all_objects_size)
+ return 1;
+ else
+ return -1;
+ } else if (pl_a->remaining_objects->size < pl_b->remaining_objects->size) {
+ /* sort by remaining objects, more objects first */
+ return 1;
+ } else {
+ return -1;
+ }
+}
+
+/* Sort pack_list, greater size of remaining_objects first */
+static void sort_pack_list(struct pack_list **pl)
+{
+ struct pack_list **ary, *p;
+ int i;
+ size_t n = pack_list_size(*pl);
+
+ if (n < 2)
+ return;
+
+ /* prepare an array of packed_list for easier sorting */
+ ary = xcalloc(n, sizeof(struct pack_list *));
+ for (n = 0, p = *pl; p; p = p->next)
+ ary[n++] = p;
+
+ QSORT(ary, n, cmp_remaining_objects);
+
+ /* link them back again */
+ for (i = 0; i < n - 1; i++)
+ ary[i]->next = ary[i + 1];
+ ary[n - 1]->next = NULL;
+ *pl = ary[0];
+
+ free(ary);
+}
+
+
static void minimize(struct pack_list **min)
{
- struct pack_list *pl, *unique = NULL,
- *non_unique = NULL, *min_perm = NULL;
- struct pll *perm, *perm_all, *perm_ok = NULL, *new_perm;
- struct llist *missing;
- off_t min_perm_size = 0, perm_size;
- int n;
+ struct pack_list *pl, *unique = NULL, *non_unique = NULL;
+ struct llist *missing, *unique_pack_objects;
pl = local_packs;
while (pl) {
@@ -442,53 +406,41 @@
missing = llist_copy(all_objects);
pl = unique;
while (pl) {
- llist_sorted_difference_inplace(missing, pl->all_objects);
+ llist_sorted_difference_inplace(missing, pl->remaining_objects);
pl = pl->next;
}
+ *min = unique;
+
/* return if there are no objects missing from the unique set */
if (missing->size == 0) {
- *min = unique;
free(missing);
return;
}
- /* find the permutations which contain all missing objects */
- for (n = 1; n <= pack_list_size(non_unique) && !perm_ok; n++) {
- perm_all = perm = get_permutations(non_unique, n);
- while (perm) {
- if (is_superset(perm->pl, missing)) {
- new_perm = xmalloc(sizeof(struct pll));
- memcpy(new_perm, perm, sizeof(struct pll));
- new_perm->next = perm_ok;
- perm_ok = new_perm;
- }
- perm = perm->next;
- }
- if (perm_ok)
- break;
- pll_free(perm_all);
- }
- if (perm_ok == NULL)
- die("Internal error: No complete sets found!");
+ unique_pack_objects = llist_copy(all_objects);
+ llist_sorted_difference_inplace(unique_pack_objects, missing);
- /* find the permutation with the smallest size */
- perm = perm_ok;
- while (perm) {
- perm_size = pack_set_bytecount(perm->pl);
- if (!min_perm_size || min_perm_size > perm_size) {
- min_perm_size = perm_size;
- min_perm = perm->pl;
- }
- perm = perm->next;
- }
- *min = min_perm;
- /* add the unique packs to the list */
- pl = unique;
+ /* remove unique pack objects from the non_unique packs */
+ pl = non_unique;
while (pl) {
- pack_list_insert(min, pl);
+ llist_sorted_difference_inplace(pl->remaining_objects, unique_pack_objects);
pl = pl->next;
}
+
+ while (non_unique) {
+ /* sort the non_unique packs, greater size of remaining_objects first */
+ sort_pack_list(&non_unique);
+ if (non_unique->remaining_objects->size == 0)
+ break;
+
+ pack_list_insert(min, non_unique);
+
+ for (pl = non_unique->next; pl && pl->remaining_objects->size > 0; pl = pl->next)
+ llist_sorted_difference_inplace(pl->remaining_objects, non_unique->remaining_objects);
+
+ non_unique = non_unique->next;
+ }
}
static void load_all_objects(void)
@@ -500,7 +452,7 @@
while (pl) {
hint = NULL;
- l = pl->all_objects->front;
+ l = pl->remaining_objects->front;
while (l) {
hint = llist_insert_sorted_unique(all_objects,
l->oid, hint);
@@ -511,7 +463,7 @@
/* remove objects present in remote packs */
pl = altodb_packs;
while (pl) {
- llist_sorted_difference_inplace(all_objects, pl->all_objects);
+ llist_sorted_difference_inplace(all_objects, pl->remaining_objects);
pl = pl->next;
}
}
@@ -536,11 +488,10 @@
while (alt) {
local = local_packs;
while (local) {
- llist_sorted_difference_inplace(local->unique_objects,
- alt->all_objects);
+ llist_sorted_difference_inplace(local->remaining_objects,
+ alt->remaining_objects);
local = local->next;
}
- llist_sorted_difference_inplace(all_objects, alt->all_objects);
alt = alt->next;
}
}
@@ -555,7 +506,7 @@
return NULL;
l.pack = p;
- llist_init(&l.all_objects);
+ llist_init(&l.remaining_objects);
if (open_pack_index(p))
return NULL;
@@ -564,11 +515,11 @@
base += 256 * 4 + ((p->index_version < 2) ? 4 : 8);
step = the_hash_algo->rawsz + ((p->index_version < 2) ? 4 : 0);
while (off < p->num_objects * step) {
- llist_insert_back(l.all_objects, (const struct object_id *)(base + off));
+ llist_insert_back(l.remaining_objects, (const struct object_id *)(base + off));
off += step;
}
- /* this list will be pruned in cmp_two_packs later */
- l.unique_objects = llist_copy(l.all_objects);
+ l.all_objects_size = l.remaining_objects->size;
+ l.unique_objects = NULL;
if (p->pack_local)
return pack_list_insert(&local_packs, &l);
else
@@ -603,7 +554,7 @@
int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
{
int i;
- struct pack_list *min, *red, *pl;
+ struct pack_list *min = NULL, *red, *pl;
struct llist *ignore;
struct object_id *oid;
char buf[GIT_MAX_HEXSZ + 2]; /* hex hash + \n + \0 */
@@ -646,7 +597,6 @@
load_all_objects();
- cmp_local_packs();
if (alt_odb)
scan_alt_odb_packs();
@@ -663,10 +613,12 @@
llist_sorted_difference_inplace(all_objects, ignore);
pl = local_packs;
while (pl) {
- llist_sorted_difference_inplace(pl->unique_objects, ignore);
+ llist_sorted_difference_inplace(pl->remaining_objects, ignore);
pl = pl->next;
}
+ cmp_local_packs();
+
minimize(&min);
if (verbose) {
@@ -689,7 +641,7 @@
pl = red = pack_list_difference(local_packs, min);
while (pl) {
printf("%s\n%s\n",
- sha1_pack_index_name(pl->pack->sha1),
+ sha1_pack_index_name(pl->pack->hash),
pl->pack->pack_name);
pl = pl->next;
}
diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index f335356..cfbd5c3 100644
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -1,4 +1,5 @@
#include "builtin.h"
+#include "config.h"
#include "parse-options.h"
#include "refs.h"
#include "repository.h"
@@ -16,6 +17,7 @@
OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
OPT_END(),
};
+ git_config(git_default_config, NULL);
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
usage_with_options(pack_refs_usage, opts);
return refs_pack_refs(get_main_ref_store(the_repository), flags);
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 970d0d3..bd28b80 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "config.h"
+#include "diff.h"
static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
{
@@ -54,22 +55,6 @@
return 1;
}
-static void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
-{
- unsigned char hash[GIT_MAX_RAWSZ];
- unsigned short carry = 0;
- int i;
-
- git_SHA1_Final(hash, ctx);
- git_SHA1_Init(ctx);
- /* 20-byte sum, with carry */
- for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
- carry += result->hash[i] + hash[i];
- result->hash[i] = carry;
- carry >>= 8;
- }
-}
-
static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
struct strbuf *line_buf, int stable)
{
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index a9e7b55..48c5e78 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -63,6 +63,11 @@
argc = parse_options(argc, argv, prefix, prune_packed_options,
prune_packed_usage, 0);
+ if (argc > 0)
+ usage_msg_opt(_("too many arguments"),
+ prune_packed_usage,
+ prune_packed_options);
+
prune_packed_objects(opts);
return 0;
}
diff --git a/builtin/prune.c b/builtin/prune.c
index 1ec9ddd..2b76872 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -31,16 +31,39 @@
return 0;
}
+static void perform_reachability_traversal(struct rev_info *revs)
+{
+ static int initialized;
+ struct progress *progress = NULL;
+
+ if (initialized)
+ return;
+
+ if (show_progress)
+ progress = start_delayed_progress(_("Checking connectivity"), 0);
+ mark_reachable_objects(revs, 1, expire, progress);
+ stop_progress(&progress);
+ initialized = 1;
+}
+
+static int is_object_reachable(const struct object_id *oid,
+ struct rev_info *revs)
+{
+ struct object *obj;
+
+ perform_reachability_traversal(revs);
+
+ obj = lookup_object(the_repository, oid);
+ return obj && (obj->flags & SEEN);
+}
+
static int prune_object(const struct object_id *oid, const char *fullpath,
void *data)
{
+ struct rev_info *revs = data;
struct stat st;
- /*
- * Do we know about this object?
- * It must have been reachable
- */
- if (lookup_object(the_repository, oid->hash))
+ if (is_object_reachable(oid, revs))
return 0;
if (lstat(fullpath, &st)) {
@@ -102,7 +125,6 @@
int cmd_prune(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
- struct progress *progress = NULL;
int exclude_promisor_objects = 0;
const struct option options[] = {
OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
@@ -142,17 +164,13 @@
if (show_progress == -1)
show_progress = isatty(2);
- if (show_progress)
- progress = start_delayed_progress(_("Checking connectivity"), 0);
if (exclude_promisor_objects) {
fetch_if_missing = 0;
revs.exclude_promisor_objects = 1;
}
- mark_reachable_objects(&revs, 1, expire, progress);
- stop_progress(&progress);
for_each_loose_file_in_objdir(get_object_directory(), prune_object,
- prune_cruft, prune_subdir, NULL);
+ prune_cruft, prune_subdir, &revs);
prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
remove_temporary_files(get_object_directory());
@@ -160,8 +178,10 @@
remove_temporary_files(s);
free(s);
- if (is_repository_shallow(the_repository))
+ if (is_repository_shallow(the_repository)) {
+ perform_reachability_traversal(&revs);
prune_shallow(show_only ? PRUNE_SHOW_ONLY : 0);
+ }
return 0;
}
diff --git a/builtin/pull.c b/builtin/pull.c
index 701d147..d25ff13 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -24,6 +24,7 @@
#include "lockfile.h"
#include "wt-status.h"
#include "commit-reach.h"
+#include "sequencer.h"
enum rebase_type {
REBASE_INVALID = -1,
@@ -56,6 +57,10 @@
return REBASE_MERGES;
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
return REBASE_INTERACTIVE;
+ /*
+ * Please update _git_config() in git-completion.bash when you
+ * add new rebase modes.
+ */
if (fatal)
die(_("Invalid value for %s: %s"), key, value);
@@ -97,6 +102,7 @@
static char *opt_squash;
static char *opt_commit;
static char *opt_edit;
+static char *cleanup_arg;
static char *opt_ff;
static char *opt_verify_signatures;
static int opt_autostash = -1;
@@ -122,6 +128,8 @@
static char *opt_refmap;
static char *opt_ipv4;
static char *opt_ipv6;
+static int opt_show_forced_updates = -1;
+static char *set_upstream;
static struct option pull_options[] = {
/* Shared options */
@@ -164,6 +172,7 @@
OPT_PASSTHRU(0, "edit", &opt_edit, NULL,
N_("edit message before committing"),
PARSE_OPT_NOARG),
+ OPT_CLEANUP(&cleanup_arg),
OPT_PASSTHRU(0, "ff", &opt_ff, NULL,
N_("allow fast-forward"),
PARSE_OPT_NOARG),
@@ -233,6 +242,11 @@
OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
N_("use IPv6 addresses only"),
PARSE_OPT_NOARG),
+ OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
+ N_("check for forced-updates on all updated branches")),
+ OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
+ N_("set upstream for git pull/fetch"),
+ PARSE_OPT_NOARG),
OPT_END()
};
@@ -365,9 +379,10 @@
fp = xfopen(filename, "r");
while (strbuf_getline_lf(&sb, fp) != EOF) {
- if (get_oid_hex(sb.buf, &oid))
- continue; /* invalid line: does not start with SHA1 */
- if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
+ const char *p;
+ if (parse_oid_hex(sb.buf, &oid, &p))
+ continue; /* invalid line: does not start with object ID */
+ if (starts_with(p, "\tnot-for-merge\t"))
continue; /* ref is not-for-merge */
oid_array_append(merge_heads, &oid);
}
@@ -541,6 +556,12 @@
argv_array_push(&args, opt_ipv4);
if (opt_ipv6)
argv_array_push(&args, opt_ipv6);
+ if (opt_show_forced_updates > 0)
+ argv_array_push(&args, "--show-forced-updates");
+ else if (opt_show_forced_updates == 0)
+ argv_array_push(&args, "--no-show-forced-updates");
+ if (set_upstream)
+ argv_array_push(&args, set_upstream);
if (repo) {
argv_array_push(&args, repo);
@@ -640,6 +661,8 @@
argv_array_push(&args, opt_commit);
if (opt_edit)
argv_array_push(&args, opt_edit);
+ if (cleanup_arg)
+ argv_array_pushf(&args, "--cleanup=%s", cleanup_arg);
if (opt_ff)
argv_array_push(&args, opt_ff);
if (opt_verify_signatures)
@@ -756,7 +779,7 @@
cp.no_stderr = 1;
cp.git_cmd = 1;
- ret = capture_command(&cp, &sb, GIT_SHA1_HEXSZ);
+ ret = capture_command(&cp, &sb, GIT_MAX_HEXSZ);
if (ret)
goto cleanup;
@@ -801,7 +824,7 @@
}
/**
- * Given the current HEAD SHA1, the merge head returned from git-fetch and the
+ * Given the current HEAD oid, the merge head returned from git-fetch and the
* fork point calculated by get_rebase_fork_point(), runs git-rebase with the
* appropriate arguments and returns its exit status.
*/
@@ -871,6 +894,13 @@
argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
+ if (cleanup_arg)
+ /*
+ * this only checks the validity of cleanup_arg; we don't need
+ * a valid value for use_editor
+ */
+ get_cleanup_mode(cleanup_arg, 0);
+
parse_repo_refspecs(argc, argv, &repo, &refspecs);
if (!opt_ff)
diff --git a/builtin/push.c b/builtin/push.c
index 021dd3b..3742daf 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -385,30 +385,14 @@
}
static int do_push(const char *repo, int flags,
- const struct string_list *push_options)
+ const struct string_list *push_options,
+ struct remote *remote)
{
int i, errs;
- struct remote *remote = pushremote_get(repo);
const char **url;
int url_nr;
struct refspec *push_refspec = &rs;
- if (!remote) {
- if (repo)
- die(_("bad repository '%s'"), repo);
- die(_("No configured push destination.\n"
- "Either specify the URL from the command-line or configure a remote repository using\n"
- "\n"
- " git remote add <name> <url>\n"
- "\n"
- "and then push using the remote name\n"
- "\n"
- " git push <name>\n"));
- }
-
- if (remote->mirror)
- flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
-
if (push_options->nr)
flags |= TRANSPORT_PUSH_OPTIONS;
@@ -548,6 +532,7 @@
struct string_list push_options_cmdline = STRING_LIST_INIT_DUP;
struct string_list *push_options;
const struct string_list_item *item;
+ struct remote *remote;
struct option options[] = {
OPT__VERBOSITY(&verbosity),
@@ -602,20 +587,6 @@
die(_("--delete is incompatible with --all, --mirror and --tags"));
if (deleterefs && argc < 2)
die(_("--delete doesn't make sense without any refs"));
- if (flags & TRANSPORT_PUSH_ALL) {
- if (tags)
- die(_("--all and --tags are incompatible"));
- if (argc >= 2)
- die(_("--all can't be combined with refspecs"));
- }
- if (flags & TRANSPORT_PUSH_MIRROR) {
- if (tags)
- die(_("--mirror and --tags are incompatible"));
- if (argc >= 2)
- die(_("--mirror can't be combined with refspecs"));
- }
- if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
- die(_("--all and --mirror are incompatible"));
if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
@@ -632,11 +603,43 @@
set_refspecs(argv + 1, argc - 1, repo);
}
+ remote = pushremote_get(repo);
+ if (!remote) {
+ if (repo)
+ die(_("bad repository '%s'"), repo);
+ die(_("No configured push destination.\n"
+ "Either specify the URL from the command-line or configure a remote repository using\n"
+ "\n"
+ " git remote add <name> <url>\n"
+ "\n"
+ "and then push using the remote name\n"
+ "\n"
+ " git push <name>\n"));
+ }
+
+ if (remote->mirror)
+ flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
+
+ if (flags & TRANSPORT_PUSH_ALL) {
+ if (tags)
+ die(_("--all and --tags are incompatible"));
+ if (argc >= 2)
+ die(_("--all can't be combined with refspecs"));
+ }
+ if (flags & TRANSPORT_PUSH_MIRROR) {
+ if (tags)
+ die(_("--mirror and --tags are incompatible"));
+ if (argc >= 2)
+ die(_("--mirror can't be combined with refspecs"));
+ }
+ if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
+ die(_("--all and --mirror are incompatible"));
+
for_each_string_list_item(item, push_options)
if (strchr(item->string, '\n'))
die(_("push options must not have new line characters"));
- rc = do_push(repo, flags, push_options);
+ rc = do_push(repo, flags, push_options, remote);
string_list_clear(&push_options_cmdline, 0);
string_list_clear(&push_options_config, 0);
if (rc == -1)
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index f01a0be..9202e75 100644
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -16,42 +16,27 @@
int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
struct diff_options diffopt = { NULL };
int simple_color = -1;
- struct option options[] = {
+ struct option range_diff_options[] = {
OPT_INTEGER(0, "creation-factor", &creation_factor,
N_("Percentage by which creation is weighted")),
OPT_BOOL(0, "no-dual-color", &simple_color,
N_("use simple diff colors")),
OPT_END()
};
- int i, j, res = 0;
+ struct option *options;
+ int res = 0;
struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT;
git_config(git_diff_ui_config, NULL);
repo_diff_setup(the_repository, &diffopt);
- argc = parse_options(argc, argv, NULL, options,
- builtin_range_diff_usage, PARSE_OPT_KEEP_UNKNOWN |
- PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
-
- for (i = j = 1; i < argc && strcmp("--", argv[i]); ) {
- int c = diff_opt_parse(&diffopt, argv + i, argc - i, prefix);
-
- if (!c)
- argv[j++] = argv[i++];
- else
- i += c;
- }
- while (i < argc)
- argv[j++] = argv[i++];
- argc = j;
- diff_setup_done(&diffopt);
-
- /* Make sure that there are no unparsed options */
- argc = parse_options(argc, argv, NULL,
- options + ARRAY_SIZE(options) - 1, /* OPT_END */
+ options = parse_options_concat(range_diff_options, diffopt.parseopts);
+ argc = parse_options(argc, argv, prefix, options,
builtin_range_diff_usage, 0);
+ diff_setup_done(&diffopt);
+
/* force color when --dual-color was used */
if (!simple_color)
diffopt.use_color = 1;
@@ -90,6 +75,7 @@
error(_("need two commit ranges"));
usage_with_options(builtin_range_diff_usage, options);
}
+ FREE_AND_NULL(options);
res = show_range_diff(range1.buf, range2.buf, creation_factor,
simple_color < 1, &diffopt);
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 9083dcf..ca5e655 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -111,7 +111,7 @@
return git_default_config(var, value, cb);
}
-int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
+int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
{
int i, stage = 0;
struct object_id oid;
@@ -154,6 +154,7 @@
{ OPTION_CALLBACK, 0, "recurse-submodules", NULL,
"checkout", "control recursive updating of submodules",
PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
+ OPT__QUIET(&opts.quiet, N_("suppress feedback messages")),
OPT_END()
};
@@ -164,7 +165,7 @@
git_config(git_read_tree_config, NULL);
- argc = parse_options(argc, argv, unused_prefix, read_tree_options,
+ argc = parse_options(argc, argv, cmd_prefix, read_tree_options,
read_tree_usage, 0);
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
deleted file mode 100644
index 888390f..0000000
--- a/builtin/rebase--interactive.c
+++ /dev/null
@@ -1,275 +0,0 @@
-#define USE_THE_INDEX_COMPATIBILITY_MACROS
-#include "builtin.h"
-#include "cache.h"
-#include "config.h"
-#include "parse-options.h"
-#include "sequencer.h"
-#include "rebase-interactive.h"
-#include "argv-array.h"
-#include "refs.h"
-#include "rerere.h"
-#include "run-command.h"
-
-static GIT_PATH_FUNC(path_state_dir, "rebase-merge/")
-static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
-static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
-
-static int get_revision_ranges(const char *upstream, const char *onto,
- const char **head_hash,
- char **revisions, char **shortrevisions)
-{
- const char *base_rev = upstream ? upstream : onto, *shorthead;
- struct object_id orig_head;
-
- if (get_oid("HEAD", &orig_head))
- return error(_("no HEAD?"));
-
- *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
- *revisions = xstrfmt("%s...%s", base_rev, *head_hash);
-
- shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
-
- if (upstream) {
- const char *shortrev;
- struct object_id rev_oid;
-
- get_oid(base_rev, &rev_oid);
- shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV);
-
- *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
- } else
- *shortrevisions = xstrdup(shorthead);
-
- return 0;
-}
-
-static int init_basic_state(struct replay_opts *opts, const char *head_name,
- const char *onto, const char *orig_head)
-{
- FILE *interactive;
-
- if (!is_directory(path_state_dir()) && mkdir_in_gitdir(path_state_dir()))
- return error_errno(_("could not create temporary %s"), path_state_dir());
-
- delete_reflog("REBASE_HEAD");
-
- interactive = fopen(path_interactive(), "w");
- if (!interactive)
- return error_errno(_("could not mark as interactive"));
- fclose(interactive);
-
- return write_basic_state(opts, head_name, onto, orig_head);
-}
-
-static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
- const char *switch_to, const char *upstream,
- const char *onto, const char *onto_name,
- const char *squash_onto, const char *head_name,
- const char *restrict_revision, char *raw_strategies,
- const char *cmd, unsigned autosquash)
-{
- int ret;
- const char *head_hash = NULL;
- char *revisions = NULL, *shortrevisions = NULL;
- struct argv_array make_script_args = ARGV_ARRAY_INIT;
- FILE *todo_list;
-
- if (prepare_branch_to_be_rebased(opts, switch_to))
- return -1;
-
- if (get_revision_ranges(upstream, onto, &head_hash,
- &revisions, &shortrevisions))
- return -1;
-
- if (raw_strategies)
- parse_strategy_opts(opts, raw_strategies);
-
- if (init_basic_state(opts, head_name, onto, head_hash)) {
- free(revisions);
- free(shortrevisions);
-
- return -1;
- }
-
- if (!upstream && squash_onto)
- write_file(path_squash_onto(), "%s\n", squash_onto);
-
- todo_list = fopen(rebase_path_todo(), "w");
- if (!todo_list) {
- free(revisions);
- free(shortrevisions);
-
- return error_errno(_("could not open %s"), rebase_path_todo());
- }
-
- argv_array_pushl(&make_script_args, "", revisions, NULL);
- if (restrict_revision)
- argv_array_push(&make_script_args, restrict_revision);
-
- ret = sequencer_make_script(the_repository, todo_list,
- make_script_args.argc, make_script_args.argv,
- flags);
- fclose(todo_list);
-
- if (ret)
- error(_("could not generate todo list"));
- else {
- discard_cache();
- ret = complete_action(the_repository, opts, flags,
- shortrevisions, onto_name, onto,
- head_hash, cmd, autosquash);
- }
-
- free(revisions);
- free(shortrevisions);
- argv_array_clear(&make_script_args);
-
- return ret;
-}
-
-static const char * const builtin_rebase_interactive_usage[] = {
- N_("git rebase--interactive [<options>]"),
- NULL
-};
-
-int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
-{
- struct replay_opts opts = REPLAY_OPTS_INIT;
- unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0;
- int abbreviate_commands = 0, rebase_cousins = -1, ret = 0;
- const char *onto = NULL, *onto_name = NULL, *restrict_revision = NULL,
- *squash_onto = NULL, *upstream = NULL, *head_name = NULL,
- *switch_to = NULL, *cmd = NULL;
- char *raw_strategies = NULL;
- enum {
- NONE = 0, CONTINUE, SKIP, EDIT_TODO, SHOW_CURRENT_PATCH,
- SHORTEN_OIDS, EXPAND_OIDS, CHECK_TODO_LIST, REARRANGE_SQUASH, ADD_EXEC
- } command = 0;
- struct option options[] = {
- OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
- OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
- OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
- N_("allow commits with empty messages")),
- OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")),
- OPT_BOOL(0, "rebase-cousins", &rebase_cousins,
- N_("keep original branch points of cousins")),
- OPT_BOOL(0, "autosquash", &autosquash,
- N_("move commits that begin with squash!/fixup!")),
- OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
- OPT__VERBOSE(&opts.verbose, N_("be verbose")),
- OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
- CONTINUE),
- OPT_CMDMODE(0, "skip", &command, N_("skip commit"), SKIP),
- OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
- EDIT_TODO),
- OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
- SHOW_CURRENT_PATCH),
- OPT_CMDMODE(0, "shorten-ids", &command,
- N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
- OPT_CMDMODE(0, "expand-ids", &command,
- N_("expand commit ids in the todo list"), EXPAND_OIDS),
- OPT_CMDMODE(0, "check-todo-list", &command,
- N_("check the todo list"), CHECK_TODO_LIST),
- OPT_CMDMODE(0, "rearrange-squash", &command,
- N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
- OPT_CMDMODE(0, "add-exec-commands", &command,
- N_("insert exec commands in todo list"), ADD_EXEC),
- OPT_STRING(0, "onto", &onto, N_("onto"), N_("onto")),
- OPT_STRING(0, "restrict-revision", &restrict_revision,
- N_("restrict-revision"), N_("restrict revision")),
- OPT_STRING(0, "squash-onto", &squash_onto, N_("squash-onto"),
- N_("squash onto")),
- OPT_STRING(0, "upstream", &upstream, N_("upstream"),
- N_("the upstream commit")),
- OPT_STRING(0, "head-name", &head_name, N_("head-name"), N_("head name")),
- { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign, N_("key-id"),
- N_("GPG-sign commits"),
- PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
- OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
- N_("rebase strategy")),
- OPT_STRING(0, "strategy-opts", &raw_strategies, N_("strategy-opts"),
- N_("strategy options")),
- OPT_STRING(0, "switch-to", &switch_to, N_("switch-to"),
- N_("the branch or commit to checkout")),
- OPT_STRING(0, "onto-name", &onto_name, N_("onto-name"), N_("onto name")),
- OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")),
- OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto),
- OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
- N_("automatically re-schedule any `exec` that fails")),
- OPT_END()
- };
-
- sequencer_init_config(&opts);
- git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
-
- opts.action = REPLAY_INTERACTIVE_REBASE;
- opts.allow_ff = 1;
- opts.allow_empty = 1;
-
- if (argc == 1)
- usage_with_options(builtin_rebase_interactive_usage, options);
-
- argc = parse_options(argc, argv, NULL, options,
- builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
-
- opts.gpg_sign = xstrdup_or_null(opts.gpg_sign);
-
- flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
- flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
- flags |= rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
- flags |= rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
- flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
-
- if (rebase_cousins >= 0 && !rebase_merges)
- warning(_("--[no-]rebase-cousins has no effect without "
- "--rebase-merges"));
-
- switch (command) {
- case NONE:
- if (!onto && !upstream)
- die(_("a base commit must be provided with --upstream or --onto"));
-
- ret = do_interactive_rebase(&opts, flags, switch_to, upstream, onto,
- onto_name, squash_onto, head_name, restrict_revision,
- raw_strategies, cmd, autosquash);
- break;
- case SKIP: {
- struct string_list merge_rr = STRING_LIST_INIT_DUP;
-
- rerere_clear(the_repository, &merge_rr);
- /* fallthrough */
- case CONTINUE:
- ret = sequencer_continue(the_repository, &opts);
- break;
- }
- case EDIT_TODO:
- ret = edit_todo_list(the_repository, flags);
- break;
- case SHOW_CURRENT_PATCH: {
- struct child_process cmd = CHILD_PROCESS_INIT;
-
- cmd.git_cmd = 1;
- argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
- ret = run_command(&cmd);
-
- break;
- }
- case SHORTEN_OIDS:
- case EXPAND_OIDS:
- ret = transform_todos(the_repository, flags);
- break;
- case CHECK_TODO_LIST:
- ret = check_todo_list(the_repository);
- break;
- case REARRANGE_SQUASH:
- ret = rearrange_squash(the_repository);
- break;
- case ADD_EXEC:
- ret = sequencer_add_exec_commands(the_repository, cmd);
- break;
- default:
- BUG("invalid command '%d'", command);
- }
-
- return !!ret;
-}
diff --git a/builtin/rebase.c b/builtin/rebase.c
index b9d6177..4a20582 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -25,16 +25,20 @@
#include "commit-reach.h"
#include "rerere.h"
#include "branch.h"
+#include "sequencer.h"
+#include "rebase-interactive.h"
static char const * const builtin_rebase_usage[] = {
- N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
- "[<upstream>] [<branch>]"),
+ N_("git rebase [-i] [options] [--exec <cmd>] "
+ "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
"--root [<branch>]"),
N_("git rebase --continue | --abort | --skip | --edit-todo"),
NULL
};
+static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
+static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
static GIT_PATH_FUNC(apply_dir, "rebase-apply")
static GIT_PATH_FUNC(merge_dir, "rebase-merge")
@@ -46,29 +50,6 @@
REBASE_PRESERVE_MERGES
};
-static int use_builtin_rebase(void)
-{
- struct child_process cp = CHILD_PROCESS_INIT;
- struct strbuf out = STRBUF_INIT;
- int ret, env = git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1);
-
- if (env != -1)
- return env;
-
- argv_array_pushl(&cp.args,
- "config", "--bool", "rebase.usebuiltin", NULL);
- cp.git_cmd = 1;
- if (capture_command(&cp, &out, 6)) {
- strbuf_release(&out);
- return 1;
- }
-
- strbuf_trim(&out);
- ret = !strcmp("true", out.buf);
- strbuf_release(&out);
- return ret;
-}
-
struct rebase_options {
enum rebase_type type;
const char *state_dir;
@@ -81,7 +62,7 @@
const char *onto_name;
const char *revisions;
const char *switch_to;
- int root;
+ int root, root_with_onto;
struct object_id *squash_onto;
struct commit *restrict_revision;
int dont_finish_rebase;
@@ -106,8 +87,441 @@
char *strategy, *strategy_opts;
struct strbuf git_format_patch_opt;
int reschedule_failed_exec;
+ int use_legacy_rebase;
};
+#define REBASE_OPTIONS_INIT { \
+ .type = REBASE_UNSPECIFIED, \
+ .flags = REBASE_NO_QUIET, \
+ .git_am_opts = ARGV_ARRAY_INIT, \
+ .git_format_patch_opt = STRBUF_INIT \
+ }
+
+static struct replay_opts get_replay_opts(const struct rebase_options *opts)
+{
+ struct replay_opts replay = REPLAY_OPTS_INIT;
+
+ replay.action = REPLAY_INTERACTIVE_REBASE;
+ sequencer_init_config(&replay);
+
+ replay.signoff = opts->signoff;
+ replay.allow_ff = !(opts->flags & REBASE_FORCE);
+ if (opts->allow_rerere_autoupdate)
+ replay.allow_rerere_auto = opts->allow_rerere_autoupdate;
+ replay.allow_empty = 1;
+ replay.allow_empty_message = opts->allow_empty_message;
+ replay.verbose = opts->flags & REBASE_VERBOSE;
+ replay.reschedule_failed_exec = opts->reschedule_failed_exec;
+ replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
+ replay.strategy = opts->strategy;
+ if (opts->strategy_opts)
+ parse_strategy_opts(&replay, opts->strategy_opts);
+
+ return replay;
+}
+
+enum action {
+ ACTION_NONE = 0,
+ ACTION_CONTINUE,
+ ACTION_SKIP,
+ ACTION_ABORT,
+ ACTION_QUIT,
+ ACTION_EDIT_TODO,
+ ACTION_SHOW_CURRENT_PATCH,
+ ACTION_SHORTEN_OIDS,
+ ACTION_EXPAND_OIDS,
+ ACTION_CHECK_TODO_LIST,
+ ACTION_REARRANGE_SQUASH,
+ ACTION_ADD_EXEC
+};
+
+static const char *action_names[] = { "undefined",
+ "continue",
+ "skip",
+ "abort",
+ "quit",
+ "edit_todo",
+ "show_current_patch" };
+
+static int add_exec_commands(struct string_list *commands)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ int res;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error_errno(_("could not read '%s'."), todo_file);
+
+ if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
+ &todo_list)) {
+ todo_list_release(&todo_list);
+ return error(_("unusable todo list: '%s'"), todo_file);
+ }
+
+ todo_list_add_exec_commands(&todo_list, commands);
+ res = todo_list_write_to_file(the_repository, &todo_list,
+ todo_file, NULL, NULL, -1, 0);
+ todo_list_release(&todo_list);
+
+ if (res)
+ return error_errno(_("could not write '%s'."), todo_file);
+ return 0;
+}
+
+static int rearrange_squash_in_todo_file(void)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ int res = 0;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error_errno(_("could not read '%s'."), todo_file);
+ if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
+ &todo_list)) {
+ todo_list_release(&todo_list);
+ return error(_("unusable todo list: '%s'"), todo_file);
+ }
+
+ res = todo_list_rearrange_squash(&todo_list);
+ if (!res)
+ res = todo_list_write_to_file(the_repository, &todo_list,
+ todo_file, NULL, NULL, -1, 0);
+
+ todo_list_release(&todo_list);
+
+ if (res)
+ return error_errno(_("could not write '%s'."), todo_file);
+ return 0;
+}
+
+static int transform_todo_file(unsigned flags)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ int res;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error_errno(_("could not read '%s'."), todo_file);
+
+ if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
+ &todo_list)) {
+ todo_list_release(&todo_list);
+ return error(_("unusable todo list: '%s'"), todo_file);
+ }
+
+ res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
+ NULL, NULL, -1, flags);
+ todo_list_release(&todo_list);
+
+ if (res)
+ return error_errno(_("could not write '%s'."), todo_file);
+ return 0;
+}
+
+static int edit_todo_file(unsigned flags)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT,
+ new_todo = TODO_LIST_INIT;
+ int res = 0;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error_errno(_("could not read '%s'."), todo_file);
+
+ strbuf_stripspace(&todo_list.buf, 1);
+ res = edit_todo_list(the_repository, &todo_list, &new_todo, NULL, NULL, flags);
+ if (!res && todo_list_write_to_file(the_repository, &new_todo, todo_file,
+ NULL, NULL, -1, flags & ~(TODO_LIST_SHORTEN_IDS)))
+ res = error_errno(_("could not write '%s'"), todo_file);
+
+ todo_list_release(&todo_list);
+ todo_list_release(&new_todo);
+
+ return res;
+}
+
+static int get_revision_ranges(struct commit *upstream, struct commit *onto,
+ const char **head_hash,
+ char **revisions, char **shortrevisions)
+{
+ struct commit *base_rev = upstream ? upstream : onto;
+ const char *shorthead;
+ struct object_id orig_head;
+
+ if (get_oid("HEAD", &orig_head))
+ return error(_("no HEAD?"));
+
+ *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
+ *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
+ *head_hash);
+
+ shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
+
+ if (upstream) {
+ const char *shortrev;
+
+ shortrev = find_unique_abbrev(&base_rev->object.oid,
+ DEFAULT_ABBREV);
+
+ *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
+ } else
+ *shortrevisions = xstrdup(shorthead);
+
+ return 0;
+}
+
+static int init_basic_state(struct replay_opts *opts, const char *head_name,
+ struct commit *onto, const char *orig_head)
+{
+ FILE *interactive;
+
+ if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
+ return error_errno(_("could not create temporary %s"), merge_dir());
+
+ delete_reflog("REBASE_HEAD");
+
+ interactive = fopen(path_interactive(), "w");
+ if (!interactive)
+ return error_errno(_("could not mark as interactive"));
+ fclose(interactive);
+
+ return write_basic_state(opts, head_name, onto, orig_head);
+}
+
+static void split_exec_commands(const char *cmd, struct string_list *commands)
+{
+ if (cmd && *cmd) {
+ string_list_split(commands, cmd, '\n', -1);
+
+ /* rebase.c adds a new line to cmd after every command,
+ * so here the last command is always empty */
+ string_list_remove_empty_items(commands, 0);
+ }
+}
+
+static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
+{
+ int ret;
+ const char *head_hash = NULL;
+ char *revisions = NULL, *shortrevisions = NULL;
+ struct argv_array make_script_args = ARGV_ARRAY_INIT;
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct replay_opts replay = get_replay_opts(opts);
+ struct string_list commands = STRING_LIST_INIT_DUP;
+
+ if (prepare_branch_to_be_rebased(the_repository, &replay,
+ opts->switch_to))
+ return -1;
+
+ if (get_revision_ranges(opts->upstream, opts->onto, &head_hash,
+ &revisions, &shortrevisions))
+ return -1;
+
+ if (init_basic_state(&replay,
+ opts->head_name ? opts->head_name : "detached HEAD",
+ opts->onto, head_hash)) {
+ free(revisions);
+ free(shortrevisions);
+
+ return -1;
+ }
+
+ if (!opts->upstream && opts->squash_onto)
+ write_file(path_squash_onto(), "%s\n",
+ oid_to_hex(opts->squash_onto));
+
+ argv_array_pushl(&make_script_args, "", revisions, NULL);
+ if (opts->restrict_revision)
+ argv_array_push(&make_script_args,
+ oid_to_hex(&opts->restrict_revision->object.oid));
+
+ ret = sequencer_make_script(the_repository, &todo_list.buf,
+ make_script_args.argc, make_script_args.argv,
+ flags);
+
+ if (ret)
+ error(_("could not generate todo list"));
+ else {
+ discard_cache();
+ if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
+ &todo_list))
+ BUG("unusable todo list");
+
+ split_exec_commands(opts->cmd, &commands);
+ ret = complete_action(the_repository, &replay, flags,
+ shortrevisions, opts->onto_name, opts->onto, head_hash,
+ &commands, opts->autosquash, &todo_list);
+ }
+
+ string_list_clear(&commands, 0);
+ free(revisions);
+ free(shortrevisions);
+ todo_list_release(&todo_list);
+ argv_array_clear(&make_script_args);
+
+ return ret;
+}
+
+static int run_rebase_interactive(struct rebase_options *opts,
+ enum action command)
+{
+ unsigned flags = 0;
+ int abbreviate_commands = 0, ret = 0;
+
+ git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
+
+ flags |= opts->keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
+ flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
+ flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
+ flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
+ flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
+ flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
+
+ switch (command) {
+ case ACTION_NONE: {
+ if (!opts->onto && !opts->upstream)
+ die(_("a base commit must be provided with --upstream or --onto"));
+
+ ret = do_interactive_rebase(opts, flags);
+ break;
+ }
+ case ACTION_SKIP: {
+ struct string_list merge_rr = STRING_LIST_INIT_DUP;
+
+ rerere_clear(the_repository, &merge_rr);
+ }
+ /* fallthrough */
+ case ACTION_CONTINUE: {
+ struct replay_opts replay_opts = get_replay_opts(opts);
+
+ ret = sequencer_continue(the_repository, &replay_opts);
+ break;
+ }
+ case ACTION_EDIT_TODO:
+ ret = edit_todo_file(flags);
+ break;
+ case ACTION_SHOW_CURRENT_PATCH: {
+ struct child_process cmd = CHILD_PROCESS_INIT;
+
+ cmd.git_cmd = 1;
+ argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
+ ret = run_command(&cmd);
+
+ break;
+ }
+ case ACTION_SHORTEN_OIDS:
+ case ACTION_EXPAND_OIDS:
+ ret = transform_todo_file(flags);
+ break;
+ case ACTION_CHECK_TODO_LIST:
+ ret = check_todo_list_from_file(the_repository);
+ break;
+ case ACTION_REARRANGE_SQUASH:
+ ret = rearrange_squash_in_todo_file();
+ break;
+ case ACTION_ADD_EXEC: {
+ struct string_list commands = STRING_LIST_INIT_DUP;
+
+ split_exec_commands(opts->cmd, &commands);
+ ret = add_exec_commands(&commands);
+ string_list_clear(&commands, 0);
+ break;
+ }
+ default:
+ BUG("invalid command '%d'", command);
+ }
+
+ return ret;
+}
+
+static const char * const builtin_rebase_interactive_usage[] = {
+ N_("git rebase--interactive [<options>]"),
+ NULL
+};
+
+int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
+{
+ struct rebase_options opts = REBASE_OPTIONS_INIT;
+ struct object_id squash_onto = null_oid;
+ enum action command = ACTION_NONE;
+ struct option options[] = {
+ OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
+ REBASE_FORCE),
+ OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
+ OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
+ N_("allow commits with empty messages")),
+ OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
+ OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
+ N_("keep original branch points of cousins")),
+ OPT_BOOL(0, "autosquash", &opts.autosquash,
+ N_("move commits that begin with squash!/fixup!")),
+ OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
+ OPT_BIT('v', "verbose", &opts.flags,
+ N_("display a diffstat of what changed upstream"),
+ REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
+ OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
+ ACTION_CONTINUE),
+ OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
+ OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
+ ACTION_EDIT_TODO),
+ OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
+ ACTION_SHOW_CURRENT_PATCH),
+ OPT_CMDMODE(0, "shorten-ids", &command,
+ N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
+ OPT_CMDMODE(0, "expand-ids", &command,
+ N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
+ OPT_CMDMODE(0, "check-todo-list", &command,
+ N_("check the todo list"), ACTION_CHECK_TODO_LIST),
+ OPT_CMDMODE(0, "rearrange-squash", &command,
+ N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
+ OPT_CMDMODE(0, "add-exec-commands", &command,
+ N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
+ { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
+ PARSE_OPT_NONEG, parse_opt_commit, 0 },
+ { OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
+ N_("restrict-revision"), N_("restrict revision"),
+ PARSE_OPT_NONEG, parse_opt_commit, 0 },
+ { OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
+ N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
+ { OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
+ N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
+ 0 },
+ OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
+ { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
+ N_("GPG-sign commits"),
+ PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+ OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
+ N_("rebase strategy")),
+ OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
+ N_("strategy options")),
+ OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
+ N_("the branch or commit to checkout")),
+ OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
+ OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
+ OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
+ OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
+ N_("automatically re-schedule any `exec` that fails")),
+ OPT_END()
+ };
+
+ opts.rebase_cousins = -1;
+
+ if (argc == 1)
+ usage_with_options(builtin_rebase_interactive_usage, options);
+
+ argc = parse_options(argc, argv, prefix, options,
+ builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
+
+ if (!is_null_oid(&squash_onto))
+ opts.squash_onto = &squash_onto;
+
+ if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
+ warning(_("--[no-]rebase-cousins has no effect without "
+ "--rebase-merges"));
+
+ return !!run_rebase_interactive(&opts, command);
+}
+
static int is_interactive(struct rebase_options *opts)
{
return opts->type == REBASE_INTERACTIVE ||
@@ -206,14 +620,13 @@
&buf))
return -1;
if (!strcmp(buf.buf, "--rerere-autoupdate"))
- opts->allow_rerere_autoupdate = 1;
+ opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
- opts->allow_rerere_autoupdate = 0;
+ opts->allow_rerere_autoupdate = RERERE_NOAUTOUPDATE;
else
warning(_("ignoring invalid allow_rerere_autoupdate: "
"'%s'"), buf.buf);
- } else
- opts->allow_rerere_autoupdate = -1;
+ }
if (file_exists(state_dir_path("gpg_sign_opt", opts))) {
strbuf_reset(&buf);
@@ -245,7 +658,7 @@
return 0;
}
-static int write_basic_state(struct rebase_options *opts)
+static int rebase_write_basic_state(struct rebase_options *opts)
{
write_file(state_dir_path("head-name", opts), "%s",
opts->head_name ? opts->head_name : "detached HEAD");
@@ -263,10 +676,11 @@
if (opts->strategy_opts)
write_file(state_dir_path("strategy_opts", opts), "%s",
opts->strategy_opts);
- if (opts->allow_rerere_autoupdate >= 0)
+ if (opts->allow_rerere_autoupdate > 0)
write_file(state_dir_path("allow_rerere_autoupdate", opts),
"-%s-rerere-autoupdate",
- opts->allow_rerere_autoupdate ? "" : "-no");
+ opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
+ "" : "-no");
if (opts->gpg_sign_opt)
write_file(state_dir_path("gpg_sign_opt", opts), "%s",
opts->gpg_sign_opt);
@@ -325,20 +739,30 @@
{
struct strbuf dir = STRBUF_INIT;
const char *argv_gc_auto[] = { "gc", "--auto", NULL };
+ int ret = 0;
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
apply_autostash(opts);
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
/*
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
- strbuf_addstr(&dir, opts->state_dir);
- remove_dir_recursively(&dir, 0);
- strbuf_release(&dir);
+ if (opts->type == REBASE_INTERACTIVE) {
+ struct replay_opts replay = REPLAY_OPTS_INIT;
- return 0;
+ replay.action = REPLAY_INTERACTIVE_REBASE;
+ ret = sequencer_remove_state(&replay);
+ } else {
+ strbuf_addstr(&dir, opts->state_dir);
+ if (remove_dir_recursively(&dir, 0))
+ ret = error(_("could not remove '%s'"),
+ opts->state_dir);
+ strbuf_release(&dir);
+ }
+
+ return ret;
}
static struct commit *peel_committish(const char *name)
@@ -369,6 +793,7 @@
#define RESET_HEAD_HARD (1<<1)
#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
#define RESET_HEAD_REFS_ONLY (1<<3)
+#define RESET_ORIG_HEAD (1<<4)
static int reset_head(struct object_id *oid, const char *action,
const char *switch_to_branch, unsigned flags,
@@ -378,6 +803,7 @@
unsigned reset_hard = flags & RESET_HEAD_HARD;
unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
+ unsigned update_orig_head = flags & RESET_ORIG_HEAD;
struct object_id head_oid;
struct tree_desc desc[2] = { { NULL }, { NULL } };
struct lock_file lock = LOCK_INIT;
@@ -425,13 +851,13 @@
goto leave_reset_head;
}
- if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {
+ if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
ret = error(_("failed to find tree of %s"),
oid_to_hex(&head_oid));
goto leave_reset_head;
}
- if (!fill_tree_descriptor(&desc[nr++], oid)) {
+ if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
goto leave_reset_head;
}
@@ -454,18 +880,21 @@
strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
prefix_len = msg.len;
- if (!get_oid("ORIG_HEAD", &oid_old_orig))
- old_orig = &oid_old_orig;
- if (!get_oid("HEAD", &oid_orig)) {
- orig = &oid_orig;
- if (!reflog_orig_head) {
- strbuf_addstr(&msg, "updating ORIG_HEAD");
- reflog_orig_head = msg.buf;
- }
- update_ref(reflog_orig_head, "ORIG_HEAD", orig, old_orig, 0,
- UPDATE_REFS_MSG_ON_ERR);
- } else if (old_orig)
- delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
+ if (update_orig_head) {
+ if (!get_oid("ORIG_HEAD", &oid_old_orig))
+ old_orig = &oid_old_orig;
+ if (!get_oid("HEAD", &oid_orig)) {
+ orig = &oid_orig;
+ if (!reflog_orig_head) {
+ strbuf_addstr(&msg, "updating ORIG_HEAD");
+ reflog_orig_head = msg.buf;
+ }
+ update_ref(reflog_orig_head, "ORIG_HEAD", orig,
+ old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
+ } else if (old_orig)
+ delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
+ }
+
if (!reflog_head) {
strbuf_setlen(&msg, prefix_len);
strbuf_addstr(&msg, "updating HEAD");
@@ -476,7 +905,7 @@
detach_head ? REF_NO_DEREF : 0,
UPDATE_REFS_MSG_ON_ERR);
else {
- ret = update_ref(reflog_orig_head, switch_to_branch, oid,
+ ret = update_ref(reflog_head, switch_to_branch, oid,
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
if (!ret)
ret = create_symref("HEAD", switch_to_branch,
@@ -625,9 +1054,9 @@
argv_array_push(&am.args, "--rebasing");
argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
argv_array_push(&am.args, "--patch-format=mboxrd");
- if (opts->allow_rerere_autoupdate > 0)
+ if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE)
argv_array_push(&am.args, "--rerere-autoupdate");
- else if (opts->allow_rerere_autoupdate == 0)
+ else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE)
argv_array_push(&am.args, "--no-rerere-autoupdate");
if (opts->gpg_sign_opt)
argv_array_push(&am.args, opts->gpg_sign_opt);
@@ -640,12 +1069,12 @@
}
if (is_directory(opts->state_dir))
- write_basic_state(opts);
+ rebase_write_basic_state(opts);
return status;
}
-static int run_specific_rebase(struct rebase_options *opts)
+static int run_specific_rebase(struct rebase_options *opts, enum action action)
{
const char *argv[] = { NULL, NULL };
struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
@@ -654,77 +1083,19 @@
if (opts->type == REBASE_INTERACTIVE) {
/* Run builtin interactive rebase */
- struct child_process child = CHILD_PROCESS_INIT;
-
- argv_array_pushf(&child.env_array, "GIT_CHERRY_PICK_HELP=%s",
- resolvemsg);
+ setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
- argv_array_push(&child.env_array,
- "GIT_SEQUENCE_EDITOR=:");
+ setenv("GIT_SEQUENCE_EDITOR", ":", 1);
opts->autosquash = 0;
}
+ if (opts->gpg_sign_opt) {
+ /* remove the leading "-S" */
+ char *tmp = xstrdup(opts->gpg_sign_opt + 2);
+ free(opts->gpg_sign_opt);
+ opts->gpg_sign_opt = tmp;
+ }
- child.git_cmd = 1;
- argv_array_push(&child.args, "rebase--interactive");
-
- if (opts->action)
- argv_array_pushf(&child.args, "--%s", opts->action);
- if (opts->keep_empty)
- argv_array_push(&child.args, "--keep-empty");
- if (opts->rebase_merges)
- argv_array_push(&child.args, "--rebase-merges");
- if (opts->rebase_cousins)
- argv_array_push(&child.args, "--rebase-cousins");
- if (opts->autosquash)
- argv_array_push(&child.args, "--autosquash");
- if (opts->flags & REBASE_VERBOSE)
- argv_array_push(&child.args, "--verbose");
- if (opts->flags & REBASE_FORCE)
- argv_array_push(&child.args, "--no-ff");
- if (opts->restrict_revision)
- argv_array_pushf(&child.args,
- "--restrict-revision=^%s",
- oid_to_hex(&opts->restrict_revision->object.oid));
- if (opts->upstream)
- argv_array_pushf(&child.args, "--upstream=%s",
- oid_to_hex(&opts->upstream->object.oid));
- if (opts->onto)
- argv_array_pushf(&child.args, "--onto=%s",
- oid_to_hex(&opts->onto->object.oid));
- if (opts->squash_onto)
- argv_array_pushf(&child.args, "--squash-onto=%s",
- oid_to_hex(opts->squash_onto));
- if (opts->onto_name)
- argv_array_pushf(&child.args, "--onto-name=%s",
- opts->onto_name);
- argv_array_pushf(&child.args, "--head-name=%s",
- opts->head_name ?
- opts->head_name : "detached HEAD");
- if (opts->strategy)
- argv_array_pushf(&child.args, "--strategy=%s",
- opts->strategy);
- if (opts->strategy_opts)
- argv_array_pushf(&child.args, "--strategy-opts=%s",
- opts->strategy_opts);
- if (opts->switch_to)
- argv_array_pushf(&child.args, "--switch-to=%s",
- opts->switch_to);
- if (opts->cmd)
- argv_array_pushf(&child.args, "--cmd=%s", opts->cmd);
- if (opts->allow_empty_message)
- argv_array_push(&child.args, "--allow-empty-message");
- if (opts->allow_rerere_autoupdate > 0)
- argv_array_push(&child.args, "--rerere-autoupdate");
- else if (opts->allow_rerere_autoupdate == 0)
- argv_array_push(&child.args, "--no-rerere-autoupdate");
- if (opts->gpg_sign_opt)
- argv_array_push(&child.args, opts->gpg_sign_opt);
- if (opts->signoff)
- argv_array_push(&child.args, "--signoff");
- if (opts->reschedule_failed_exec)
- argv_array_push(&child.args, "--reschedule-failed-exec");
-
- status = run_command(&child);
+ status = run_rebase_interactive(opts, action);
goto finished_rebase;
}
@@ -764,9 +1135,9 @@
add_var(&script_snippet, "action", opts->action ? opts->action : "");
add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
add_var(&script_snippet, "allow_rerere_autoupdate",
- opts->allow_rerere_autoupdate < 0 ? "" :
opts->allow_rerere_autoupdate ?
- "--rerere-autoupdate" : "--no-rerere-autoupdate");
+ opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
+ "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
@@ -793,10 +1164,6 @@
}
switch (opts->type) {
- case REBASE_AM:
- backend = "git-rebase--am";
- backend_func = "git_rebase__am";
- break;
case REBASE_PRESERVE_MERGES:
backend = "git-rebase--preserve-merges";
backend_func = "git_rebase__preserve_merges";
@@ -807,8 +1174,7 @@
}
strbuf_addf(&script_snippet,
- ". git-sh-setup && . git-rebase--common &&"
- " . %s && %s", backend, backend_func);
+ ". git-sh-setup && . %s && %s", backend, backend_func);
argv[0] = script_snippet.buf;
status = run_command_v_opt(argv, RUN_USING_SHELL);
@@ -843,7 +1209,7 @@
if (git_config_bool(var, value))
opts->flags |= REBASE_DIFFSTAT;
else
- opts->flags &= !REBASE_DIFFSTAT;
+ opts->flags &= ~REBASE_DIFFSTAT;
return 0;
}
@@ -869,6 +1235,11 @@
return 0;
}
+ if (!strcmp(var, "rebase.usebuiltin")) {
+ opts->use_legacy_rebase = !git_config_bool(var, value);
+ return 0;
+ }
+
return git_default_config(var, value, data);
}
@@ -890,24 +1261,44 @@
return 1;
}
-static int can_fast_forward(struct commit *onto, struct object_id *head_oid,
- struct object_id *merge_base)
+static int can_fast_forward(struct commit *onto, struct commit *upstream,
+ struct commit *restrict_revision,
+ struct object_id *head_oid, struct object_id *merge_base)
{
struct commit *head = lookup_commit(the_repository, head_oid);
- struct commit_list *merge_bases;
- int res;
+ struct commit_list *merge_bases = NULL;
+ int res = 0;
if (!head)
- return 0;
+ goto done;
merge_bases = get_merge_bases(onto, head);
- if (merge_bases && !merge_bases->next) {
- oidcpy(merge_base, &merge_bases->item->object.oid);
- res = oideq(merge_base, &onto->object.oid);
- } else {
+ if (!merge_bases || merge_bases->next) {
oidcpy(merge_base, &null_oid);
- res = 0;
+ goto done;
}
+
+ oidcpy(merge_base, &merge_bases->item->object.oid);
+ if (!oideq(merge_base, &onto->object.oid))
+ goto done;
+
+ if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
+ goto done;
+
+ if (!upstream)
+ goto done;
+
+ free_commit_list(merge_bases);
+ merge_bases = get_merge_bases(upstream, head);
+ if (!merge_bases || merge_bases->next)
+ goto done;
+
+ if (!oideq(&onto->object.oid, &merge_bases->item->object.oid))
+ goto done;
+
+ res = 1;
+
+done:
free_commit_list(merge_bases);
return res && is_linear_history(onto, head);
}
@@ -941,23 +1332,6 @@
return 0;
}
-struct opt_y {
- struct string_list *list;
- struct rebase_options *options;
-};
-
-static int parse_opt_y(const struct option *opt, const char *arg, int unset)
-{
- struct opt_y *o = opt->value;
-
- if (unset || !arg)
- return -1;
-
- o->options->reschedule_failed_exec = 1;
- string_list_append(o->list, arg);
- return 0;
-}
-
static void NORETURN error_on_missing_default_upstream(void)
{
struct branch *current_branch = branch_get(NULL);
@@ -1020,30 +1394,16 @@
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
- struct rebase_options options = {
- .type = REBASE_UNSPECIFIED,
- .flags = REBASE_NO_QUIET,
- .git_am_opts = ARGV_ARRAY_INIT,
- .allow_rerere_autoupdate = -1,
- .allow_empty_message = 1,
- .git_format_patch_opt = STRBUF_INIT,
- };
+ struct rebase_options options = REBASE_OPTIONS_INIT;
const char *branch_name;
int ret, flags, total_argc, in_progress = 0;
+ int keep_base = 0;
int ok_to_skip_pre_rebase = 0;
struct strbuf msg = STRBUF_INIT;
struct strbuf revisions = STRBUF_INIT;
struct strbuf buf = STRBUF_INIT;
struct object_id merge_base;
- enum {
- NO_ACTION,
- ACTION_CONTINUE,
- ACTION_SKIP,
- ACTION_ABORT,
- ACTION_QUIT,
- ACTION_EDIT_TODO,
- ACTION_SHOW_CURRENT_PATCH,
- } action = NO_ACTION;
+ enum action action = ACTION_NONE;
const char *gpg_sign = NULL;
struct string_list exec = STRING_LIST_INIT_NODUP;
const char *rebase_merges = NULL;
@@ -1051,11 +1411,13 @@
struct string_list strategy_options = STRING_LIST_INIT_NODUP;
struct object_id squash_onto;
char *squash_onto_name = NULL;
- struct opt_y opt_y = { .list = &exec, .options = &options };
+ int reschedule_failed_exec = -1;
struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name,
N_("revision"),
N_("rebase onto given branch instead of upstream")),
+ OPT_BOOL(0, "keep-base", &keep_base,
+ N_("use the merge-base of upstream and branch as the current base")),
OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
N_("allow pre-rebase hook to run")),
OPT_NEGBIT('q', "quiet", &options.flags,
@@ -1110,12 +1472,9 @@
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive },
OPT_SET_INT('p', "preserve-merges", &options.type,
- N_("try to recreate merges instead of ignoring "
- "them"), REBASE_PRESERVE_MERGES),
- OPT_BOOL(0, "rerere-autoupdate",
- &options.allow_rerere_autoupdate,
- N_("allow rerere to update index with resolved "
- "conflict")),
+ N_("(DEPRECATED) try to recreate merges instead of "
+ "ignoring them"), REBASE_PRESERVE_MERGES),
+ OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
OPT_BOOL('k', "keep-empty", &options.keep_empty,
N_("preserve empty commits during rebase")),
OPT_BOOL(0, "autosquash", &options.autosquash,
@@ -1129,9 +1488,6 @@
OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
N_("add exec lines after each commit of the "
"editable list")),
- { OPTION_CALLBACK, 'y', NULL, &opt_y, N_("<cmd>"),
- N_("same as --reschedule-failed-exec -x <cmd>"),
- PARSE_OPT_NONEG, parse_opt_y },
OPT_BOOL(0, "allow-empty-message",
&options.allow_empty_message,
N_("allow rebasing commits with empty messages")),
@@ -1150,38 +1506,24 @@
OPT_BOOL(0, "root", &options.root,
N_("rebase all reachable commits up to the root(s)")),
OPT_BOOL(0, "reschedule-failed-exec",
- &options.reschedule_failed_exec,
+ &reschedule_failed_exec,
N_("automatically re-schedule any `exec` that fails")),
OPT_END(),
};
int i;
- /*
- * NEEDSWORK: Once the builtin rebase has been tested enough
- * and git-legacy-rebase.sh is retired to contrib/, this preamble
- * can be removed.
- */
-
- if (!use_builtin_rebase()) {
- const char *path = mkpath("%s/git-legacy-rebase",
- git_exec_path());
-
- if (sane_execvp(path, (char **)argv) < 0)
- die_errno(_("could not exec %s"), path);
- else
- BUG("sane_execvp() returned???");
- }
-
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
- prefix = setup_git_directory();
- trace_repo_setup(prefix);
- setup_work_tree();
-
+ options.allow_empty_message = 1;
git_config(rebase_config, &options);
+ if (options.use_legacy_rebase ||
+ !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
+ warning(_("the rebase.useBuiltin support has been removed!\n"
+ "See its entry in 'git help config' for details."));
+
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/applying", apply_dir());
if(file_exists(buf.buf))
@@ -1216,7 +1558,7 @@
builtin_rebase_options,
builtin_rebase_usage, 0);
- if (action != NO_ACTION && total_argc != 2) {
+ if (action != ACTION_NONE && total_argc != 2) {
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
}
@@ -1225,7 +1567,18 @@
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
- if (action != NO_ACTION && !in_progress)
+ if (options.type == REBASE_PRESERVE_MERGES)
+ warning(_("git rebase --preserve-merges is deprecated. "
+ "Use --rebase-merges instead."));
+
+ if (keep_base) {
+ if (options.onto_name)
+ die(_("cannot combine '--keep-base' with '--onto'"));
+ if (options.root)
+ die(_("cannot combine '--keep-base' with '--root'"));
+ }
+
+ if (action != ACTION_NONE && !in_progress)
die(_("No rebase in progress?"));
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
@@ -1233,6 +1586,15 @@
die(_("The --edit-todo action can only be used during "
"interactive rebase."));
+ if (trace2_is_enabled()) {
+ if (is_interactive(&options))
+ trace2_cmd_mode("interactive");
+ else if (exec.nr)
+ trace2_cmd_mode("interactive-exec");
+ else
+ trace2_cmd_mode(action_names[action]);
+ }
+
switch (action) {
case ACTION_CONTINUE: {
struct object_id head;
@@ -1276,7 +1638,7 @@
if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD,
NULL, NULL) < 0)
die(_("could not discard worktree changes"));
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
if (read_basic_state(&options))
exit(1);
goto run_rebase;
@@ -1296,16 +1658,24 @@
NULL, NULL) < 0)
die(_("could not move back to %s"),
oid_to_hex(&options.orig_head));
- remove_branch_state(the_repository);
- ret = finish_rebase(&options);
+ remove_branch_state(the_repository, 0);
+ ret = !!finish_rebase(&options);
goto cleanup;
}
case ACTION_QUIT: {
- strbuf_reset(&buf);
- strbuf_addstr(&buf, options.state_dir);
- ret = !!remove_dir_recursively(&buf, 0);
- if (ret)
- die(_("could not remove '%s'"), options.state_dir);
+ if (options.type == REBASE_INTERACTIVE) {
+ struct replay_opts replay = REPLAY_OPTS_INIT;
+
+ replay.action = REPLAY_INTERACTIVE_REBASE;
+ ret = !!sequencer_remove_state(&replay);
+ } else {
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, options.state_dir);
+ ret = !!remove_dir_recursively(&buf, 0);
+ if (ret)
+ error(_("could not remove '%s'"),
+ options.state_dir);
+ }
goto cleanup;
}
case ACTION_EDIT_TODO:
@@ -1316,7 +1686,7 @@
options.action = "show-current-patch";
options.dont_finish_rebase = 1;
goto run_rebase;
- case NO_ACTION:
+ case ACTION_NONE:
break;
default:
BUG("action: %d", action);
@@ -1454,8 +1824,11 @@
break;
}
- if (options.reschedule_failed_exec && !is_interactive(&options))
- die(_("--reschedule-failed-exec requires an interactive rebase"));
+ if (reschedule_failed_exec > 0 && !is_interactive(&options))
+ die(_("--reschedule-failed-exec requires "
+ "--exec or --interactive"));
+ if (reschedule_failed_exec >= 0)
+ options.reschedule_failed_exec = reschedule_failed_exec;
if (options.git_am_opts.argc) {
/* all am options except -q are compatible only with --am */
@@ -1491,15 +1864,6 @@
"'--reschedule-failed-exec'"));
}
- if (options.rebase_merges) {
- if (strategy_options.nr)
- die(_("cannot combine '--rebase-merges' with "
- "'--strategy-option'"));
- if (options.strategy)
- die(_("cannot combine '--rebase-merges' with "
- "'--strategy'"));
- }
-
if (!options.root) {
if (argc < 1) {
struct branch *branch;
@@ -1530,7 +1894,9 @@
options.squash_onto = &squash_onto;
options.onto_name = squash_onto_name =
xstrdup(oid_to_hex(&squash_onto));
- }
+ } else
+ options.root_with_onto = 1;
+
options.upstream_name = NULL;
options.upstream = NULL;
if (argc > 1)
@@ -1540,12 +1906,22 @@
}
/* Make sure the branch to rebase onto is valid. */
- if (!options.onto_name)
+ if (keep_base) {
+ strbuf_reset(&buf);
+ strbuf_addstr(&buf, options.upstream_name);
+ strbuf_addstr(&buf, "...");
+ options.onto_name = xstrdup(buf.buf);
+ } else if (!options.onto_name)
options.onto_name = options.upstream_name;
if (strstr(options.onto_name, "...")) {
- if (get_oid_mb(options.onto_name, &merge_base) < 0)
- die(_("'%s': need exactly one merge base"),
- options.onto_name);
+ if (get_oid_mb(options.onto_name, &merge_base) < 0) {
+ if (keep_base)
+ die(_("'%s': need exactly one merge base with branch"),
+ options.upstream_name);
+ else
+ die(_("'%s': need exactly one merge base"),
+ options.onto_name);
+ }
options.onto = lookup_commit_or_die(&merge_base,
options.onto_name);
} else {
@@ -1591,8 +1967,7 @@
branch_name = options.head_name;
} else {
- free(options.head_name);
- options.head_name = NULL;
+ FREE_AND_NULL(options.head_name);
branch_name = "HEAD";
}
if (get_oid("HEAD", &options.orig_head))
@@ -1627,9 +2002,6 @@
state_dir_path("autostash", &options);
struct child_process stash = CHILD_PROCESS_INIT;
struct object_id oid;
- struct commit *head =
- lookup_commit_reference(the_repository,
- &options.orig_head);
argv_array_pushl(&stash.args,
"stash", "create", "autostash", NULL);
@@ -1650,17 +2022,9 @@
options.state_dir);
write_file(autostash, "%s", oid_to_hex(&oid));
printf(_("Created autostash: %s\n"), buf.buf);
- if (reset_head(&head->object.oid, "reset --hard",
+ if (reset_head(NULL, "reset --hard",
NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
die(_("could not reset --hard"));
- printf(_("HEAD is now at %s"),
- find_unique_abbrev(&head->object.oid,
- DEFAULT_ABBREV));
- strbuf_reset(&buf);
- pp_commit_easy(CMIT_FMT_ONELINE, head, &buf);
- if (buf.len > 0)
- printf(" %s", buf.buf);
- putchar('\n');
if (discard_index(the_repository->index) < 0 ||
repo_read_index(the_repository) < 0)
@@ -1681,13 +2045,13 @@
/*
* Check if we are already based on onto with linear history,
- * but this should be done only when upstream and onto are the same
- * and if this is not an interactive rebase.
+ * in which case we could fast-forward without replacing the commits
+ * with new commits recreated by replaying their changes. This
+ * optimization must not be done if this is an interactive rebase.
*/
- if (can_fast_forward(options.onto, &options.orig_head, &merge_base) &&
- !is_interactive(&options) && !options.restrict_revision &&
- options.upstream &&
- !oidcmp(&options.upstream->object.oid, &options.onto->object.oid)) {
+ if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
+ &options.orig_head, &merge_base) &&
+ !is_interactive(&options)) {
int flag;
if (!(options.flags & REBASE_FORCE)) {
@@ -1781,7 +2145,8 @@
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL,
- RESET_HEAD_DETACH | RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
+ RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, msg.buf))
die(_("Could not detach HEAD"));
strbuf_release(&msg);
@@ -1791,14 +2156,14 @@
* we just fast-forwarded.
*/
strbuf_reset(&msg);
- if (!oidcmp(&merge_base, &options.orig_head)) {
+ if (oideq(&merge_base, &options.orig_head)) {
printf(_("Fast-forwarded %s to %s.\n"),
branch_name, options.onto_name);
strbuf_addf(&msg, "rebase finished: %s onto %s",
options.head_name ? options.head_name : "detached HEAD",
oid_to_hex(&options.onto->object.oid));
- reset_head(NULL, "Fast-forwarded", options.head_name, 0,
- "HEAD", msg.buf);
+ reset_head(NULL, "Fast-forwarded", options.head_name,
+ RESET_HEAD_REFS_ONLY, "HEAD", msg.buf);
strbuf_release(&msg);
ret = !!finish_rebase(&options);
goto cleanup;
@@ -1814,9 +2179,10 @@
options.revisions = revisions.buf;
run_rebase:
- ret = !!run_specific_rebase(&options);
+ ret = !!run_specific_rebase(&options, action);
cleanup:
+ strbuf_release(&buf);
strbuf_release(&revisions);
free(options.head_name);
free(options.gpg_sign_opt);
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index d58b775..dcf3855 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -12,7 +12,6 @@
#include "object.h"
#include "remote.h"
#include "connect.h"
-#include "transport.h"
#include "string-list.h"
#include "sha1-array.h"
#include "connected.h"
@@ -694,6 +693,8 @@
proc.argv = argv;
proc.in = -1;
proc.stdout_to_stderr = 1;
+ proc.trace2_hook_name = hook_name;
+
if (feed_state->push_options) {
int i;
for (i = 0; i < feed_state->push_options->nr; i++)
@@ -807,6 +808,7 @@
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
proc.argv = argv;
+ proc.trace2_hook_name = "update";
code = start_command(&proc);
if (code)
@@ -1190,6 +1192,7 @@
proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
+ proc.trace2_hook_name = "post-update";
if (!start_command(&proc)) {
if (use_sideband)
@@ -1198,17 +1201,12 @@
}
}
-static void check_aliased_update(struct command *cmd, struct string_list *list)
+static void check_aliased_update_internal(struct command *cmd,
+ struct string_list *list,
+ const char *dst_name, int flag)
{
- struct strbuf buf = STRBUF_INIT;
- const char *dst_name;
struct string_list_item *item;
struct command *dst_cmd;
- int flag;
-
- strbuf_addf(&buf, "%s%s", get_git_namespace(), cmd->ref_name);
- dst_name = resolve_ref_unsafe(buf.buf, 0, NULL, &flag);
- strbuf_release(&buf);
if (!(flag & REF_ISSYMREF))
return;
@@ -1247,6 +1245,18 @@
"inconsistent aliased update";
}
+static void check_aliased_update(struct command *cmd, struct string_list *list)
+{
+ struct strbuf buf = STRBUF_INIT;
+ const char *dst_name;
+ int flag;
+
+ strbuf_addf(&buf, "%s%s", get_git_namespace(), cmd->ref_name);
+ dst_name = resolve_ref_unsafe(buf.buf, 0, NULL, &flag);
+ check_aliased_update_internal(cmd, list, dst_name, flag);
+ strbuf_release(&buf);
+}
+
static void check_aliased_updates(struct command *commands)
{
struct command *cmd;
@@ -1798,8 +1808,7 @@
return ret;
}
-static void prepare_shallow_update(struct command *commands,
- struct shallow_info *si)
+static void prepare_shallow_update(struct shallow_info *si)
{
int i, j, k, bitmap_size = DIV_ROUND_UP(si->ref->nr, 32);
@@ -1865,7 +1874,7 @@
si->ref = ref;
if (shallow_update) {
- prepare_shallow_update(commands, si);
+ prepare_shallow_update(si);
return;
}
@@ -2032,7 +2041,7 @@
proc.git_cmd = 1;
proc.argv = argv_gc_auto;
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
if (!start_command(&proc)) {
if (use_sideband)
copy_to_sideband(proc.err, -1, NULL);
diff --git a/builtin/remote.c b/builtin/remote.c
index f7edf7f..5591cef 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1407,7 +1407,7 @@
return retval;
}
-static int remove_all_fetch_refspecs(const char *remote, const char *key)
+static int remove_all_fetch_refspecs(const char *key)
{
return git_config_set_multivar_gently(key, NULL, NULL, 1);
}
@@ -1437,7 +1437,7 @@
if (!remote_is_configured(remote, 1))
die(_("No such remote '%s'"), remotename);
- if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
+ if (!add_mode && remove_all_fetch_refspecs(key.buf)) {
strbuf_release(&key);
return 1;
}
diff --git a/builtin/repack.c b/builtin/repack.c
index 67f8978..3b3dd14 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -11,10 +11,11 @@
#include "midx.h"
#include "packfile.h"
#include "object-store.h"
+#include "promisor-remote.h"
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
-static int write_bitmaps;
+static int write_bitmaps = -1;
static int use_delta_islands;
static char *packdir, *packtmp;
@@ -129,19 +130,9 @@
static void remove_redundant_pack(const char *dir_name, const char *base_name)
{
- const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
- int i;
struct strbuf buf = STRBUF_INIT;
- size_t plen;
-
- strbuf_addf(&buf, "%s/%s", dir_name, base_name);
- plen = buf.len;
-
- for (i = 0; i < ARRAY_SIZE(exts); i++) {
- strbuf_setlen(&buf, plen);
- strbuf_addstr(&buf, exts[i]);
- unlink(buf.buf);
- }
+ strbuf_addf(&buf, "%s/%s.pack", dir_name, base_name);
+ unlink_pack_path(buf.buf, 1);
strbuf_release(&buf);
}
@@ -343,8 +334,13 @@
(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
die(_("--keep-unreachable and -A are incompatible"));
+ if (write_bitmaps < 0) {
+ if (!(pack_everything & ALL_INTO_ONE) ||
+ !is_bare_repository())
+ write_bitmaps = 0;
+ }
if (pack_kept_objects < 0)
- pack_kept_objects = write_bitmaps;
+ pack_kept_objects = write_bitmaps > 0;
if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
die(_(incremental_bitmap_conflict_error));
@@ -366,10 +362,12 @@
argv_array_push(&cmd.args, "--all");
argv_array_push(&cmd.args, "--reflog");
argv_array_push(&cmd.args, "--indexed-objects");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&cmd.args, "--exclude-promisor-objects");
- if (write_bitmaps)
+ if (write_bitmaps > 0)
argv_array_push(&cmd.args, "--write-bitmap-index");
+ else if (write_bitmaps < 0)
+ argv_array_push(&cmd.args, "--write-bitmap-index-quiet");
if (use_delta_islands)
argv_array_push(&cmd.args, "--delta-islands");
@@ -419,7 +417,7 @@
if (!names.nr && !po_args.quiet)
printf_ln(_("Nothing new to pack."));
- close_all_packs(the_repository->objects);
+ close_object_store(the_repository->objects);
/*
* Ok we have prepared all new packfiles.
diff --git a/builtin/replace.c b/builtin/replace.c
index 5b80b7f..2a4afb3 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -82,6 +82,10 @@
data.format = REPLACE_FORMAT_MEDIUM;
else if (!strcmp(format, "long"))
data.format = REPLACE_FORMAT_LONG;
+ /*
+ * Please update _git_replace() in git-completion.bash when
+ * you add new format
+ */
else
return error(_("invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"),
@@ -366,16 +370,19 @@
/* prepare new parents */
for (i = 0; i < argc; i++) {
struct object_id oid;
+ struct commit *commit;
+
if (get_oid(argv[i], &oid) < 0) {
strbuf_release(&new_parents);
return error(_("not a valid object name: '%s'"),
argv[i]);
}
- if (!lookup_commit_reference(the_repository, &oid)) {
+ commit = lookup_commit_reference(the_repository, &oid);
+ if (!commit) {
strbuf_release(&new_parents);
- return error(_("could not parse %s"), argv[i]);
+ return error(_("could not parse %s as a commit"), argv[i]);
}
- strbuf_addf(&new_parents, "parent %s\n", oid_to_hex(&oid));
+ strbuf_addf(&new_parents, "parent %s\n", oid_to_hex(&commit->object.oid));
}
/* replace existing parents with new ones */
@@ -414,7 +421,7 @@
if (get_oid(mergetag_data->argv[i], &oid) < 0)
return error(_("not a valid object name: '%s'"),
mergetag_data->argv[i]);
- if (oideq(&tag->tagged->oid, &oid))
+ if (oideq(get_tagged_oid(tag), &oid))
return 0; /* found */
}
@@ -474,15 +481,18 @@
strbuf_release(&buf);
- if (oideq(&old_oid, &new_oid)) {
+ if (oideq(&commit->object.oid, &new_oid)) {
if (gentle) {
- warning(_("graft for '%s' unnecessary"), oid_to_hex(&old_oid));
+ warning(_("graft for '%s' unnecessary"),
+ oid_to_hex(&commit->object.oid));
return 0;
}
- return error(_("new commit is the same as the old one: '%s'"), oid_to_hex(&old_oid));
+ return error(_("new commit is the same as the old one: '%s'"),
+ oid_to_hex(&commit->object.oid));
}
- return replace_object_oid(old_ref, &old_oid, "replacement", &new_oid, force);
+ return replace_object_oid(old_ref, &commit->object.oid,
+ "replacement", &new_oid, force);
}
static int convert_graft_file(int force)
diff --git a/builtin/reset.c b/builtin/reset.c
index 4d18a46..fdd5721 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -79,13 +79,13 @@
struct object_id head_oid;
if (get_oid("HEAD", &head_oid))
return error(_("You do not have a valid HEAD."));
- if (!fill_tree_descriptor(desc + nr, &head_oid))
+ if (!fill_tree_descriptor(the_repository, desc + nr, &head_oid))
return error(_("Failed to find tree of HEAD."));
nr++;
opts.fn = twoway_merge;
}
- if (!fill_tree_descriptor(desc + nr, oid)) {
+ if (!fill_tree_descriptor(the_repository, desc + nr, oid)) {
error(_("Failed to find tree of %s."), oid_to_hex(oid));
goto out;
}
@@ -341,6 +341,7 @@
if (patch_mode) {
if (reset_type != NONE)
die(_("--patch is incompatible with --{hard,mixed,soft}"));
+ trace2_cmd_mode("patch-interactive");
return run_add_interactive(rev, "--patch=reset", &pathspec);
}
@@ -357,6 +358,11 @@
if (reset_type == NONE)
reset_type = MIXED; /* by default */
+ if (pathspec.nr)
+ trace2_cmd_mode("path");
+ else
+ trace2_cmd_mode(reset_type_names[reset_type]);
+
if (reset_type != SOFT && (reset_type != MIXED || get_git_work_tree()))
setup_work_tree();
@@ -380,6 +386,7 @@
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
if (read_from_tree(&pathspec, &oid, intent_to_add))
return 1;
+ the_index.updated_skipworktree = 1;
if (!quiet && get_git_work_tree()) {
uint64_t t_begin, t_delta_in_ms;
@@ -414,7 +421,7 @@
print_new_head_line(lookup_commit_reference(the_repository, &oid));
}
if (!pathspec.nr)
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return update_ref_status;
}
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 5b5b6db..74dbfad 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -49,6 +49,7 @@
" --objects | --objects-edge\n"
" --unpacked\n"
" --header | --pretty\n"
+" --[no-]object-names\n"
" --abbrev=<n> | --no-abbrev\n"
" --abbrev-commit\n"
" --left-right\n"
@@ -75,9 +76,12 @@
};
static enum missing_action arg_missing_action;
+/* display only the oid of each object encountered */
+static int arg_show_object_names = 1;
+
#define DEFAULT_OIDSET_SIZE (16*1024)
-static void finish_commit(struct commit *commit, void *data);
+static void finish_commit(struct commit *commit);
static void show_commit(struct commit *commit, void *data)
{
struct rev_list_info *info = data;
@@ -86,7 +90,7 @@
display_progress(progress, ++progress_counter);
if (info->flags & REV_LIST_QUIET) {
- finish_commit(commit, data);
+ finish_commit(commit);
return;
}
@@ -99,7 +103,7 @@
revs->count_left++;
else
revs->count_right++;
- finish_commit(commit, data);
+ finish_commit(commit);
return;
}
@@ -188,10 +192,10 @@
putchar('\n');
}
maybe_flush_or_die(stdout, "stdout");
- finish_commit(commit, data);
+ finish_commit(commit);
}
-static void finish_commit(struct commit *commit, void *data)
+static void finish_commit(struct commit *commit)
{
if (commit->parents) {
free_commit_list(commit->parents);
@@ -238,7 +242,7 @@
static int finish_object(struct object *obj, const char *name, void *cb_data)
{
struct rev_list_info *info = cb_data;
- if (!has_object_file(&obj->oid)) {
+ if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) {
finish_object__ma(obj);
return 1;
}
@@ -255,7 +259,10 @@
display_progress(progress, ++progress_counter);
if (info->flags & REV_LIST_QUIET)
return;
- show_object_with_name(stdout, obj, name);
+ if (arg_show_object_names)
+ show_object_with_name(stdout, obj, name);
+ else
+ printf("%s\n", oid_to_hex(&obj->oid));
}
static void show_edge(struct commit *commit)
@@ -379,7 +386,6 @@
repo_init_revisions(the_repository, &revs, prefix);
revs.abbrev = DEFAULT_ABBREV;
revs.commit_format = CMIT_FMT_UNSPECIFIED;
- revs.do_not_die_on_missing_tree = 1;
/*
* Scan the argument list before invoking setup_revisions(), so that we
@@ -409,6 +415,9 @@
}
}
+ if (arg_missing_action)
+ revs.do_not_die_on_missing_tree = 1;
+
argc = setup_revisions(argc, argv, &revs, &s_r_opt);
memset(&info, 0, sizeof(info));
@@ -462,10 +471,6 @@
parse_list_objects_filter(&filter_options, arg);
if (filter_options.choice && !revs.blob_objects)
die(_("object filtering requires --objects"));
- if (filter_options.choice == LOFC_SPARSE_OID &&
- !filter_options.sparse_oid_value)
- die(_("invalid sparse value '%s'"),
- filter_options.filter_spec);
continue;
}
if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
@@ -482,6 +487,16 @@
if (skip_prefix(arg, "--missing=", &arg))
continue; /* already handled above */
+ if (!strcmp(arg, ("--no-object-names"))) {
+ arg_show_object_names = 0;
+ continue;
+ }
+
+ if (!strcmp(arg, ("--object-names"))) {
+ arg_show_object_names = 1;
+ continue;
+ }
+
usage(rev_list_usage);
}
diff --git a/builtin/revert.c b/builtin/revert.c
index a47b53c..f61cc5d 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -96,11 +96,14 @@
{
const char * const * usage_str = revert_or_cherry_pick_usage(opts);
const char *me = action_name(opts);
+ const char *cleanup_arg = NULL;
int cmd = 0;
struct option base_options[] = {
OPT_CMDMODE(0, "quit", &cmd, N_("end revert or cherry-pick sequence"), 'q'),
OPT_CMDMODE(0, "continue", &cmd, N_("resume revert or cherry-pick sequence"), 'c'),
OPT_CMDMODE(0, "abort", &cmd, N_("cancel revert or cherry-pick sequence"), 'a'),
+ OPT_CMDMODE(0, "skip", &cmd, N_("skip current commit and continue"), 's'),
+ OPT_CLEANUP(&cleanup_arg),
OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit message")),
OPT_NOOP_NOARG('r', NULL),
@@ -137,6 +140,11 @@
if (opts->keep_redundant_commits)
opts->allow_empty = 1;
+ if (cleanup_arg) {
+ opts->default_msg_cleanup = get_cleanup_mode(cleanup_arg, 1);
+ opts->explicit_cleanup = 1;
+ }
+
/* Check for incompatible command line arguments */
if (cmd) {
char *this_operation;
@@ -144,6 +152,8 @@
this_operation = "--quit";
else if (cmd == 'c')
this_operation = "--continue";
+ else if (cmd == 's')
+ this_operation = "--skip";
else {
assert(cmd == 'a');
this_operation = "--abort";
@@ -196,13 +206,15 @@
if (cmd == 'q') {
int ret = sequencer_remove_state(opts);
if (!ret)
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return ret;
}
if (cmd == 'c')
return sequencer_continue(the_repository, opts);
if (cmd == 'a')
return sequencer_rollback(the_repository, opts);
+ if (cmd == 's')
+ return sequencer_skip(the_repository, opts);
return sequencer_pick_revisions(the_repository, opts);
}
diff --git a/builtin/rm.c b/builtin/rm.c
index db85b33..19ce95a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -61,7 +61,7 @@
}
}
-static void submodules_absorb_gitdir_if_needed(const char *prefix)
+static void submodules_absorb_gitdir_if_needed(void)
{
int i;
for (i = 0; i < list.nr; i++) {
@@ -83,7 +83,7 @@
continue;
if (!submodule_uses_gitfile(name))
- absorb_git_dir_into_superproject(prefix, name,
+ absorb_git_dir_into_superproject(name,
ABSORB_GITDIR_RECURSE_SUBMODULES);
}
}
@@ -110,7 +110,7 @@
const struct cache_entry *ce;
const char *name = list.entry[i].name;
struct object_id oid;
- unsigned mode;
+ unsigned short mode;
int local_changes = 0;
int staged_changes = 0;
@@ -179,7 +179,7 @@
* way as changed from the HEAD.
*/
if (no_head
- || get_tree_entry(head, name, &oid, &mode)
+ || get_tree_entry(the_repository, head, name, &oid, &mode)
|| ce->ce_mode != create_ce_mode(mode)
|| !oideq(&ce->oid, &oid))
staged_changes = 1;
@@ -273,7 +273,7 @@
parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD,
prefix, argv);
- refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);
+ refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL);
seen = xcalloc(pathspec.nr, 1);
@@ -313,7 +313,7 @@
}
if (!index_only)
- submodules_absorb_gitdir_if_needed(prefix);
+ submodules_absorb_gitdir_if_needed();
/*
* If not forced, the file, the index and the HEAD (if exists)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 934e514..35d7f51 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -514,7 +514,6 @@
static int show_independent(struct commit **rev,
int num_rev,
- char **ref_name,
unsigned int *rev_mask)
{
int i;
@@ -753,7 +752,8 @@
/* Ah, that is a date spec... */
timestamp_t at;
at = approxidate(reflog_base);
- read_ref_at(ref, flags, at, -1, &oid, NULL,
+ read_ref_at(get_main_ref_store(the_repository),
+ ref, flags, at, -1, &oid, NULL,
NULL, NULL, &base);
}
}
@@ -765,7 +765,8 @@
timestamp_t timestamp;
int tz;
- if (read_ref_at(ref, flags, 0, base + i, &oid, &logmsg,
+ if (read_ref_at(get_main_ref_store(the_repository),
+ ref, flags, 0, base + i, &oid, &logmsg,
×tamp, &tz, NULL)) {
reflog = i;
break;
@@ -860,7 +861,7 @@
return show_merge_base(seen, num_rev);
if (independent)
- return show_independent(rev, num_rev, ref_name, rev_mask);
+ return show_independent(rev, num_rev, rev_mask);
/* Show list; --more=-1 means list-only */
if (1 < num_rev || extra < 0) {
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6a706c0..6456da7 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "cache.h"
+#include "config.h"
#include "refs.h"
#include "object-store.h"
#include "object.h"
@@ -182,6 +183,8 @@
int cmd_show_ref(int argc, const char **argv, const char *prefix)
{
+ git_config(git_default_config, NULL);
+
argc = parse_options(argc, argv, prefix, show_ref_options,
show_ref_usage, 0);
diff --git a/builtin/stash.c b/builtin/stash.c
new file mode 100644
index 0000000..ab30d1e
--- /dev/null
+++ b/builtin/stash.c
@@ -0,0 +1,1638 @@
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
+#include "builtin.h"
+#include "config.h"
+#include "parse-options.h"
+#include "refs.h"
+#include "lockfile.h"
+#include "cache-tree.h"
+#include "unpack-trees.h"
+#include "merge-recursive.h"
+#include "argv-array.h"
+#include "run-command.h"
+#include "dir.h"
+#include "rerere.h"
+#include "revision.h"
+#include "log-tree.h"
+#include "diffcore.h"
+#include "exec-cmd.h"
+
+#define INCLUDE_ALL_FILES 2
+
+static const char * const git_stash_usage[] = {
+ N_("git stash list [<options>]"),
+ N_("git stash show [<options>] [<stash>]"),
+ N_("git stash drop [-q|--quiet] [<stash>]"),
+ N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
+ N_("git stash branch <branchname> [<stash>]"),
+ N_("git stash clear"),
+ N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+ " [--] [<pathspec>...]]"),
+ N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ " [-u|--include-untracked] [-a|--all] [<message>]"),
+ NULL
+};
+
+static const char * const git_stash_list_usage[] = {
+ N_("git stash list [<options>]"),
+ NULL
+};
+
+static const char * const git_stash_show_usage[] = {
+ N_("git stash show [<options>] [<stash>]"),
+ NULL
+};
+
+static const char * const git_stash_drop_usage[] = {
+ N_("git stash drop [-q|--quiet] [<stash>]"),
+ NULL
+};
+
+static const char * const git_stash_pop_usage[] = {
+ N_("git stash pop [--index] [-q|--quiet] [<stash>]"),
+ NULL
+};
+
+static const char * const git_stash_apply_usage[] = {
+ N_("git stash apply [--index] [-q|--quiet] [<stash>]"),
+ NULL
+};
+
+static const char * const git_stash_branch_usage[] = {
+ N_("git stash branch <branchname> [<stash>]"),
+ NULL
+};
+
+static const char * const git_stash_clear_usage[] = {
+ N_("git stash clear"),
+ NULL
+};
+
+static const char * const git_stash_store_usage[] = {
+ N_("git stash store [-m|--message <message>] [-q|--quiet] <commit>"),
+ NULL
+};
+
+static const char * const git_stash_push_usage[] = {
+ N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+ " [--] [<pathspec>...]]"),
+ NULL
+};
+
+static const char * const git_stash_save_usage[] = {
+ N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ " [-u|--include-untracked] [-a|--all] [<message>]"),
+ NULL
+};
+
+static const char *ref_stash = "refs/stash";
+static struct strbuf stash_index_path = STRBUF_INIT;
+
+/*
+ * w_commit is set to the commit containing the working tree
+ * b_commit is set to the base commit
+ * i_commit is set to the commit containing the index tree
+ * u_commit is set to the commit containing the untracked files tree
+ * w_tree is set to the working tree
+ * b_tree is set to the base tree
+ * i_tree is set to the index tree
+ * u_tree is set to the untracked files tree
+ */
+struct stash_info {
+ struct object_id w_commit;
+ struct object_id b_commit;
+ struct object_id i_commit;
+ struct object_id u_commit;
+ struct object_id w_tree;
+ struct object_id b_tree;
+ struct object_id i_tree;
+ struct object_id u_tree;
+ struct strbuf revision;
+ int is_stash_ref;
+ int has_u;
+};
+
+static void free_stash_info(struct stash_info *info)
+{
+ strbuf_release(&info->revision);
+}
+
+static void assert_stash_like(struct stash_info *info, const char *revision)
+{
+ if (get_oidf(&info->b_commit, "%s^1", revision) ||
+ get_oidf(&info->w_tree, "%s:", revision) ||
+ get_oidf(&info->b_tree, "%s^1:", revision) ||
+ get_oidf(&info->i_tree, "%s^2:", revision))
+ die(_("'%s' is not a stash-like commit"), revision);
+}
+
+static int get_stash_info(struct stash_info *info, int argc, const char **argv)
+{
+ int ret;
+ char *end_of_rev;
+ char *expanded_ref;
+ const char *revision;
+ const char *commit = NULL;
+ struct object_id dummy;
+ struct strbuf symbolic = STRBUF_INIT;
+
+ if (argc > 1) {
+ int i;
+ struct strbuf refs_msg = STRBUF_INIT;
+
+ for (i = 0; i < argc; i++)
+ strbuf_addf(&refs_msg, " '%s'", argv[i]);
+
+ fprintf_ln(stderr, _("Too many revisions specified:%s"),
+ refs_msg.buf);
+ strbuf_release(&refs_msg);
+
+ return -1;
+ }
+
+ if (argc == 1)
+ commit = argv[0];
+
+ strbuf_init(&info->revision, 0);
+ if (!commit) {
+ if (!ref_exists(ref_stash)) {
+ free_stash_info(info);
+ fprintf_ln(stderr, _("No stash entries found."));
+ return -1;
+ }
+
+ strbuf_addf(&info->revision, "%s@{0}", ref_stash);
+ } else if (strspn(commit, "0123456789") == strlen(commit)) {
+ strbuf_addf(&info->revision, "%s@{%s}", ref_stash, commit);
+ } else {
+ strbuf_addstr(&info->revision, commit);
+ }
+
+ revision = info->revision.buf;
+
+ if (get_oid(revision, &info->w_commit)) {
+ error(_("%s is not a valid reference"), revision);
+ free_stash_info(info);
+ return -1;
+ }
+
+ assert_stash_like(info, revision);
+
+ info->has_u = !get_oidf(&info->u_tree, "%s^3:", revision);
+
+ end_of_rev = strchrnul(revision, '@');
+ strbuf_add(&symbolic, revision, end_of_rev - revision);
+
+ ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref);
+ strbuf_release(&symbolic);
+ switch (ret) {
+ case 0: /* Not found, but valid ref */
+ info->is_stash_ref = 0;
+ break;
+ case 1:
+ info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
+ break;
+ default: /* Invalid or ambiguous */
+ free_stash_info(info);
+ }
+
+ free(expanded_ref);
+ return !(ret == 0 || ret == 1);
+}
+
+static int do_clear_stash(void)
+{
+ struct object_id obj;
+ if (get_oid(ref_stash, &obj))
+ return 0;
+
+ return delete_ref(NULL, ref_stash, &obj, 0);
+}
+
+static int clear_stash(int argc, const char **argv, const char *prefix)
+{
+ struct option options[] = {
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_clear_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION);
+
+ if (argc)
+ return error(_("git stash clear with parameters is "
+ "unimplemented"));
+
+ return do_clear_stash();
+}
+
+static int reset_tree(struct object_id *i_tree, int update, int reset)
+{
+ int nr_trees = 1;
+ struct unpack_trees_options opts;
+ struct tree_desc t[MAX_UNPACK_TREES];
+ struct tree *tree;
+ struct lock_file lock_file = LOCK_INIT;
+
+ read_cache_preload(NULL);
+ if (refresh_cache(REFRESH_QUIET))
+ return -1;
+
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
+
+ memset(&opts, 0, sizeof(opts));
+
+ tree = parse_tree_indirect(i_tree);
+ if (parse_tree(tree))
+ return -1;
+
+ init_tree_desc(t, tree->buffer, tree->size);
+
+ opts.head_idx = 1;
+ opts.src_index = &the_index;
+ opts.dst_index = &the_index;
+ opts.merge = 1;
+ opts.reset = reset;
+ opts.update = update;
+ opts.fn = oneway_merge;
+
+ if (unpack_trees(nr_trees, t, &opts))
+ return -1;
+
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ return error(_("unable to write new index file"));
+
+ return 0;
+}
+
+static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ const char *w_commit_hex = oid_to_hex(w_commit);
+
+ /*
+ * Diff-tree would not be very hard to replace with a native function,
+ * however it should be done together with apply_cached.
+ */
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "diff-tree", "--binary", NULL);
+ argv_array_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
+
+ return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
+}
+
+static int apply_cached(struct strbuf *out)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * Apply currently only reads either from stdin or a file, thus
+ * apply_all_patches would have to be updated to optionally take a
+ * buffer.
+ */
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "apply", "--cached", NULL);
+ return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
+}
+
+static int reset_head(void)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * Reset is overall quite simple, however there is no current public
+ * API for resetting.
+ */
+ cp.git_cmd = 1;
+ argv_array_push(&cp.args, "reset");
+
+ return run_command(&cp);
+}
+
+static void add_diff_to_buf(struct diff_queue_struct *q,
+ struct diff_options *options,
+ void *data)
+{
+ int i;
+
+ for (i = 0; i < q->nr; i++) {
+ strbuf_addstr(data, q->queue[i]->one->path);
+
+ /* NUL-terminate: will be fed to update-index -z */
+ strbuf_addch(data, '\0');
+ }
+}
+
+static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ const char *c_tree_hex = oid_to_hex(c_tree);
+
+ /*
+ * diff-index is very similar to diff-tree above, and should be
+ * converted together with update_index.
+ */
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "diff-index", "--cached", "--name-only",
+ "--diff-filter=A", NULL);
+ argv_array_push(&cp.args, c_tree_hex);
+ return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
+}
+
+static int update_index(struct strbuf *out)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * Update-index is very complicated and may need to have a public
+ * function exposed in order to remove this forking.
+ */
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL);
+ return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
+}
+
+static int restore_untracked(struct object_id *u_tree)
+{
+ int res;
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * We need to run restore files from a given index, but without
+ * affecting the current index, so we use GIT_INDEX_FILE with
+ * run_command to fork processes that will not interfere.
+ */
+ cp.git_cmd = 1;
+ argv_array_push(&cp.args, "read-tree");
+ argv_array_push(&cp.args, oid_to_hex(u_tree));
+ argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+ if (run_command(&cp)) {
+ remove_path(stash_index_path.buf);
+ return -1;
+ }
+
+ child_process_init(&cp);
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "checkout-index", "--all", NULL);
+ argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+
+ res = run_command(&cp);
+ remove_path(stash_index_path.buf);
+ return res;
+}
+
+static int do_apply_stash(const char *prefix, struct stash_info *info,
+ int index, int quiet)
+{
+ int ret;
+ int has_index = index;
+ struct merge_options o;
+ struct object_id c_tree;
+ struct object_id index_tree;
+ struct commit *result;
+ const struct object_id *bases[1];
+
+ read_cache_preload(NULL);
+ if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
+ return -1;
+
+ if (write_cache_as_tree(&c_tree, 0, NULL))
+ return error(_("cannot apply a stash in the middle of a merge"));
+
+ if (index) {
+ if (oideq(&info->b_tree, &info->i_tree) ||
+ oideq(&c_tree, &info->i_tree)) {
+ has_index = 0;
+ } else {
+ struct strbuf out = STRBUF_INIT;
+
+ if (diff_tree_binary(&out, &info->w_commit)) {
+ strbuf_release(&out);
+ return error(_("could not generate diff %s^!."),
+ oid_to_hex(&info->w_commit));
+ }
+
+ ret = apply_cached(&out);
+ strbuf_release(&out);
+ if (ret)
+ return error(_("conflicts in index."
+ "Try without --index."));
+
+ discard_cache();
+ read_cache();
+ if (write_cache_as_tree(&index_tree, 0, NULL))
+ return error(_("could not save index tree"));
+
+ reset_head();
+ }
+ }
+
+ if (info->has_u && restore_untracked(&info->u_tree))
+ return error(_("could not restore untracked files from stash"));
+
+ init_merge_options(&o, the_repository);
+
+ o.branch1 = "Updated upstream";
+ o.branch2 = "Stashed changes";
+
+ if (oideq(&info->b_tree, &c_tree))
+ o.branch1 = "Version stash was based on";
+
+ if (quiet)
+ o.verbosity = 0;
+
+ if (o.verbosity >= 3)
+ printf_ln(_("Merging %s with %s"), o.branch1, o.branch2);
+
+ bases[0] = &info->b_tree;
+
+ ret = merge_recursive_generic(&o, &c_tree, &info->w_tree, 1, bases,
+ &result);
+ if (ret) {
+ rerere(0);
+
+ if (index)
+ fprintf_ln(stderr, _("Index was not unstashed."));
+
+ return ret;
+ }
+
+ if (has_index) {
+ if (reset_tree(&index_tree, 0, 0))
+ return -1;
+ } else {
+ struct strbuf out = STRBUF_INIT;
+
+ if (get_newly_staged(&out, &c_tree)) {
+ strbuf_release(&out);
+ return -1;
+ }
+
+ if (reset_tree(&c_tree, 0, 1)) {
+ strbuf_release(&out);
+ return -1;
+ }
+
+ ret = update_index(&out);
+ strbuf_release(&out);
+ if (ret)
+ return -1;
+
+ discard_cache();
+ }
+
+ if (quiet) {
+ if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
+ warning("could not refresh index");
+ } else {
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * Status is quite simple and could be replaced with calls to
+ * wt_status in the future, but it adds complexities which may
+ * require more tests.
+ */
+ cp.git_cmd = 1;
+ cp.dir = prefix;
+ argv_array_push(&cp.args, "status");
+ run_command(&cp);
+ }
+
+ return 0;
+}
+
+static int apply_stash(int argc, const char **argv, const char *prefix)
+{
+ int ret;
+ int quiet = 0;
+ int index = 0;
+ struct stash_info info;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_BOOL(0, "index", &index,
+ N_("attempt to recreate the index")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_apply_usage, 0);
+
+ if (get_stash_info(&info, argc, argv))
+ return -1;
+
+ ret = do_apply_stash(prefix, &info, index, quiet);
+ free_stash_info(&info);
+ return ret;
+}
+
+static int do_drop_stash(struct stash_info *info, int quiet)
+{
+ int ret;
+ struct child_process cp_reflog = CHILD_PROCESS_INIT;
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /*
+ * reflog does not provide a simple function for deleting refs. One will
+ * need to be added to avoid implementing too much reflog code here
+ */
+
+ cp_reflog.git_cmd = 1;
+ argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
+ "--rewrite", NULL);
+ argv_array_push(&cp_reflog.args, info->revision.buf);
+ ret = run_command(&cp_reflog);
+ if (!ret) {
+ if (!quiet)
+ printf_ln(_("Dropped %s (%s)"), info->revision.buf,
+ oid_to_hex(&info->w_commit));
+ } else {
+ return error(_("%s: Could not drop stash entry"),
+ info->revision.buf);
+ }
+
+ /*
+ * This could easily be replaced by get_oid, but currently it will throw
+ * a fatal error when a reflog is empty, which we can not recover from.
+ */
+ cp.git_cmd = 1;
+ /* Even though --quiet is specified, rev-parse still outputs the hash */
+ cp.no_stdout = 1;
+ argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL);
+ argv_array_pushf(&cp.args, "%s@{0}", ref_stash);
+ ret = run_command(&cp);
+
+ /* do_clear_stash if we just dropped the last stash entry */
+ if (ret)
+ do_clear_stash();
+
+ return 0;
+}
+
+static void assert_stash_ref(struct stash_info *info)
+{
+ if (!info->is_stash_ref) {
+ error(_("'%s' is not a stash reference"), info->revision.buf);
+ free_stash_info(info);
+ exit(1);
+ }
+}
+
+static int drop_stash(int argc, const char **argv, const char *prefix)
+{
+ int ret;
+ int quiet = 0;
+ struct stash_info info;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_drop_usage, 0);
+
+ if (get_stash_info(&info, argc, argv))
+ return -1;
+
+ assert_stash_ref(&info);
+
+ ret = do_drop_stash(&info, quiet);
+ free_stash_info(&info);
+ return ret;
+}
+
+static int pop_stash(int argc, const char **argv, const char *prefix)
+{
+ int ret;
+ int index = 0;
+ int quiet = 0;
+ struct stash_info info;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet, only report errors")),
+ OPT_BOOL(0, "index", &index,
+ N_("attempt to recreate the index")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_pop_usage, 0);
+
+ if (get_stash_info(&info, argc, argv))
+ return -1;
+
+ assert_stash_ref(&info);
+ if ((ret = do_apply_stash(prefix, &info, index, quiet)))
+ printf_ln(_("The stash entry is kept in case "
+ "you need it again."));
+ else
+ ret = do_drop_stash(&info, quiet);
+
+ free_stash_info(&info);
+ return ret;
+}
+
+static int branch_stash(int argc, const char **argv, const char *prefix)
+{
+ int ret;
+ const char *branch = NULL;
+ struct stash_info info;
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct option options[] = {
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_branch_usage, 0);
+
+ if (!argc) {
+ fprintf_ln(stderr, _("No branch name specified"));
+ return -1;
+ }
+
+ branch = argv[0];
+
+ if (get_stash_info(&info, argc - 1, argv + 1))
+ return -1;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "checkout", "-b", NULL);
+ argv_array_push(&cp.args, branch);
+ argv_array_push(&cp.args, oid_to_hex(&info.b_commit));
+ ret = run_command(&cp);
+ if (!ret)
+ ret = do_apply_stash(prefix, &info, 1, 0);
+ if (!ret && info.is_stash_ref)
+ ret = do_drop_stash(&info, 0);
+
+ free_stash_info(&info);
+
+ return ret;
+}
+
+static int list_stash(int argc, const char **argv, const char *prefix)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct option options[] = {
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_list_usage,
+ PARSE_OPT_KEEP_UNKNOWN);
+
+ if (!ref_exists(ref_stash))
+ return 0;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
+ "--first-parent", "-m", NULL);
+ argv_array_pushv(&cp.args, argv);
+ argv_array_push(&cp.args, ref_stash);
+ argv_array_push(&cp.args, "--");
+ return run_command(&cp);
+}
+
+static int show_stat = 1;
+static int show_patch;
+
+static int git_stash_config(const char *var, const char *value, void *cb)
+{
+ if (!strcmp(var, "stash.showstat")) {
+ show_stat = git_config_bool(var, value);
+ return 0;
+ }
+ if (!strcmp(var, "stash.showpatch")) {
+ show_patch = git_config_bool(var, value);
+ return 0;
+ }
+ return git_default_config(var, value, cb);
+}
+
+static int show_stash(int argc, const char **argv, const char *prefix)
+{
+ int i;
+ int ret = 0;
+ struct stash_info info;
+ struct rev_info rev;
+ struct argv_array stash_args = ARGV_ARRAY_INIT;
+ struct argv_array revision_args = ARGV_ARRAY_INIT;
+ struct option options[] = {
+ OPT_END()
+ };
+
+ init_diff_ui_defaults();
+ git_config(git_diff_ui_config, NULL);
+ init_revisions(&rev, prefix);
+
+ argv_array_push(&revision_args, argv[0]);
+ for (i = 1; i < argc; i++) {
+ if (argv[i][0] != '-')
+ argv_array_push(&stash_args, argv[i]);
+ else
+ argv_array_push(&revision_args, argv[i]);
+ }
+
+ ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
+ argv_array_clear(&stash_args);
+ if (ret)
+ return -1;
+
+ /*
+ * The config settings are applied only if there are not passed
+ * any options.
+ */
+ if (revision_args.argc == 1) {
+ git_config(git_stash_config, NULL);
+ if (show_stat)
+ rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
+
+ if (show_patch)
+ rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+
+ if (!show_stat && !show_patch) {
+ free_stash_info(&info);
+ return 0;
+ }
+ }
+
+ argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL);
+ if (argc > 1) {
+ free_stash_info(&info);
+ usage_with_options(git_stash_show_usage, options);
+ }
+ if (!rev.diffopt.output_format) {
+ rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+ diff_setup_done(&rev.diffopt);
+ }
+
+ rev.diffopt.flags.recursive = 1;
+ setup_diff_pager(&rev.diffopt);
+ diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+ log_tree_diff_flush(&rev);
+
+ free_stash_info(&info);
+ return diff_result_code(&rev.diffopt, 0);
+}
+
+static int do_store_stash(const struct object_id *w_commit, const char *stash_msg,
+ int quiet)
+{
+ if (!stash_msg)
+ stash_msg = "Created via \"git stash store\".";
+
+ if (update_ref(stash_msg, ref_stash, w_commit, NULL,
+ REF_FORCE_CREATE_REFLOG,
+ quiet ? UPDATE_REFS_QUIET_ON_ERR :
+ UPDATE_REFS_MSG_ON_ERR)) {
+ if (!quiet) {
+ fprintf_ln(stderr, _("Cannot update %s with %s"),
+ ref_stash, oid_to_hex(w_commit));
+ }
+ return -1;
+ }
+
+ return 0;
+}
+
+static int store_stash(int argc, const char **argv, const char *prefix)
+{
+ int quiet = 0;
+ const char *stash_msg = NULL;
+ struct object_id obj;
+ struct object_context dummy;
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("be quiet")),
+ OPT_STRING('m', "message", &stash_msg, "message",
+ N_("stash message")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_store_usage,
+ PARSE_OPT_KEEP_UNKNOWN);
+
+ if (argc != 1) {
+ if (!quiet)
+ fprintf_ln(stderr, _("\"git stash store\" requires one "
+ "<commit> argument"));
+ return -1;
+ }
+
+ if (get_oid_with_context(the_repository,
+ argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
+ &dummy)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot update %s with %s"),
+ ref_stash, argv[0]);
+ return -1;
+ }
+
+ return do_store_stash(&obj, stash_msg, quiet);
+}
+
+static void add_pathspecs(struct argv_array *args,
+ const struct pathspec *ps) {
+ int i;
+
+ for (i = 0; i < ps->nr; i++)
+ argv_array_push(args, ps->items[i].original);
+}
+
+/*
+ * `untracked_files` will be filled with the names of untracked files.
+ * The return value is:
+ *
+ * = 0 if there are not any untracked files
+ * > 0 if there are untracked files
+ */
+static int get_untracked_files(const struct pathspec *ps, int include_untracked,
+ struct strbuf *untracked_files)
+{
+ int i;
+ int max_len;
+ int found = 0;
+ char *seen;
+ struct dir_struct dir;
+
+ memset(&dir, 0, sizeof(dir));
+ if (include_untracked != INCLUDE_ALL_FILES)
+ setup_standard_excludes(&dir);
+
+ seen = xcalloc(ps->nr, 1);
+
+ max_len = fill_directory(&dir, the_repository->index, ps);
+ for (i = 0; i < dir.nr; i++) {
+ struct dir_entry *ent = dir.entries[i];
+ if (dir_path_match(&the_index, ent, ps, max_len, seen)) {
+ found++;
+ strbuf_addstr(untracked_files, ent->name);
+ /* NUL-terminate: will be fed to update-index -z */
+ strbuf_addch(untracked_files, '\0');
+ }
+ free(ent);
+ }
+
+ free(seen);
+ free(dir.entries);
+ free(dir.ignored);
+ clear_directory(&dir);
+ return found;
+}
+
+/*
+ * The return value of `check_changes_tracked_files()` can be:
+ *
+ * < 0 if there was an error
+ * = 0 if there are no changes.
+ * > 0 if there are changes.
+ */
+static int check_changes_tracked_files(const struct pathspec *ps)
+{
+ int result;
+ struct rev_info rev;
+ struct object_id dummy;
+ int ret = 0;
+
+ /* No initial commit. */
+ if (get_oid("HEAD", &dummy))
+ return -1;
+
+ if (read_cache() < 0)
+ return -1;
+
+ init_revisions(&rev, NULL);
+ copy_pathspec(&rev.prune_data, ps);
+
+ rev.diffopt.flags.quick = 1;
+ rev.diffopt.flags.ignore_submodules = 1;
+ rev.abbrev = 0;
+
+ add_head_to_pending(&rev);
+ diff_setup_done(&rev.diffopt);
+
+ result = run_diff_index(&rev, 1);
+ if (diff_result_code(&rev.diffopt, result)) {
+ ret = 1;
+ goto done;
+ }
+
+ object_array_clear(&rev.pending);
+ result = run_diff_files(&rev, 0);
+ if (diff_result_code(&rev.diffopt, result)) {
+ ret = 1;
+ goto done;
+ }
+
+done:
+ clear_pathspec(&rev.prune_data);
+ return ret;
+}
+
+/*
+ * The function will fill `untracked_files` with the names of untracked files
+ * It will return 1 if there were any changes and 0 if there were not.
+ */
+static int check_changes(const struct pathspec *ps, int include_untracked,
+ struct strbuf *untracked_files)
+{
+ int ret = 0;
+ if (check_changes_tracked_files(ps))
+ ret = 1;
+
+ if (include_untracked && get_untracked_files(ps, include_untracked,
+ untracked_files))
+ ret = 1;
+
+ return ret;
+}
+
+static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
+ struct strbuf files)
+{
+ int ret = 0;
+ struct strbuf untracked_msg = STRBUF_INIT;
+ struct child_process cp_upd_index = CHILD_PROCESS_INIT;
+ struct index_state istate = { NULL };
+
+ cp_upd_index.git_cmd = 1;
+ argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
+ "--remove", "--stdin", NULL);
+ argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+
+ strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
+ if (pipe_command(&cp_upd_index, files.buf, files.len, NULL, 0,
+ NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (write_index_as_tree(&info->u_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (commit_tree(untracked_msg.buf, untracked_msg.len,
+ &info->u_tree, NULL, &info->u_commit, NULL, NULL)) {
+ ret = -1;
+ goto done;
+ }
+
+done:
+ discard_index(&istate);
+ strbuf_release(&untracked_msg);
+ remove_path(stash_index_path.buf);
+ return ret;
+}
+
+static int stash_patch(struct stash_info *info, const struct pathspec *ps,
+ struct strbuf *out_patch, int quiet)
+{
+ int ret = 0;
+ struct child_process cp_read_tree = CHILD_PROCESS_INIT;
+ struct child_process cp_add_i = CHILD_PROCESS_INIT;
+ struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
+ struct index_state istate = { NULL };
+
+ remove_path(stash_index_path.buf);
+
+ cp_read_tree.git_cmd = 1;
+ argv_array_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
+ argv_array_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+ if (run_command(&cp_read_tree)) {
+ ret = -1;
+ goto done;
+ }
+
+ /* Find out what the user wants. */
+ cp_add_i.git_cmd = 1;
+ argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash",
+ "--", NULL);
+ add_pathspecs(&cp_add_i.args, ps);
+ argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+ if (run_command(&cp_add_i)) {
+ ret = -1;
+ goto done;
+ }
+
+ /* State of the working tree. */
+ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
+ ret = -1;
+ goto done;
+ }
+
+ cp_diff_tree.git_cmd = 1;
+ argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
+ oid_to_hex(&info->w_tree), "--", NULL);
+ if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (!out_patch->len) {
+ if (!quiet)
+ fprintf_ln(stderr, _("No changes selected"));
+ ret = 1;
+ }
+
+done:
+ discard_index(&istate);
+ remove_path(stash_index_path.buf);
+ return ret;
+}
+
+static int stash_working_tree(struct stash_info *info, const struct pathspec *ps)
+{
+ int ret = 0;
+ struct rev_info rev;
+ struct child_process cp_upd_index = CHILD_PROCESS_INIT;
+ struct strbuf diff_output = STRBUF_INIT;
+ struct index_state istate = { NULL };
+
+ init_revisions(&rev, NULL);
+ copy_pathspec(&rev.prune_data, ps);
+
+ set_alternate_index_output(stash_index_path.buf);
+ if (reset_tree(&info->i_tree, 0, 0)) {
+ ret = -1;
+ goto done;
+ }
+ set_alternate_index_output(NULL);
+
+ rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
+ rev.diffopt.format_callback = add_diff_to_buf;
+ rev.diffopt.format_callback_data = &diff_output;
+
+ if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
+ ret = -1;
+ goto done;
+ }
+
+ add_pending_object(&rev, parse_object(the_repository, &info->b_commit),
+ "");
+ if (run_diff_index(&rev, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ cp_upd_index.git_cmd = 1;
+ argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
+ "--remove", "--stdin", NULL);
+ argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+ stash_index_path.buf);
+
+ if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
+ NULL, 0, NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
+ ret = -1;
+ goto done;
+ }
+
+done:
+ discard_index(&istate);
+ UNLEAK(rev);
+ object_array_clear(&rev.pending);
+ clear_pathspec(&rev.prune_data);
+ strbuf_release(&diff_output);
+ remove_path(stash_index_path.buf);
+ return ret;
+}
+
+static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
+ int include_untracked, int patch_mode,
+ struct stash_info *info, struct strbuf *patch,
+ int quiet)
+{
+ int ret = 0;
+ int flags = 0;
+ int untracked_commit_option = 0;
+ const char *head_short_sha1 = NULL;
+ const char *branch_ref = NULL;
+ const char *branch_name = "(no branch)";
+ struct commit *head_commit = NULL;
+ struct commit_list *parents = NULL;
+ struct strbuf msg = STRBUF_INIT;
+ struct strbuf commit_tree_label = STRBUF_INIT;
+ struct strbuf untracked_files = STRBUF_INIT;
+
+ prepare_fallback_ident("git stash", "git@stash");
+
+ read_cache_preload(NULL);
+ if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) {
+ ret = -1;
+ goto done;
+ }
+
+ if (get_oid("HEAD", &info->b_commit)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("You do not have "
+ "the initial commit yet"));
+ ret = -1;
+ goto done;
+ } else {
+ head_commit = lookup_commit(the_repository, &info->b_commit);
+ }
+
+ if (!check_changes(ps, include_untracked, &untracked_files)) {
+ ret = 1;
+ goto done;
+ }
+
+ branch_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flags);
+ if (flags & REF_ISSYMREF)
+ branch_name = strrchr(branch_ref, '/') + 1;
+ head_short_sha1 = find_unique_abbrev(&head_commit->object.oid,
+ DEFAULT_ABBREV);
+ strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1);
+ pp_commit_easy(CMIT_FMT_ONELINE, head_commit, &msg);
+
+ strbuf_addf(&commit_tree_label, "index on %s\n", msg.buf);
+ commit_list_insert(head_commit, &parents);
+ if (write_cache_as_tree(&info->i_tree, 0, NULL) ||
+ commit_tree(commit_tree_label.buf, commit_tree_label.len,
+ &info->i_tree, parents, &info->i_commit, NULL, NULL)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current "
+ "index state"));
+ ret = -1;
+ goto done;
+ }
+
+ if (include_untracked) {
+ if (save_untracked_files(info, &msg, untracked_files)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save "
+ "the untracked files"));
+ ret = -1;
+ goto done;
+ }
+ untracked_commit_option = 1;
+ }
+ if (patch_mode) {
+ ret = stash_patch(info, ps, patch, quiet);
+ if (ret < 0) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current "
+ "worktree state"));
+ goto done;
+ } else if (ret > 0) {
+ goto done;
+ }
+ } else {
+ if (stash_working_tree(info, ps)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current "
+ "worktree state"));
+ ret = -1;
+ goto done;
+ }
+ }
+
+ if (!stash_msg_buf->len)
+ strbuf_addf(stash_msg_buf, "WIP on %s", msg.buf);
+ else
+ strbuf_insertf(stash_msg_buf, 0, "On %s: ", branch_name);
+
+ /*
+ * `parents` will be empty after calling `commit_tree()`, so there is
+ * no need to call `free_commit_list()`
+ */
+ parents = NULL;
+ if (untracked_commit_option)
+ commit_list_insert(lookup_commit(the_repository,
+ &info->u_commit),
+ &parents);
+ commit_list_insert(lookup_commit(the_repository, &info->i_commit),
+ &parents);
+ commit_list_insert(head_commit, &parents);
+
+ if (commit_tree(stash_msg_buf->buf, stash_msg_buf->len, &info->w_tree,
+ parents, &info->w_commit, NULL, NULL)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot record "
+ "working tree state"));
+ ret = -1;
+ goto done;
+ }
+
+done:
+ strbuf_release(&commit_tree_label);
+ strbuf_release(&msg);
+ strbuf_release(&untracked_files);
+ return ret;
+}
+
+static int create_stash(int argc, const char **argv, const char *prefix)
+{
+ int ret = 0;
+ struct strbuf stash_msg_buf = STRBUF_INIT;
+ struct stash_info info;
+ struct pathspec ps;
+
+ /* Starting with argv[1], since argv[0] is "create" */
+ strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
+
+ memset(&ps, 0, sizeof(ps));
+ if (!check_changes_tracked_files(&ps))
+ return 0;
+
+ ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, &info,
+ NULL, 0);
+ if (!ret)
+ printf_ln("%s", oid_to_hex(&info.w_commit));
+
+ strbuf_release(&stash_msg_buf);
+ return ret;
+}
+
+static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
+ int keep_index, int patch_mode, int include_untracked)
+{
+ int ret = 0;
+ struct stash_info info;
+ struct strbuf patch = STRBUF_INIT;
+ struct strbuf stash_msg_buf = STRBUF_INIT;
+ struct strbuf untracked_files = STRBUF_INIT;
+
+ if (patch_mode && keep_index == -1)
+ keep_index = 1;
+
+ if (patch_mode && include_untracked) {
+ fprintf_ln(stderr, _("Can't use --patch and --include-untracked"
+ " or --all at the same time"));
+ ret = -1;
+ goto done;
+ }
+
+ read_cache_preload(NULL);
+ if (!include_untracked && ps->nr) {
+ int i;
+ char *ps_matched = xcalloc(ps->nr, 1);
+
+ for (i = 0; i < active_nr; i++)
+ ce_path_match(&the_index, active_cache[i], ps,
+ ps_matched);
+
+ if (report_path_error(ps_matched, ps)) {
+ fprintf_ln(stderr, _("Did you forget to 'git add'?"));
+ ret = -1;
+ free(ps_matched);
+ goto done;
+ }
+ free(ps_matched);
+ }
+
+ if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (!check_changes(ps, include_untracked, &untracked_files)) {
+ if (!quiet)
+ printf_ln(_("No local changes to save"));
+ goto done;
+ }
+
+ if (!reflog_exists(ref_stash) && do_clear_stash()) {
+ ret = -1;
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot initialize stash"));
+ goto done;
+ }
+
+ if (stash_msg)
+ strbuf_addstr(&stash_msg_buf, stash_msg);
+ if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
+ &info, &patch, quiet)) {
+ ret = -1;
+ goto done;
+ }
+
+ if (do_store_stash(&info.w_commit, stash_msg_buf.buf, 1)) {
+ ret = -1;
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current status"));
+ goto done;
+ }
+
+ if (!quiet)
+ printf_ln(_("Saved working directory and index state %s"),
+ stash_msg_buf.buf);
+
+ if (!patch_mode) {
+ if (include_untracked && !ps->nr) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "clean", "--force",
+ "--quiet", "-d", NULL);
+ if (include_untracked == INCLUDE_ALL_FILES)
+ argv_array_push(&cp.args, "-x");
+ if (run_command(&cp)) {
+ ret = -1;
+ goto done;
+ }
+ }
+ discard_cache();
+ if (ps->nr) {
+ struct child_process cp_add = CHILD_PROCESS_INIT;
+ struct child_process cp_diff = CHILD_PROCESS_INIT;
+ struct child_process cp_apply = CHILD_PROCESS_INIT;
+ struct strbuf out = STRBUF_INIT;
+
+ cp_add.git_cmd = 1;
+ argv_array_push(&cp_add.args, "add");
+ if (!include_untracked)
+ argv_array_push(&cp_add.args, "-u");
+ if (include_untracked == INCLUDE_ALL_FILES)
+ argv_array_push(&cp_add.args, "--force");
+ argv_array_push(&cp_add.args, "--");
+ add_pathspecs(&cp_add.args, ps);
+ if (run_command(&cp_add)) {
+ ret = -1;
+ goto done;
+ }
+
+ cp_diff.git_cmd = 1;
+ argv_array_pushl(&cp_diff.args, "diff-index", "-p",
+ "--cached", "--binary", "HEAD", "--",
+ NULL);
+ add_pathspecs(&cp_diff.args, ps);
+ if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+
+ cp_apply.git_cmd = 1;
+ argv_array_pushl(&cp_apply.args, "apply", "--index",
+ "-R", NULL);
+ if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0,
+ NULL, 0)) {
+ ret = -1;
+ goto done;
+ }
+ } else {
+ struct child_process cp = CHILD_PROCESS_INIT;
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "reset", "--hard", "-q",
+ NULL);
+ if (run_command(&cp)) {
+ ret = -1;
+ goto done;
+ }
+ }
+
+ if (keep_index == 1 && !is_null_oid(&info.i_tree)) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "checkout", "--no-overlay",
+ oid_to_hex(&info.i_tree), "--", NULL);
+ if (!ps->nr)
+ argv_array_push(&cp.args, ":/");
+ else
+ add_pathspecs(&cp.args, ps);
+ if (run_command(&cp)) {
+ ret = -1;
+ goto done;
+ }
+ }
+ goto done;
+ } else {
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "apply", "-R", NULL);
+
+ if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) {
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot remove "
+ "worktree changes"));
+ ret = -1;
+ goto done;
+ }
+
+ if (keep_index < 1) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "reset", "-q", "--", NULL);
+ add_pathspecs(&cp.args, ps);
+ if (run_command(&cp)) {
+ ret = -1;
+ goto done;
+ }
+ }
+ goto done;
+ }
+
+done:
+ strbuf_release(&stash_msg_buf);
+ return ret;
+}
+
+static int push_stash(int argc, const char **argv, const char *prefix)
+{
+ int keep_index = -1;
+ int patch_mode = 0;
+ int include_untracked = 0;
+ int quiet = 0;
+ const char *stash_msg = NULL;
+ struct pathspec ps;
+ struct option options[] = {
+ OPT_BOOL('k', "keep-index", &keep_index,
+ N_("keep index")),
+ OPT_BOOL('p', "patch", &patch_mode,
+ N_("stash in patch mode")),
+ OPT__QUIET(&quiet, N_("quiet mode")),
+ OPT_BOOL('u', "include-untracked", &include_untracked,
+ N_("include untracked files in stash")),
+ OPT_SET_INT('a', "all", &include_untracked,
+ N_("include ignore files"), 2),
+ OPT_STRING('m', "message", &stash_msg, N_("message"),
+ N_("stash message")),
+ OPT_END()
+ };
+
+ if (argc)
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_push_usage,
+ 0);
+
+ parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
+ prefix, argv);
+ return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
+ include_untracked);
+}
+
+static int save_stash(int argc, const char **argv, const char *prefix)
+{
+ int keep_index = -1;
+ int patch_mode = 0;
+ int include_untracked = 0;
+ int quiet = 0;
+ int ret = 0;
+ const char *stash_msg = NULL;
+ struct pathspec ps;
+ struct strbuf stash_msg_buf = STRBUF_INIT;
+ struct option options[] = {
+ OPT_BOOL('k', "keep-index", &keep_index,
+ N_("keep index")),
+ OPT_BOOL('p', "patch", &patch_mode,
+ N_("stash in patch mode")),
+ OPT__QUIET(&quiet, N_("quiet mode")),
+ OPT_BOOL('u', "include-untracked", &include_untracked,
+ N_("include untracked files in stash")),
+ OPT_SET_INT('a', "all", &include_untracked,
+ N_("include ignore files"), 2),
+ OPT_STRING('m', "message", &stash_msg, "message",
+ N_("stash message")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_save_usage,
+ PARSE_OPT_KEEP_DASHDASH);
+
+ if (argc)
+ stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
+
+ memset(&ps, 0, sizeof(ps));
+ ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
+ patch_mode, include_untracked);
+
+ strbuf_release(&stash_msg_buf);
+ return ret;
+}
+
+static int use_builtin_stash(void)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct strbuf out = STRBUF_INIT;
+ int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
+
+ if (env != -1)
+ return env;
+
+ argv_array_pushl(&cp.args,
+ "config", "--bool", "stash.usebuiltin", NULL);
+ cp.git_cmd = 1;
+ if (capture_command(&cp, &out, 6)) {
+ strbuf_release(&out);
+ return 1;
+ }
+
+ strbuf_trim(&out);
+ ret = !strcmp("true", out.buf);
+ strbuf_release(&out);
+ return ret;
+}
+
+int cmd_stash(int argc, const char **argv, const char *prefix)
+{
+ int i = -1;
+ pid_t pid = getpid();
+ const char *index_file;
+ struct argv_array args = ARGV_ARRAY_INIT;
+
+ struct option options[] = {
+ OPT_END()
+ };
+
+ if (!use_builtin_stash()) {
+ const char *path = mkpath("%s/git-legacy-stash",
+ git_exec_path());
+
+ if (sane_execvp(path, (char **)argv) < 0)
+ die_errno(_("could not exec %s"), path);
+ else
+ BUG("sane_execvp() returned???");
+ }
+
+ prefix = setup_git_directory();
+ trace_repo_setup(prefix);
+ setup_work_tree();
+
+ git_config(git_diff_basic_config, NULL);
+
+ argc = parse_options(argc, argv, prefix, options, git_stash_usage,
+ PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
+
+ index_file = get_index_file();
+ strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
+ (uintmax_t)pid);
+
+ if (!argc)
+ return !!push_stash(0, NULL, prefix);
+ else if (!strcmp(argv[0], "apply"))
+ return !!apply_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "clear"))
+ return !!clear_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "drop"))
+ return !!drop_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "pop"))
+ return !!pop_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "branch"))
+ return !!branch_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "list"))
+ return !!list_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "show"))
+ return !!show_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "store"))
+ return !!store_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "create"))
+ return !!create_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "push"))
+ return !!push_stash(argc, argv, prefix);
+ else if (!strcmp(argv[0], "save"))
+ return !!save_stash(argc, argv, prefix);
+ else if (*argv[0] != '-')
+ usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
+ git_stash_usage, options);
+
+ if (strcmp(argv[0], "-p")) {
+ while (++i < argc && strcmp(argv[i], "--")) {
+ /*
+ * `akpqu` is a string which contains all short options,
+ * except `-m` which is verified separately.
+ */
+ if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
+ strchr("akpqu", argv[i][1]))
+ continue;
+
+ if (!strcmp(argv[i], "--all") ||
+ !strcmp(argv[i], "--keep-index") ||
+ !strcmp(argv[i], "--no-keep-index") ||
+ !strcmp(argv[i], "--patch") ||
+ !strcmp(argv[i], "--quiet") ||
+ !strcmp(argv[i], "--include-untracked"))
+ continue;
+
+ /*
+ * `-m` and `--message=` are verified separately because
+ * they need to be immediately followed by a string
+ * (i.e.`-m"foobar"` or `--message="foobar"`).
+ */
+ if (starts_with(argv[i], "-m") ||
+ starts_with(argv[i], "--message="))
+ continue;
+
+ usage_with_options(git_stash_usage, options);
+ }
+ }
+
+ argv_array_push(&args, "push");
+ argv_array_pushv(&args, argv);
+ return !!push_stash(args.argc, args.argv, prefix);
+}
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 33d9f82..909e77e 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -348,7 +348,7 @@
i++;
}
- if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
+ if (ps_matched && report_path_error(ps_matched, pathspec))
result = -1;
free(ps_matched);
@@ -540,6 +540,7 @@
if (info->quiet)
argv_array_push(&cpr.args, "--quiet");
+ argv_array_push(&cpr.args, "--");
argv_array_pushv(&cpr.args, info->argv);
if (run_command(&cpr))
@@ -566,12 +567,12 @@
};
const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper foreach [--quiet] [--recursive] <command>"),
+ N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"),
NULL
};
argc = parse_options(argc, argv, prefix, module_foreach_options,
- git_submodule_helper_usage, PARSE_OPT_KEEP_UNKNOWN);
+ git_submodule_helper_usage, 0);
if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0)
return 1;
@@ -709,7 +710,7 @@
};
const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper init [<path>]"),
+ N_("git submodule--helper init [<options>] [<path>]"),
NULL
};
@@ -1301,7 +1302,7 @@
die(_("submodule '%s' cannot add alternate: %s"),
sas->submodule_name, err.buf);
case SUBMODULE_ALTERNATE_ERROR_INFO:
- fprintf(stderr, _("submodule '%s' cannot add alternate: %s"),
+ fprintf_ln(stderr, _("submodule '%s' cannot add alternate: %s"),
sas->submodule_name, err.buf);
case SUBMODULE_ALTERNATE_ERROR_IGNORE:
; /* nothing */
@@ -1816,11 +1817,10 @@
{
int i;
- run_processes_parallel(suc->max_jobs,
- update_clone_get_next_task,
- update_clone_start_failure,
- update_clone_task_finished,
- suc);
+ run_processes_parallel_tr2(suc->max_jobs, update_clone_get_next_task,
+ update_clone_start_failure,
+ update_clone_task_finished, suc, "submodule",
+ "parallel/update");
/*
* We saved the output and put it out all at once now.
@@ -2097,7 +2097,7 @@
};
const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper embed-git-dir [<path>...]"),
+ N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
NULL
};
@@ -2108,8 +2108,7 @@
return 1;
for (i = 0; i < list.nr; i++)
- absorb_git_dir_into_superproject(prefix,
- list.entries[i]->name, flags);
+ absorb_git_dir_into_superproject(list.entries[i]->name, flags);
return 0;
}
diff --git a/builtin/tag.c b/builtin/tag.c
index 02f6bd1..e0a4c25 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -22,16 +22,18 @@
#include "ref-filter.h"
static const char * const git_tag_usage[] = {
- N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"),
+ N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+ "\t\t<tagname> [<head>]"),
N_("git tag -d <tagname>..."),
- N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]"
- "\n\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
+ N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+ "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
N_("git tag -v [--format=<format>] <tagname>..."),
NULL
};
static unsigned int colopts;
static int force_sign_annotate;
+static int config_sign_tag = -1; /* unspecified */
static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,
struct ref_format *format)
@@ -143,6 +145,11 @@
int status;
struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
+ if (!strcmp(var, "tag.gpgsign")) {
+ config_sign_tag = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "tag.sort")) {
if (!value)
return config_error_nonbool(var);
@@ -205,7 +212,14 @@
} cleanup_mode;
};
-static void create_tag(const struct object_id *object, const char *tag,
+static const char message_advice_nested_tag[] =
+ N_("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^{}");
+
+static void create_tag(const struct object_id *object, const char *object_ref,
+ const char *tag,
struct strbuf *buf, struct create_tag_options *opt,
struct object_id *prev, struct object_id *result)
{
@@ -215,7 +229,10 @@
type = oid_object_info(the_repository, object, NULL);
if (type <= OBJ_NONE)
- die(_("bad object type."));
+ die(_("bad object type."));
+
+ if (type == OBJ_TAG && advice_nested_tag)
+ advise(_(message_advice_nested_tag), tag, object_ref);
strbuf_addf(&header,
"object %s\n"
@@ -397,8 +414,7 @@
OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")),
OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
- OPT_STRING(0, "cleanup", &cleanup_arg, N_("mode"),
- N_("how to strip spaces and #comments from message")),
+ OPT_CLEANUP(&cleanup_arg),
OPT_STRING('u', "local-user", &keyid, N_("key-id"),
N_("use another key to sign the tag")),
OPT__FORCE(&force, N_("replace the tag if exists"), 0),
@@ -412,8 +428,7 @@
OPT_WITHOUT(&filter.no_commit, N_("print only tags that don't contain the commit")),
OPT_MERGED(&filter, N_("print only tags that are merged")),
OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
- OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
- N_("field name to sort on"), &parse_opt_ref_sorting),
+ OPT_REF_SORT(sorting_tail),
{
OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
N_("print only tags of the object"), PARSE_OPT_LASTARG_DEFAULT,
@@ -433,15 +448,10 @@
memset(&opt, 0, sizeof(opt));
memset(&filter, 0, sizeof(filter));
filter.lines = -1;
+ opt.sign = -1;
argc = parse_options(argc, argv, prefix, options, git_tag_usage, 0);
- if (keyid) {
- opt.sign = 1;
- set_signing_key(keyid);
- }
- create_tag_object = (opt.sign || annotate || msg.given || msgfile);
-
if (!cmdmode) {
if (argc == 0)
cmdmode = 'l';
@@ -454,6 +464,15 @@
if (cmdmode == 'l')
setup_auto_pager("tag", 1);
+ if (opt.sign == -1)
+ opt.sign = cmdmode ? 0 : config_sign_tag > 0;
+
+ if (keyid) {
+ opt.sign = 1;
+ set_signing_key(keyid);
+ }
+ create_tag_object = (opt.sign || annotate || msg.given || msgfile);
+
if ((create_tag_object || force) && (cmdmode != 0))
usage_with_options(git_tag_usage, options);
@@ -550,7 +569,7 @@
if (create_tag_object) {
if (force_sign_annotate && !annotate)
opt.sign = 1;
- create_tag(&object, tag, &buf, &opt, &prev, &object);
+ create_tag(&object, object_ref, tag, &buf, &opt, &prev, &object);
}
transaction = ref_transaction_begin(&err);
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 8047880..a87a4bf 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -332,7 +332,7 @@
{
struct object *obj;
struct obj_buffer *obj_buffer;
- obj = lookup_object(the_repository, base->hash);
+ obj = lookup_object(the_repository, base);
if (!obj)
return 0;
obj_buffer = lookup_object_buffer(obj);
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 02ace60..49302d9 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -280,7 +280,7 @@
memcpy(ce->name, path, len);
ce->ce_flags = create_ce_flags(0);
ce->ce_namelen = len;
- fill_stat_cache_info(ce, st);
+ fill_stat_cache_info(&the_index, ce, st);
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
if (index_path(&the_index, &ce->oid, path, st,
@@ -597,11 +597,11 @@
struct object_id *ent, const char *path,
int namelen, int stage)
{
- unsigned mode;
+ unsigned short mode;
struct object_id oid;
struct cache_entry *ce;
- if (get_tree_entry(ent, path, &oid, &mode)) {
+ if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
if (which)
error("%s: not in %s branch.", path, which);
return NULL;
@@ -724,7 +724,7 @@
}
static int do_reupdate(int ac, const char **av,
- const char *prefix, int prefix_length)
+ const char *prefix)
{
/* Read HEAD and run update-index on paths that are
* merged and already different between index and HEAD.
@@ -848,14 +848,16 @@
return 0;
}
-static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result cacheinfo_callback(
+ struct parse_opt_ctx_t *ctx, const struct option *opt,
+ const char *arg, int unset)
{
struct object_id oid;
unsigned int mode;
const char *path;
BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
if (add_cacheinfo(mode, &oid, path, 0))
@@ -874,12 +876,14 @@
return 0;
}
-static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result stdin_cacheinfo_callback(
+ struct parse_opt_ctx_t *ctx, const struct option *opt,
+ const char *arg, int unset)
{
int *nul_term_line = opt->value;
BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
if (ctx->argc != 1)
return error("option '%s' must be the last argument", opt->long_name);
@@ -888,12 +892,14 @@
return 0;
}
-static int stdin_callback(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result stdin_callback(
+ struct parse_opt_ctx_t *ctx, const struct option *opt,
+ const char *arg, int unset)
{
int *read_from_stdin = opt->value;
BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
if (ctx->argc != 1)
return error("option '%s' must be the last argument", opt->long_name);
@@ -901,13 +907,15 @@
return 0;
}
-static int unresolve_callback(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result unresolve_callback(
+ struct parse_opt_ctx_t *ctx, const struct option *opt,
+ const char *arg, int unset)
{
int *has_errors = opt->value;
const char *prefix = startup_info->prefix;
BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
/* consume remaining arguments. */
*has_errors = do_unresolve(ctx->argc, ctx->argv,
@@ -920,18 +928,19 @@
return 0;
}
-static int reupdate_callback(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset)
+static enum parse_opt_result reupdate_callback(
+ struct parse_opt_ctx_t *ctx, const struct option *opt,
+ const char *arg, int unset)
{
int *has_errors = opt->value;
const char *prefix = startup_info->prefix;
BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
/* consume remaining arguments. */
setup_work_tree();
- *has_errors = do_reupdate(ctx->argc, ctx->argv,
- prefix, prefix ? strlen(prefix) : 0);
+ *has_errors = do_reupdate(ctx->argc, ctx->argv, prefix);
if (*has_errors)
active_cache_changed = 0;
@@ -957,6 +966,7 @@
struct parse_opt_ctx_t ctx;
strbuf_getline_fn getline_fn;
int parseopt_state = PARSE_OPT_UNKNOWN;
+ struct repository *r = the_repository;
struct option options[] = {
OPT_BIT('q', NULL, &refresh_args.flags,
N_("continue refresh even when index needs update"),
@@ -986,7 +996,8 @@
N_("add the specified entry to the index"),
PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
- (parse_opt_cb *) cacheinfo_callback},
+ NULL, 0,
+ cacheinfo_callback},
{OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+|-)x",
N_("override the executable bit of the listed files"),
PARSE_OPT_NONEG,
@@ -1012,19 +1023,19 @@
{OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
N_("read list of paths to be updated from standard input"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
- (parse_opt_cb *) stdin_callback},
+ NULL, 0, stdin_callback},
{OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &nul_term_line, NULL,
N_("add entries from standard input to the index"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
- (parse_opt_cb *) stdin_cacheinfo_callback},
+ NULL, 0, stdin_cacheinfo_callback},
{OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
N_("repopulate stages #2 and #3 for the listed paths"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
- (parse_opt_cb *) unresolve_callback},
+ NULL, 0, unresolve_callback},
{OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
N_("only update entries that differ from HEAD"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
- (parse_opt_cb *) reupdate_callback},
+ NULL, 0, reupdate_callback},
OPT_BIT(0, "ignore-missing", &refresh_args.flags,
N_("ignore files missing from worktree"),
REFRESH_IGNORE_MISSING),
@@ -1071,6 +1082,8 @@
if (entries < 0)
die("cache corrupted");
+ the_index.updated_skipworktree = 1;
+
/*
* Custom copy of parse_options() because we want to handle
* filename arguments as they come.
@@ -1168,11 +1181,12 @@
remove_split_index(&the_index);
}
+ prepare_repo_settings(r);
switch (untracked_cache) {
case UC_UNSPECIFIED:
break;
case UC_DISABLE:
- if (git_config_get_untracked_cache() == 1)
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
warning(_("core.untrackedCache is set to true; "
"remove or change it, if you really want to "
"disable the untracked cache"));
@@ -1184,7 +1198,7 @@
return !test_if_untracked_cache_is_supported();
case UC_ENABLE:
case UC_FORCE:
- if (git_config_get_untracked_cache() == 0)
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
warning(_("core.untrackedCache is set to false; "
"remove or change it, if you really want to "
"enable the untracked cache"));
diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 42dc4da..6da8fa2 100644
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -33,7 +33,7 @@
packet_trace_identity("upload-pack");
read_replace_refs = 0;
- argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, upload_pack_usage, 0);
if (argc != 1)
usage_with_options(upload_pack_usage, options);
diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index 7772c07..40c69a0 100644
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -12,7 +12,6 @@
#include "repository.h"
#include "commit.h"
#include "run-command.h"
-#include <signal.h>
#include "parse-options.h"
#include "gpg-interface.h"
@@ -21,15 +20,14 @@
NULL
};
-static int run_gpg_verify(const struct object_id *oid, const char *buf, unsigned long size, unsigned flags)
+static int run_gpg_verify(struct commit *commit, unsigned flags)
{
struct signature_check signature_check;
int ret;
memset(&signature_check, 0, sizeof(signature_check));
- ret = check_commit_signature(lookup_commit(the_repository, oid),
- &signature_check);
+ ret = check_commit_signature(commit, &signature_check);
print_signature_buffer(&signature_check, flags);
signature_check_clear(&signature_check);
@@ -38,26 +36,20 @@
static int verify_commit(const char *name, unsigned flags)
{
- enum object_type type;
struct object_id oid;
- char *buf;
- unsigned long size;
- int ret;
+ struct object *obj;
if (get_oid(name, &oid))
return error("commit '%s' not found.", name);
- buf = read_object_file(&oid, &type, &size);
- if (!buf)
+ obj = parse_object(the_repository, &oid);
+ if (!obj)
return error("%s: unable to read file.", name);
- if (type != OBJ_COMMIT)
+ if (obj->type != OBJ_COMMIT)
return error("%s: cannot verify a non-commit object of type %s.",
- name, type_name(type));
+ name, type_name(obj->type));
- ret = run_gpg_verify(&oid, buf, size, flags);
-
- free(buf);
- return ret;
+ return run_gpg_verify((struct commit *)obj, flags);
}
static int git_verify_commit_config(const char *var, const char *value, void *cb)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 6fa04b7..f45136a 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -10,7 +10,6 @@
#include "builtin.h"
#include "tag.h"
#include "run-command.h"
-#include <signal.h>
#include "parse-options.h"
#include "gpg-interface.h"
#include "ref-filter.h"
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 3f9907f..7f094f8 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -268,13 +268,14 @@
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
const char *name;
- struct stat st;
struct child_process cp = CHILD_PROCESS_INIT;
struct argv_array child_env = ARGV_ARRAY_INIT;
- int counter = 0, len, ret;
+ unsigned int counter = 0;
+ int len, ret;
struct strbuf symref = STRBUF_INIT;
struct commit *commit = NULL;
int is_branch = 0;
+ struct strbuf sb_name = STRBUF_INIT;
validate_worktree_add(path, opts);
@@ -290,13 +291,23 @@
die(_("invalid reference: %s"), refname);
name = worktree_basename(path, &len);
- git_path_buf(&sb_repo, "worktrees/%.*s", (int)(path + len - name), name);
+ strbuf_add(&sb, name, path + len - name);
+ sanitize_refname_component(sb.buf, &sb_name);
+ if (!sb_name.len)
+ BUG("How come '%s' becomes empty after sanitization?", sb.buf);
+ strbuf_reset(&sb);
+ name = sb_name.buf;
+ git_path_buf(&sb_repo, "worktrees/%s", name);
len = sb_repo.len;
if (safe_create_leading_directories_const(sb_repo.buf))
die_errno(_("could not create leading directories of '%s'"),
sb_repo.buf);
- while (!stat(sb_repo.buf, &st)) {
+
+ while (mkdir(sb_repo.buf, 0777)) {
counter++;
+ if ((errno != EEXIST) || !counter /* overflow */)
+ die_errno(_("could not create directory of '%s'"),
+ sb_repo.buf);
strbuf_setlen(&sb_repo, len);
strbuf_addf(&sb_repo, "%d", counter);
}
@@ -306,8 +317,6 @@
atexit(remove_junk);
sigchain_push_common(remove_junk_on_signal);
- if (mkdir(sb_repo.buf, 0777))
- die_errno(_("could not create directory of '%s'"), sb_repo.buf);
junk_git_dir = xstrdup(sb_repo.buf);
is_junk = 1;
@@ -402,6 +411,7 @@
cp.dir = path;
cp.env = env;
cp.argv = NULL;
+ cp.trace2_hook_name = "post-checkout";
argv_array_pushl(&cp.args, absolute_path(hook),
oid_to_hex(&null_oid),
oid_to_hex(&commit->object.oid),
@@ -415,6 +425,7 @@
strbuf_release(&symref);
strbuf_release(&sb_repo);
strbuf_release(&sb_git);
+ strbuf_release(&sb_name);
return ret;
}
@@ -869,7 +880,7 @@
original_path);
ret = xread(cp.out, buf, sizeof(buf));
if (ret)
- die(_("'%s' is dirty, use --force to delete it"),
+ die(_("'%s' contains modified or untracked files, use --force to delete it"),
original_path);
close(cp.out);
ret = finish_command(&cp);
diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index 3d46d22..45d6170 100644
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -16,16 +16,16 @@
NULL
};
-int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
+int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)
{
int flags = 0, ret;
- const char *prefix = NULL;
+ const char *tree_prefix = NULL;
struct object_id oid;
const char *me = "git-write-tree";
struct option write_tree_options[] = {
OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"),
WRITE_TREE_MISSING_OK),
- OPT_STRING(0, "prefix", &prefix, N_("<prefix>/"),
+ OPT_STRING(0, "prefix", &tree_prefix, N_("<prefix>/"),
N_("write tree object for a subdirectory <prefix>")),
{ OPTION_BIT, 0, "ignore-cache-tree", &flags, NULL,
N_("only useful for debugging"),
@@ -35,10 +35,10 @@
};
git_config(git_default_config, NULL);
- argc = parse_options(argc, argv, unused_prefix, write_tree_options,
+ argc = parse_options(argc, argv, cmd_prefix, write_tree_options,
write_tree_usage, 0);
- ret = write_cache_as_tree(&oid, flags, prefix);
+ ret = write_cache_as_tree(&oid, flags, tree_prefix);
switch (ret) {
case 0:
printf("%s\n", oid_to_hex(&oid));
@@ -50,7 +50,7 @@
die("%s: error building trees", me);
break;
case WRITE_TREE_PREFIX_ERROR:
- die("%s: prefix %s not found", me, prefix);
+ die("%s: prefix %s not found", me, tree_prefix);
break;
}
return ret;
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 39ee7d6..583aacb 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -197,7 +197,7 @@
git_hash_ctx ctx;
unsigned char obuf[16384];
unsigned header_len;
- struct hashfile_checkpoint checkpoint;
+ struct hashfile_checkpoint checkpoint = {0};
struct pack_idx_entry *idx = NULL;
seekback = lseek(fd, 0, SEEK_CUR);
diff --git a/bulk-checkin.h b/bulk-checkin.h
index f438f93..b26f3dc 100644
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -6,11 +6,11 @@
#include "cache.h"
-extern int index_bulk_checkin(struct object_id *oid,
- int fd, size_t size, enum object_type type,
- const char *path, unsigned flags);
+int index_bulk_checkin(struct object_id *oid,
+ int fd, size_t size, enum object_type type,
+ const char *path, unsigned flags);
-extern void plug_bulk_checkin(void);
-extern void unplug_bulk_checkin(void);
+void plug_bulk_checkin(void);
+void unplug_bulk_checkin(void);
#endif
diff --git a/bundle.c b/bundle.c
index b45666c..b5d21cd 100644
--- a/bundle.c
+++ b/bundle.c
@@ -142,6 +142,9 @@
int i, ret = 0, req_nr;
const char *message = _("Repository lacks these prerequisite commits:");
+ if (!r || !r->objects || !r->objects->odb)
+ return error(_("need a repository to verify a bundle"));
+
repo_init_revisions(r, &revs, NULL);
for (i = 0; i < p->nr; i++) {
struct ref_list_entry *e = p->list + i;
diff --git a/cache-tree.c b/cache-tree.c
index b13bfaf..0e5724f 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -5,9 +5,10 @@
#include "cache-tree.h"
#include "object-store.h"
#include "replace-object.h"
+#include "promisor-remote.h"
-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_CACHE_TREE
+#define DEBUG_CACHE_TREE 0
#endif
struct cache_tree *cache_tree(void)
@@ -111,7 +112,7 @@
int namelen;
struct cache_tree_sub *down;
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif
@@ -357,7 +358,7 @@
}
ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
- (repository_format_partial_clone &&
+ (has_promisor_remote() &&
ce_skip_worktree(ce));
if (is_null_oid(oid) ||
(!ce_missing_ok && !has_object_file(oid))) {
@@ -398,7 +399,7 @@
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one %o %.*s\n",
mode, entlen, path + baselen);
#endif
@@ -421,7 +422,7 @@
strbuf_release(&buffer);
it->entry_count = to_invalidate ? -1 : i - *skip_count;
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
it->entry_count, it->subtree_nr,
oid_to_hex(&it->oid));
@@ -462,7 +463,7 @@
strbuf_add(buffer, path, pathlen);
strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
-#if DEBUG
+#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
pathlen, path, it->entry_count, it->subtree_nr,
@@ -536,7 +537,7 @@
size -= rawsz;
}
-#if DEBUG
+#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
*buffer, it->entry_count, subtree_nr,
@@ -713,7 +714,7 @@
if (!info->prev)
return root;
our_parent = find_cache_tree_from_traversal(root, info->prev);
- return cache_tree_find(our_parent, info->name.path);
+ return cache_tree_find(our_parent, info->name);
}
int cache_tree_matches_traversal(struct cache_tree *root,
diff --git a/cache.h b/cache.h
index 27fe635..1e64b13 100644
--- a/cache.h
+++ b/cache.h
@@ -9,6 +9,7 @@
#include "gettext.h"
#include "convert.h"
#include "trace.h"
+#include "trace2.h"
#include "string-list.h"
#include "pack-revindex.h"
#include "hash.h"
@@ -42,30 +43,6 @@
int git_deflate(git_zstream *, int flush);
unsigned long git_deflate_bound(git_zstream *, unsigned long);
-/* The length in bytes and in hex digits of an object name (SHA-1 value). */
-#define GIT_SHA1_RAWSZ 20
-#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
-/* The block size of SHA-1. */
-#define GIT_SHA1_BLKSZ 64
-
-/* The length in bytes and in hex digits of an object name (SHA-256 value). */
-#define GIT_SHA256_RAWSZ 32
-#define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
-/* The block size of SHA-256. */
-#define GIT_SHA256_BLKSZ 64
-
-/* The length in byte and in hex digits of the largest possible hash value. */
-#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
-#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
-/* The largest possible block size for any supported hash. */
-#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
-
-struct object_id {
- unsigned char hash[GIT_MAX_RAWSZ];
-};
-
-#define the_hash_algo the_repository->hash_algo
-
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
#define DTYPE(de) ((de)->d_type)
#else
@@ -338,7 +315,10 @@
struct cache_time timestamp;
unsigned name_hash_initialized : 1,
initialized : 1,
- drop_cache_tree : 1;
+ drop_cache_tree : 1,
+ updated_workdir : 1,
+ updated_skipworktree : 1,
+ fsmonitor_has_run_once : 1;
struct hashmap name_hash;
struct hashmap dir_hash;
struct object_id oid;
@@ -349,10 +329,10 @@
};
/* Name hashing */
-extern int test_lazy_init_name_hash(struct index_state *istate, int try_threaded);
-extern void add_name_hash(struct index_state *istate, struct cache_entry *ce);
-extern void remove_name_hash(struct index_state *istate, struct cache_entry *ce);
-extern void free_name_hash(struct index_state *istate);
+int test_lazy_init_name_hash(struct index_state *istate, int try_threaded);
+void add_name_hash(struct index_state *istate, struct cache_entry *ce);
+void remove_name_hash(struct index_state *istate, struct cache_entry *ce);
+void free_name_hash(struct index_state *istate);
/* Cache entry creation and cleanup */
@@ -434,6 +414,7 @@
#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
#define chmod_cache_entry(ce, flip) chmod_index_entry(&the_index, (ce), (flip))
#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL)
+#define refresh_and_write_cache(refresh_flags, write_flags, gentle) repo_refresh_and_write_index(the_repository, (refresh_flags), (write_flags), (gentle), NULL, NULL, NULL)
#define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
#define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen))
@@ -542,7 +523,7 @@
*/
extern const char * const local_repo_env[];
-extern void setup_git_env(const char *git_dir);
+void setup_git_env(const char *git_dir);
/*
* Returns true iff we have a configured git repository (either via
@@ -551,29 +532,29 @@
int have_git_dir(void);
extern int is_bare_repository_cfg;
-extern int is_bare_repository(void);
-extern int is_inside_git_dir(void);
+int is_bare_repository(void);
+int is_inside_git_dir(void);
extern char *git_work_tree_cfg;
-extern int is_inside_work_tree(void);
-extern const char *get_git_dir(void);
-extern const char *get_git_common_dir(void);
-extern char *get_object_directory(void);
-extern char *get_index_file(void);
-extern char *get_graft_file(struct repository *r);
-extern void set_git_dir(const char *path);
-extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
-extern int get_common_dir(struct strbuf *sb, const char *gitdir);
-extern const char *get_git_namespace(void);
-extern const char *strip_namespace(const char *namespaced_ref);
-extern const char *get_super_prefix(void);
-extern const char *get_git_work_tree(void);
+int is_inside_work_tree(void);
+const char *get_git_dir(void);
+const char *get_git_common_dir(void);
+char *get_object_directory(void);
+char *get_index_file(void);
+char *get_graft_file(struct repository *r);
+void set_git_dir(const char *path);
+int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
+int get_common_dir(struct strbuf *sb, const char *gitdir);
+const char *get_git_namespace(void);
+const char *strip_namespace(const char *namespaced_ref);
+const char *get_super_prefix(void);
+const char *get_git_work_tree(void);
/*
* Return true if the given path is a git directory; note that this _just_
* looks at the directory itself. If you want to know whether "foo/.git"
* is a repository, you must feed that path, not just "foo".
*/
-extern int is_git_directory(const char *path);
+int is_git_directory(const char *path);
/*
* Return 1 if the given path is the root of a git repository or
@@ -585,7 +566,7 @@
* as we usually consider sub-repos precious, and would prefer to err on the
* side of not disrupting or deleting them.
*/
-extern int is_nonbare_repository_dir(struct strbuf *path);
+int is_nonbare_repository_dir(struct strbuf *path);
#define READ_GITFILE_ERR_STAT_FAILED 1
#define READ_GITFILE_ERR_NOT_A_FILE 2
@@ -595,17 +576,17 @@
#define READ_GITFILE_ERR_NO_PATH 6
#define READ_GITFILE_ERR_NOT_A_REPO 7
#define READ_GITFILE_ERR_TOO_LARGE 8
-extern void read_gitfile_error_die(int error_code, const char *path, const char *dir);
-extern const char *read_gitfile_gently(const char *path, int *return_error_code);
+void read_gitfile_error_die(int error_code, const char *path, const char *dir);
+const char *read_gitfile_gently(const char *path, int *return_error_code);
#define read_gitfile(path) read_gitfile_gently((path), NULL)
-extern const char *resolve_gitdir_gently(const char *suspect, int *return_error_code);
+const char *resolve_gitdir_gently(const char *suspect, int *return_error_code);
#define resolve_gitdir(path) resolve_gitdir_gently((path), NULL)
-extern void set_git_work_tree(const char *tree);
+void set_git_work_tree(const char *tree);
#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
-extern void setup_work_tree(void);
+void setup_work_tree(void);
/*
* Find the commondir and gitdir of the repository that contains the current
* working directory, without changing the working directory or other global
@@ -614,12 +595,12 @@
* both have the same result appended to the buffer. The return value is
* either 0 upon success and non-zero if no repository was found.
*/
-extern int discover_git_directory(struct strbuf *commondir,
- struct strbuf *gitdir);
-extern const char *setup_git_directory_gently(int *);
-extern const char *setup_git_directory(void);
-extern char *prefix_path(const char *prefix, int len, const char *path);
-extern char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path);
+int discover_git_directory(struct strbuf *commondir,
+ struct strbuf *gitdir);
+const char *setup_git_directory_gently(int *);
+const char *setup_git_directory(void);
+char *prefix_path(const char *prefix, int len, const char *path);
+char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path);
/*
* Concatenate "prefix" (if len is non-zero) and "path", with no
@@ -631,23 +612,23 @@
* The return value is always a newly allocated string (even if the
* prefix was empty).
*/
-extern char *prefix_filename(const char *prefix, const char *path);
+char *prefix_filename(const char *prefix, const char *path);
-extern int check_filename(const char *prefix, const char *name);
-extern void verify_filename(const char *prefix,
- const char *name,
- int diagnose_misspelt_rev);
-extern void verify_non_filename(const char *prefix, const char *name);
-extern int path_inside_repo(const char *prefix, const char *path);
+int check_filename(const char *prefix, const char *name);
+void verify_filename(const char *prefix,
+ const char *name,
+ int diagnose_misspelt_rev);
+void verify_non_filename(const char *prefix, const char *name);
+int path_inside_repo(const char *prefix, const char *path);
#define INIT_DB_QUIET 0x0001
#define INIT_DB_EXIST_OK 0x0002
-extern int init_db(const char *git_dir, const char *real_git_dir,
- const char *template_dir, unsigned int flags);
+int init_db(const char *git_dir, const char *real_git_dir,
+ const char *template_dir, unsigned int flags);
-extern void sanitize_stdfds(void);
-extern int daemonize(void);
+void sanitize_stdfds(void);
+int daemonize(void);
#define alloc_nr(x) (((x)+16)*3/2)
@@ -656,6 +637,9 @@
* at least 'nr' entries; the number of entries currently allocated
* is 'alloc', using the standard growing factor alloc_nr() macro.
*
+ * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some
+ * added niceties.
+ *
* DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'.
*/
#define ALLOC_GROW(x, nr, alloc) \
@@ -669,16 +653,35 @@
} \
} while (0)
+/*
+ * Similar to ALLOC_GROW but handles updating of the nr value and
+ * zeroing the bytes of the newly-grown array elements.
+ *
+ * DO NOT USE any expression with side-effect for any of the
+ * arguments.
+ */
+#define ALLOC_GROW_BY(x, nr, increase, alloc) \
+ do { \
+ if (increase) { \
+ size_t new_nr = nr + (increase); \
+ if (new_nr < nr) \
+ BUG("negative growth in ALLOC_GROW_BY"); \
+ ALLOC_GROW(x, new_nr, alloc); \
+ memset((x) + nr, 0, sizeof(*(x)) * (increase)); \
+ nr = new_nr; \
+ } \
+ } while (0)
+
/* Initialize and use the cache information */
struct lock_file;
-extern void preload_index(struct index_state *index,
- const struct pathspec *pathspec,
- unsigned int refresh_flags);
-extern int do_read_index(struct index_state *istate, const char *path,
- int must_exist); /* for testting only! */
-extern int read_index_from(struct index_state *, const char *path,
- const char *gitdir);
-extern int is_index_unborn(struct index_state *);
+void preload_index(struct index_state *index,
+ const struct pathspec *pathspec,
+ unsigned int refresh_flags);
+int do_read_index(struct index_state *istate, const char *path,
+ int must_exist); /* for testting only! */
+int read_index_from(struct index_state *, const char *path,
+ const char *gitdir);
+int is_index_unborn(struct index_state *);
/* For use with `write_locked_index()`. */
#define COMMIT_LOCK (1 << 0)
@@ -703,11 +706,11 @@
* If `SKIP_IF_UNCHANGED` is given and the index is unchanged, nothing
* is written (and the lock is rolled back if `COMMIT_LOCK` is given).
*/
-extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags);
+int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags);
-extern int discard_index(struct index_state *);
-extern void move_index_extensions(struct index_state *dst, struct index_state *src);
-extern int unmerged_index(const struct index_state *);
+int discard_index(struct index_state *);
+void move_index_extensions(struct index_state *dst, struct index_state *src);
+int unmerged_index(const struct index_state *);
/**
* Returns 1 if istate differs from tree, 0 otherwise. If tree is NULL,
@@ -716,15 +719,15 @@
* provided, the space-separated list of files that differ will be appended
* to it.
*/
-extern int repo_index_has_changes(struct repository *repo,
- struct tree *tree,
- struct strbuf *sb);
+int repo_index_has_changes(struct repository *repo,
+ struct tree *tree,
+ struct strbuf *sb);
-extern int verify_path(const char *path, unsigned mode);
-extern int strcmp_offset(const char *s1, const char *s2, size_t *first_change);
-extern int index_dir_exists(struct index_state *istate, const char *name, int namelen);
-extern void adjust_dirname_case(struct index_state *istate, char *name);
-extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase);
+int verify_path(const char *path, unsigned mode);
+int strcmp_offset(const char *s1, const char *s2, size_t *first_change);
+int index_dir_exists(struct index_state *istate, const char *name, int namelen);
+void adjust_dirname_case(struct index_state *istate, char *name);
+struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase);
/*
* Searches for an entry defined by name and namelen in the given index.
@@ -743,7 +746,7 @@
* index_name_pos(&index, "f", 1) -> -3
* index_name_pos(&index, "g", 1) -> -5
*/
-extern int index_name_pos(const struct index_state *, const char *name, int namelen);
+int index_name_pos(const struct index_state *, const char *name, int namelen);
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
@@ -752,14 +755,14 @@
#define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */
#define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */
#define ADD_CACHE_RENORMALIZE 64 /* Pass along HASH_RENORMALIZE */
-extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
-extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
+int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
+void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
/* Remove entry, return true if there are more entries to go. */
-extern int remove_index_entry_at(struct index_state *, int pos);
+int remove_index_entry_at(struct index_state *, int pos);
-extern void remove_marked_cache_entries(struct index_state *istate);
-extern int remove_file_from_index(struct index_state *, const char *path);
+void remove_marked_cache_entries(struct index_state *istate, int invalidate);
+int remove_file_from_index(struct index_state *, const char *path);
#define ADD_CACHE_VERBOSE 1
#define ADD_CACHE_PRETEND 2
#define ADD_CACHE_IGNORE_ERRORS 4
@@ -774,14 +777,14 @@
* the latter will do necessary lstat(2) internally before
* calling the former.
*/
-extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
-extern int add_file_to_index(struct index_state *, const char *path, int flags);
+int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
+int add_file_to_index(struct index_state *, const char *path, int flags);
-extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
-extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
-extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
-extern int index_name_is_other(const struct index_state *, const char *, int);
-extern void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *);
+int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
+int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
+void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
+int index_name_is_other(const struct index_state *, const char *, int);
+void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *);
/* do stat comparison even if CE_VALID is true */
#define CE_MATCH_IGNORE_VALID 01
@@ -795,22 +798,22 @@
#define CE_MATCH_REFRESH 0x10
/* don't refresh_fsmonitor state or do stat comparison even if CE_FSMONITOR_VALID is true */
#define CE_MATCH_IGNORE_FSMONITOR 0X20
-extern int is_racy_timestamp(const struct index_state *istate,
- const struct cache_entry *ce);
-extern int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
-extern int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
+int is_racy_timestamp(const struct index_state *istate,
+ const struct cache_entry *ce);
+int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
+int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
#define HASH_WRITE_OBJECT 1
#define HASH_FORMAT_CHECK 2
#define HASH_RENORMALIZE 4
-extern int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
-extern int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);
+int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
+int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);
/*
* Record to sd the data from st that we use to check whether a file
* might have changed.
*/
-extern void fill_stat_data(struct stat_data *sd, struct stat *st);
+void fill_stat_data(struct stat_data *sd, struct stat *st);
/*
* Return 0 if st is consistent with a file not having been changed
@@ -818,11 +821,11 @@
* combination of MTIME_CHANGED, CTIME_CHANGED, OWNER_CHANGED,
* INODE_CHANGED, and DATA_CHANGED.
*/
-extern int match_stat_data(const struct stat_data *sd, struct stat *st);
-extern int match_stat_data_racy(const struct index_state *istate,
- const struct stat_data *sd, struct stat *st);
+int match_stat_data(const struct stat_data *sd, struct stat *st);
+int match_stat_data_racy(const struct index_state *istate,
+ const struct stat_data *sd, struct stat *st);
-extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
+void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
#define REFRESH_REALLY 0x0001 /* ignore_valid */
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
@@ -831,10 +834,27 @@
#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
#define REFRESH_PROGRESS 0x0040 /* show progress bar if stderr is tty */
-extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
-extern struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int);
+int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
+/*
+ * Refresh the index and write it to disk.
+ *
+ * 'refresh_flags' is passed directly to 'refresh_index()', while
+ * 'COMMIT_LOCK | write_flags' is passed to 'write_locked_index()', so
+ * the lockfile is always either committed or rolled back.
+ *
+ * If 'gentle' is passed, errors locking the index are ignored.
+ *
+ * Return 1 if refreshing the index returns an error, -1 if writing
+ * the index to disk fails, 0 on success.
+ *
+ * Note that if refreshing the index returns an error, we still write
+ * out the index (unless locking fails).
+ */
+int repo_refresh_and_write_index(struct repository*, unsigned int refresh_flags, unsigned int write_flags, int gentle, const struct pathspec *, char *seen, const char *header_msg);
-extern void set_alternate_index_output(const char *);
+struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int);
+
+void set_alternate_index_output(const char *);
extern int verify_index_checksum;
extern int verify_ce_order;
@@ -957,10 +977,12 @@
#define GIT_REPO_VERSION 0
#define GIT_REPO_VERSION_READ 1
extern int repository_format_precious_objects;
-extern char *repository_format_partial_clone;
-extern const char *core_partial_clone_filter_default;
extern int repository_format_worktree_config;
+/*
+ * You _have_ to initialize a `struct repository_format` using
+ * `= REPOSITORY_FORMAT_INIT` before calling `read_repository_format()`.
+ */
struct repository_format {
int version;
int precious_objects;
@@ -973,14 +995,35 @@
};
/*
+ * Always use this to initialize a `struct repository_format`
+ * to a well-defined, default state before calling
+ * `read_repository()`.
+ */
+#define REPOSITORY_FORMAT_INIT \
+{ \
+ .version = -1, \
+ .is_bare = -1, \
+ .hash_algo = GIT_HASH_SHA1, \
+ .unknown_extensions = STRING_LIST_INIT_DUP, \
+}
+
+/*
* Read the repository format characteristics from the config file "path" into
- * "format" struct. Returns the numeric version. On error, -1 is returned,
- * format->version is set to -1, and all other fields in the struct are
- * undefined.
+ * "format" struct. Returns the numeric version. On error, or if no version is
+ * found in the configuration, -1 is returned, format->version is set to -1,
+ * and all other fields in the struct are set to the default configuration
+ * (REPOSITORY_FORMAT_INIT). Always initialize the struct using
+ * REPOSITORY_FORMAT_INIT before calling this function.
*/
int read_repository_format(struct repository_format *format, const char *path);
/*
+ * Free the memory held onto by `format`, but not the struct itself.
+ * (No need to use this after `read_repository_format()` fails.)
+ */
+void clear_repository_format(struct repository_format *format);
+
+/*
* Verify that the repository described by repository_format is something we
* can read. If it is, return 0. Otherwise, return -1, and "err" will describe
* any errors encountered.
@@ -994,7 +1037,7 @@
* set_git_dir() before calling this, and use it only for "are we in a valid
* repo?".
*/
-extern void check_repository_format(void);
+void check_repository_format(void);
#define MTIME_CHANGED 0x0001
#define CTIME_CHANGED 0x0002
@@ -1019,8 +1062,10 @@
* Note that while this version avoids the static buffer, it is not fully
* reentrant, as it calls into other non-reentrant git code.
*/
-extern const char *find_unique_abbrev(const struct object_id *oid, int len);
-extern int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len);
+const char *repo_find_unique_abbrev(struct repository *r, const struct object_id *oid, int len);
+#define find_unique_abbrev(oid, len) repo_find_unique_abbrev(the_repository, oid, len)
+int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len);
+#define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len)
extern const unsigned char null_sha1[GIT_MAX_RAWSZ];
extern const struct object_id null_oid;
@@ -1216,7 +1261,7 @@
int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
int mkdir_in_gitdir(const char *path);
-extern char *expand_user_path(const char *path, int real_home);
+char *expand_user_path(const char *path, int real_home);
const char *enter_repo(const char *path, int strict);
static inline int is_absolute_path(const char *path)
{
@@ -1260,26 +1305,26 @@
* "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise
* "$HOME/.config/git/$filename". Return NULL upon error.
*/
-extern char *xdg_config_home(const char *filename);
+char *xdg_config_home(const char *filename);
/**
* Return a newly allocated string with the evaluation of
* "$XDG_CACHE_HOME/git/$filename" if $XDG_CACHE_HOME is non-empty, otherwise
* "$HOME/.cache/git/$filename". Return NULL upon error.
*/
-extern char *xdg_cache_home(const char *filename);
+char *xdg_cache_home(const char *filename);
-extern int git_open_cloexec(const char *name, int flags);
+int git_open_cloexec(const char *name, int flags);
#define git_open(name) git_open_cloexec(name, O_RDONLY)
-extern int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
-extern int parse_loose_header(const char *hdr, unsigned long *sizep);
+int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
+int parse_loose_header(const char *hdr, unsigned long *sizep);
-extern int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type);
+int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type);
-extern int finalize_object_file(const char *tmpfile, const char *filename);
+int finalize_object_file(const char *tmpfile, const char *filename);
/* Helper to check and "touch" a file */
-extern int check_and_freshen_file(const char *fn, int freshen);
+int check_and_freshen_file(const char *fn, int freshen);
extern const signed char hexval_table[256];
static inline unsigned int hexval(unsigned char c)
@@ -1305,7 +1350,7 @@
#define FALLBACK_DEFAULT_ABBREV 7
struct object_context {
- unsigned mode;
+ unsigned short mode;
/*
* symlink_path is only used by get_tree_entry_follow_symlinks,
* and only for symlinks that point outside the repository.
@@ -1352,21 +1397,34 @@
*/
};
-extern int get_oid(const char *str, struct object_id *oid);
-extern int get_oid_commit(const char *str, struct object_id *oid);
-extern int get_oid_committish(const char *str, struct object_id *oid);
-extern int get_oid_tree(const char *str, struct object_id *oid);
-extern int get_oid_treeish(const char *str, struct object_id *oid);
-extern int get_oid_blob(const char *str, struct object_id *oid);
-extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
-extern enum get_oid_result get_oid_with_context(struct repository *repo, const char *str,
- unsigned flags, struct object_id *oid,
- struct object_context *oc);
+int repo_get_oid(struct repository *r, const char *str, struct object_id *oid);
+int get_oidf(struct object_id *oid, const char *fmt, ...);
+int repo_get_oid_commit(struct repository *r, const char *str, struct object_id *oid);
+int repo_get_oid_committish(struct repository *r, const char *str, struct object_id *oid);
+int repo_get_oid_tree(struct repository *r, const char *str, struct object_id *oid);
+int repo_get_oid_treeish(struct repository *r, const char *str, struct object_id *oid);
+int repo_get_oid_blob(struct repository *r, const char *str, struct object_id *oid);
+int repo_get_oid_mb(struct repository *r, const char *str, struct object_id *oid);
+void maybe_die_on_misspelt_object_name(struct repository *repo,
+ const char *name,
+ const char *prefix);
+enum get_oid_result get_oid_with_context(struct repository *repo, const char *str,
+ unsigned flags, struct object_id *oid,
+ struct object_context *oc);
+
+#define get_oid(str, oid) repo_get_oid(the_repository, str, oid)
+#define get_oid_commit(str, oid) repo_get_oid_commit(the_repository, str, oid)
+#define get_oid_committish(str, oid) repo_get_oid_committish(the_repository, str, oid)
+#define get_oid_tree(str, oid) repo_get_oid_tree(the_repository, str, oid)
+#define get_oid_treeish(str, oid) repo_get_oid_treeish(the_repository, str, oid)
+#define get_oid_blob(str, oid) repo_get_oid_blob(the_repository, str, oid)
+#define get_oid_mb(str, oid) repo_get_oid_mb(the_repository, str, oid)
typedef int each_abbrev_fn(const struct object_id *oid, void *);
-extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
+int repo_for_each_abbrev(struct repository *r, const char *prefix, each_abbrev_fn, void *);
+#define for_each_abbrev(prefix, fn, data) repo_for_each_abbrev(the_repository, prefix, fn, data)
-extern int set_disambiguate_hint_config(const char *var, const char *value);
+int set_disambiguate_hint_config(const char *var, const char *value);
/*
* Try to read a SHA1 in hexadecimal format from the 40 characters
@@ -1375,15 +1433,15 @@
* input, so it is safe to pass this function an arbitrary
* null-terminated string.
*/
-extern int get_sha1_hex(const char *hex, unsigned char *sha1);
-extern int get_oid_hex(const char *hex, struct object_id *sha1);
+int get_sha1_hex(const char *hex, unsigned char *sha1);
+int get_oid_hex(const char *hex, struct object_id *sha1);
/*
* Read `len` pairs of hexadecimal digits from `hex` and write the
* values to `binary` as `len` bytes. Return 0 on success, or -1 if
* the input does not consist of hex digits).
*/
-extern int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
+int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
/*
* Convert a binary hash to its hex equivalent. The `_r` variant is reentrant,
@@ -1411,7 +1469,7 @@
* other invalid character. end is only updated on success; otherwise, it is
* unmodified.
*/
-extern int parse_oid_hex(const char *hex, struct object_id *oid, const char **end);
+int parse_oid_hex(const char *hex, struct object_id *oid, const char **end);
/*
* This reads short-hand syntax that not only evaluates to a commit
@@ -1442,24 +1500,31 @@
#define INTERPRET_BRANCH_LOCAL (1<<0)
#define INTERPRET_BRANCH_REMOTE (1<<1)
#define INTERPRET_BRANCH_HEAD (1<<2)
-extern int interpret_branch_name(const char *str, int len, struct strbuf *,
- unsigned allowed);
-extern int get_oid_mb(const char *str, struct object_id *oid);
+int repo_interpret_branch_name(struct repository *r,
+ const char *str, int len,
+ struct strbuf *buf,
+ unsigned allowed);
+#define interpret_branch_name(str, len, buf, allowed) \
+ repo_interpret_branch_name(the_repository, str, len, buf, allowed)
-extern int validate_headref(const char *ref);
+int validate_headref(const char *ref);
-extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
-extern int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
-extern int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
-extern int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
+int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
+int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
+int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
+int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
-extern void *read_object_with_reference(const struct object_id *oid,
- const char *required_type,
- unsigned long *size,
- struct object_id *oid_ret);
+void *read_object_with_reference(struct repository *r,
+ const struct object_id *oid,
+ const char *required_type,
+ unsigned long *size,
+ struct object_id *oid_ret);
-extern struct object *peel_to_type(const char *name, int namelen,
- struct object *o, enum object_type);
+struct object *repo_peel_to_type(struct repository *r,
+ const char *name, int namelen,
+ struct object *o, enum object_type);
+#define peel_to_type(name, namelen, obj, type) \
+ repo_peel_to_type(the_repository, name, namelen, obj, type)
enum date_mode_type {
DATE_NORMAL = 0,
@@ -1489,8 +1554,7 @@
struct date_mode *date_mode_from_type(enum date_mode_type type);
const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
-void show_date_relative(timestamp_t time, const struct timeval *now,
- struct strbuf *timebuf);
+void show_date_relative(timestamp_t time, struct strbuf *timebuf);
void show_date_human(timestamp_t time, int tz, const struct timeval *now,
struct strbuf *timebuf);
int parse_date(const char *date, struct strbuf *out);
@@ -1499,25 +1563,38 @@
void datestamp(struct strbuf *out);
#define approxidate(s) approxidate_careful((s), NULL)
timestamp_t approxidate_careful(const char *, int *);
-timestamp_t approxidate_relative(const char *date, const struct timeval *now);
+timestamp_t approxidate_relative(const char *date);
void parse_date_format(const char *format, struct date_mode *mode);
int date_overflows(timestamp_t date);
#define IDENT_STRICT 1
#define IDENT_NO_DATE 2
#define IDENT_NO_NAME 4
-extern const char *git_author_info(int);
-extern const char *git_committer_info(int);
-extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
-extern const char *fmt_name(const char *name, const char *email);
-extern const char *ident_default_name(void);
-extern const char *ident_default_email(void);
-extern const char *git_editor(void);
-extern const char *git_sequence_editor(void);
-extern const char *git_pager(int stdout_is_tty);
-extern int is_terminal_dumb(void);
-extern int git_ident_config(const char *, const char *, void *);
-extern void reset_ident_date(void);
+
+enum want_ident {
+ WANT_BLANK_IDENT,
+ WANT_AUTHOR_IDENT,
+ WANT_COMMITTER_IDENT
+};
+
+const char *git_author_info(int);
+const char *git_committer_info(int);
+const char *fmt_ident(const char *name, const char *email,
+ enum want_ident whose_ident,
+ const char *date_str, int);
+const char *fmt_name(enum want_ident);
+const char *ident_default_name(void);
+const char *ident_default_email(void);
+const char *git_editor(void);
+const char *git_sequence_editor(void);
+const char *git_pager(int stdout_is_tty);
+int is_terminal_dumb(void);
+int git_ident_config(const char *, const char *, void *);
+/*
+ * Prepare an ident to fall back on if the user didn't configure it.
+ */
+void prepare_fallback_ident(const char *name, const char *email);
+void reset_ident_date(void);
struct ident_split {
const char *name_begin;
@@ -1533,7 +1610,7 @@
* Signals an success with 0, but time part of the result may be NULL
* if the input lacks timestamp and zone
*/
-extern int split_ident_line(struct ident_split *, const char *, int);
+int split_ident_line(struct ident_split *, const char *, int);
/*
* Like show_date, but pull the timestamp and tz parameters from
@@ -1550,7 +1627,7 @@
* Because there are two fields, we must choose one as the primary key; we
* currently arbitrarily pick the email.
*/
-extern int ident_cmp(const struct ident_split *, const struct ident_split *);
+int ident_cmp(const struct ident_split *, const struct ident_split *);
struct checkout {
struct index_state *istate;
@@ -1566,9 +1643,14 @@
#define CHECKOUT_INIT { NULL, "" }
#define TEMPORARY_FILENAME_LENGTH 25
-extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath, int *nr_checkouts);
-extern void enable_delayed_checkout(struct checkout *state);
-extern int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);
+int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath, int *nr_checkouts);
+void enable_delayed_checkout(struct checkout *state);
+int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);
+/*
+ * Unlink the last component and schedule the leading directories for
+ * removal, such that empty directories get removed.
+ */
+void unlink_entry(const struct cache_entry *ce);
struct cache_def {
struct strbuf path;
@@ -1582,12 +1664,12 @@
strbuf_release(&cache->path);
}
-extern int has_symlink_leading_path(const char *name, int len);
-extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
-extern int check_leading_path(const char *name, int len);
-extern int has_dirs_only_path(const char *name, int len, int prefix_len);
-extern void schedule_dir_for_removal(const char *name, int len);
-extern void remove_scheduled_dirs(void);
+int has_symlink_leading_path(const char *name, int len);
+int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
+int check_leading_path(const char *name, int len);
+int has_dirs_only_path(const char *name, int len, int prefix_len);
+void schedule_dir_for_removal(const char *name, int len);
+void remove_scheduled_dirs(void);
struct pack_window {
struct pack_window *next;
@@ -1609,14 +1691,14 @@
* usual "XXXXXX" trailer, and the resulting filename is written into the
* "template" buffer. Returns the open descriptor.
*/
-extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
+int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
/*
* Create a pack .keep file named "name" (which should generally be the output
* of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
* error.
*/
-extern int odb_pack_keep(const char *name);
+int odb_pack_keep(const char *name);
/*
* Set this to 0 to prevent oid_object_info_extended() from fetching missing
@@ -1627,10 +1709,10 @@
extern int fetch_if_missing;
/* Dumb servers support */
-extern int update_server_info(int);
+int update_server_info(int);
-extern const char *get_log_output_encoding(void);
-extern const char *get_commit_output_encoding(void);
+const char *get_log_output_encoding(void);
+const char *get_commit_output_encoding(void);
/*
* This is a hack for test programs like test-dump-untracked-cache to
@@ -1639,8 +1721,8 @@
*/
extern int ignore_untracked_cache_config;
-extern int committer_ident_sufficiently_given(void);
-extern int author_ident_sufficiently_given(void);
+int committer_ident_sufficiently_given(void);
+int author_ident_sufficiently_given(void);
extern const char *git_commit_encoding;
extern const char *git_log_output_encoding;
@@ -1648,22 +1730,22 @@
extern const char *git_mailmap_blob;
/* IO helper functions */
-extern void maybe_flush_or_die(FILE *, const char *);
+void maybe_flush_or_die(FILE *, const char *);
__attribute__((format (printf, 2, 3)))
-extern void fprintf_or_die(FILE *, const char *fmt, ...);
+void fprintf_or_die(FILE *, const char *fmt, ...);
#define COPY_READ_ERROR (-2)
#define COPY_WRITE_ERROR (-3)
-extern int copy_fd(int ifd, int ofd);
-extern int copy_file(const char *dst, const char *src, int mode);
-extern int copy_file_with_time(const char *dst, const char *src, int mode);
+int copy_fd(int ifd, int ofd);
+int copy_file(const char *dst, const char *src, int mode);
+int copy_file_with_time(const char *dst, const char *src, int mode);
-extern void write_or_die(int fd, const void *buf, size_t count);
-extern void fsync_or_die(int fd, const char *);
+void write_or_die(int fd, const void *buf, size_t count);
+void fsync_or_die(int fd, const char *);
-extern ssize_t read_in_full(int fd, void *buf, size_t count);
-extern ssize_t write_in_full(int fd, const void *buf, size_t count);
-extern ssize_t pread_in_full(int fd, void *buf, size_t count, off_t offset);
+ssize_t read_in_full(int fd, void *buf, size_t count);
+ssize_t write_in_full(int fd, const void *buf, size_t count);
+ssize_t pread_in_full(int fd, void *buf, size_t count, off_t offset);
static inline ssize_t write_str_in_full(int fd, const char *str)
{
@@ -1674,7 +1756,7 @@
* Open (and truncate) the file at path, write the contents of buf to it,
* and close it. Dies if any errors are encountered.
*/
-extern void write_file_buf(const char *path, const char *buf, size_t len);
+void write_file_buf(const char *path, const char *buf, size_t len);
/**
* Like write_file_buf(), but format the contents into a buffer first.
@@ -1684,16 +1766,17 @@
* write_file(path, "counter: %d", ctr);
*/
__attribute__((format (printf, 2, 3)))
-extern void write_file(const char *path, const char *fmt, ...);
+void write_file(const char *path, const char *fmt, ...);
/* pager.c */
-extern void setup_pager(void);
-extern int pager_in_use(void);
+void setup_pager(void);
+int pager_in_use(void);
extern int pager_use_color;
-extern int term_columns(void);
-extern int decimal_width(uintmax_t);
-extern int check_pager_config(const char *cmd);
-extern void prepare_pager_args(struct child_process *, const char *pager);
+int term_columns(void);
+void term_clear_line(void);
+int decimal_width(uintmax_t);
+int check_pager_config(const char *cmd);
+void prepare_pager_args(struct child_process *, const char *pager);
extern const char *editor_program;
extern const char *askpass_program;
@@ -1717,8 +1800,8 @@
extern int diff_auto_refresh_index;
/* match-trees.c */
-void shift_tree(const struct object_id *, const struct object_id *, struct object_id *, int);
-void shift_tree_by(const struct object_id *, const struct object_id *, struct object_id *, const char *);
+void shift_tree(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, int);
+void shift_tree_by(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, const char *);
/*
* whitespace rules.
@@ -1737,13 +1820,13 @@
/* All WS_* -- when extended, adapt diff.c emit_symbol */
#define WS_RULE_MASK 07777
extern unsigned whitespace_rule_cfg;
-extern unsigned whitespace_rule(struct index_state *, const char *);
-extern unsigned parse_whitespace_rule(const char *);
-extern unsigned ws_check(const char *line, int len, unsigned ws_rule);
-extern void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
-extern char *whitespace_error_string(unsigned ws);
-extern void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *);
-extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
+unsigned whitespace_rule(struct index_state *, const char *);
+unsigned parse_whitespace_rule(const char *);
+unsigned ws_check(const char *line, int len, unsigned ws_rule);
+void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
+char *whitespace_error_string(unsigned ws);
+void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *);
+int ws_blank_line(const char *line, int len, unsigned ws_rule);
#define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK)
/* ls-files */
@@ -1813,9 +1896,9 @@
* Should we print an ellipsis after an abbreviated SHA-1 value
* when doing diff-raw output or indicating a detached HEAD?
*/
-extern int print_sha1_ellipsis(void);
+int print_sha1_ellipsis(void);
/* Return 1 if the file is empty or does not exists, 0 otherwise. */
-extern int is_empty_or_missing_file(const char *filename);
+int is_empty_or_missing_file(const char *filename);
#endif /* CACHE_H */
diff --git a/check-racy.c b/check-racy.c
deleted file mode 100644
index 24b6542..0000000
--- a/check-racy.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "cache.h"
-
-int main(int ac, char **av)
-{
- int i;
- int dirty, clean, racy;
-
- dirty = clean = racy = 0;
- read_cache();
- for (i = 0; i < active_nr; i++) {
- struct cache_entry *ce = active_cache[i];
- struct stat st;
-
- if (lstat(ce->name, &st)) {
- error_errno("lstat(%s)", ce->name);
- continue;
- }
-
- if (ce_match_stat(ce, &st, 0))
- dirty++;
- else if (ce_match_stat(ce, &st, CE_MATCH_RACY_IS_DIRTY))
- racy++;
- else
- clean++;
- }
- printf("dirty %d, clean %d, racy %d\n", dirty, clean, racy);
- return 0;
-}
diff --git a/checkout.h b/checkout.h
index 6b20733..1152133 100644
--- a/checkout.h
+++ b/checkout.h
@@ -8,8 +8,8 @@
* tracking branch. Return the name of the remote if such a branch
* exists, NULL otherwise.
*/
-extern const char *unique_tracking_name(const char *name,
- struct object_id *oid,
- int *dwim_remotes_matched);
+const char *unique_tracking_name(const char *name,
+ struct object_id *oid,
+ int *dwim_remotes_matched);
#endif /* CHECKOUT_H */
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index d64667f..a76f348 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -12,7 +12,7 @@
linux-clang|linux-gcc)
sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
sudo apt-get -q update
- sudo apt-get -q -y install language-pack-is git-svn apache2
+ sudo apt-get -q -y install language-pack-is libsvn-perl apache2
case "$jobname" in
linux-gcc)
sudo apt-get -q -y install gcc-8
@@ -34,7 +34,7 @@
popd
;;
osx-clang|osx-gcc)
- brew update >/dev/null
+ export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
# Uncomment this if you want to run perf tests:
# brew install gnu-time
test -z "$BREW_INSTALL_PACKAGES" ||
@@ -53,7 +53,10 @@
;;
Documentation)
sudo apt-get -q update
- sudo apt-get -q -y install asciidoc xmlto
+ sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
+
+ test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
+ gem install --version 1.5.8 asciidoctor
;;
esac
diff --git a/ci/lib.sh b/ci/lib.sh
index 16f4ecb..29dc740 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -74,6 +74,9 @@
}
}
+# Clear MAKEFLAGS that may come from the outside world.
+export MAKEFLAGS=
+
# Set 'exit on error' for all CI scripts to let the caller know that
# something went wrong.
# Set tracing executed commands, primarily setting environment variables
@@ -101,7 +104,7 @@
BREW_INSTALL_PACKAGES="git-lfs gettext"
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --immediate"
- export MAKEFLAGS="--jobs=2"
+ MAKEFLAGS="$MAKEFLAGS --jobs=2"
elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
then
CI_TYPE=azure-pipelines
@@ -126,7 +129,7 @@
BREW_INSTALL_PACKAGES=gcc@8
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
- export MAKEFLAGS="--jobs=10"
+ MAKEFLAGS="$MAKEFLAGS --jobs=10"
test windows_nt != "$CI_OS_NAME" ||
GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
else
@@ -157,11 +160,13 @@
export CC=gcc-8
fi
- export GIT_TEST_HTTPD=YesPlease
+ export GIT_TEST_HTTPD=true
# The Linux build installs the defined dependency versions below.
- # The OS X build installs the latest available versions. Keep that
- # in mind when you encounter a broken OS X build!
+ # The OS X build installs much more recent versions, whichever
+ # were recorded in the Homebrew database upon creating the OS X
+ # image.
+ # Keep that in mind when you encounter a broken OS X build!
export LINUX_P4_VERSION="16.2"
export LINUX_GIT_LFS_VERSION="1.5.2"
@@ -181,8 +186,8 @@
export GIT_SKIP_TESTS="t9810 t9816"
;;
GIT_TEST_GETTEXT_POISON)
- export GIT_TEST_GETTEXT_POISON=YesPlease
+ export GIT_TEST_GETTEXT_POISON=true
;;
esac
-export MAKEFLAGS="CC=${CC:-cc}"
+MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index cdd2913..ff0ef7f 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -11,9 +11,9 @@
esac
make
-make test
-if test "$jobname" = "linux-gcc"
-then
+case "$jobname" in
+linux-gcc)
+ make test
export GIT_TEST_SPLIT_INDEX=yes
export GIT_TEST_FULL_IN_PACK_ARRAY=true
export GIT_TEST_OE_SIZE=10
@@ -21,7 +21,16 @@
export GIT_TEST_COMMIT_GRAPH=1
export GIT_TEST_MULTI_PACK_INDEX=1
make test
-fi
+ ;;
+linux-gcc-4.8)
+ # Don't run the tests; we only care about whether Git can be
+ # built with GCC 4.8, as it errors out on some undesired (C99)
+ # constructs that newer compilers seem to quietly accept.
+ ;;
+*)
+ make test
+ ;;
+esac
check_unignored_build_artifacts
diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh
deleted file mode 100755
index a73a4ec..0000000
--- a/ci/run-windows-build.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-#
-# Script to trigger the Git for Windows build and test run.
-# Set the $GFW_CI_TOKEN as environment variable.
-# Pass the branch (only branches on https://github.com/git/git are
-# supported) and a commit hash.
-#
-
-. ${0%/*}/lib.sh
-
-test $# -ne 2 && echo "Unexpected number of parameters" && exit 1
-test -z "$GFW_CI_TOKEN" && echo "GFW_CI_TOKEN not defined" && exit
-
-BRANCH=$1
-COMMIT=$2
-
-gfwci () {
- local CURL_ERROR_CODE HTTP_CODE
- CONTENT_FILE=$(mktemp -t "git-windows-ci-XXXXXX")
- while test -z $HTTP_CODE
- do
- HTTP_CODE=$(curl \
- -H "Authentication: Bearer $GFW_CI_TOKEN" \
- --silent --retry 5 --write-out '%{HTTP_CODE}' \
- --output >(sed "$(printf '1s/^\xef\xbb\xbf//')" >$CONTENT_FILE) \
- "https://git-for-windows-ci.azurewebsites.net/api/TestNow?$1" \
- )
- CURL_ERROR_CODE=$?
- # The GfW CI web app sometimes returns HTTP errors of
- # "502 bad gateway" or "503 service unavailable".
- # We also need to check the HTTP content because the GfW web
- # app seems to pass through (error) results from other Azure
- # calls with HTTP code 200.
- # Wait a little and retry if we detect this error. More info:
- # https://docs.microsoft.com/en-in/azure/app-service-web/app-service-web-troubleshoot-http-502-http-503
- if test $HTTP_CODE -eq 502 ||
- test $HTTP_CODE -eq 503 ||
- grep "502 - Web server received an invalid response" $CONTENT_FILE >/dev/null
- then
- sleep 10
- HTTP_CODE=
- fi
- done
- cat $CONTENT_FILE
- rm $CONTENT_FILE
- if test $CURL_ERROR_CODE -ne 0
- then
- return $CURL_ERROR_CODE
- fi
- if test "$HTTP_CODE" -ge 400 && test "$HTTP_CODE" -lt 600
- then
- return 127
- fi
-}
-
-# Trigger build job
-BUILD_ID=$(gfwci "action=trigger&branch=$BRANCH&commit=$COMMIT&skipTests=false")
-if test $? -ne 0
-then
- echo "Unable to trigger Visual Studio Team Services Build"
- echo "$BUILD_ID"
- exit 1
-fi
-
-# Check if the $BUILD_ID contains a number
-case $BUILD_ID in
-''|*[!0-9]*) echo "Unexpected build number: $BUILD_ID" && exit 1
-esac
-
-echo "Visual Studio Team Services Build #${BUILD_ID}"
-
-# Tracing execued commands would produce too much noise in the waiting
-# loop below.
-set +x
-
-# Wait until build job finished
-STATUS=
-RESULT=
-while true
-do
- LAST_STATUS=$STATUS
- STATUS=$(gfwci "action=status&buildId=$BUILD_ID")
- test "$STATUS" = "$LAST_STATUS" || printf "\nStatus: %s " "$STATUS"
- printf "."
-
- case "$STATUS" in
- inProgress|postponed|notStarted) sleep 10 ;; # continue
- "completed: succeeded") RESULT="success"; break;; # success
- "completed: failed") break;; # failure
- *) echo "Unhandled status: $STATUS"; break;; # unknown
- esac
-done
-
-# Print log
-echo ""
-echo ""
-set -x
-gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
-
-# Set exit code for TravisCI
-test "$RESULT" = "success"
-
-save_good_tree
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index be3b7d3..b3e76ef 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -5,32 +5,40 @@
. ${0%/*}/lib.sh
-test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
-gem install asciidoctor
+filter_log () {
+ sed -e '/^GIT_VERSION = /d' \
+ -e '/^ \* new asciidoc flags$/d' \
+ -e '/stripped namespace before processing/d' \
+ -e '/Attributed.*IDs for element/d' \
+ "$1"
+}
make check-builtins
make check-docs
# Build docs with AsciiDoc
-make doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
-! test -s stderr.log
+make doc > >(tee stdout.log) 2> >(tee stderr.raw >&2)
+cat stderr.raw
+filter_log stderr.raw >stderr.log
+test ! -s stderr.log
test -s Documentation/git.html
test -s Documentation/git.xml
test -s Documentation/git.1
grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html
-rm -f stdout.log stderr.log
+rm -f stdout.log stderr.log stderr.raw
check_unignored_build_artifacts
# Build docs with AsciiDoctor
make clean
-make USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
-sed '/^GIT_VERSION = / d' stderr.log
-! test -s stderr.log
+make USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.raw >&2)
+cat stderr.raw
+filter_log stderr.raw >stderr.log
+test ! -s stderr.log
test -s Documentation/git.html
grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html
-rm -f stdout.log stderr.log
+rm -f stdout.log stderr.log stderr.raw
check_unignored_build_artifacts
save_good_tree
diff --git a/column.h b/column.h
index 2567a5c..448c744 100644
--- a/column.h
+++ b/column.h
@@ -27,20 +27,20 @@
};
struct option;
-extern int parseopt_column_callback(const struct option *, const char *, int);
-extern int git_column_config(const char *var, const char *value,
- const char *command, unsigned int *colopts);
-extern int finalize_colopts(unsigned int *colopts, int stdout_is_tty);
+int parseopt_column_callback(const struct option *, const char *, int);
+int git_column_config(const char *var, const char *value,
+ const char *command, unsigned int *colopts);
+int finalize_colopts(unsigned int *colopts, int stdout_is_tty);
static inline int column_active(unsigned int colopts)
{
return (colopts & COL_ENABLE_MASK) == COL_ENABLED;
}
struct string_list;
-extern void print_columns(const struct string_list *list, unsigned int colopts,
- const struct column_options *opts);
+void print_columns(const struct string_list *list, unsigned int colopts,
+ const struct column_options *opts);
-extern int run_column_filter(int colopts, const struct column_options *);
-extern int stop_column_filter(void);
+int run_column_filter(int colopts, const struct column_options *);
+int stop_column_filter(void);
#endif
diff --git a/combine-diff.c b/combine-diff.c
index 23d8fab..3e49f3b 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -23,11 +23,20 @@
two->path, strlen(two->path), two->mode);
}
-static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
+static int filename_changed(char status)
+{
+ return status == 'R' || status == 'C';
+}
+
+static struct combine_diff_path *intersect_paths(
+ struct combine_diff_path *curr,
+ int n,
+ int num_parent,
+ int combined_all_paths)
{
struct diff_queue_struct *q = &diff_queued_diff;
struct combine_diff_path *p, **tail = &curr;
- int i, cmp;
+ int i, j, cmp;
if (!n) {
for (i = 0; i < q->nr; i++) {
@@ -50,6 +59,13 @@
oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
p->parent[n].mode = q->queue[i]->one->mode;
p->parent[n].status = q->queue[i]->status;
+
+ if (combined_all_paths &&
+ filename_changed(p->parent[n].status)) {
+ strbuf_init(&p->parent[n].path, 0);
+ strbuf_addstr(&p->parent[n].path,
+ q->queue[i]->one->path);
+ }
*tail = p;
tail = &p->next;
}
@@ -68,6 +84,10 @@
if (cmp < 0) {
/* p->path not in q->queue[]; drop it */
*tail = p->next;
+ for (j = 0; j < num_parent; j++)
+ if (combined_all_paths &&
+ filename_changed(p->parent[j].status))
+ strbuf_release(&p->parent[j].path);
free(p);
continue;
}
@@ -81,6 +101,10 @@
oidcpy(&p->parent[n].oid, &q->queue[i]->one->oid);
p->parent[n].mode = q->queue[i]->one->mode;
p->parent[n].status = q->queue[i]->status;
+ if (combined_all_paths &&
+ filename_changed(p->parent[n].status))
+ strbuf_addstr(&p->parent[n].path,
+ q->queue[i]->one->path);
tail = &p->next;
i++;
@@ -960,12 +984,25 @@
if (!show_file_header)
return;
- if (added)
- dump_quoted_path("--- ", "", "/dev/null",
- line_prefix, c_meta, c_reset);
- else
- dump_quoted_path("--- ", a_prefix, elem->path,
- line_prefix, c_meta, c_reset);
+ if (rev->combined_all_paths) {
+ for (i = 0; i < num_parent; i++) {
+ char *path = filename_changed(elem->parent[i].status)
+ ? elem->parent[i].path.buf : elem->path;
+ if (elem->parent[i].status == DIFF_STATUS_ADDED)
+ dump_quoted_path("--- ", "", "/dev/null",
+ line_prefix, c_meta, c_reset);
+ else
+ dump_quoted_path("--- ", a_prefix, path,
+ line_prefix, c_meta, c_reset);
+ }
+ } else {
+ if (added)
+ dump_quoted_path("--- ", "", "/dev/null",
+ line_prefix, c_meta, c_reset);
+ else
+ dump_quoted_path("--- ", a_prefix, elem->path,
+ line_prefix, c_meta, c_reset);
+ }
if (deleted)
dump_quoted_path("+++ ", "", "/dev/null",
line_prefix, c_meta, c_reset);
@@ -1227,6 +1264,15 @@
putchar(inter_name_termination);
}
+ for (i = 0; i < num_parent; i++)
+ if (rev->combined_all_paths) {
+ if (filename_changed(p->parent[i].status))
+ write_name_quoted(p->parent[i].path.buf, stdout,
+ inter_name_termination);
+ else
+ write_name_quoted(p->path, stdout,
+ inter_name_termination);
+ }
write_name_quoted(p->path, stdout, line_termination);
}
@@ -1332,7 +1378,9 @@
/* find set of paths that every parent touches */
static struct combine_diff_path *find_paths_generic(const struct object_id *oid,
- const struct oid_array *parents, struct diff_options *opt)
+ const struct oid_array *parents,
+ struct diff_options *opt,
+ int combined_all_paths)
{
struct combine_diff_path *paths = NULL;
int i, num_parent = parents->nr;
@@ -1357,7 +1405,8 @@
opt->output_format = DIFF_FORMAT_NO_OUTPUT;
diff_tree_oid(&parents->oid[i], oid, "", opt);
diffcore_std(opt);
- paths = intersect_paths(paths, i, num_parent);
+ paths = intersect_paths(paths, i, num_parent,
+ combined_all_paths);
/* if showing diff, show it in requested order */
if (opt->output_format != DIFF_FORMAT_NO_OUTPUT &&
@@ -1467,7 +1516,8 @@
* diff(sha1,parent_i) for all i to do the job, specifically
* for parent0.
*/
- paths = find_paths_generic(oid, parents, &diffopts);
+ paths = find_paths_generic(oid, parents, &diffopts,
+ rev->combined_all_paths);
}
else {
int stat_opt;
@@ -1540,6 +1590,10 @@
while (paths) {
struct combine_diff_path *tmp = paths;
paths = paths->next;
+ for (i = 0; i < num_parent; i++)
+ if (rev->combined_all_paths &&
+ filename_changed(tmp->parent[i].status))
+ strbuf_release(&tmp->parent[i].path);
free(tmp);
}
diff --git a/command-list.txt b/command-list.txt
index 3a9af10..a9ac72b 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -59,7 +59,7 @@
git-check-attr purehelpers
git-check-ignore purehelpers
git-check-mailmap purehelpers
-git-checkout mainporcelain history
+git-checkout mainporcelain
git-checkout-index plumbingmanipulators
git-check-ref-format purehelpers
git-cherry plumbinginterrogators complete
@@ -81,7 +81,7 @@
git-cvsserver foreignscminterface
git-daemon synchingrepositories
git-describe mainporcelain
-git-diff mainporcelain history
+git-diff mainporcelain info
git-diff-files plumbinginterrogators
git-diff-index plumbinginterrogators
git-diff-tree plumbinginterrogators
@@ -150,7 +150,8 @@
git-replace ancillarymanipulators complete
git-request-pull foreignscminterface complete
git-rerere ancillaryinterrogators
-git-reset mainporcelain worktree
+git-reset mainporcelain history
+git-restore mainporcelain worktree
git-revert mainporcelain
git-rev-list plumbinginterrogators
git-rev-parse plumbinginterrogators
@@ -171,6 +172,7 @@
git-stripspace purehelpers
git-submodule mainporcelain
git-svn foreignscminterface
+git-switch mainporcelain history
git-symbolic-ref plumbingmanipulators
git-tag mainporcelain history
git-unpack-file plumbinginterrogators
diff --git a/commit-graph.c b/commit-graph.c
index 47e9be0..394908b 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -22,6 +22,7 @@
#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
#define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
+#define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
#define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
@@ -42,7 +43,28 @@
char *get_commit_graph_filename(const char *obj_dir)
{
- return xstrfmt("%s/info/commit-graph", obj_dir);
+ char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
+ char *normalized = xmalloc(strlen(filename) + 1);
+ normalize_path_copy(normalized, filename);
+ free(filename);
+ return normalized;
+}
+
+static char *get_split_graph_filename(const char *obj_dir,
+ const char *oid_hex)
+{
+ char *filename = xstrfmt("%s/info/commit-graphs/graph-%s.graph",
+ obj_dir,
+ oid_hex);
+ char *normalized = xmalloc(strlen(filename) + 1);
+ normalize_path_copy(normalized, filename);
+ free(filename);
+ return normalized;
+}
+
+static char *get_chain_filename(const char *obj_dir)
+{
+ return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir);
}
static uint8_t oid_version(void)
@@ -80,25 +102,30 @@
return 1;
}
-struct commit_graph *load_commit_graph_one(const char *graph_file)
+int open_commit_graph(const char *graph_file, int *fd, struct stat *st)
+{
+ *fd = git_open(graph_file);
+ if (*fd < 0)
+ return 0;
+ if (fstat(*fd, st)) {
+ close(*fd);
+ return 0;
+ }
+ return 1;
+}
+
+struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st)
{
void *graph_map;
size_t graph_size;
- struct stat st;
struct commit_graph *ret;
- int fd = git_open(graph_file);
- if (fd < 0)
- return NULL;
- if (fstat(fd, &st)) {
- close(fd);
- return NULL;
- }
- graph_size = xsize_t(st.st_size);
+ graph_size = xsize_t(st->st_size);
if (graph_size < GRAPH_MIN_SIZE) {
close(fd);
- die(_("graph file %s is too small"), graph_file);
+ error(_("commit-graph file is too small"));
+ return NULL;
}
graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
ret = parse_commit_graph(graph_map, fd, graph_size);
@@ -106,12 +133,41 @@
if (!ret) {
munmap(graph_map, graph_size);
close(fd);
- exit(1);
}
return ret;
}
+static int verify_commit_graph_lite(struct commit_graph *g)
+{
+ /*
+ * Basic validation shared between parse_commit_graph()
+ * which'll be called every time the graph is used, and the
+ * much more expensive verify_commit_graph() used by
+ * "commit-graph verify".
+ *
+ * There should only be very basic checks here to ensure that
+ * we don't e.g. segfault in fill_commit_in_graph(), but
+ * because this is a very hot codepath nothing that e.g. loops
+ * over g->num_commits, or runs a checksum on the commit-graph
+ * itself.
+ */
+ if (!g->chunk_oid_fanout) {
+ error("commit-graph is missing the OID Fanout chunk");
+ return 1;
+ }
+ if (!g->chunk_oid_lookup) {
+ error("commit-graph is missing the OID Lookup chunk");
+ return 1;
+ }
+ if (!g->chunk_commit_data) {
+ error("commit-graph is missing the Commit Data chunk");
+ return 1;
+ }
+
+ return 0;
+}
+
struct commit_graph *parse_commit_graph(void *graph_map, int fd,
size_t graph_size)
{
@@ -133,21 +189,21 @@
graph_signature = get_be32(data);
if (graph_signature != GRAPH_SIGNATURE) {
- error(_("graph signature %X does not match signature %X"),
+ error(_("commit-graph signature %X does not match signature %X"),
graph_signature, GRAPH_SIGNATURE);
return NULL;
}
graph_version = *(unsigned char*)(data + 4);
if (graph_version != GRAPH_VERSION) {
- error(_("graph version %X does not match version %X"),
+ error(_("commit-graph version %X does not match version %X"),
graph_version, GRAPH_VERSION);
return NULL;
}
hash_version = *(unsigned char*)(data + 5);
if (hash_version != oid_version()) {
- error(_("hash version %X does not match version %X"),
+ error(_("commit-graph hash version %X does not match version %X"),
hash_version, oid_version());
return NULL;
}
@@ -170,7 +226,7 @@
if (data + graph_size - chunk_lookup <
GRAPH_CHUNKLOOKUP_WIDTH) {
- error(_("chunk lookup table entry missing; graph file may be incomplete"));
+ error(_("commit-graph chunk lookup table entry missing; file may be incomplete"));
free(graph);
return NULL;
}
@@ -181,7 +237,7 @@
chunk_lookup += GRAPH_CHUNKLOOKUP_WIDTH;
if (chunk_offset > graph_size - the_hash_algo->rawsz) {
- error(_("improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32),
+ error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32),
(uint32_t)chunk_offset);
free(graph);
return NULL;
@@ -215,10 +271,16 @@
else
graph->chunk_extra_edges = data + chunk_offset;
break;
+
+ case GRAPH_CHUNKID_BASE:
+ if (graph->chunk_base_graphs)
+ chunk_repeated = 1;
+ else
+ graph->chunk_base_graphs = data + chunk_offset;
}
if (chunk_repeated) {
- error(_("chunk id %08x appears multiple times"), chunk_id);
+ error(_("commit-graph chunk id %08x appears multiple times"), chunk_id);
free(graph);
return NULL;
}
@@ -233,21 +295,167 @@
last_chunk_offset = chunk_offset;
}
+ hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
+
+ if (verify_commit_graph_lite(graph)) {
+ free(graph);
+ return NULL;
+ }
+
return graph;
}
+static struct commit_graph *load_commit_graph_one(const char *graph_file)
+{
+
+ struct stat st;
+ int fd;
+ struct commit_graph *g;
+ int open_ok = open_commit_graph(graph_file, &fd, &st);
+
+ if (!open_ok)
+ return NULL;
+
+ g = load_commit_graph_one_fd_st(fd, &st);
+
+ if (g)
+ g->filename = xstrdup(graph_file);
+
+ return g;
+}
+
+static struct commit_graph *load_commit_graph_v1(struct repository *r, const char *obj_dir)
+{
+ char *graph_name = get_commit_graph_filename(obj_dir);
+ struct commit_graph *g = load_commit_graph_one(graph_name);
+ free(graph_name);
+
+ if (g)
+ g->obj_dir = obj_dir;
+
+ return g;
+}
+
+static int add_graph_to_chain(struct commit_graph *g,
+ struct commit_graph *chain,
+ struct object_id *oids,
+ int n)
+{
+ struct commit_graph *cur_g = chain;
+
+ if (n && !g->chunk_base_graphs) {
+ warning(_("commit-graph has no base graphs chunk"));
+ return 0;
+ }
+
+ while (n) {
+ n--;
+
+ if (!cur_g ||
+ !oideq(&oids[n], &cur_g->oid) ||
+ !hasheq(oids[n].hash, g->chunk_base_graphs + g->hash_len * n)) {
+ warning(_("commit-graph chain does not match"));
+ return 0;
+ }
+
+ cur_g = cur_g->base_graph;
+ }
+
+ g->base_graph = chain;
+
+ if (chain)
+ g->num_commits_in_base = chain->num_commits + chain->num_commits_in_base;
+
+ return 1;
+}
+
+static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir)
+{
+ struct commit_graph *graph_chain = NULL;
+ struct strbuf line = STRBUF_INIT;
+ struct stat st;
+ struct object_id *oids;
+ int i = 0, valid = 1, count;
+ char *chain_name = get_chain_filename(obj_dir);
+ FILE *fp;
+ int stat_res;
+
+ fp = fopen(chain_name, "r");
+ stat_res = stat(chain_name, &st);
+ free(chain_name);
+
+ if (!fp ||
+ stat_res ||
+ st.st_size <= the_hash_algo->hexsz)
+ return NULL;
+
+ count = st.st_size / (the_hash_algo->hexsz + 1);
+ oids = xcalloc(count, sizeof(struct object_id));
+
+ prepare_alt_odb(r);
+
+ for (i = 0; i < count; i++) {
+ struct object_directory *odb;
+
+ if (strbuf_getline_lf(&line, fp) == EOF)
+ break;
+
+ if (get_oid_hex(line.buf, &oids[i])) {
+ warning(_("invalid commit-graph chain: line '%s' not a hash"),
+ line.buf);
+ valid = 0;
+ break;
+ }
+
+ valid = 0;
+ for (odb = r->objects->odb; odb; odb = odb->next) {
+ char *graph_name = get_split_graph_filename(odb->path, line.buf);
+ struct commit_graph *g = load_commit_graph_one(graph_name);
+
+ free(graph_name);
+
+ if (g) {
+ g->obj_dir = odb->path;
+
+ if (add_graph_to_chain(g, graph_chain, oids, i)) {
+ graph_chain = g;
+ valid = 1;
+ }
+
+ break;
+ }
+ }
+
+ if (!valid) {
+ warning(_("unable to find all commit-graph files"));
+ break;
+ }
+ }
+
+ free(oids);
+ fclose(fp);
+ strbuf_release(&line);
+
+ return graph_chain;
+}
+
+struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir)
+{
+ struct commit_graph *g = load_commit_graph_v1(r, obj_dir);
+
+ if (!g)
+ g = load_commit_graph_chain(r, obj_dir);
+
+ return g;
+}
+
static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
{
- char *graph_name;
if (r->objects->commit_graph)
return;
- graph_name = get_commit_graph_filename(obj_dir);
- r->objects->commit_graph =
- load_commit_graph_one(graph_name);
-
- FREE_AND_NULL(graph_name);
+ r->objects->commit_graph = read_commit_graph_one(r, obj_dir);
}
/*
@@ -259,15 +467,26 @@
static int prepare_commit_graph(struct repository *r)
{
struct object_directory *odb;
- int config_value;
+
+ /*
+ * This must come before the "already attempted?" check below, because
+ * we want to disable even an already-loaded graph file.
+ */
+ if (r->commit_graph_disabled)
+ return 0;
if (r->objects->commit_graph_attempted)
return !!r->objects->commit_graph;
r->objects->commit_graph_attempted = 1;
+ if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
+ die("dying as requested by the '%s' variable on commit-graph load!",
+ GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
+
+ prepare_repo_settings(r);
+
if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
- (repo_config_get_bool(r, "core.commitgraph", &config_value) ||
- !config_value))
+ r->settings.core_commit_graph != 1)
/*
* This repository is not configured to use commit graphs, so
* do not load one. (But report commit_graph_attempted anyway
@@ -305,10 +524,19 @@
return !!first_generation;
}
-void close_commit_graph(struct repository *r)
+static void close_commit_graph_one(struct commit_graph *g)
{
- free_commit_graph(r->objects->commit_graph);
- r->objects->commit_graph = NULL;
+ if (!g)
+ return;
+
+ close_commit_graph_one(g->base_graph);
+ free_commit_graph(g);
+}
+
+void close_commit_graph(struct raw_object_store *o)
+{
+ close_commit_graph_one(o->commit_graph);
+ o->commit_graph = NULL;
}
static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos)
@@ -317,18 +545,38 @@
g->chunk_oid_lookup, g->hash_len, pos);
}
+static void load_oid_from_graph(struct commit_graph *g,
+ uint32_t pos,
+ struct object_id *oid)
+{
+ uint32_t lex_index;
+
+ while (g && pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ if (!g)
+ BUG("NULL commit-graph");
+
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die(_("invalid commit position. commit-graph is likely corrupt"));
+
+ lex_index = pos - g->num_commits_in_base;
+
+ hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * lex_index);
+}
+
static struct commit_list **insert_parent_or_die(struct repository *r,
struct commit_graph *g,
- uint64_t pos,
+ uint32_t pos,
struct commit_list **pptr)
{
struct commit *c;
struct object_id oid;
- if (pos >= g->num_commits)
- die("invalid parent position %"PRIu64, pos);
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die("invalid parent position %"PRIu32, pos);
- hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * pos);
+ load_oid_from_graph(g, pos, &oid);
c = lookup_commit(r, &oid);
if (!c)
die(_("could not find commit %s"), oid_to_hex(&oid));
@@ -338,11 +586,23 @@
static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos)
{
- const unsigned char *commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * pos;
+ const unsigned char *commit_data;
+ uint32_t lex_index;
+
+ while (pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ lex_index = pos - g->num_commits_in_base;
+ commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * lex_index;
item->graph_pos = pos;
item->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
}
+static inline void set_commit_tree(struct commit *c, struct tree *t)
+{
+ c->maybe_tree = t;
+}
+
static int fill_commit_in_graph(struct repository *r,
struct commit *item,
struct commit_graph *g, uint32_t pos)
@@ -351,12 +611,27 @@
uint32_t *parent_data_ptr;
uint64_t date_low, date_high;
struct commit_list **pptr;
- const unsigned char *commit_data = g->chunk_commit_data + (g->hash_len + 16) * pos;
+ const unsigned char *commit_data;
+ uint32_t lex_index;
+
+ while (pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die(_("invalid commit position. commit-graph is likely corrupt"));
+
+ /*
+ * Store the "full" position, but then use the
+ * "local" position for the rest of the calculation.
+ */
+ item->graph_pos = pos;
+ lex_index = pos - g->num_commits_in_base;
+
+ commit_data = g->chunk_commit_data + (g->hash_len + 16) * lex_index;
item->object.parsed = 1;
- item->graph_pos = pos;
- item->maybe_tree = NULL;
+ set_commit_tree(item, NULL);
date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
date_low = get_be32(commit_data + g->hash_len + 12);
@@ -398,7 +673,18 @@
*pos = item->graph_pos;
return 1;
} else {
- return bsearch_graph(g, &(item->object.oid), pos);
+ struct commit_graph *cur_g = g;
+ uint32_t lex_index;
+
+ while (cur_g && !bsearch_graph(cur_g, &(item->object.oid), &lex_index))
+ cur_g = cur_g->base_graph;
+
+ if (cur_g) {
+ *pos = lex_index + cur_g->num_commits_in_base;
+ return 1;
+ }
+
+ return 0;
}
}
@@ -438,11 +724,16 @@
struct commit *c)
{
struct object_id oid;
- const unsigned char *commit_data = g->chunk_commit_data +
- GRAPH_DATA_WIDTH * (c->graph_pos);
+ const unsigned char *commit_data;
+
+ while (c->graph_pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ commit_data = g->chunk_commit_data +
+ GRAPH_DATA_WIDTH * (c->graph_pos - g->num_commits_in_base);
hashcpy(oid.hash, commit_data);
- c->maybe_tree = lookup_tree(r, &oid);
+ set_commit_tree(c, lookup_tree(r, &oid));
return c->maybe_tree;
}
@@ -464,14 +755,52 @@
return get_commit_tree_in_graph_one(r, r->objects->commit_graph, c);
}
+struct packed_commit_list {
+ struct commit **list;
+ int nr;
+ int alloc;
+};
+
+struct packed_oid_list {
+ struct object_id *list;
+ int nr;
+ int alloc;
+};
+
+struct write_commit_graph_context {
+ struct repository *r;
+ char *obj_dir;
+ char *graph_name;
+ struct packed_oid_list oids;
+ struct packed_commit_list commits;
+ int num_extra_edges;
+ unsigned long approx_nr_objects;
+ struct progress *progress;
+ int progress_done;
+ uint64_t progress_cnt;
+
+ char *base_graph_name;
+ int num_commit_graphs_before;
+ int num_commit_graphs_after;
+ char **commit_graph_filenames_before;
+ char **commit_graph_filenames_after;
+ char **commit_graph_hash_after;
+ uint32_t new_num_commits_in_base;
+ struct commit_graph *new_base_graph;
+
+ unsigned append:1,
+ report_progress:1,
+ split:1,
+ check_oids:1;
+
+ const struct split_commit_graph_opts *split_opts;
+};
+
static void write_graph_chunk_fanout(struct hashfile *f,
- struct commit **commits,
- int nr_commits,
- struct progress *progress,
- uint64_t *progress_cnt)
+ struct write_commit_graph_context *ctx)
{
int i, count = 0;
- struct commit **list = commits;
+ struct commit **list = ctx->commits.list;
/*
* Write the first-level table (the list is sorted,
@@ -479,10 +808,10 @@
* having to do eight extra binary search iterations).
*/
for (i = 0; i < 256; i++) {
- while (count < nr_commits) {
+ while (count < ctx->commits.nr) {
if ((*list)->object.oid.hash[0] != i)
break;
- display_progress(progress, ++*progress_cnt);
+ display_progress(ctx->progress, ++ctx->progress_cnt);
count++;
list++;
}
@@ -492,14 +821,12 @@
}
static void write_graph_chunk_oids(struct hashfile *f, int hash_len,
- struct commit **commits, int nr_commits,
- struct progress *progress,
- uint64_t *progress_cnt)
+ struct write_commit_graph_context *ctx)
{
- struct commit **list = commits;
+ struct commit **list = ctx->commits.list;
int count;
- for (count = 0; count < nr_commits; count++, list++) {
- display_progress(progress, ++*progress_cnt);
+ for (count = 0; count < ctx->commits.nr; count++, list++) {
+ display_progress(ctx->progress, ++ctx->progress_cnt);
hashwrite(f, (*list)->object.oid.hash, (int)hash_len);
}
}
@@ -511,21 +838,19 @@
}
static void write_graph_chunk_data(struct hashfile *f, int hash_len,
- struct commit **commits, int nr_commits,
- struct progress *progress,
- uint64_t *progress_cnt)
+ struct write_commit_graph_context *ctx)
{
- struct commit **list = commits;
- struct commit **last = commits + nr_commits;
+ struct commit **list = ctx->commits.list;
+ struct commit **last = ctx->commits.list + ctx->commits.nr;
uint32_t num_extra_edges = 0;
while (list < last) {
struct commit_list *parent;
int edge_value;
uint32_t packedDate[2];
- display_progress(progress, ++*progress_cnt);
+ display_progress(ctx->progress, ++ctx->progress_cnt);
- parse_commit(*list);
+ parse_commit_no_graph(*list);
hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len);
parent = (*list)->parents;
@@ -534,10 +859,20 @@
edge_value = GRAPH_PARENT_NONE;
else {
edge_value = sha1_pos(parent->item->object.oid.hash,
- commits,
- nr_commits,
+ ctx->commits.list,
+ ctx->commits.nr,
commit_to_sha1);
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
@@ -555,9 +890,20 @@
edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges;
else {
edge_value = sha1_pos(parent->item->object.oid.hash,
- commits,
- nr_commits,
+ ctx->commits.list,
+ ctx->commits.nr,
commit_to_sha1);
+
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
@@ -588,19 +934,16 @@
}
static void write_graph_chunk_extra_edges(struct hashfile *f,
- struct commit **commits,
- int nr_commits,
- struct progress *progress,
- uint64_t *progress_cnt)
+ struct write_commit_graph_context *ctx)
{
- struct commit **list = commits;
- struct commit **last = commits + nr_commits;
+ struct commit **list = ctx->commits.list;
+ struct commit **last = ctx->commits.list + ctx->commits.nr;
struct commit_list *parent;
while (list < last) {
int num_parents = 0;
- display_progress(progress, ++*progress_cnt);
+ display_progress(ctx->progress, ++ctx->progress_cnt);
for (parent = (*list)->parents; num_parents < 3 && parent;
parent = parent->next)
@@ -614,10 +957,20 @@
/* Since num_parents > 2, this initializer is safe. */
for (parent = (*list)->parents->next; parent; parent = parent->next) {
int edge_value = sha1_pos(parent->item->object.oid.hash,
- commits,
- nr_commits,
+ ctx->commits.list,
+ ctx->commits.nr,
commit_to_sha1);
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
@@ -632,132 +985,124 @@
}
}
-static int commit_compare(const void *_a, const void *_b)
+static int oid_compare(const void *_a, const void *_b)
{
const struct object_id *a = (const struct object_id *)_a;
const struct object_id *b = (const struct object_id *)_b;
return oidcmp(a, b);
}
-struct packed_commit_list {
- struct commit **list;
- int nr;
- int alloc;
-};
-
-struct packed_oid_list {
- struct object_id *list;
- int nr;
- int alloc;
- struct progress *progress;
- int progress_done;
-};
-
static int add_packed_commits(const struct object_id *oid,
struct packed_git *pack,
uint32_t pos,
void *data)
{
- struct packed_oid_list *list = (struct packed_oid_list*)data;
+ struct write_commit_graph_context *ctx = (struct write_commit_graph_context*)data;
enum object_type type;
off_t offset = nth_packed_object_offset(pack, pos);
struct object_info oi = OBJECT_INFO_INIT;
- if (list->progress)
- display_progress(list->progress, ++list->progress_done);
+ if (ctx->progress)
+ display_progress(ctx->progress, ++ctx->progress_done);
oi.typep = &type;
- if (packed_object_info(the_repository, pack, offset, &oi) < 0)
+ if (packed_object_info(ctx->r, pack, offset, &oi) < 0)
die(_("unable to get type of object %s"), oid_to_hex(oid));
if (type != OBJ_COMMIT)
return 0;
- ALLOC_GROW(list->list, list->nr + 1, list->alloc);
- oidcpy(&(list->list[list->nr]), oid);
- list->nr++;
+ ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
+ oidcpy(&(ctx->oids.list[ctx->oids.nr]), oid);
+ ctx->oids.nr++;
return 0;
}
-static void add_missing_parents(struct packed_oid_list *oids, struct commit *commit)
+static void add_missing_parents(struct write_commit_graph_context *ctx, struct commit *commit)
{
struct commit_list *parent;
for (parent = commit->parents; parent; parent = parent->next) {
if (!(parent->item->object.flags & UNINTERESTING)) {
- ALLOC_GROW(oids->list, oids->nr + 1, oids->alloc);
- oidcpy(&oids->list[oids->nr], &(parent->item->object.oid));
- oids->nr++;
+ ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
+ oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid));
+ ctx->oids.nr++;
parent->item->object.flags |= UNINTERESTING;
}
}
}
-static void close_reachable(struct packed_oid_list *oids, int report_progress)
+static void close_reachable(struct write_commit_graph_context *ctx)
{
int i;
struct commit *commit;
- struct progress *progress = NULL;
- if (report_progress)
- progress = start_delayed_progress(
- _("Loading known commits in commit graph"), oids->nr);
- for (i = 0; i < oids->nr; i++) {
- display_progress(progress, i + 1);
- commit = lookup_commit(the_repository, &oids->list[i]);
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Loading known commits in commit graph"),
+ ctx->oids.nr);
+ for (i = 0; i < ctx->oids.nr; i++) {
+ display_progress(ctx->progress, i + 1);
+ commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
if (commit)
commit->object.flags |= UNINTERESTING;
}
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
/*
- * As this loop runs, oids->nr may grow, but not more
+ * As this loop runs, ctx->oids.nr may grow, but not more
* than the number of missing commits in the reachable
* closure.
*/
- if (report_progress)
- progress = start_delayed_progress(
- _("Expanding reachable commits in commit graph"), oids->nr);
- for (i = 0; i < oids->nr; i++) {
- display_progress(progress, i + 1);
- commit = lookup_commit(the_repository, &oids->list[i]);
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Expanding reachable commits in commit graph"),
+ 0);
+ for (i = 0; i < ctx->oids.nr; i++) {
+ display_progress(ctx->progress, i + 1);
+ commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
- if (commit && !parse_commit(commit))
- add_missing_parents(oids, commit);
+ if (!commit)
+ continue;
+ if (ctx->split) {
+ if (!parse_commit(commit) &&
+ commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+ add_missing_parents(ctx, commit);
+ } else if (!parse_commit_no_graph(commit))
+ add_missing_parents(ctx, commit);
}
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
- if (report_progress)
- progress = start_delayed_progress(
- _("Clearing commit marks in commit graph"), oids->nr);
- for (i = 0; i < oids->nr; i++) {
- display_progress(progress, i + 1);
- commit = lookup_commit(the_repository, &oids->list[i]);
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Clearing commit marks in commit graph"),
+ ctx->oids.nr);
+ for (i = 0; i < ctx->oids.nr; i++) {
+ display_progress(ctx->progress, i + 1);
+ commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
if (commit)
commit->object.flags &= ~UNINTERESTING;
}
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
}
-static void compute_generation_numbers(struct packed_commit_list* commits,
- int report_progress)
+static void compute_generation_numbers(struct write_commit_graph_context *ctx)
{
int i;
struct commit_list *list = NULL;
- struct progress *progress = NULL;
- if (report_progress)
- progress = start_progress(
- _("Computing commit graph generation numbers"),
- commits->nr);
- for (i = 0; i < commits->nr; i++) {
- display_progress(progress, i + 1);
- if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY &&
- commits->list[i]->generation != GENERATION_NUMBER_ZERO)
+ if (ctx->report_progress)
+ ctx->progress = start_progress(
+ _("Computing commit graph generation numbers"),
+ ctx->commits.nr);
+ for (i = 0; i < ctx->commits.nr; i++) {
+ display_progress(ctx->progress, i + 1);
+ if (ctx->commits.list[i]->generation != GENERATION_NUMBER_INFINITY &&
+ ctx->commits.list[i]->generation != GENERATION_NUMBER_ZERO)
continue;
- commit_list_insert(commits->list[i], &list);
+ commit_list_insert(ctx->commits.list[i], &list);
while (list) {
struct commit *current = list->item;
struct commit_list *parent;
@@ -784,7 +1129,7 @@
}
}
}
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
}
static int add_ref_to_list(const char *refname,
@@ -797,230 +1142,296 @@
return 0;
}
-void write_commit_graph_reachable(const char *obj_dir, int append,
- int report_progress)
+int write_commit_graph_reachable(const char *obj_dir,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts)
{
struct string_list list = STRING_LIST_INIT_DUP;
+ int result;
for_each_ref(add_ref_to_list, &list);
- write_commit_graph(obj_dir, NULL, &list, append, report_progress);
+ result = write_commit_graph(obj_dir, NULL, &list,
+ flags, split_opts);
string_list_clear(&list, 0);
+ return result;
}
-void write_commit_graph(const char *obj_dir,
- struct string_list *pack_indexes,
- struct string_list *commit_hex,
- int append, int report_progress)
+static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
+ struct string_list *pack_indexes)
{
- struct packed_oid_list oids;
- struct packed_commit_list commits;
- struct hashfile *f;
- uint32_t i, count_distinct = 0;
- char *graph_name;
- struct lock_file lk = LOCK_INIT;
- uint32_t chunk_ids[5];
- uint64_t chunk_offsets[5];
- int num_chunks;
- int num_extra_edges;
- struct commit_list *parent;
- struct progress *progress = NULL;
- const unsigned hashsz = the_hash_algo->rawsz;
- uint64_t progress_cnt = 0;
+ uint32_t i;
struct strbuf progress_title = STRBUF_INIT;
- unsigned long approx_nr_objects;
+ struct strbuf packname = STRBUF_INIT;
+ int dirlen;
- if (!commit_graph_compatible(the_repository))
- return;
-
- oids.nr = 0;
- approx_nr_objects = approximate_object_count();
- oids.alloc = approx_nr_objects / 32;
- oids.progress = NULL;
- oids.progress_done = 0;
-
- if (append) {
- prepare_commit_graph_one(the_repository, obj_dir);
- if (the_repository->objects->commit_graph)
- oids.alloc += the_repository->objects->commit_graph->num_commits;
+ strbuf_addf(&packname, "%s/pack/", ctx->obj_dir);
+ dirlen = packname.len;
+ if (ctx->report_progress) {
+ strbuf_addf(&progress_title,
+ Q_("Finding commits for commit graph in %d pack",
+ "Finding commits for commit graph in %d packs",
+ pack_indexes->nr),
+ pack_indexes->nr);
+ ctx->progress = start_delayed_progress(progress_title.buf, 0);
+ ctx->progress_done = 0;
+ }
+ for (i = 0; i < pack_indexes->nr; i++) {
+ struct packed_git *p;
+ strbuf_setlen(&packname, dirlen);
+ strbuf_addstr(&packname, pack_indexes->items[i].string);
+ p = add_packed_git(packname.buf, packname.len, 1);
+ if (!p) {
+ error(_("error adding pack %s"), packname.buf);
+ return -1;
+ }
+ if (open_pack_index(p)) {
+ error(_("error opening index for %s"), packname.buf);
+ return -1;
+ }
+ for_each_object_in_pack(p, add_packed_commits, ctx,
+ FOR_EACH_OBJECT_PACK_ORDER);
+ close_pack(p);
+ free(p);
}
- if (oids.alloc < 1024)
- oids.alloc = 1024;
- ALLOC_ARRAY(oids.list, oids.alloc);
+ stop_progress(&ctx->progress);
+ strbuf_release(&progress_title);
+ strbuf_release(&packname);
- if (append && the_repository->objects->commit_graph) {
- struct commit_graph *commit_graph =
- the_repository->objects->commit_graph;
- for (i = 0; i < commit_graph->num_commits; i++) {
- const unsigned char *hash = commit_graph->chunk_oid_lookup +
- commit_graph->hash_len * i;
- hashcpy(oids.list[oids.nr++].hash, hash);
+ return 0;
+}
+
+static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
+ struct string_list *commit_hex)
+{
+ uint32_t i;
+ struct strbuf progress_title = STRBUF_INIT;
+
+ if (ctx->report_progress) {
+ strbuf_addf(&progress_title,
+ Q_("Finding commits for commit graph from %d ref",
+ "Finding commits for commit graph from %d refs",
+ commit_hex->nr),
+ commit_hex->nr);
+ ctx->progress = start_delayed_progress(
+ progress_title.buf,
+ commit_hex->nr);
+ }
+ for (i = 0; i < commit_hex->nr; i++) {
+ const char *end;
+ struct object_id oid;
+ struct commit *result;
+
+ display_progress(ctx->progress, i + 1);
+ if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
+ (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
+ ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
+ oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
+ ctx->oids.nr++;
+ } else if (ctx->check_oids) {
+ error(_("invalid commit object id: %s"),
+ commit_hex->items[i].string);
+ return -1;
}
}
+ stop_progress(&ctx->progress);
+ strbuf_release(&progress_title);
- if (pack_indexes) {
- struct strbuf packname = STRBUF_INIT;
- int dirlen;
- strbuf_addf(&packname, "%s/pack/", obj_dir);
- dirlen = packname.len;
- if (report_progress) {
- strbuf_addf(&progress_title,
- Q_("Finding commits for commit graph in %d pack",
- "Finding commits for commit graph in %d packs",
- pack_indexes->nr),
- pack_indexes->nr);
- oids.progress = start_delayed_progress(progress_title.buf, 0);
- oids.progress_done = 0;
- }
- for (i = 0; i < pack_indexes->nr; i++) {
- struct packed_git *p;
- strbuf_setlen(&packname, dirlen);
- strbuf_addstr(&packname, pack_indexes->items[i].string);
- p = add_packed_git(packname.buf, packname.len, 1);
- if (!p)
- die(_("error adding pack %s"), packname.buf);
- if (open_pack_index(p))
- die(_("error opening index for %s"), packname.buf);
- for_each_object_in_pack(p, add_packed_commits, &oids,
- FOR_EACH_OBJECT_PACK_ORDER);
- close_pack(p);
- free(p);
- }
- stop_progress(&oids.progress);
- strbuf_reset(&progress_title);
- strbuf_release(&packname);
- }
+ return 0;
+}
- if (commit_hex) {
- if (report_progress) {
- strbuf_addf(&progress_title,
- Q_("Finding commits for commit graph from %d ref",
- "Finding commits for commit graph from %d refs",
- commit_hex->nr),
- commit_hex->nr);
- progress = start_delayed_progress(progress_title.buf,
- commit_hex->nr);
- }
- for (i = 0; i < commit_hex->nr; i++) {
- const char *end;
- struct object_id oid;
- struct commit *result;
+static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
+{
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Finding commits for commit graph among packed objects"),
+ ctx->approx_nr_objects);
+ for_each_packed_object(add_packed_commits, ctx,
+ FOR_EACH_OBJECT_PACK_ORDER);
+ if (ctx->progress_done < ctx->approx_nr_objects)
+ display_progress(ctx->progress, ctx->approx_nr_objects);
+ stop_progress(&ctx->progress);
+}
- display_progress(progress, i + 1);
- if (commit_hex->items[i].string &&
- parse_oid_hex(commit_hex->items[i].string, &oid, &end))
- continue;
+static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)
+{
+ uint32_t i, count_distinct = 1;
- result = lookup_commit_reference_gently(the_repository, &oid, 1);
-
- if (result) {
- ALLOC_GROW(oids.list, oids.nr + 1, oids.alloc);
- oidcpy(&oids.list[oids.nr], &(result->object.oid));
- oids.nr++;
- }
- }
- stop_progress(&progress);
- strbuf_reset(&progress_title);
- }
-
- if (!pack_indexes && !commit_hex) {
- if (report_progress)
- oids.progress = start_delayed_progress(
- _("Finding commits for commit graph among packed objects"),
- approx_nr_objects);
- for_each_packed_object(add_packed_commits, &oids,
- FOR_EACH_OBJECT_PACK_ORDER);
- if (oids.progress_done < approx_nr_objects)
- display_progress(oids.progress, approx_nr_objects);
- stop_progress(&oids.progress);
- }
-
- close_reachable(&oids, report_progress);
-
- if (report_progress)
- progress = start_delayed_progress(
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
_("Counting distinct commits in commit graph"),
- oids.nr);
- display_progress(progress, 0); /* TODO: Measure QSORT() progress */
- QSORT(oids.list, oids.nr, commit_compare);
- count_distinct = 1;
- for (i = 1; i < oids.nr; i++) {
- display_progress(progress, i + 1);
- if (!oideq(&oids.list[i - 1], &oids.list[i]))
+ ctx->oids.nr);
+ display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */
+ QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);
+
+ for (i = 1; i < ctx->oids.nr; i++) {
+ display_progress(ctx->progress, i + 1);
+ if (!oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) {
+ if (ctx->split) {
+ struct commit *c = lookup_commit(ctx->r, &ctx->oids.list[i]);
+
+ if (!c || c->graph_pos != COMMIT_NOT_FROM_GRAPH)
+ continue;
+ }
+
count_distinct++;
+ }
}
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
- if (count_distinct >= GRAPH_EDGE_LAST_MASK)
- die(_("the commit graph format cannot write %d commits"), count_distinct);
+ return count_distinct;
+}
- commits.nr = 0;
- commits.alloc = count_distinct;
- ALLOC_ARRAY(commits.list, commits.alloc);
+static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
+{
+ uint32_t i;
+ struct commit_list *parent;
- num_extra_edges = 0;
- if (report_progress)
- progress = start_delayed_progress(
+ ctx->num_extra_edges = 0;
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
_("Finding extra edges in commit graph"),
- oids.nr);
- for (i = 0; i < oids.nr; i++) {
+ ctx->oids.nr);
+ for (i = 0; i < ctx->oids.nr; i++) {
int num_parents = 0;
- display_progress(progress, i + 1);
- if (i > 0 && oideq(&oids.list[i - 1], &oids.list[i]))
+ display_progress(ctx->progress, i + 1);
+ if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
continue;
- commits.list[commits.nr] = lookup_commit(the_repository, &oids.list[i]);
- parse_commit(commits.list[commits.nr]);
+ ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc);
+ ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.list[i]);
- for (parent = commits.list[commits.nr]->parents;
+ if (ctx->split &&
+ ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH)
+ continue;
+
+ parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
+
+ for (parent = ctx->commits.list[ctx->commits.nr]->parents;
parent; parent = parent->next)
num_parents++;
if (num_parents > 2)
- num_extra_edges += num_parents - 1;
+ ctx->num_extra_edges += num_parents - 1;
- commits.nr++;
+ ctx->commits.nr++;
}
- num_chunks = num_extra_edges ? 4 : 3;
- stop_progress(&progress);
+ stop_progress(&ctx->progress);
+}
- if (commits.nr >= GRAPH_EDGE_LAST_MASK)
- die(_("too many commits to write graph"));
+static int write_graph_chunk_base_1(struct hashfile *f,
+ struct commit_graph *g)
+{
+ int num = 0;
- compute_generation_numbers(&commits, report_progress);
+ if (!g)
+ return 0;
- graph_name = get_commit_graph_filename(obj_dir);
- if (safe_create_leading_directories(graph_name)) {
- UNLEAK(graph_name);
- die_errno(_("unable to create leading directories of %s"),
- graph_name);
+ num = write_graph_chunk_base_1(f, g->base_graph);
+ hashwrite(f, g->oid.hash, the_hash_algo->rawsz);
+ return num + 1;
+}
+
+static int write_graph_chunk_base(struct hashfile *f,
+ struct write_commit_graph_context *ctx)
+{
+ int num = write_graph_chunk_base_1(f, ctx->new_base_graph);
+
+ if (num != ctx->num_commit_graphs_after - 1) {
+ error(_("failed to write correct number of base graph ids"));
+ return -1;
}
- hold_lock_file_for_update(&lk, graph_name, LOCK_DIE_ON_ERROR);
- f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ return 0;
+}
+
+static int write_commit_graph_file(struct write_commit_graph_context *ctx)
+{
+ uint32_t i;
+ int fd;
+ struct hashfile *f;
+ struct lock_file lk = LOCK_INIT;
+ uint32_t chunk_ids[6];
+ uint64_t chunk_offsets[6];
+ const unsigned hashsz = the_hash_algo->rawsz;
+ struct strbuf progress_title = STRBUF_INIT;
+ int num_chunks = 3;
+ struct object_id file_hash;
+
+ if (ctx->split) {
+ struct strbuf tmp_file = STRBUF_INIT;
+
+ strbuf_addf(&tmp_file,
+ "%s/info/commit-graphs/tmp_graph_XXXXXX",
+ ctx->obj_dir);
+ ctx->graph_name = strbuf_detach(&tmp_file, NULL);
+ } else {
+ ctx->graph_name = get_commit_graph_filename(ctx->obj_dir);
+ }
+
+ if (safe_create_leading_directories(ctx->graph_name)) {
+ UNLEAK(ctx->graph_name);
+ error(_("unable to create leading directories of %s"),
+ ctx->graph_name);
+ return -1;
+ }
+
+ if (ctx->split) {
+ char *lock_name = get_chain_filename(ctx->obj_dir);
+
+ hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR);
+
+ fd = git_mkstemp_mode(ctx->graph_name, 0444);
+ if (fd < 0) {
+ error(_("unable to create '%s'"), ctx->graph_name);
+ return -1;
+ }
+
+ f = hashfd(fd, ctx->graph_name);
+ } else {
+ hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR);
+ fd = lk.tempfile->fd;
+ f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ }
+
+ chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
+ chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
+ chunk_ids[2] = GRAPH_CHUNKID_DATA;
+ if (ctx->num_extra_edges) {
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
+ num_chunks++;
+ }
+ if (ctx->num_commit_graphs_after > 1) {
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
+ num_chunks++;
+ }
+
+ chunk_ids[num_chunks] = 0;
+
+ chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH;
+ chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
+ chunk_offsets[2] = chunk_offsets[1] + hashsz * ctx->commits.nr;
+ chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * ctx->commits.nr;
+
+ num_chunks = 3;
+ if (ctx->num_extra_edges) {
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ 4 * ctx->num_extra_edges;
+ num_chunks++;
+ }
+ if (ctx->num_commit_graphs_after > 1) {
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ hashsz * (ctx->num_commit_graphs_after - 1);
+ num_chunks++;
+ }
hashwrite_be32(f, GRAPH_SIGNATURE);
hashwrite_u8(f, GRAPH_VERSION);
hashwrite_u8(f, oid_version());
hashwrite_u8(f, num_chunks);
- hashwrite_u8(f, 0); /* unused padding byte */
-
- chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
- chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
- chunk_ids[2] = GRAPH_CHUNKID_DATA;
- if (num_extra_edges)
- chunk_ids[3] = GRAPH_CHUNKID_EXTRAEDGES;
- else
- chunk_ids[3] = 0;
- chunk_ids[4] = 0;
-
- chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH;
- chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
- chunk_offsets[2] = chunk_offsets[1] + hashsz * commits.nr;
- chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * commits.nr;
- chunk_offsets[4] = chunk_offsets[3] + 4 * num_extra_edges;
+ hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
for (i = 0; i <= num_chunks; i++) {
uint32_t chunk_write[3];
@@ -1031,31 +1442,476 @@
hashwrite(f, chunk_write, 12);
}
- if (report_progress) {
+ if (ctx->report_progress) {
strbuf_addf(&progress_title,
Q_("Writing out commit graph in %d pass",
"Writing out commit graph in %d passes",
num_chunks),
num_chunks);
- progress = start_delayed_progress(
+ ctx->progress = start_delayed_progress(
progress_title.buf,
- num_chunks * commits.nr);
+ num_chunks * ctx->commits.nr);
}
- write_graph_chunk_fanout(f, commits.list, commits.nr, progress, &progress_cnt);
- write_graph_chunk_oids(f, hashsz, commits.list, commits.nr, progress, &progress_cnt);
- write_graph_chunk_data(f, hashsz, commits.list, commits.nr, progress, &progress_cnt);
- if (num_extra_edges)
- write_graph_chunk_extra_edges(f, commits.list, commits.nr, progress, &progress_cnt);
- stop_progress(&progress);
+ write_graph_chunk_fanout(f, ctx);
+ write_graph_chunk_oids(f, hashsz, ctx);
+ write_graph_chunk_data(f, hashsz, ctx);
+ if (ctx->num_extra_edges)
+ write_graph_chunk_extra_edges(f, ctx);
+ if (ctx->num_commit_graphs_after > 1 &&
+ write_graph_chunk_base(f, ctx)) {
+ return -1;
+ }
+ stop_progress(&ctx->progress);
strbuf_release(&progress_title);
- close_commit_graph(the_repository);
- finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+ if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) {
+ char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid));
+ char *new_base_name = get_split_graph_filename(ctx->new_base_graph->obj_dir, new_base_hash);
+
+ free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]);
+ free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]);
+ ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2] = new_base_name;
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2] = new_base_hash;
+ }
+
+ close_commit_graph(ctx->r->objects);
+ finalize_hashfile(f, file_hash.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+
+ if (ctx->split) {
+ FILE *chainf = fdopen_lock_file(&lk, "w");
+ char *final_graph_name;
+ int result;
+
+ close(fd);
+
+ if (!chainf) {
+ error(_("unable to open commit-graph chain file"));
+ return -1;
+ }
+
+ if (ctx->base_graph_name) {
+ const char *dest = ctx->commit_graph_filenames_after[
+ ctx->num_commit_graphs_after - 2];
+
+ if (strcmp(ctx->base_graph_name, dest)) {
+ result = rename(ctx->base_graph_name, dest);
+
+ if (result) {
+ error(_("failed to rename base commit-graph file"));
+ return -1;
+ }
+ }
+ } else {
+ char *graph_name = get_commit_graph_filename(ctx->obj_dir);
+ unlink(graph_name);
+ }
+
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(oid_to_hex(&file_hash));
+ final_graph_name = get_split_graph_filename(ctx->obj_dir,
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]);
+ ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name;
+
+ result = rename(ctx->graph_name, final_graph_name);
+
+ for (i = 0; i < ctx->num_commit_graphs_after; i++)
+ fprintf(lk.tempfile->fp, "%s\n", ctx->commit_graph_hash_after[i]);
+
+ if (result) {
+ error(_("failed to rename temporary commit-graph file"));
+ return -1;
+ }
+ }
+
commit_lock_file(&lk);
- free(graph_name);
- free(commits.list);
- free(oids.list);
+ return 0;
+}
+
+static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
+{
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+ uint32_t num_commits = ctx->commits.nr;
+ uint32_t i;
+
+ int max_commits = 0;
+ int size_mult = 2;
+
+ if (ctx->split_opts) {
+ max_commits = ctx->split_opts->max_commits;
+ size_mult = ctx->split_opts->size_multiple;
+ }
+
+ g = ctx->r->objects->commit_graph;
+ ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
+
+ while (g && (g->num_commits <= size_mult * num_commits ||
+ (max_commits && num_commits > max_commits))) {
+ if (strcmp(g->obj_dir, ctx->obj_dir))
+ break;
+
+ num_commits += g->num_commits;
+ g = g->base_graph;
+
+ ctx->num_commit_graphs_after--;
+ }
+
+ ctx->new_base_graph = g;
+
+ if (ctx->num_commit_graphs_after == 2) {
+ char *old_graph_name = get_commit_graph_filename(g->obj_dir);
+
+ if (!strcmp(g->filename, old_graph_name) &&
+ strcmp(g->obj_dir, ctx->obj_dir)) {
+ ctx->num_commit_graphs_after = 1;
+ ctx->new_base_graph = NULL;
+ }
+
+ free(old_graph_name);
+ }
+
+ ALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after);
+ ALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after);
+
+ for (i = 0; i < ctx->num_commit_graphs_after &&
+ i < ctx->num_commit_graphs_before; i++)
+ ctx->commit_graph_filenames_after[i] = xstrdup(ctx->commit_graph_filenames_before[i]);
+
+ i = ctx->num_commit_graphs_before - 1;
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ if (i < ctx->num_commit_graphs_after)
+ ctx->commit_graph_hash_after[i] = xstrdup(oid_to_hex(&g->oid));
+
+ i--;
+ g = g->base_graph;
+ }
+}
+
+static void merge_commit_graph(struct write_commit_graph_context *ctx,
+ struct commit_graph *g)
+{
+ uint32_t i;
+ uint32_t offset = g->num_commits_in_base;
+
+ ALLOC_GROW(ctx->commits.list, ctx->commits.nr + g->num_commits, ctx->commits.alloc);
+
+ for (i = 0; i < g->num_commits; i++) {
+ struct object_id oid;
+ struct commit *result;
+
+ display_progress(ctx->progress, i + 1);
+
+ load_oid_from_graph(g, i + offset, &oid);
+
+ /* only add commits if they still exist in the repo */
+ result = lookup_commit_reference_gently(ctx->r, &oid, 1);
+
+ if (result) {
+ ctx->commits.list[ctx->commits.nr] = result;
+ ctx->commits.nr++;
+ }
+ }
+}
+
+static int commit_compare(const void *_a, const void *_b)
+{
+ const struct commit *a = *(const struct commit **)_a;
+ const struct commit *b = *(const struct commit **)_b;
+ return oidcmp(&a->object.oid, &b->object.oid);
+}
+
+static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
+{
+ uint32_t i, num_parents;
+ struct commit_list *parent;
+
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Scanning merged commits"),
+ ctx->commits.nr);
+
+ QSORT(ctx->commits.list, ctx->commits.nr, commit_compare);
+
+ ctx->num_extra_edges = 0;
+ for (i = 0; i < ctx->commits.nr; i++) {
+ display_progress(ctx->progress, i);
+
+ if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
+ &ctx->commits.list[i]->object.oid)) {
+ die(_("unexpected duplicate commit id %s"),
+ oid_to_hex(&ctx->commits.list[i]->object.oid));
+ } else {
+ num_parents = 0;
+ for (parent = ctx->commits.list[i]->parents; parent; parent = parent->next)
+ num_parents++;
+
+ if (num_parents > 2)
+ ctx->num_extra_edges += num_parents - 1;
+ }
+ }
+
+ stop_progress(&ctx->progress);
+}
+
+static void merge_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+ uint32_t current_graph_number = ctx->num_commit_graphs_before;
+ struct strbuf progress_title = STRBUF_INIT;
+
+ while (g && current_graph_number >= ctx->num_commit_graphs_after) {
+ current_graph_number--;
+
+ if (ctx->report_progress) {
+ strbuf_addstr(&progress_title, _("Merging commit-graph"));
+ ctx->progress = start_delayed_progress(progress_title.buf, 0);
+ }
+
+ merge_commit_graph(ctx, g);
+ stop_progress(&ctx->progress);
+ strbuf_release(&progress_title);
+
+ g = g->base_graph;
+ }
+
+ if (g) {
+ ctx->new_base_graph = g;
+ ctx->new_num_commits_in_base = g->num_commits + g->num_commits_in_base;
+ }
+
+ if (ctx->new_base_graph)
+ ctx->base_graph_name = xstrdup(ctx->new_base_graph->filename);
+
+ sort_and_scan_merged_commits(ctx);
+}
+
+static void mark_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ uint32_t i;
+ time_t now = time(NULL);
+
+ for (i = ctx->num_commit_graphs_after - 1; i < ctx->num_commit_graphs_before; i++) {
+ struct stat st;
+ struct utimbuf updated_time;
+
+ stat(ctx->commit_graph_filenames_before[i], &st);
+
+ updated_time.actime = st.st_atime;
+ updated_time.modtime = now;
+ utime(ctx->commit_graph_filenames_before[i], &updated_time);
+ }
+}
+
+static void expire_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ struct strbuf path = STRBUF_INIT;
+ DIR *dir;
+ struct dirent *de;
+ size_t dirnamelen;
+ timestamp_t expire_time = time(NULL);
+
+ if (ctx->split_opts && ctx->split_opts->expire_time)
+ expire_time -= ctx->split_opts->expire_time;
+ if (!ctx->split) {
+ char *chain_file_name = get_chain_filename(ctx->obj_dir);
+ unlink(chain_file_name);
+ free(chain_file_name);
+ ctx->num_commit_graphs_after = 0;
+ }
+
+ strbuf_addstr(&path, ctx->obj_dir);
+ strbuf_addstr(&path, "/info/commit-graphs");
+ dir = opendir(path.buf);
+
+ if (!dir)
+ goto out;
+
+ strbuf_addch(&path, '/');
+ dirnamelen = path.len;
+ while ((de = readdir(dir)) != NULL) {
+ struct stat st;
+ uint32_t i, found = 0;
+
+ strbuf_setlen(&path, dirnamelen);
+ strbuf_addstr(&path, de->d_name);
+
+ stat(path.buf, &st);
+
+ if (st.st_mtime > expire_time)
+ continue;
+ if (path.len < 6 || strcmp(path.buf + path.len - 6, ".graph"))
+ continue;
+
+ for (i = 0; i < ctx->num_commit_graphs_after; i++) {
+ if (!strcmp(ctx->commit_graph_filenames_after[i],
+ path.buf)) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ unlink(path.buf);
+ }
+
+out:
+ strbuf_release(&path);
+}
+
+int write_commit_graph(const char *obj_dir,
+ struct string_list *pack_indexes,
+ struct string_list *commit_hex,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts)
+{
+ struct write_commit_graph_context *ctx;
+ uint32_t i, count_distinct = 0;
+ size_t len;
+ int res = 0;
+
+ if (!commit_graph_compatible(the_repository))
+ return 0;
+
+ ctx = xcalloc(1, sizeof(struct write_commit_graph_context));
+ ctx->r = the_repository;
+
+ /* normalize object dir with no trailing slash */
+ ctx->obj_dir = xmallocz(strlen(obj_dir) + 1);
+ normalize_path_copy(ctx->obj_dir, obj_dir);
+ len = strlen(ctx->obj_dir);
+ if (len && ctx->obj_dir[len - 1] == '/')
+ ctx->obj_dir[len - 1] = 0;
+
+ ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
+ ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
+ ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
+ ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
+ ctx->split_opts = split_opts;
+
+ if (ctx->split) {
+ struct commit_graph *g;
+ prepare_commit_graph(ctx->r);
+
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ ctx->num_commit_graphs_before++;
+ g = g->base_graph;
+ }
+
+ if (ctx->num_commit_graphs_before) {
+ ALLOC_ARRAY(ctx->commit_graph_filenames_before, ctx->num_commit_graphs_before);
+ i = ctx->num_commit_graphs_before;
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ ctx->commit_graph_filenames_before[--i] = xstrdup(g->filename);
+ g = g->base_graph;
+ }
+ }
+ }
+
+ ctx->approx_nr_objects = approximate_object_count();
+ ctx->oids.alloc = ctx->approx_nr_objects / 32;
+
+ if (ctx->split && split_opts && ctx->oids.alloc > split_opts->max_commits)
+ ctx->oids.alloc = split_opts->max_commits;
+
+ if (ctx->append) {
+ prepare_commit_graph_one(ctx->r, ctx->obj_dir);
+ if (ctx->r->objects->commit_graph)
+ ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits;
+ }
+
+ if (ctx->oids.alloc < 1024)
+ ctx->oids.alloc = 1024;
+ ALLOC_ARRAY(ctx->oids.list, ctx->oids.alloc);
+
+ if (ctx->append && ctx->r->objects->commit_graph) {
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+ for (i = 0; i < g->num_commits; i++) {
+ const unsigned char *hash = g->chunk_oid_lookup + g->hash_len * i;
+ hashcpy(ctx->oids.list[ctx->oids.nr++].hash, hash);
+ }
+ }
+
+ if (pack_indexes) {
+ if ((res = fill_oids_from_packs(ctx, pack_indexes)))
+ goto cleanup;
+ }
+
+ if (commit_hex) {
+ if ((res = fill_oids_from_commit_hex(ctx, commit_hex)))
+ goto cleanup;
+ }
+
+ if (!pack_indexes && !commit_hex)
+ fill_oids_from_all_packs(ctx);
+
+ close_reachable(ctx);
+
+ count_distinct = count_distinct_commits(ctx);
+
+ if (count_distinct >= GRAPH_EDGE_LAST_MASK) {
+ error(_("the commit graph format cannot write %d commits"), count_distinct);
+ res = -1;
+ goto cleanup;
+ }
+
+ ctx->commits.alloc = count_distinct;
+ ALLOC_ARRAY(ctx->commits.list, ctx->commits.alloc);
+
+ copy_oids_to_commits(ctx);
+
+ if (ctx->commits.nr >= GRAPH_EDGE_LAST_MASK) {
+ error(_("too many commits to write graph"));
+ res = -1;
+ goto cleanup;
+ }
+
+ if (!ctx->commits.nr)
+ goto cleanup;
+
+ if (ctx->split) {
+ split_graph_merge_strategy(ctx);
+
+ merge_commit_graphs(ctx);
+ } else
+ ctx->num_commit_graphs_after = 1;
+
+ compute_generation_numbers(ctx);
+
+ res = write_commit_graph_file(ctx);
+
+ if (ctx->split)
+ mark_commit_graphs(ctx);
+
+ expire_commit_graphs(ctx);
+
+cleanup:
+ free(ctx->graph_name);
+ free(ctx->commits.list);
+ free(ctx->oids.list);
+ free(ctx->obj_dir);
+
+ if (ctx->commit_graph_filenames_after) {
+ for (i = 0; i < ctx->num_commit_graphs_after; i++) {
+ free(ctx->commit_graph_filenames_after[i]);
+ free(ctx->commit_graph_hash_after[i]);
+ }
+
+ for (i = 0; i < ctx->num_commit_graphs_before; i++)
+ free(ctx->commit_graph_filenames_before[i]);
+
+ free(ctx->commit_graph_filenames_after);
+ free(ctx->commit_graph_filenames_before);
+ free(ctx->commit_graph_hash_after);
+ }
+
+ free(ctx);
+
+ return res;
}
#define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
@@ -1075,7 +1931,7 @@
#define GENERATION_ZERO_EXISTS 1
#define GENERATION_NUMBER_EXISTS 2
-int verify_commit_graph(struct repository *r, struct commit_graph *g)
+int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
{
uint32_t i, cur_fanout_pos = 0;
struct object_id prev_oid, cur_oid, checksum;
@@ -1083,21 +1939,14 @@
struct hashfile *f;
int devnull;
struct progress *progress = NULL;
+ int local_error = 0;
if (!g) {
graph_report("no commit-graph file loaded");
return 1;
}
- verify_commit_graph_error = 0;
-
- if (!g->chunk_oid_fanout)
- graph_report("commit-graph is missing the OID Fanout chunk");
- if (!g->chunk_oid_lookup)
- graph_report("commit-graph is missing the OID Lookup chunk");
- if (!g->chunk_commit_data)
- graph_report("commit-graph is missing the Commit Data chunk");
-
+ verify_commit_graph_error = verify_commit_graph_lite(g);
if (verify_commit_graph_error)
return verify_commit_graph_error;
@@ -1116,7 +1965,7 @@
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
if (i && oidcmp(&prev_oid, &cur_oid) >= 0)
- graph_report("commit-graph has incorrect OID order: %s then %s",
+ graph_report(_("commit-graph has incorrect OID order: %s then %s"),
oid_to_hex(&prev_oid),
oid_to_hex(&cur_oid));
@@ -1126,14 +1975,14 @@
uint32_t fanout_value = get_be32(g->chunk_oid_fanout + cur_fanout_pos);
if (i != fanout_value)
- graph_report("commit-graph has incorrect fanout value: fanout[%d] = %u != %u",
+ graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
cur_fanout_pos, fanout_value, i);
cur_fanout_pos++;
}
graph_commit = lookup_commit(r, &cur_oid);
if (!parse_commit_in_graph_one(r, g, graph_commit))
- graph_report("failed to parse %s from commit-graph",
+ graph_report(_("failed to parse commit %s from commit-graph"),
oid_to_hex(&cur_oid));
}
@@ -1141,7 +1990,7 @@
uint32_t fanout_value = get_be32(g->chunk_oid_fanout + cur_fanout_pos);
if (g->num_commits != fanout_value)
- graph_report("commit-graph has incorrect fanout value: fanout[%d] = %u != %u",
+ graph_report(_("commit-graph has incorrect fanout value: fanout[%d] = %u != %u"),
cur_fanout_pos, fanout_value, i);
cur_fanout_pos++;
@@ -1161,16 +2010,16 @@
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
graph_commit = lookup_commit(r, &cur_oid);
- odb_commit = (struct commit *)create_object(r, cur_oid.hash, alloc_commit_node(r));
+ odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));
if (parse_commit_internal(odb_commit, 0, 0)) {
- graph_report("failed to parse %s from object database",
+ graph_report(_("failed to parse commit %s from object database for commit-graph"),
oid_to_hex(&cur_oid));
continue;
}
if (!oideq(&get_commit_tree_in_graph_one(r, g, graph_commit)->object.oid,
get_commit_tree_oid(odb_commit)))
- graph_report("root tree OID for commit %s in commit-graph is %s != %s",
+ graph_report(_("root tree OID for commit %s in commit-graph is %s != %s"),
oid_to_hex(&cur_oid),
oid_to_hex(get_commit_tree_oid(graph_commit)),
oid_to_hex(get_commit_tree_oid(odb_commit)));
@@ -1180,13 +2029,16 @@
while (graph_parents) {
if (odb_parents == NULL) {
- graph_report("commit-graph parent list for commit %s is too long",
+ graph_report(_("commit-graph parent list for commit %s is too long"),
oid_to_hex(&cur_oid));
break;
}
+ /* parse parent in case it is in a base graph */
+ parse_commit_in_graph_one(r, g, graph_parents->item);
+
if (!oideq(&graph_parents->item->object.oid, &odb_parents->item->object.oid))
- graph_report("commit-graph parent for %s is %s != %s",
+ graph_report(_("commit-graph parent for %s is %s != %s"),
oid_to_hex(&cur_oid),
oid_to_hex(&graph_parents->item->object.oid),
oid_to_hex(&odb_parents->item->object.oid));
@@ -1199,16 +2051,16 @@
}
if (odb_parents != NULL)
- graph_report("commit-graph parent list for commit %s terminates early",
+ graph_report(_("commit-graph parent list for commit %s terminates early"),
oid_to_hex(&cur_oid));
if (!graph_commit->generation) {
if (generation_zero == GENERATION_NUMBER_EXISTS)
- graph_report("commit-graph has generation number zero for commit %s, but non-zero elsewhere",
+ graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
oid_to_hex(&cur_oid));
generation_zero = GENERATION_ZERO_EXISTS;
} else if (generation_zero == GENERATION_ZERO_EXISTS)
- graph_report("commit-graph has non-zero generation number for commit %s, but zero elsewhere",
+ graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
oid_to_hex(&cur_oid));
if (generation_zero == GENERATION_ZERO_EXISTS)
@@ -1223,20 +2075,25 @@
max_generation--;
if (graph_commit->generation != max_generation + 1)
- graph_report("commit-graph generation for commit %s is %u != %u",
+ graph_report(_("commit-graph generation for commit %s is %u != %u"),
oid_to_hex(&cur_oid),
graph_commit->generation,
max_generation + 1);
if (graph_commit->date != odb_commit->date)
- graph_report("commit date for commit %s in commit-graph is %"PRItime" != %"PRItime,
+ graph_report(_("commit date for commit %s in commit-graph is %"PRItime" != %"PRItime),
oid_to_hex(&cur_oid),
graph_commit->date,
odb_commit->date);
}
stop_progress(&progress);
- return verify_commit_graph_error;
+ local_error = verify_commit_graph_error;
+
+ if (!(flags & COMMIT_GRAPH_VERIFY_SHALLOW) && g->base_graph)
+ local_error |= verify_commit_graph(r, g->base_graph, flags);
+
+ return local_error;
}
void free_commit_graph(struct commit_graph *g)
@@ -1248,5 +2105,11 @@
g->data = NULL;
close(g->graph_fd);
}
+ free(g->filename);
free(g);
}
+
+void disable_commit_graph(struct repository *r)
+{
+ r->commit_graph_disabled = 1;
+}
diff --git a/commit-graph.h b/commit-graph.h
index 096d8ba..7f5c933 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -7,10 +7,12 @@
#include "cache.h"
#define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
+#define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD"
struct commit;
char *get_commit_graph_filename(const char *obj_dir);
+int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
/*
* Given a commit struct, try to fill the commit struct info, including:
@@ -45,15 +47,21 @@
unsigned char num_chunks;
uint32_t num_commits;
struct object_id oid;
+ char *filename;
+ const char *obj_dir;
+
+ uint32_t num_commits_in_base;
+ struct commit_graph *base_graph;
const uint32_t *chunk_oid_fanout;
const unsigned char *chunk_oid_lookup;
const unsigned char *chunk_commit_data;
const unsigned char *chunk_extra_edges;
+ const unsigned char *chunk_base_graphs;
};
-struct commit_graph *load_commit_graph_one(const char *graph_file);
-
+struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st);
+struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir);
struct commit_graph *parse_commit_graph(void *graph_map, int fd,
size_t graph_size);
@@ -63,16 +71,46 @@
*/
int generation_numbers_enabled(struct repository *r);
-void write_commit_graph_reachable(const char *obj_dir, int append,
- int report_progress);
-void write_commit_graph(const char *obj_dir,
- struct string_list *pack_indexes,
- struct string_list *commit_hex,
- int append, int report_progress);
+enum commit_graph_write_flags {
+ COMMIT_GRAPH_WRITE_APPEND = (1 << 0),
+ COMMIT_GRAPH_WRITE_PROGRESS = (1 << 1),
+ COMMIT_GRAPH_WRITE_SPLIT = (1 << 2),
+ /* Make sure that each OID in the input is a valid commit OID. */
+ COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
+};
-int verify_commit_graph(struct repository *r, struct commit_graph *g);
+struct split_commit_graph_opts {
+ int size_multiple;
+ int max_commits;
+ timestamp_t expire_time;
+};
-void close_commit_graph(struct repository *);
+/*
+ * The write_commit_graph* methods return zero on success
+ * and a negative value on failure. Note that if the repository
+ * is not compatible with the commit-graph feature, then the
+ * methods will return 0 without writing a commit-graph.
+ */
+int write_commit_graph_reachable(const char *obj_dir,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts);
+int write_commit_graph(const char *obj_dir,
+ struct string_list *pack_indexes,
+ struct string_list *commit_hex,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts);
+
+#define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0)
+
+int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags);
+
+void close_commit_graph(struct raw_object_store *);
void free_commit_graph(struct commit_graph *);
+/*
+ * Disable further use of the commit graph in this process when parsing a
+ * "struct commit".
+ */
+void disable_commit_graph(struct repository *r);
+
#endif
diff --git a/commit.c b/commit.c
index a5333c7..3fe5f8f 100644
--- a/commit.c
+++ b/commit.c
@@ -57,10 +57,9 @@
struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_commit_node(r));
+ return create_object(r, oid, alloc_commit_node(r));
return object_as_type(r, obj, OBJ_COMMIT, 0);
}
@@ -340,15 +339,21 @@
}
}
-struct tree *get_commit_tree(const struct commit *commit)
+static inline void set_commit_tree(struct commit *c, struct tree *t)
+{
+ c->maybe_tree = t;
+}
+
+struct tree *repo_get_commit_tree(struct repository *r,
+ const struct commit *commit)
{
if (commit->maybe_tree || !commit->object.parsed)
return commit->maybe_tree;
- if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
- BUG("commit has NULL tree, but was not loaded from commit-graph");
+ if (commit->graph_pos != COMMIT_NOT_FROM_GRAPH)
+ return get_commit_tree_in_graph(r, commit);
- return get_commit_tree_in_graph(the_repository, commit);
+ return NULL;
}
struct object_id *get_commit_tree_oid(const struct commit *commit)
@@ -358,9 +363,9 @@
void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
{
- c->maybe_tree = NULL;
- c->index = 0;
+ set_commit_tree(c, NULL);
free_commit_buffer(pool, c);
+ c->index = 0;
free_commit_list(c->parents);
c->object.parsed = 0;
@@ -406,7 +411,7 @@
if (get_oid_hex(bufptr + 5, &parent) < 0)
return error("bad tree pointer in commit %s",
oid_to_hex(&item->object.oid));
- item->maybe_tree = lookup_tree(r, &parent);
+ set_commit_tree(item, lookup_tree(r, &parent));
bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
pptr = &item->parents;
@@ -443,7 +448,7 @@
item->date = parse_commit_date(bufptr, tail);
if (check_graph)
- load_commit_graph_info(the_repository, item);
+ load_commit_graph_info(r, item);
return 0;
}
diff --git a/commit.h b/commit.h
index 42728c2..f5295ca 100644
--- a/commit.h
+++ b/commit.h
@@ -32,7 +32,7 @@
/*
* If the commit is loaded from the commit-graph file, then this
- * member may be NULL. Only access it through get_commit_tree()
+ * member may be NULL. Only access it through repo_get_commit_tree()
* or get_commit_tree_oid().
*/
struct tree *maybe_tree;
@@ -89,6 +89,12 @@
{
return repo_parse_commit_gently(r, item, 0);
}
+
+static inline int parse_commit_no_graph(struct commit *commit)
+{
+ return repo_parse_commit_internal(the_repository, commit, 0, 0);
+}
+
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
@@ -143,7 +149,8 @@
*/
void free_commit_buffer(struct parsed_object_pool *pool, struct commit *);
-struct tree *get_commit_tree(const struct commit *);
+struct tree *repo_get_commit_tree(struct repository *, const struct commit *);
+#define get_commit_tree(c) repo_get_commit_tree(the_repository, c)
struct object_id *get_commit_tree_oid(const struct commit *);
/*
@@ -177,10 +184,10 @@
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
-extern int has_non_ascii(const char *text);
-extern const char *logmsg_reencode(const struct commit *commit,
- char **commit_encoding,
- const char *output_encoding);
+int has_non_ascii(const char *text);
+const char *logmsg_reencode(const struct commit *commit,
+ char **commit_encoding,
+ const char *output_encoding);
const char *repo_logmsg_reencode(struct repository *r,
const struct commit *commit,
char **commit_encoding,
@@ -189,7 +196,7 @@
#define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out)
#endif
-extern const char *skip_blank_lines(const char *msg);
+const char *skip_blank_lines(const char *msg);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
@@ -240,23 +247,27 @@
struct oid_array;
struct ref;
-extern int register_shallow(struct repository *r, const struct object_id *oid);
-extern int unregister_shallow(const struct object_id *oid);
-extern int for_each_commit_graft(each_commit_graft_fn, void *);
-extern int is_repository_shallow(struct repository *r);
-extern struct commit_list *get_shallow_commits(struct object_array *heads,
- int depth, int shallow_flag, int not_shallow_flag);
-extern struct commit_list *get_shallow_commits_by_rev_list(
+int register_shallow(struct repository *r, const struct object_id *oid);
+int unregister_shallow(const struct object_id *oid);
+int for_each_commit_graft(each_commit_graft_fn, void *);
+int is_repository_shallow(struct repository *r);
+struct commit_list *get_shallow_commits(struct object_array *heads,
+ int depth, int shallow_flag, int not_shallow_flag);
+struct commit_list *get_shallow_commits_by_rev_list(
int ac, const char **av, int shallow_flag, int not_shallow_flag);
-extern void set_alternate_shallow_file(struct repository *r, const char *path, int override);
-extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
- const struct oid_array *extra);
-extern void setup_alternate_shallow(struct lock_file *shallow_lock,
- const char **alternate_shallow_file,
- const struct oid_array *extra);
-extern const char *setup_temporary_shallow(const struct oid_array *extra);
-extern void advertise_shallow_grafts(int);
+void set_alternate_shallow_file(struct repository *r, const char *path, int override);
+int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
+ const struct oid_array *extra);
+void setup_alternate_shallow(struct lock_file *shallow_lock,
+ const char **alternate_shallow_file,
+ const struct oid_array *extra);
+const char *setup_temporary_shallow(const struct oid_array *extra);
+void advertise_shallow_grafts(int);
+/*
+ * Initialize with prepare_shallow_info() or zero-initialize (equivalent to
+ * prepare_shallow_info with a NULL oid_array).
+ */
struct shallow_info {
struct oid_array *shallow;
int *ours, nr_ours;
@@ -272,21 +283,21 @@
int nr_commits;
};
-extern void prepare_shallow_info(struct shallow_info *, struct oid_array *);
-extern void clear_shallow_info(struct shallow_info *);
-extern void remove_nonexistent_theirs_shallow(struct shallow_info *);
-extern void assign_shallow_commits_to_refs(struct shallow_info *info,
- uint32_t **used,
- int *ref_status);
-extern int delayed_reachability_test(struct shallow_info *si, int c);
+void prepare_shallow_info(struct shallow_info *, struct oid_array *);
+void clear_shallow_info(struct shallow_info *);
+void remove_nonexistent_theirs_shallow(struct shallow_info *);
+void assign_shallow_commits_to_refs(struct shallow_info *info,
+ uint32_t **used,
+ int *ref_status);
+int delayed_reachability_test(struct shallow_info *si, int c);
#define PRUNE_SHOW_ONLY 1
#define PRUNE_QUICK 2
-extern void prune_shallow(unsigned options);
+void prune_shallow(unsigned options);
extern struct trace_key trace_shallow;
-extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
-extern int run_add_interactive(const char *revision, const char *patch_mode,
- const struct pathspec *pathspec);
+int interactive_add(int argc, const char **argv, const char *prefix, int patch);
+int run_add_interactive(const char *revision, const char *patch_mode,
+ const struct pathspec *pathspec);
struct commit_extra_header {
struct commit_extra_header *next;
@@ -295,24 +306,24 @@
size_t len;
};
-extern void append_merge_tag_headers(struct commit_list *parents,
- struct commit_extra_header ***tail);
+void append_merge_tag_headers(struct commit_list *parents,
+ struct commit_extra_header ***tail);
-extern int commit_tree(const char *msg, size_t msg_len,
- const struct object_id *tree,
- struct commit_list *parents, struct object_id *ret,
- const char *author, const char *sign_commit);
+int commit_tree(const char *msg, size_t msg_len,
+ const struct object_id *tree,
+ struct commit_list *parents, struct object_id *ret,
+ const char *author, const char *sign_commit);
-extern int commit_tree_extended(const char *msg, size_t msg_len,
- const struct object_id *tree,
- struct commit_list *parents,
- struct object_id *ret, const char *author,
- const char *sign_commit,
- struct commit_extra_header *);
+int commit_tree_extended(const char *msg, size_t msg_len,
+ const struct object_id *tree,
+ struct commit_list *parents,
+ struct object_id *ret, const char *author,
+ const char *sign_commit,
+ struct commit_extra_header *);
-extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
+struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
-extern void free_commit_extra_headers(struct commit_extra_header *extra);
+void free_commit_extra_headers(struct commit_extra_header *extra);
/*
* Search the commit object contents given by "msg" for the header "key".
@@ -322,24 +333,24 @@
* Note that some headers (like mergetag) may be multi-line. It is the caller's
* responsibility to parse further in this case!
*/
-extern const char *find_commit_header(const char *msg, const char *key,
- size_t *out_len);
+const char *find_commit_header(const char *msg, const char *key,
+ size_t *out_len);
/* Find the end of the log message, the right place for a new trailer. */
-extern size_t ignore_non_trailer(const char *buf, size_t len);
+size_t ignore_non_trailer(const char *buf, size_t len);
typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
- void *cb_data);
+ void *cb_data);
-extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
+int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
struct merge_remote_desc {
struct object *obj; /* the named object, could be a tag */
char name[FLEX_ARRAY];
};
-extern struct merge_remote_desc *merge_remote_util(struct commit *);
-extern void set_merge_remote_desc(struct commit *commit,
- const char *name, struct object *obj);
+struct merge_remote_desc *merge_remote_util(struct commit *);
+void set_merge_remote_desc(struct commit *commit,
+ const char *name, struct object *obj);
/*
* Given "name" from the command line to merge, find the commit object
@@ -348,9 +359,9 @@
*/
struct commit *get_merge_parent(const char *name);
-extern int parse_signed_commit(const struct commit *commit,
- struct strbuf *message, struct strbuf *signature);
-extern int remove_signature(struct strbuf *buf);
+int parse_signed_commit(const struct commit *commit,
+ struct strbuf *message, struct strbuf *signature);
+int remove_signature(struct strbuf *buf);
/*
* Check the signature of the given commit. The result of the check is stored
@@ -359,7 +370,7 @@
* at all. This may allocate memory for sig->gpg_output, sig->gpg_status,
* sig->signer and sig->key.
*/
-extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
+int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
/* record author-date for each commit object */
struct author_date_slab;
@@ -379,6 +390,6 @@
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
LAST_ARG_MUST_BE_NULL
-extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
+int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
#endif /* COMMIT_H */
diff --git a/common-main.c b/common-main.c
index 3728f66..71e21dd 100644
--- a/common-main.c
+++ b/common-main.c
@@ -25,12 +25,17 @@
int main(int argc, const char **argv)
{
+ int result;
+
+ trace2_initialize_clock();
+
/*
* Always open file descriptors 0/1/2 to avoid clobbering files
* in die(). It also avoids messing up when the pipes are dup'ed
* onto stdin/stdout/stderr in the child processes we spawn.
*/
sanitize_stdfds();
+ restore_sigpipe_to_default();
git_resolve_executable_dir(argv[0]);
@@ -40,7 +45,13 @@
attr_start();
- restore_sigpipe_to_default();
+ trace2_initialize();
+ trace2_cmd_start(argv);
+ trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
- return cmd_main(argc, argv);
+ result = cmd_main(argc, argv);
+
+ trace2_cmd_exit(result);
+
+ return result;
}
diff --git a/compat/access.c b/compat/access.c
new file mode 100644
index 0000000..19fda3e
--- /dev/null
+++ b/compat/access.c
@@ -0,0 +1,31 @@
+#define COMPAT_CODE_ACCESS
+#include "../git-compat-util.h"
+
+/* Do the same thing access(2) does, but use the effective uid,
+ * and don't make the mistake of telling root that any file is
+ * executable. This version uses stat(2).
+ */
+int git_access(const char *path, int mode)
+{
+ struct stat st;
+
+ /* do not interfere a normal user */
+ if (geteuid())
+ return access(path, mode);
+
+ if (stat(path, &st) < 0)
+ return -1;
+
+ /* Root can read or write any file. */
+ if (!(mode & X_OK))
+ return 0;
+
+ /* Root can execute any file that has any one of the execute
+ * bits set.
+ */
+ if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
+ return 0;
+
+ errno = EACCES;
+ return -1;
+}
diff --git a/compat/bswap.h b/compat/bswap.h
index 5078ce5..e4e2573 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -1,3 +1,6 @@
+#ifndef COMPAT_BSWAP_H
+#define COMPAT_BSWAP_H
+
/*
* Let's make sure we always have a sane definition for ntohl()/htonl().
* Some libraries define those as a function call, just to perform byte
@@ -210,3 +213,5 @@
}
#endif
+
+#endif /* COMPAT_BSWAP_H */
diff --git a/compat/fileno.c b/compat/fileno.c
new file mode 100644
index 0000000..8e80ef3
--- /dev/null
+++ b/compat/fileno.c
@@ -0,0 +1,7 @@
+#define COMPAT_CODE_FILENO
+#include "../git-compat-util.h"
+
+int git_fileno(FILE *stream)
+{
+ return fileno(stream);
+}
diff --git a/compat/mingw.c b/compat/mingw.c
index 4276297..7a0d619 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1161,14 +1161,21 @@
int isexe, int exe_only)
{
char path[MAX_PATH];
+ wchar_t wpath[MAX_PATH];
snprintf(path, sizeof(path), "%.*s\\%s.exe", dirlen, dir, cmd);
- if (!isexe && access(path, F_OK) == 0)
+ if (xutftowcs_path(wpath, path) < 0)
+ return NULL;
+
+ if (!isexe && _waccess(wpath, F_OK) == 0)
return xstrdup(path);
- path[strlen(path)-4] = '\0';
- if ((!exe_only || isexe) && access(path, F_OK) == 0)
- if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
+ wpath[wcslen(wpath)-4] = '\0';
+ if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) {
+ if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY)) {
+ path[strlen(path)-4] = '\0';
return xstrdup(path);
+ }
+ }
return NULL;
}
@@ -1265,7 +1272,7 @@
}
ALLOC_ARRAY(result, size);
- memcpy(result, wenv, size * sizeof(*wenv));
+ COPY_ARRAY(result, wenv, size);
FreeEnvironmentStringsW(wenv);
return result;
}
@@ -1309,7 +1316,7 @@
continue;
size = wcslen(array[i]) + 1;
- memcpy(p, array[i], size * sizeof(*p));
+ COPY_ARRAY(p, array[i], size);
p += size;
}
*p = L'\0';
@@ -1407,7 +1414,7 @@
do_unset_environment_variables();
/* Determine whether or not we are associated to a console */
- cons = CreateFile("CONOUT$", GENERIC_WRITE,
+ cons = CreateFileW(L"CONOUT$", GENERIC_WRITE,
FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (cons == INVALID_HANDLE_VALUE) {
@@ -1437,7 +1444,9 @@
si.hStdOutput = winansi_get_osfhandle(fhout);
si.hStdError = winansi_get_osfhandle(fherr);
- if (xutftowcs_path(wcmd, cmd) < 0)
+ if (*argv && !strcmp(cmd, *argv))
+ wcmd[0] = L'\0';
+ else if (xutftowcs_path(wcmd, cmd) < 0)
return -1;
if (dir && xutftowcs_path(wdir, dir) < 0)
return -1;
@@ -1466,8 +1475,8 @@
wenvblk = make_environment_block(deltaenv);
memset(&pi, 0, sizeof(pi));
- ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags,
- wenvblk, dir ? wdir : NULL, &si, &pi);
+ ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
+ flags, wenvblk, dir ? wdir : NULL, &si, &pi);
free(wenvblk);
free(wargs);
@@ -1551,19 +1560,26 @@
return 0;
prog = path_lookup(interpr, 1);
if (prog) {
+ int exec_id;
int argc = 0;
- const char **argv2;
+#ifndef _MSC_VER
+ const
+#endif
+ char **argv2;
while (argv[argc]) argc++;
ALLOC_ARRAY(argv2, argc + 1);
argv2[0] = (char *)cmd; /* full path to the script file */
memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
+ exec_id = trace2_exec(prog, argv2);
pid = mingw_spawnv(prog, argv2, 1);
if (pid >= 0) {
int status;
if (waitpid(pid, &status, 0) < 0)
status = 255;
+ trace2_exec_result(exec_id, status);
exit(status);
}
+ trace2_exec_result(exec_id, -1);
pid = 1; /* indicate that we tried but failed */
free(prog);
free(argv2);
@@ -1576,12 +1592,17 @@
/* check if git_command is a shell script */
if (!try_shell_exec(cmd, argv)) {
int pid, status;
+ int exec_id;
+ exec_id = trace2_exec(cmd, (const char **)argv);
pid = mingw_spawnv(cmd, (const char **)argv, 0);
- if (pid < 0)
+ if (pid < 0) {
+ trace2_exec_result(exec_id, -1);
return -1;
+ }
if (waitpid(pid, &status, 0) < 0)
status = 255;
+ trace2_exec_result(exec_id, status);
exit(status);
}
return -1;
@@ -1632,7 +1653,7 @@
*/
char *mingw_getenv(const char *name)
{
-#define GETENV_MAX_RETAIN 30
+#define GETENV_MAX_RETAIN 64
static char *values[GETENV_MAX_RETAIN];
static int value_counter;
int len_key, len_value;
@@ -1705,142 +1726,10 @@
return result ? 0 : -1;
}
-/*
- * Note, this isn't a complete replacement for getaddrinfo. It assumes
- * that service contains a numerical port, or that it is null. It
- * does a simple search using gethostbyname, and returns one IPv4 host
- * if one was found.
- */
-static int WSAAPI getaddrinfo_stub(const char *node, const char *service,
- const struct addrinfo *hints,
- struct addrinfo **res)
-{
- struct hostent *h = NULL;
- struct addrinfo *ai;
- struct sockaddr_in *sin;
-
- if (node) {
- h = gethostbyname(node);
- if (!h)
- return WSAGetLastError();
- }
-
- ai = xmalloc(sizeof(struct addrinfo));
- *res = ai;
- ai->ai_flags = 0;
- ai->ai_family = AF_INET;
- ai->ai_socktype = hints ? hints->ai_socktype : 0;
- switch (ai->ai_socktype) {
- case SOCK_STREAM:
- ai->ai_protocol = IPPROTO_TCP;
- break;
- case SOCK_DGRAM:
- ai->ai_protocol = IPPROTO_UDP;
- break;
- default:
- ai->ai_protocol = 0;
- break;
- }
- ai->ai_addrlen = sizeof(struct sockaddr_in);
- if (hints && (hints->ai_flags & AI_CANONNAME))
- ai->ai_canonname = h ? xstrdup(h->h_name) : NULL;
- else
- ai->ai_canonname = NULL;
-
- sin = xcalloc(1, ai->ai_addrlen);
- sin->sin_family = AF_INET;
- /* Note: getaddrinfo is supposed to allow service to be a string,
- * which should be looked up using getservbyname. This is
- * currently not implemented */
- if (service)
- sin->sin_port = htons(atoi(service));
- if (h)
- sin->sin_addr = *(struct in_addr *)h->h_addr;
- else if (hints && (hints->ai_flags & AI_PASSIVE))
- sin->sin_addr.s_addr = INADDR_ANY;
- else
- sin->sin_addr.s_addr = INADDR_LOOPBACK;
- ai->ai_addr = (struct sockaddr *)sin;
- ai->ai_next = NULL;
- return 0;
-}
-
-static void WSAAPI freeaddrinfo_stub(struct addrinfo *res)
-{
- free(res->ai_canonname);
- free(res->ai_addr);
- free(res);
-}
-
-static int WSAAPI getnameinfo_stub(const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen,
- char *serv, DWORD servlen, int flags)
-{
- const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;
- if (sa->sa_family != AF_INET)
- return EAI_FAMILY;
- if (!host && !serv)
- return EAI_NONAME;
-
- if (host && hostlen > 0) {
- struct hostent *ent = NULL;
- if (!(flags & NI_NUMERICHOST))
- ent = gethostbyaddr((const char *)&sin->sin_addr,
- sizeof(sin->sin_addr), AF_INET);
-
- if (ent)
- snprintf(host, hostlen, "%s", ent->h_name);
- else if (flags & NI_NAMEREQD)
- return EAI_NONAME;
- else
- snprintf(host, hostlen, "%s", inet_ntoa(sin->sin_addr));
- }
-
- if (serv && servlen > 0) {
- struct servent *ent = NULL;
- if (!(flags & NI_NUMERICSERV))
- ent = getservbyport(sin->sin_port,
- flags & NI_DGRAM ? "udp" : "tcp");
-
- if (ent)
- snprintf(serv, servlen, "%s", ent->s_name);
- else
- snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
- }
-
- return 0;
-}
-
-static HMODULE ipv6_dll = NULL;
-static void (WSAAPI *ipv6_freeaddrinfo)(struct addrinfo *res);
-static int (WSAAPI *ipv6_getaddrinfo)(const char *node, const char *service,
- const struct addrinfo *hints,
- struct addrinfo **res);
-static int (WSAAPI *ipv6_getnameinfo)(const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen,
- char *serv, DWORD servlen, int flags);
-/*
- * gai_strerror is an inline function in the ws2tcpip.h header, so we
- * don't need to try to load that one dynamically.
- */
-
-static void socket_cleanup(void)
-{
- WSACleanup();
- if (ipv6_dll)
- FreeLibrary(ipv6_dll);
- ipv6_dll = NULL;
- ipv6_freeaddrinfo = freeaddrinfo_stub;
- ipv6_getaddrinfo = getaddrinfo_stub;
- ipv6_getnameinfo = getnameinfo_stub;
-}
-
static void ensure_socket_initialization(void)
{
WSADATA wsa;
static int initialized = 0;
- const char *libraries[] = { "ws2_32.dll", "wship6.dll", NULL };
- const char **name;
if (initialized)
return;
@@ -1849,35 +1738,7 @@
die("unable to initialize winsock subsystem, error %d",
WSAGetLastError());
- for (name = libraries; *name; name++) {
- ipv6_dll = LoadLibraryExA(*name, NULL,
- LOAD_LIBRARY_SEARCH_SYSTEM32);
- if (!ipv6_dll)
- continue;
-
- ipv6_freeaddrinfo = (void (WSAAPI *)(struct addrinfo *))
- GetProcAddress(ipv6_dll, "freeaddrinfo");
- ipv6_getaddrinfo = (int (WSAAPI *)(const char *, const char *,
- const struct addrinfo *,
- struct addrinfo **))
- GetProcAddress(ipv6_dll, "getaddrinfo");
- ipv6_getnameinfo = (int (WSAAPI *)(const struct sockaddr *,
- socklen_t, char *, DWORD,
- char *, DWORD, int))
- GetProcAddress(ipv6_dll, "getnameinfo");
- if (!ipv6_freeaddrinfo || !ipv6_getaddrinfo || !ipv6_getnameinfo) {
- FreeLibrary(ipv6_dll);
- ipv6_dll = NULL;
- } else
- break;
- }
- if (!ipv6_freeaddrinfo || !ipv6_getaddrinfo || !ipv6_getnameinfo) {
- ipv6_freeaddrinfo = freeaddrinfo_stub;
- ipv6_getaddrinfo = getaddrinfo_stub;
- ipv6_getnameinfo = getnameinfo_stub;
- }
-
- atexit(socket_cleanup);
+ atexit((void(*)(void)) WSACleanup);
initialized = 1;
}
@@ -1895,24 +1756,12 @@
return gethostbyname(host);
}
-void mingw_freeaddrinfo(struct addrinfo *res)
-{
- ipv6_freeaddrinfo(res);
-}
-
+#undef getaddrinfo
int mingw_getaddrinfo(const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res)
{
ensure_socket_initialization();
- return ipv6_getaddrinfo(node, service, hints, res);
-}
-
-int mingw_getnameinfo(const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen,
- int flags)
-{
- ensure_socket_initialization();
- return ipv6_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+ return getaddrinfo(node, service, hints, res);
}
int mingw_socket(int domain, int type, int protocol)
@@ -2109,13 +1958,19 @@
static unsigned initialized;
static char user_name[100];
static struct passwd *p;
+ wchar_t buf[100];
DWORD len;
if (initialized)
return p;
- len = sizeof(user_name);
- if (!GetUserName(user_name, &len)) {
+ len = ARRAY_SIZE(buf);
+ if (!GetUserNameW(buf, &len)) {
+ initialized = 1;
+ return NULL;
+ }
+
+ if (xwcstoutf(user_name, buf, sizeof(user_name)) < 0) {
initialized = 1;
return NULL;
}
@@ -2279,8 +2134,33 @@
sigint_fn(SIGINT);
return 0;
+#if defined(_MSC_VER)
+ case SIGILL:
+ case SIGFPE:
+ case SIGSEGV:
+ case SIGTERM:
+ case SIGBREAK:
+ case SIGABRT:
+ case SIGABRT_COMPAT:
+ /*
+ * The <signal.h> header in the MS C Runtime defines 8 signals
+ * as being supported on the platform. Anything else causes an
+ * "Invalid signal or error" (which in DEBUG builds causes the
+ * Abort/Retry/Ignore dialog). We by-pass the CRT for things we
+ * already know will fail.
+ */
+ return raise(sig);
+ default:
+ errno = EINVAL;
+ return -1;
+
+#else
+
default:
return raise(sig);
+
+#endif
+
}
}
@@ -2462,20 +2342,39 @@
/* simulate TERM to enable auto-color (see color.c) */
if (!getenv("TERM"))
setenv("TERM", "cygwin", 1);
+
+ /* calculate HOME if not set */
+ if (!getenv("HOME")) {
+ /*
+ * try $HOMEDRIVE$HOMEPATH - the home share may be a network
+ * location, thus also check if the path exists (i.e. is not
+ * disconnected)
+ */
+ if ((tmp = getenv("HOMEDRIVE"))) {
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addstr(&buf, tmp);
+ if ((tmp = getenv("HOMEPATH"))) {
+ strbuf_addstr(&buf, tmp);
+ if (is_directory(buf.buf))
+ setenv("HOME", buf.buf, 1);
+ else
+ tmp = NULL; /* use $USERPROFILE */
+ }
+ strbuf_release(&buf);
+ }
+ /* use $USERPROFILE if the home share is not available */
+ if (!tmp && (tmp = getenv("USERPROFILE")))
+ setenv("HOME", tmp, 1);
+ }
}
+#if !defined(_MSC_VER)
/*
* Disable MSVCRT command line wildcard expansion (__getmainargs called from
* mingw startup code, see init.c in mingw runtime).
*/
int _CRT_glob = 0;
-
-typedef struct {
- int newmode;
-} _startupinfo;
-
-extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob,
- _startupinfo *si);
+#endif
static NORETURN void die_startup(void)
{
@@ -2553,20 +2452,41 @@
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
}
-void mingw_startup(void)
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#include <crtdbg.h>
+#endif
+#endif
+
+/*
+ * We implement wmain() and compile with -municode, which would
+ * normally ignore main(), but we call the latter from the former
+ * so that we can handle non-ASCII command-line parameters
+ * appropriately.
+ *
+ * To be more compatible with the core git code, we convert
+ * argv into UTF8 and pass them directly to main().
+ */
+int wmain(int argc, const wchar_t **wargv)
{
- int i, maxlen, argc;
- char *buffer;
- wchar_t **wenv, **wargv;
- _startupinfo si;
+ int i, maxlen, exit_status;
+ char *buffer, **save;
+ const char **argv;
+
+ trace2_initialize_clock();
+
+#ifdef _MSC_VER
+#ifdef _DEBUG
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+#endif
+
+#ifdef USE_MSVC_CRTDBG
+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+#endif
maybe_redirect_std_handles();
- /* get wide char arguments and environment */
- si.newmode = 0;
- if (__wgetmainargs(&argc, &wargv, &wenv, _CRT_glob, &si) < 0)
- die_startup();
-
/* determine size of argv and environ conversion buffer */
maxlen = wcslen(wargv[0]);
for (i = 1; i < argc; i++)
@@ -2576,9 +2496,16 @@
maxlen = 3 * maxlen + 1;
buffer = malloc_startup(maxlen);
- /* convert command line arguments and environment to UTF-8 */
+ /*
+ * Create a UTF-8 version of w_argv. Also create a "save" copy
+ * to remember all the string pointers because parse_options()
+ * will remove claimed items from the argv that we pass down.
+ */
+ ALLOC_ARRAY(argv, argc + 1);
+ ALLOC_ARRAY(save, argc + 1);
for (i = 0; i < argc; i++)
- __argv[i] = wcstoutfdup_startup(buffer, wargv[i], maxlen);
+ argv[i] = save[i] = wcstoutfdup_startup(buffer, wargv[i], maxlen);
+ argv[i] = save[i] = NULL;
free(buffer);
/* fix Windows specific environment settings */
@@ -2597,6 +2524,16 @@
/* initialize Unicode console */
winansi_init();
+
+ /* invoke the real main() using our utf8 version of argv. */
+ exit_status = main(argc, argv);
+
+ for (i = 0; i < argc; i++)
+ free(save[i]);
+ free(save);
+ free(argv);
+
+ return exit_status;
}
int uname(struct utsname *buf)
diff --git a/compat/mingw.h b/compat/mingw.h
index 30d9fb3..9ad204c 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -11,7 +11,7 @@
#undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif
-extern int mingw_core_config(const char *var, const char *value, void *cb);
+int mingw_core_config(const char *var, const char *value, void *cb);
#define platform_core_config mingw_core_config
/*
@@ -147,8 +147,7 @@
errno = EINVAL;
return -1;
}
-/* bash cannot reliably detect negative return codes as failure */
-#define exit(code) exit((code) & 0xff)
+
#define sigemptyset(x) (void)0
static inline int sigaddset(sigset_t *set, int signum)
{ return 0; }
@@ -296,18 +295,10 @@
struct hostent *mingw_gethostbyname(const char *host);
#define gethostbyname mingw_gethostbyname
-void mingw_freeaddrinfo(struct addrinfo *res);
-#define freeaddrinfo mingw_freeaddrinfo
-
int mingw_getaddrinfo(const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res);
#define getaddrinfo mingw_getaddrinfo
-int mingw_getnameinfo(const struct sockaddr *sa, socklen_t salen,
- char *host, DWORD hostlen, char *serv, DWORD servlen,
- int flags);
-#define getnameinfo mingw_getnameinfo
-
int mingw_socket(int domain, int type, int protocol);
#define socket mingw_socket
@@ -361,11 +352,13 @@
#ifndef __MINGW64_VERSION_MAJOR
#define off_t off64_t
#define lseek _lseeki64
+#ifndef _MSC_VER
struct timespec {
time_t tv_sec;
long tv_nsec;
};
#endif
+#endif
struct mingw_stat {
_dev_t st_dev;
@@ -450,7 +443,7 @@
*path = '/';
}
#define PATH_SEP ';'
-extern char *mingw_query_user_email(void);
+char *mingw_query_user_email(void);
#define query_user_email mingw_query_user_email
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
#define PRIuMAX "I64u"
@@ -571,20 +564,20 @@
extern CRITICAL_SECTION pinfo_cs;
/*
- * A replacement of main() that adds win32 specific initialization.
+ * Git, like most portable C applications, implements a main() function. On
+ * Windows, this main() function would receive parameters encoded in the
+ * current locale, but Git for Windows would prefer UTF-8 encoded parameters.
+ *
+ * To make that happen, we still declare main() here, and then declare and
+ * implement wmain() (which is the Unicode variant of main()) and compile with
+ * -municode. This wmain() function reencodes the parameters from UTF-16 to
+ * UTF-8 format, sets up a couple of other things as required on Windows, and
+ * then hands off to the main() function.
*/
-
-void mingw_startup(void);
-#define main(c,v) dummy_decl_mingw_main(void); \
-static int mingw_main(c,v); \
-int main(int argc, const char **argv) \
-{ \
- mingw_startup(); \
- return mingw_main(__argc, (void *)__argv); \
-} \
-static int mingw_main(c,v)
+int wmain(int argc, const wchar_t **w_argv);
+int main(int argc, const char **argv);
/*
* Used by Pthread API implementation for Windows
*/
-extern int err_win_to_posix(DWORD winerr);
+int err_win_to_posix(DWORD winerr);
diff --git a/compat/msvc.h b/compat/msvc.h
index 29a8ce8..1d7a8c6 100644
--- a/compat/msvc.h
+++ b/compat/msvc.h
@@ -6,6 +6,10 @@
#include <malloc.h>
#include <io.h>
+#pragma warning(disable: 4018) /* signed/unsigned comparison */
+#pragma warning(disable: 4244) /* type conversion, possible loss of data */
+#pragma warning(disable: 4090) /* 'function' : different 'const' qualifiers (ALLOC_GROW etc.)*/
+
/* porting function */
#define inline __inline
#define __inline__ __inline
@@ -18,6 +22,12 @@
#undef ERROR
+#define ftello _ftelli64
+
+typedef int sigset_t;
+/* open for reading, writing, or both (not in fcntl.h) */
+#define O_ACCMODE (_O_RDONLY | _O_WRONLY | _O_RDWR)
+
#include "compat/mingw.h"
#endif
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index b833ff9..9134349 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -1755,10 +1755,10 @@
assert(sl->l != 0);
assert(sl->threadid == CURRENT_THREAD);
if (--sl->c == 0) {
- sl->threadid = 0;
volatile unsigned int* lp = &sl->l;
int prev = 0;
int ret;
+ sl->threadid = 0;
__asm__ __volatile__ ("lock; xchgl %0, %1"
: "=r" (ret)
: "m" (*(lp)), "0"(prev)
@@ -3066,7 +3066,7 @@
#if !ONLY_MSPACES
/* Set up lock for main malloc area */
gm->mflags = mparams.default_mflags;
- INITIAL_LOCK(&gm->mutex);
+ (void)INITIAL_LOCK(&gm->mutex);
#endif
#if (FOOTERS && !INSECURE)
@@ -5017,7 +5017,7 @@
mchunkptr msp = align_as_chunk(tbase);
mstate m = (mstate)(chunk2mem(msp));
memset(m, 0, msize);
- INITIAL_LOCK(&m->mutex);
+ (void)INITIAL_LOCK(&m->mutex);
msp->head = (msize|PINUSE_BIT|CINUSE_BIT);
m->seg.base = m->least_addr = tbase;
m->seg.size = m->footprint = m->max_footprint = tsize;
diff --git a/compat/obstack.h b/compat/obstack.h
index ced94d0..ae36ed6 100644
--- a/compat/obstack.h
+++ b/compat/obstack.h
@@ -496,7 +496,7 @@
( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \
((((h)->temp.tempint > 0 \
&& (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \
- ? (int) ((h)->next_free = (h)->object_base \
+ ? (ptrdiff_t) ((h)->next_free = (h)->object_base \
= (h)->temp.tempint + (char *) (h)->chunk) \
: (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 4459408..0e95dd4 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -149,8 +149,8 @@
case FILE_TYPE_PIPE:
if (!once_only)
{
- NtQueryInformationFile = (PNtQueryInformationFile)
- GetProcAddress (GetModuleHandle ("ntdll.dll"),
+ NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
+ GetProcAddress (GetModuleHandleW (L"ntdll.dll"),
"NtQueryInformationFile");
once_only = TRUE;
}
diff --git a/compat/vcbuild/.gitignore b/compat/vcbuild/.gitignore
new file mode 100644
index 0000000..8f8b794
--- /dev/null
+++ b/compat/vcbuild/.gitignore
@@ -0,0 +1,3 @@
+/vcpkg/
+/MSVC-DEFS-GEN
+/VCPKG-DEFS
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 60fd873..1b6dabf 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -1,3 +1,65 @@
+The Steps to Build Git with VS2015 or VS2017 from the command line.
+
+1. Install the "vcpkg" open source package manager and build essential
+ third-party libraries. The steps for this have been captured in a
+ set of convenience scripts. These can be run from a stock Command
+ Prompt or from an SDK bash window:
+
+ $ cd <repo_root>
+ $ ./compat/vcbuild/vcpkg_install.bat
+
+ The vcpkg tools and all of the third-party sources will be installed
+ in this folder:
+ <repo_root>/compat/vcbuild/vcpkg/
+
+ A file will be created with a set of Makefile macros pointing to a
+ unified "include", "lib", and "bin" directory (release and debug) for
+ all of the required packages. This file will be included by the main
+ Makefile:
+ <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
+
+2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
+ root to make it easier to run and debug git.exe without having to
+ manipulate your PATH. This is especially true for debug sessions in
+ Visual Studio.
+
+ Use ONE of the following forms which should match how you want to
+ compile git.exe.
+
+ $ ./compat/vcbuild/vcpkg_copy_packages.bat debug
+ $ ./compat/vcbuild/vcpkg_copy_packages.bat release
+
+3. Build git using MSVC from an SDK bash window using one of the
+ following commands:
+
+ $ make MSVC=1
+ $ make MSVC=1 DEBUG=1
+
+================================================================
+
+Alternatively, run `make vcxproj` and then load the generated `git.sln` in
+Visual Studio. The initial build will install the vcpkg system and build the
+dependencies automatically. This will take a while.
+
+Instead of generating the `git.sln` file yourself (which requires a full Git
+for Windows SDK), you may want to consider fetching the `vs/master` branch of
+https://github.com/git-for-windows/git instead (which is updated automatically
+via CI running `make vcxproj`). The `vs/master` branch does not require a Git
+for Windows to build, but you can run the test scripts in a regular Git Bash.
+
+Note that `make vcxproj` will automatically add and commit the generated `.sln`
+and `.vcxproj` files to the repo. This is necessary to allow building a
+fully-testable Git in Visual Studio, where a regular Git Bash can be used to
+run the test scripts (as opposed to a full Git for Windows SDK): a number of
+build targets, such as Git commands implemented as Unix shell scripts (where
+`@@SHELL_PATH@@` and other placeholders are interpolated) require a full-blown
+Git for Windows SDK (which is about 10x the size of a regular Git for Windows
+installation).
+
+If your plan is to open a Pull Request with Git for Windows, it is a good idea
+to drop this commit before submitting.
+
+================================================================
The Steps of Build Git with VS2008
1. You need the build environment, which contains the Git dependencies
diff --git a/compat/vcbuild/find_vs_env.bat b/compat/vcbuild/find_vs_env.bat
new file mode 100644
index 0000000..40194dd
--- /dev/null
+++ b/compat/vcbuild/find_vs_env.bat
@@ -0,0 +1,168 @@
+@ECHO OFF
+REM ================================================================
+REM You can use either GCC (the default) or MSVC to build git
+REM using the GIT-SDK command line tools.
+REM $ make
+REM $ make MSVC=1
+REM
+REM GIT-SDK BASH windows inherit environment variables with all of
+REM the bin/lib/include paths for GCC. It DOES NOT inherit values
+REM for the corresponding MSVC tools.
+REM
+REM During normal (non-git) Windows development, you launch one
+REM of the provided "developer command prompts" to set environment
+REM variables for the MSVC tools.
+REM
+REM Therefore, to allow MSVC command line builds of git from BASH
+REM and MAKE, we must blend these two different worlds. This script
+REM attempts to do that.
+REM ================================================================
+REM This BAT file starts in a plain (non-developer) command prompt,
+REM searches for the "best" commmand prompt setup script, installs
+REM it into the current CMD process, and exports the various MSVC
+REM environment variables for use by MAKE.
+REM
+REM The output of this script should be written to a make "include
+REM file" and referenced by the top-level Makefile.
+REM
+REM See "config.mak.uname" (look for compat/vcbuild/MSVC-DEFS-GEN).
+REM ================================================================
+REM The provided command prompts are custom to each VS release and
+REM filled with lots of internal knowledge (such as Registry settings);
+REM even their names vary by release, so it is not appropriate for us
+REM to look inside them. Rather, just run them in a subordinate
+REM process and extract the settings we need.
+REM ================================================================
+REM
+REM Current (VS2017 and beyond)
+REM -------------------
+REM Visual Studio 2017 introduced a new installation layout and
+REM support for side-by-side installation of multiple versions of
+REM VS2017. Furthermore, these can all coexist with installations
+REM of previous versions of VS (which have a completely different
+REM layout on disk).
+REM
+REM VS2017 Update 2 introduced a "vswhere.exe" command:
+REM https://github.com/Microsoft/vswhere
+REM https://blogs.msdn.microsoft.com/heaths/2017/02/25/vswhere-available/
+REM https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/
+REM
+REM VS2015
+REM ------
+REM Visual Studio 2015 uses the traditional VcVarsAll.
+REM
+REM Earlier Versions
+REM ----------------
+REM Currently unsupported.
+REM
+REM ================================================================
+REM Note: Throughout this script we use "dir <path> && <cmd>" rather
+REM than "if exist <path>" because of script problems with pathnames
+REM containing spaces.
+REM ================================================================
+
+REM Sanitize PATH to prevent git-sdk paths from confusing "wmic.exe"
+REM (called internally in some of the system BAT files).
+SET PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;
+
+REM ================================================================
+
+:current
+ SET vs_where=C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe
+ dir "%vs_where%" >nul 2>nul && GOTO have_vs_where
+ GOTO not_2017
+
+:have_vs_where
+ REM Try to use VsWhere to get the location of VsDevCmd.
+
+ REM Keep VsDevCmd from cd'ing away.
+ SET VSCMD_START_DIR=.
+
+ REM Get the root of the VS product installation.
+ FOR /F "usebackq tokens=*" %%i IN (`"%vs_where%" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath`) DO @SET vs_ip=%%i
+
+ SET vs_devcmd=%vs_ip%\Common7\Tools\VsDevCmd.bat
+ dir "%vs_devcmd%" >nul 2>nul && GOTO have_vs_devcmd
+ GOTO not_2017
+
+:have_vs_devcmd
+ REM Use VsDevCmd to setup the environment of this process.
+ REM Setup CL for building 64-bit apps using 64-bit tools.
+ @call "%vs_devcmd%" -no_logo -arch=x64 -host_arch=x64
+
+ SET tgt=%VSCMD_ARG_TGT_ARCH%
+
+ SET mn=%VCToolsInstallDir%
+ SET msvc_includes=-I"%mn%INCLUDE"
+ SET msvc_libs=-L"%mn%lib\%tgt%"
+ SET msvc_bin_dir=%mn%bin\Host%VSCMD_ARG_HOST_ARCH%\%tgt%
+
+ SET sdk_dir=%WindowsSdkDir%
+ SET sdk_ver=%WindowsSDKVersion%
+ SET si=%sdk_dir%Include\%sdk_ver%
+ SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared"
+ SET sl=%sdk_dir%lib\%sdk_ver%
+ SET sdk_libs=-L"%sl%ucrt\%tgt%" -L"%sl%um\%tgt%"
+
+ SET vs_ver=%VisualStudioVersion%
+
+ GOTO print_vars
+
+REM ================================================================
+
+:not_2017
+ REM See if VS2015 is installed.
+
+ SET vs_2015_bat=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
+ dir "%vs_2015_bat%" >nul 2>nul && GOTO have_vs_2015
+ GOTO not_2015
+
+:have_vs_2015
+ REM Use VcVarsAll like the "x64 Native" command prompt.
+ REM Setup CL for building 64-bit apps using 64-bit tools.
+ @call "%vs_2015_bat%" amd64
+
+ REM Note that in VS2015 they use "x64" in some contexts and "amd64" in others.
+ SET mn=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
+ SET msvc_includes=-I"%mn%INCLUDE"
+ SET msvc_libs=-L"%mn%lib\amd64"
+ SET msvc_bin_dir=%mn%bin\amd64
+
+ SET sdk_dir=%WindowsSdkDir%
+ SET sdk_ver=%WindowsSDKVersion%
+ SET si=%sdk_dir%Include\%sdk_ver%
+ SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared" -I"%si%winrt"
+ SET sl=%sdk_dir%lib\%sdk_ver%
+ SET sdk_libs=-L"%sl%ucrt\x64" -L"%sl%um\x64"
+
+ SET vs_ver=%VisualStudioVersion%
+
+ GOTO print_vars
+
+REM ================================================================
+
+:not_2015
+ echo "ERROR: unsupported VS version (older than VS2015)" >&2
+ EXIT /B 1
+
+REM ================================================================
+
+:print_vars
+ REM Dump the essential vars to stdout to allow the main
+ REM Makefile to include it. See config.mak.uname.
+ REM Include DOS-style and BASH-style path for bin dir.
+
+ echo msvc_bin_dir=%msvc_bin_dir%
+ SET X1=%msvc_bin_dir:C:=/C%
+ SET X2=%X1:\=/%
+ echo msvc_bin_dir_msys=%X2%
+
+ echo msvc_includes=%msvc_includes%
+ echo msvc_libs=%msvc_libs%
+
+ echo sdk_includes=%sdk_includes%
+ echo sdk_libs=%sdk_libs%
+
+ echo vs_ver=%vs_ver%
+
+ EXIT /B 0
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index a87d0da..c7b021b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -12,32 +12,62 @@
use strict;
my @args = ();
my @cflags = ();
+my @lflags = ();
my $is_linking = 0;
+my $is_debug = 0;
while (@ARGV) {
my $arg = shift @ARGV;
- if ("$arg" =~ /^-[DIMGO]/) {
+ if ("$arg" eq "-DDEBUG") {
+ # Some vcpkg-based libraries have different names for release
+ # and debug versions. This hack assumes that -DDEBUG comes
+ # before any "-l*" flags.
+ $is_debug = 1;
+ }
+ if ("$arg" =~ /^-[DIMGOZ]/) {
push(@cflags, $arg);
} elsif ("$arg" eq "-o") {
my $file_out = shift @ARGV;
if ("$file_out" =~ /exe$/) {
$is_linking = 1;
+ # Create foo.exe and foo.pdb
push(@args, "-OUT:$file_out");
} else {
+ # Create foo.o and foo.o.pdb
push(@args, "-Fo$file_out");
+ push(@args, "-Fd$file_out.pdb");
}
} elsif ("$arg" eq "-lz") {
+ if ($is_debug) {
+ push(@args, "zlibd.lib");
+ } else{
push(@args, "zlib.lib");
+ }
} elsif ("$arg" eq "-liconv") {
- push(@args, "iconv.lib");
+ push(@args, "libiconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libeay32.lib");
} elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib");
} elsif ("$arg" eq "-lcurl") {
- push(@args, "libcurl.lib");
+ my $lib = "";
+ # Newer vcpkg definitions call this libcurl_imp.lib; Do we
+ # need to use that instead?
+ foreach my $flag (@lflags) {
+ if ($flag =~ /^-LIBPATH:(.*)/) {
+ foreach my $l ("libcurl_imp.lib", "libcurl.lib") {
+ if (-f "$1/$l") {
+ $lib = $l;
+ last;
+ }
+ }
+ }
+ }
+ push(@args, $lib);
+ } elsif ("$arg" eq "-lexpat") {
+ push(@args, "expat.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/;
- push(@args, $arg);
+ push(@lflags, $arg);
} elsif ("$arg" =~ /^-R/) {
# eat
} else {
@@ -45,10 +75,11 @@
}
}
if ($is_linking) {
+ push(@args, @lflags);
unshift(@args, "link.exe");
} else {
unshift(@args, "cl.exe");
push(@args, @cflags);
}
-#printf("**** @args\n");
+printf(STDERR "**** @args\n\n\n") if (!defined($ENV{'QUIET_GEN'}));
exit (system(@args) != 0);
diff --git a/compat/vcbuild/vcpkg_copy_dlls.bat b/compat/vcbuild/vcpkg_copy_dlls.bat
new file mode 100644
index 0000000..13661c1
--- /dev/null
+++ b/compat/vcbuild/vcpkg_copy_dlls.bat
@@ -0,0 +1,39 @@
+@ECHO OFF
+REM ================================================================
+REM This script is an optional step. It copies the *.dll and *.pdb
+REM files (created by vcpkg_install.bat) into the top-level directory
+REM of the repo so that you can type "./git.exe" and find them without
+REM having to fixup your PATH.
+REM
+REM NOTE: Because the names of some DLL files change between DEBUG and
+REM NOTE: RELEASE builds when built using "vcpkg.exe", you will need
+REM NOTE: to copy up the corresponding version.
+REM ================================================================
+
+ SETLOCAL EnableDelayedExpansion
+
+ @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
+ cd %cwd%
+
+ SET arch=x64-windows
+ SET inst=%cwd%vcpkg\installed\%arch%
+
+ IF [%1]==[release] (
+ echo Copying RELEASE mode DLLs to repo root...
+ ) ELSE IF [%1]==[debug] (
+ SET inst=%inst%\debug
+ echo Copying DEBUG mode DLLs to repo root...
+ ) ELSE (
+ echo ERROR: Invalid argument.
+ echo Usage: %~0 release
+ echo Usage: %~0 debug
+ EXIT /B 1
+ )
+
+ xcopy /e/s/v/y %inst%\bin\*.dll ..\..\
+ xcopy /e/s/v/y %inst%\bin\*.pdb ..\..\
+
+ xcopy /e/s/v/y %inst%\bin\*.dll ..\..\t\helper\
+ xcopy /e/s/v/y %inst%\bin\*.pdb ..\..\t\helper\
+
+ EXIT /B 0
diff --git a/compat/vcbuild/vcpkg_install.bat b/compat/vcbuild/vcpkg_install.bat
new file mode 100644
index 0000000..ebd0bad
--- /dev/null
+++ b/compat/vcbuild/vcpkg_install.bat
@@ -0,0 +1,80 @@
+@ECHO OFF
+REM ================================================================
+REM This script installs the "vcpkg" source package manager and uses
+REM it to build the third-party libraries that git requires when it
+REM is built using MSVC.
+REM
+REM [1] Install VCPKG.
+REM [a] Create <root>/compat/vcbuild/vcpkg/
+REM [b] Download "vcpkg".
+REM [c] Compile using the currently installed version of VS.
+REM [d] Create <root>/compat/vcbuild/vcpkg/vcpkg.exe
+REM
+REM [2] Install third-party libraries.
+REM [a] Download each (which may also install CMAKE).
+REM [b] Compile in RELEASE mode and install in:
+REM vcpkg/installed/<arch>/{bin,lib}
+REM [c] Compile in DEBUG mode and install in:
+REM vcpkg/installed/<arch>/debug/{bin,lib}
+REM [d] Install headers in:
+REM vcpkg/installed/<arch>/include
+REM
+REM [3] Create a set of MAKE definitions for the top-level
+REM Makefile to allow "make MSVC=1" to find the above
+REM third-party libraries.
+REM [a] Write vcpkg/VCPGK-DEFS
+REM
+REM https://blogs.msdn.microsoft.com/vcblog/2016/09/19/vcpkg-a-tool-to-acquire-and-build-c-open-source-libraries-on-windows/
+REM https://github.com/Microsoft/vcpkg
+REM https://vcpkg.readthedocs.io/en/latest/
+REM ================================================================
+
+ SETLOCAL EnableDelayedExpansion
+
+ @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
+ cd %cwd%
+
+ dir vcpkg\vcpkg.exe >nul 2>nul && GOTO :install_libraries
+
+ echo Fetching vcpkg in %cwd%vcpkg
+ git.exe clone https://github.com/Microsoft/vcpkg vcpkg
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ cd vcpkg
+ echo Building vcpkg
+ powershell -exec bypass scripts\bootstrap.ps1
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ echo Successfully installed %cwd%vcpkg\vcpkg.exe
+
+:install_libraries
+ SET arch=x64-windows
+
+ echo Installing third-party libraries...
+ FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO (
+ cd %cwd%vcpkg
+ IF NOT EXIST "packages\%%i_%arch%" CALL :sub__install_one %%i
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+ )
+
+:install_defines
+ cd %cwd%
+ SET inst=%cwd%vcpkg\installed\%arch%
+
+ echo vcpkg_inc=-I"%inst%\include">VCPKG-DEFS
+ echo vcpkg_rel_lib=-L"%inst%\lib">>VCPKG-DEFS
+ echo vcpkg_rel_bin="%inst%\bin">>VCPKG-DEFS
+ echo vcpkg_dbg_lib=-L"%inst%\debug\lib">>VCPKG-DEFS
+ echo vcpkg_dbg_bin="%inst%\debug\bin">>VCPKG-DEFS
+
+ EXIT /B 0
+
+
+:sub__install_one
+ echo Installing package %1...
+
+ .\vcpkg.exe install %1:%arch%
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ echo Finished %1
+ goto :EOF
diff --git a/compat/win32/git.manifest b/compat/win32/git.manifest
new file mode 100644
index 0000000..771e3cc
--- /dev/null
+++ b/compat/win32/git.manifest
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity type="win32" name="Git" version="0.0.0.1" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
+</assembly>
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index c6cb8dd..f1cfe73 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -50,7 +50,7 @@
DWORD tid;
} pthread_t;
-extern int pthread_create(pthread_t *thread, const void *unused,
+int pthread_create(pthread_t *thread, const void *unused,
void *(*start_routine)(void*), void *arg);
/*
@@ -59,10 +59,10 @@
*/
#define pthread_join(a, b) win32_pthread_join(&(a), (b))
-extern int win32_pthread_join(pthread_t *thread, void **value_ptr);
+int win32_pthread_join(pthread_t *thread, void **value_ptr);
#define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
-extern pthread_t pthread_self(void);
+pthread_t pthread_self(void);
static inline void NORETURN pthread_exit(void *ret)
{
diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c
new file mode 100644
index 0000000..8ccbd1c
--- /dev/null
+++ b/compat/win32/trace2_win32_process_info.c
@@ -0,0 +1,191 @@
+#include "../../cache.h"
+#include "../../json-writer.h"
+#include "lazyload.h"
+#include <Psapi.h>
+#include <tlHelp32.h>
+
+/*
+ * An arbitrarily chosen value to limit the size of the ancestor
+ * array built in git_processes().
+ */
+#define NR_PIDS_LIMIT 10
+
+/*
+ * Find the process data for the given PID in the given snapshot
+ * and update the PROCESSENTRY32 data.
+ */
+static int find_pid(DWORD pid, HANDLE hSnapshot, PROCESSENTRY32 *pe32)
+{
+ pe32->dwSize = sizeof(PROCESSENTRY32);
+
+ if (Process32First(hSnapshot, pe32)) {
+ do {
+ if (pe32->th32ProcessID == pid)
+ return 1;
+ } while (Process32Next(hSnapshot, pe32));
+ }
+ return 0;
+}
+
+/*
+ * Accumulate JSON array of our parent processes:
+ * [
+ * exe-name-parent,
+ * exe-name-grand-parent,
+ * ...
+ * ]
+ *
+ * Note: we only report the filename of the process executable; the
+ * only way to get its full pathname is to use OpenProcess()
+ * and GetModuleFileNameEx() or QueryfullProcessImageName()
+ * and that seems rather expensive (on top of the cost of
+ * getting the snapshot).
+ *
+ * Note: we compute the set of parent processes by walking the PPID
+ * link in each visited PROCESSENTRY32 record. This search
+ * stops when an ancestor process is not found in the snapshot
+ * (because it exited before the current or intermediate parent
+ * process exited).
+ *
+ * This search may compute an incorrect result if the PPID link
+ * refers to the PID of an exited parent and that PID has been
+ * recycled and given to a new unrelated process.
+ *
+ * Worse, it is possible for a child or descendant of the
+ * current process to be given the recycled PID and cause a
+ * PPID-cycle. This would cause an infinite loop building our
+ * parent process array.
+ *
+ * Note: for completeness, the "System Idle" process has PID=0 and
+ * PPID=0 and could cause another PPID-cycle. We don't expect
+ * Git to be a descendant of the idle process, but because of
+ * PID recycling, it might be possible to get a PPID link value
+ * of 0. This too would cause an infinite loop.
+ *
+ * Therefore, we keep an array of the visited PPIDs to guard against
+ * cycles.
+ *
+ * We use a fixed-size array rather than ALLOC_GROW to keep things
+ * simple and avoid the alloc/realloc overhead. It is OK if we
+ * truncate the search and return a partial answer.
+ */
+static void get_processes(struct json_writer *jw, HANDLE hSnapshot)
+{
+ PROCESSENTRY32 pe32;
+ DWORD pid;
+ DWORD pid_list[NR_PIDS_LIMIT];
+ int k, nr_pids = 0;
+
+ pid = GetCurrentProcessId();
+ while (find_pid(pid, hSnapshot, &pe32)) {
+ /* Only report parents. Omit self from the JSON output. */
+ if (nr_pids)
+ jw_array_string(jw, pe32.szExeFile);
+
+ /* Check for cycle in snapshot. (Yes, it happened.) */
+ for (k = 0; k < nr_pids; k++)
+ if (pid == pid_list[k]) {
+ jw_array_string(jw, "(cycle)");
+ return;
+ }
+
+ if (nr_pids == NR_PIDS_LIMIT) {
+ jw_array_string(jw, "(truncated)");
+ return;
+ }
+
+ pid_list[nr_pids++] = pid;
+
+ pid = pe32.th32ParentProcessID;
+ }
+}
+
+/*
+ * Emit JSON data for the current and parent processes. Individual
+ * trace2 targets can decide how to actually print it.
+ */
+static void get_ancestry(void)
+{
+ HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+
+ if (hSnapshot != INVALID_HANDLE_VALUE) {
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_array_begin(&jw, 0);
+ get_processes(&jw, hSnapshot);
+ jw_end(&jw);
+
+ trace2_data_json("process", the_repository, "windows/ancestry",
+ &jw);
+
+ jw_release(&jw);
+ CloseHandle(hSnapshot);
+ }
+}
+
+/*
+ * Is a debugger attached to the current process?
+ *
+ * This will catch debug runs (where the debugger started the process).
+ * This is the normal case. Since this code is called during our startup,
+ * it will not report instances where a debugger is attached dynamically
+ * to a running git process, but that is relatively rare.
+ */
+static void get_is_being_debugged(void)
+{
+ if (IsDebuggerPresent())
+ trace2_data_intmax("process", the_repository,
+ "windows/debugger_present", 1);
+}
+
+/*
+ * Emit JSON data with the peak memory usage of the current process.
+ */
+static void get_peak_memory_info(void)
+{
+ DECLARE_PROC_ADDR(psapi.dll, BOOL, GetProcessMemoryInfo, HANDLE,
+ PPROCESS_MEMORY_COUNTERS, DWORD);
+
+ if (INIT_PROC_ADDR(GetProcessMemoryInfo)) {
+ PROCESS_MEMORY_COUNTERS pmc;
+
+ if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc,
+ sizeof(pmc))) {
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+
+#define KV(kv) #kv, (intmax_t)pmc.kv
+
+ jw_object_intmax(&jw, KV(PageFaultCount));
+ jw_object_intmax(&jw, KV(PeakWorkingSetSize));
+ jw_object_intmax(&jw, KV(PeakPagefileUsage));
+
+ jw_end(&jw);
+
+ trace2_data_json("process", the_repository,
+ "windows/memory", &jw);
+ jw_release(&jw);
+ }
+ }
+}
+
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+ if (!trace2_is_enabled())
+ return;
+
+ switch (reason) {
+ case TRACE2_PROCESS_INFO_STARTUP:
+ get_is_being_debugged();
+ get_ancestry();
+ return;
+
+ case TRACE2_PROCESS_INFO_EXIT:
+ get_peak_memory_info();
+ return;
+
+ default:
+ BUG("trace2_collect_process_info: unknown reason '%d'", reason);
+ }
+}
diff --git a/compat/winansi.c b/compat/winansi.c
index f4f0823..cacd82c 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -7,6 +7,7 @@
#include <wingdi.h>
#include <winreg.h>
#include "win32.h"
+#include "win32/lazyload.h"
static int fd_is_interactive[3] = { 0, 0, 0 };
#define FD_CONSOLE 0x1
@@ -41,26 +42,21 @@
#endif
#endif
-typedef BOOL (WINAPI *PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL,
- PCONSOLE_FONT_INFOEX);
-
static void warn_if_raster_font(void)
{
DWORD fontFamily = 0;
- PGETCURRENTCONSOLEFONTEX pGetCurrentConsoleFontEx;
+ DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
+ HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
/* don't bother if output was ascii only */
if (!non_ascii_used)
return;
/* GetCurrentConsoleFontEx is available since Vista */
- pGetCurrentConsoleFontEx = (PGETCURRENTCONSOLEFONTEX) GetProcAddress(
- GetModuleHandle("kernel32.dll"),
- "GetCurrentConsoleFontEx");
- if (pGetCurrentConsoleFontEx) {
+ if (INIT_PROC_ADDR(GetCurrentConsoleFontEx)) {
CONSOLE_FONT_INFOEX cfi;
cfi.cbSize = sizeof(cfi);
- if (pGetCurrentConsoleFontEx(console, 0, &cfi))
+ if (GetCurrentConsoleFontEx(console, 0, &cfi))
fontFamily = cfi.FontFamily;
} else {
/* pre-Vista: check default console font in registry */
@@ -544,7 +540,20 @@
#ifdef DETECT_MSYS_TTY
#include <winternl.h>
+
+#if defined(_MSC_VER)
+
+typedef struct _OBJECT_NAME_INFORMATION
+{
+ UNICODE_STRING Name;
+ WCHAR NameBuffer[0];
+} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
+
+#define ObjectNameInformation 1
+
+#else
#include <ntstatus.h>
+#endif
static void detect_msys_tty(int fd)
{
@@ -599,7 +608,7 @@
void winansi_init(void)
{
int con1, con2;
- char name[32];
+ wchar_t name[32];
/* check if either stdout or stderr is a console output screen buffer */
con1 = is_console(1);
@@ -619,13 +628,15 @@
}
/* create a named pipe to communicate with the console thread */
- xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId());
- hwrite = CreateNamedPipe(name, PIPE_ACCESS_OUTBOUND,
+ if (swprintf(name, ARRAY_SIZE(name) - 1, L"\\\\.\\pipe\\winansi%lu",
+ GetCurrentProcessId()) < 0)
+ die("Could not initialize winansi pipe name");
+ hwrite = CreateNamedPipeW(name, PIPE_ACCESS_OUTBOUND,
PIPE_TYPE_BYTE | PIPE_WAIT, 1, BUFFER_SIZE, 0, 0, NULL);
if (hwrite == INVALID_HANDLE_VALUE)
die_lasterr("CreateNamedPipe failed");
- hread = CreateFile(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
+ hread = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hread == INVALID_HANDLE_VALUE)
die_lasterr("CreateFile for named pipe failed");
diff --git a/config.c b/config.c
index 24ad1a9..743e457 100644
--- a/config.c
+++ b/config.c
@@ -19,6 +19,7 @@
#include "utf8.h"
#include "dir.h"
#include "color.h"
+#include "refs.h"
struct config_source {
struct config_source *prev;
@@ -170,6 +171,12 @@
return ret;
}
+static void add_trailing_starstar_for_dir(struct strbuf *pat)
+{
+ if (pat->len && is_dir_sep(pat->buf[pat->len - 1]))
+ strbuf_addstr(pat, "**");
+}
+
static int prepare_include_condition_pattern(struct strbuf *pat)
{
struct strbuf path = STRBUF_INIT;
@@ -199,8 +206,7 @@
} else if (!is_absolute_path(pat->buf))
strbuf_insert(pat, 0, "**/", 3);
- if (pat->len && is_dir_sep(pat->buf[pat->len - 1]))
- strbuf_addstr(pat, "**");
+ add_trailing_starstar_for_dir(pat);
strbuf_release(&path);
return prefix;
@@ -242,7 +248,7 @@
}
ret = !wildmatch(pattern.buf + prefix, text.buf + prefix,
- icase ? WM_CASEFOLD : 0);
+ WM_PATHNAME | (icase ? WM_CASEFOLD : 0));
if (!ret && !already_tried_absolute) {
/*
@@ -264,6 +270,26 @@
return ret;
}
+static int include_by_branch(const char *cond, size_t cond_len)
+{
+ int flags;
+ int ret;
+ struct strbuf pattern = STRBUF_INIT;
+ const char *refname = !the_repository->gitdir ?
+ NULL : resolve_ref_unsafe("HEAD", 0, NULL, &flags);
+ const char *shortname;
+
+ if (!refname || !(flags & REF_ISSYMREF) ||
+ !skip_prefix(refname, "refs/heads/", &shortname))
+ return 0;
+
+ strbuf_add(&pattern, cond, cond_len);
+ add_trailing_starstar_for_dir(&pattern);
+ ret = !wildmatch(pattern.buf, shortname, WM_PATHNAME);
+ strbuf_release(&pattern);
+ return ret;
+}
+
static int include_condition_is_true(const struct config_options *opts,
const char *cond, size_t cond_len)
{
@@ -272,6 +298,8 @@
return include_by_gitdir(opts, cond, cond_len, 0);
else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
return include_by_gitdir(opts, cond, cond_len, 1);
+ else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
+ return include_by_branch(cond, cond_len);
/* unknown conditionals are always false */
return 0;
@@ -834,22 +862,16 @@
return error_return;
}
-static int parse_unit_factor(const char *end, uintmax_t *val)
+static uintmax_t get_unit_factor(const char *end)
{
if (!*end)
return 1;
- else if (!strcasecmp(end, "k")) {
- *val *= 1024;
- return 1;
- }
- else if (!strcasecmp(end, "m")) {
- *val *= 1024 * 1024;
- return 1;
- }
- else if (!strcasecmp(end, "g")) {
- *val *= 1024 * 1024 * 1024;
- return 1;
- }
+ else if (!strcasecmp(end, "k"))
+ return 1024;
+ else if (!strcasecmp(end, "m"))
+ return 1024 * 1024;
+ else if (!strcasecmp(end, "g"))
+ return 1024 * 1024 * 1024;
return 0;
}
@@ -859,19 +881,20 @@
char *end;
intmax_t val;
uintmax_t uval;
- uintmax_t factor = 1;
+ uintmax_t factor;
errno = 0;
val = strtoimax(value, &end, 0);
if (errno == ERANGE)
return 0;
- if (!parse_unit_factor(end, &factor)) {
+ factor = get_unit_factor(end);
+ if (!factor) {
errno = EINVAL;
return 0;
}
- uval = labs(val);
- uval *= factor;
- if (uval > max || labs(val) > uval) {
+ uval = val < 0 ? -val : val;
+ if (unsigned_mult_overflows(factor, uval) ||
+ factor * uval > max) {
errno = ERANGE;
return 0;
}
@@ -888,21 +911,23 @@
if (value && *value) {
char *end;
uintmax_t val;
- uintmax_t oldval;
+ uintmax_t factor;
errno = 0;
val = strtoumax(value, &end, 0);
if (errno == ERANGE)
return 0;
- oldval = val;
- if (!parse_unit_factor(end, &val)) {
+ factor = get_unit_factor(end);
+ if (!factor) {
errno = EINVAL;
return 0;
}
- if (val > max || oldval > val) {
+ if (unsigned_mult_overflows(factor, val) ||
+ factor * val > max) {
errno = ERANGE;
return 0;
}
+ val *= factor;
*ret = val;
return 1;
}
@@ -949,34 +974,44 @@
NORETURN
static void die_bad_number(const char *name, const char *value)
{
- const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
+ const char *error_type = (errno == ERANGE) ?
+ N_("out of range") : N_("invalid unit");
+ const char *bad_numeric = N_("bad numeric config value '%s' for '%s': %s");
if (!value)
value = "";
+ if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
+ /*
+ * We explicitly *don't* use _() here since it would
+ * cause an infinite loop with _() needing to call
+ * use_gettext_poison(). This is why marked up
+ * translations with N_() above.
+ */
+ die(bad_numeric, value, name, error_type);
+
if (!(cf && cf->name))
- die(_("bad numeric config value '%s' for '%s': %s"),
- value, name, error_type);
+ die(_(bad_numeric), value, name, _(error_type));
switch (cf->origin_type) {
case CONFIG_ORIGIN_BLOB:
die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_FILE:
die(_("bad numeric config value '%s' for '%s' in file %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_STDIN:
die(_("bad numeric config value '%s' for '%s' in standard input: %s"),
- value, name, error_type);
+ value, name, _(error_type));
case CONFIG_ORIGIN_SUBMODULE_BLOB:
die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_CMDLINE:
die(_("bad numeric config value '%s' for '%s' in command line %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
default:
die(_("bad numeric config value '%s' for '%s' in %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
}
}
@@ -1344,11 +1379,6 @@
return 0;
}
- if (!strcmp(var, "core.partialclonefilter")) {
- return git_config_string(&core_partial_clone_filter_default,
- var, value);
- }
-
if (!strcmp(var, "core.usereplacerefs")) {
read_replace_refs = git_config_bool(var, value);
return 0;
@@ -1445,7 +1475,9 @@
if (starts_with(var, "core."))
return git_default_core_config(var, value, cb);
- if (starts_with(var, "user."))
+ if (starts_with(var, "user.") ||
+ starts_with(var, "author.") ||
+ starts_with(var, "committer."))
return git_ident_config(var, value, cb);
if (starts_with(var, "i18n."))
@@ -1674,7 +1706,9 @@
repo_config = NULL;
current_parsing_scope = CONFIG_SCOPE_SYSTEM;
- if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0))
+ if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK,
+ opts->system_gently ?
+ ACCESS_EACCES_OK : 0))
ret += git_config_from_file(fn, git_etc_gitconfig(),
data);
@@ -1686,14 +1720,15 @@
ret += git_config_from_file(fn, user_config, data);
current_parsing_scope = CONFIG_SCOPE_REPO;
- if (repo_config && !access_or_die(repo_config, R_OK, 0))
+ if (!opts->ignore_repo && repo_config &&
+ !access_or_die(repo_config, R_OK, 0))
ret += git_config_from_file(fn, repo_config, data);
/*
* Note: this should have a new scope, CONFIG_SCOPE_WORKTREE.
* But let's not complicate things before it's actually needed.
*/
- if (repository_format_worktree_config) {
+ if (!opts->ignore_worktree && repository_format_worktree_config) {
char *path = git_pathdup("config.worktree");
if (!access_or_die(path, R_OK, 0))
ret += git_config_from_file(fn, path, data);
@@ -1701,7 +1736,7 @@
}
current_parsing_scope = CONFIG_SCOPE_CMDLINE;
- if (git_config_from_parameters(fn, data) < 0)
+ if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
die(_("unable to parse command-line config"));
current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
@@ -1792,6 +1827,23 @@
strbuf_release(&gitdir);
}
+/*
+ * Read config but only enumerate system and global settings.
+ * Omit any repo-local, worktree-local, or command-line settings.
+ */
+void read_very_early_config(config_fn_t cb, void *data)
+{
+ struct config_options opts = { 0 };
+
+ opts.respect_includes = 1;
+ opts.ignore_repo = 1;
+ opts.ignore_worktree = 1;
+ opts.ignore_cmdline = 1;
+ opts.system_gently = 1;
+
+ config_with_options(cb, data, NULL, &opts);
+}
+
static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
{
struct config_set_element k;
@@ -2009,7 +2061,7 @@
/* Functions use to read configuration from a repository */
static void repo_read_config(struct repository *repo)
{
- struct config_options opts;
+ struct config_options opts = { 0 };
opts.respect_includes = 1;
opts.commondir = repo->commondir;
@@ -2231,30 +2283,6 @@
return -1; /* thing exists but cannot be parsed */
}
-int git_config_get_untracked_cache(void)
-{
- int val = -1;
- const char *v;
-
- /* Hack for test programs like test-dump-untracked-cache */
- if (ignore_untracked_cache_config)
- return -1;
-
- if (!git_config_get_maybe_bool("core.untrackedcache", &val))
- return val;
-
- if (!git_config_get_value("core.untrackedcache", &v)) {
- if (!strcasecmp(v, "keep"))
- return -1;
-
- error(_("unknown core.untrackedCache value '%s'; "
- "using 'keep' default value"), v);
- return -1;
- }
-
- return -1; /* default value */
-}
-
int git_config_get_split_index(void)
{
int val;
@@ -2655,6 +2683,8 @@
void git_config_set(const char *key, const char *value)
{
git_config_set_multivar(key, value, NULL, 0);
+
+ trace2_cmd_set_config(key, value);
}
/*
diff --git a/config.h b/config.h
index ee5d3fa..f0ed464 100644
--- a/config.h
+++ b/config.h
@@ -55,6 +55,10 @@
struct config_options {
unsigned int respect_includes : 1;
+ unsigned int ignore_repo : 1;
+ unsigned int ignore_worktree : 1;
+ unsigned int ignore_cmdline : 1;
+ unsigned int system_gently : 1;
const char *commondir;
const char *git_dir;
config_parser_event_fn_t event_fn;
@@ -68,62 +72,63 @@
};
typedef int (*config_fn_t)(const char *, const char *, void *);
-extern int git_default_config(const char *, const char *, void *);
-extern int git_config_from_file(config_fn_t fn, const char *, void *);
-extern int git_config_from_file_with_options(config_fn_t fn, const char *,
- void *,
- const struct config_options *);
-extern int git_config_from_mem(config_fn_t fn,
- const enum config_origin_type,
- const char *name,
- const char *buf, size_t len,
- void *data, const struct config_options *opts);
-extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
- const struct object_id *oid, void *data);
-extern void git_config_push_parameter(const char *text);
-extern int git_config_from_parameters(config_fn_t fn, void *data);
-extern void read_early_config(config_fn_t cb, void *data);
-extern void git_config(config_fn_t fn, void *);
-extern int config_with_options(config_fn_t fn, void *,
- struct git_config_source *config_source,
- const struct config_options *opts);
-extern int git_parse_ssize_t(const char *, ssize_t *);
-extern int git_parse_ulong(const char *, unsigned long *);
-extern int git_parse_maybe_bool(const char *);
-extern int git_config_int(const char *, const char *);
-extern int64_t git_config_int64(const char *, const char *);
-extern unsigned long git_config_ulong(const char *, const char *);
-extern ssize_t git_config_ssize_t(const char *, const char *);
-extern int git_config_bool_or_int(const char *, const char *, int *);
-extern int git_config_bool(const char *, const char *);
-extern int git_config_string(const char **, const char *, const char *);
-extern int git_config_pathname(const char **, const char *, const char *);
-extern int git_config_expiry_date(timestamp_t *, const char *, const char *);
-extern int git_config_color(char *, const char *, const char *);
-extern int git_config_set_in_file_gently(const char *, const char *, const char *);
-extern void git_config_set_in_file(const char *, const char *, const char *);
-extern int git_config_set_gently(const char *, const char *);
-extern void git_config_set(const char *, const char *);
-extern int git_config_parse_key(const char *, char **, int *);
-extern int git_config_key_is_valid(const char *key);
-extern int git_config_set_multivar_gently(const char *, const char *, const char *, int);
-extern void git_config_set_multivar(const char *, const char *, const char *, int);
-extern int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
-extern void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
-extern int git_config_rename_section(const char *, const char *);
-extern int git_config_rename_section_in_file(const char *, const char *, const char *);
-extern int git_config_copy_section(const char *, const char *);
-extern int git_config_copy_section_in_file(const char *, const char *, const char *);
-extern const char *git_etc_gitconfig(void);
-extern int git_env_bool(const char *, int);
-extern unsigned long git_env_ulong(const char *, unsigned long);
-extern int git_config_system(void);
-extern int config_error_nonbool(const char *);
+int git_default_config(const char *, const char *, void *);
+int git_config_from_file(config_fn_t fn, const char *, void *);
+int git_config_from_file_with_options(config_fn_t fn, const char *,
+ void *,
+ const struct config_options *);
+int git_config_from_mem(config_fn_t fn,
+ const enum config_origin_type,
+ const char *name,
+ const char *buf, size_t len,
+ void *data, const struct config_options *opts);
+int git_config_from_blob_oid(config_fn_t fn, const char *name,
+ const struct object_id *oid, void *data);
+void git_config_push_parameter(const char *text);
+int git_config_from_parameters(config_fn_t fn, void *data);
+void read_early_config(config_fn_t cb, void *data);
+void read_very_early_config(config_fn_t cb, void *data);
+void git_config(config_fn_t fn, void *);
+int config_with_options(config_fn_t fn, void *,
+ struct git_config_source *config_source,
+ const struct config_options *opts);
+int git_parse_ssize_t(const char *, ssize_t *);
+int git_parse_ulong(const char *, unsigned long *);
+int git_parse_maybe_bool(const char *);
+int git_config_int(const char *, const char *);
+int64_t git_config_int64(const char *, const char *);
+unsigned long git_config_ulong(const char *, const char *);
+ssize_t git_config_ssize_t(const char *, const char *);
+int git_config_bool_or_int(const char *, const char *, int *);
+int git_config_bool(const char *, const char *);
+int git_config_string(const char **, const char *, const char *);
+int git_config_pathname(const char **, const char *, const char *);
+int git_config_expiry_date(timestamp_t *, const char *, const char *);
+int git_config_color(char *, const char *, const char *);
+int git_config_set_in_file_gently(const char *, const char *, const char *);
+void git_config_set_in_file(const char *, const char *, const char *);
+int git_config_set_gently(const char *, const char *);
+void git_config_set(const char *, const char *);
+int git_config_parse_key(const char *, char **, int *);
+int git_config_key_is_valid(const char *key);
+int git_config_set_multivar_gently(const char *, const char *, const char *, int);
+void git_config_set_multivar(const char *, const char *, const char *, int);
+int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
+void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+int git_config_rename_section(const char *, const char *);
+int git_config_rename_section_in_file(const char *, const char *, const char *);
+int git_config_copy_section(const char *, const char *);
+int git_config_copy_section_in_file(const char *, const char *, const char *);
+const char *git_etc_gitconfig(void);
+int git_env_bool(const char *, int);
+unsigned long git_env_ulong(const char *, unsigned long);
+int git_config_system(void);
+int config_error_nonbool(const char *);
#if defined(__GNUC__)
#define config_error_nonbool(s) (config_error_nonbool(s), const_error())
#endif
-extern int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
+int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
enum config_scope {
CONFIG_SCOPE_UNKNOWN = 0,
@@ -133,9 +138,9 @@
CONFIG_SCOPE_CMDLINE,
};
-extern enum config_scope current_config_scope(void);
-extern const char *current_config_origin_type(void);
-extern const char *current_config_name(void);
+enum config_scope current_config_scope(void);
+const char *current_config_origin_type(void);
+const char *current_config_name(void);
struct config_include_data {
int depth;
@@ -144,7 +149,7 @@
const struct config_options *opts;
};
#define CONFIG_INCLUDE_INIT { 0 }
-extern int git_config_include(const char *name, const char *value, void *data);
+int git_config_include(const char *name, const char *value, void *data);
/*
* Match and parse a config key of the form:
@@ -159,10 +164,10 @@
* If the subsection pointer-to-pointer passed in is NULL, returns 0 only if
* there is no subsection at all.
*/
-extern int parse_config_key(const char *var,
- const char *section,
- const char **subsection, int *subsection_len,
- const char **key);
+int parse_config_key(const char *var,
+ const char *section,
+ const char **subsection, int *subsection_len,
+ const char **key);
struct config_set_element {
struct hashmap_entry ent;
@@ -192,71 +197,71 @@
struct configset_list list;
};
-extern void git_configset_init(struct config_set *cs);
-extern int git_configset_add_file(struct config_set *cs, const char *filename);
-extern const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
-extern void git_configset_clear(struct config_set *cs);
+void git_configset_init(struct config_set *cs);
+int git_configset_add_file(struct config_set *cs, const char *filename);
+const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+void git_configset_clear(struct config_set *cs);
/*
* These functions return 1 if not found, and 0 if found, leaving the found
* value in the 'dest' pointer.
*/
-extern int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
-extern int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
-extern int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
-extern int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
-extern int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
-extern int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
-extern int git_configset_get_bool_or_int(struct config_set *cs, const char *key, int *is_bool, int *dest);
-extern int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *dest);
-extern int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest);
+int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
+int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
+int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
+int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
+int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
+int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
+int git_configset_get_bool_or_int(struct config_set *cs, const char *key, int *is_bool, int *dest);
+int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *dest);
+int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest);
/* Functions for reading a repository's config */
struct repository;
-extern void repo_config(struct repository *repo, config_fn_t fn, void *data);
-extern int repo_config_get_value(struct repository *repo,
- const char *key, const char **value);
-extern const struct string_list *repo_config_get_value_multi(struct repository *repo,
- const char *key);
-extern int repo_config_get_string_const(struct repository *repo,
- const char *key, const char **dest);
-extern int repo_config_get_string(struct repository *repo,
- const char *key, char **dest);
-extern int repo_config_get_int(struct repository *repo,
+void repo_config(struct repository *repo, config_fn_t fn, void *data);
+int repo_config_get_value(struct repository *repo,
+ const char *key, const char **value);
+const struct string_list *repo_config_get_value_multi(struct repository *repo,
+ const char *key);
+int repo_config_get_string_const(struct repository *repo,
+ const char *key, const char **dest);
+int repo_config_get_string(struct repository *repo,
+ const char *key, char **dest);
+int repo_config_get_int(struct repository *repo,
+ const char *key, int *dest);
+int repo_config_get_ulong(struct repository *repo,
+ const char *key, unsigned long *dest);
+int repo_config_get_bool(struct repository *repo,
+ const char *key, int *dest);
+int repo_config_get_bool_or_int(struct repository *repo,
+ const char *key, int *is_bool, int *dest);
+int repo_config_get_maybe_bool(struct repository *repo,
const char *key, int *dest);
-extern int repo_config_get_ulong(struct repository *repo,
- const char *key, unsigned long *dest);
-extern int repo_config_get_bool(struct repository *repo,
- const char *key, int *dest);
-extern int repo_config_get_bool_or_int(struct repository *repo,
- const char *key, int *is_bool, int *dest);
-extern int repo_config_get_maybe_bool(struct repository *repo,
- const char *key, int *dest);
-extern int repo_config_get_pathname(struct repository *repo,
- const char *key, const char **dest);
+int repo_config_get_pathname(struct repository *repo,
+ const char *key, const char **dest);
-extern int git_config_get_value(const char *key, const char **value);
-extern const struct string_list *git_config_get_value_multi(const char *key);
-extern void git_config_clear(void);
-extern int git_config_get_string_const(const char *key, const char **dest);
-extern int git_config_get_string(const char *key, char **dest);
-extern int git_config_get_int(const char *key, int *dest);
-extern int git_config_get_ulong(const char *key, unsigned long *dest);
-extern int git_config_get_bool(const char *key, int *dest);
-extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
-extern int git_config_get_maybe_bool(const char *key, int *dest);
-extern int git_config_get_pathname(const char *key, const char **dest);
-extern int git_config_get_index_threads(int *dest);
-extern int git_config_get_untracked_cache(void);
-extern int git_config_get_split_index(void);
-extern int git_config_get_max_percent_split_change(void);
-extern int git_config_get_fsmonitor(void);
+int git_config_get_value(const char *key, const char **value);
+const struct string_list *git_config_get_value_multi(const char *key);
+void git_config_clear(void);
+int git_config_get_string_const(const char *key, const char **dest);
+int git_config_get_string(const char *key, char **dest);
+int git_config_get_int(const char *key, int *dest);
+int git_config_get_ulong(const char *key, unsigned long *dest);
+int git_config_get_bool(const char *key, int *dest);
+int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
+int git_config_get_maybe_bool(const char *key, int *dest);
+int git_config_get_pathname(const char *key, const char **dest);
+int git_config_get_index_threads(int *dest);
+int git_config_get_untracked_cache(void);
+int git_config_get_split_index(void);
+int git_config_get_max_percent_split_change(void);
+int git_config_get_fsmonitor(void);
/* This dies if the configured or default date is in the future */
-extern int git_config_get_expiry(const char *key, const char **output);
+int git_config_get_expiry(const char *key, const char **output);
/* parse either "this many days" integer, or "5.days.ago" approxidate */
-extern int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
+int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
struct key_value_info {
const char *filename;
@@ -265,8 +270,8 @@
enum config_scope scope;
};
-extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
-extern NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
+NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
+NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
#define LOOKUP_CONFIG(mapping, var) \
lookup_config(mapping, ARRAY_SIZE(mapping), var)
diff --git a/config.mak.dev b/config.mak.dev
index 7354fe1..bf1f3fc 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -1,41 +1,41 @@
ifeq ($(filter no-error,$(DEVOPTS)),)
-CFLAGS += -Werror
+DEVELOPER_CFLAGS += -Werror
endif
ifneq ($(filter pedantic,$(DEVOPTS)),)
-CFLAGS += -pedantic
+DEVELOPER_CFLAGS += -pedantic
# don't warn for each N_ use
-CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
+DEVELOPER_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
endif
-CFLAGS += -Wall
-CFLAGS += -Wdeclaration-after-statement
-CFLAGS += -Wformat-security
-CFLAGS += -Wno-format-zero-length
-CFLAGS += -Wold-style-definition
-CFLAGS += -Woverflow
-CFLAGS += -Wpointer-arith
-CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wunused
-CFLAGS += -Wvla
+DEVELOPER_CFLAGS += -Wall
+DEVELOPER_CFLAGS += -Wdeclaration-after-statement
+DEVELOPER_CFLAGS += -Wformat-security
+DEVELOPER_CFLAGS += -Wno-format-zero-length
+DEVELOPER_CFLAGS += -Wold-style-definition
+DEVELOPER_CFLAGS += -Woverflow
+DEVELOPER_CFLAGS += -Wpointer-arith
+DEVELOPER_CFLAGS += -Wstrict-prototypes
+DEVELOPER_CFLAGS += -Wunused
+DEVELOPER_CFLAGS += -Wvla
ifndef COMPILER_FEATURES
COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
endif
ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
-CFLAGS += -Wtautological-constant-out-of-range-compare
+DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
endif
ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
-CFLAGS += -Wextra
+DEVELOPER_CFLAGS += -Wextra
# if a function is public, there should be a prototype and the right
# header file should be included. If not, it should be static.
-CFLAGS += -Wmissing-prototypes
+DEVELOPER_CFLAGS += -Wmissing-prototypes
ifeq ($(filter extra-all,$(DEVOPTS)),)
# These are disabled because we have these all over the place.
-CFLAGS += -Wno-empty-body
-CFLAGS += -Wno-missing-field-initializers
-CFLAGS += -Wno-sign-compare
-CFLAGS += -Wno-unused-parameter
+DEVELOPER_CFLAGS += -Wno-empty-body
+DEVELOPER_CFLAGS += -Wno-missing-field-initializers
+DEVELOPER_CFLAGS += -Wno-sign-compare
+DEVELOPER_CFLAGS += -Wno-unused-parameter
endif
endif
@@ -43,6 +43,6 @@
# not worth fixing since newer compilers correctly stop complaining
ifneq ($(filter gcc4,$(COMPILER_FEATURES)),)
ifeq ($(filter gcc5,$(COMPILER_FEATURES)),)
-CFLAGS += -Wno-uninitialized
+DEVELOPER_CFLAGS += -Wno-uninitialized
endif
endif
diff --git a/config.mak.uname b/config.mak.uname
index 786bb2f..db7f06b 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -1,5 +1,9 @@
# Platform specific Makefile tweaks based on uname detection
+# Define NO_SAFESEH if you need MSVC/Visual Studio to ignore the lack of
+# Microsoft's Safe Exception Handling in libraries (such as zlib).
+# Typically required for VS2013+/32-bit compilation on Vista+ versions.
+
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
@@ -11,6 +15,21 @@
# avoid the MingW and Cygwin configuration sections
uname_S := Windows
uname_O := Windows
+
+ # Generate and include makefile variables that point to the
+ # currently installed set of MSVC command line tools.
+compat/vcbuild/MSVC-DEFS-GEN: compat/vcbuild/find_vs_env.bat
+ @"$<" | tr '\\' / >"$@"
+include compat/vcbuild/MSVC-DEFS-GEN
+
+ # See if vcpkg and the vcpkg-build versions of the third-party
+ # libraries that we use are installed. We include the result
+ # to get $(vcpkg_*) variables defined for the Makefile.
+ifeq (,$(SKIP_VCPKG))
+compat/vcbuild/VCPKG-DEFS: compat/vcbuild/vcpkg_install.bat
+ @"$<"
+include compat/vcbuild/VCPKG-DEFS
+endif
endif
# We choose to avoid "if .. else if .. else .. endif endif"
@@ -114,6 +133,8 @@
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+ BASIC_CFLAGS += -I/usr/local/include
+ BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
@@ -221,6 +242,7 @@
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
PAGER_ENV = LESS=FRX LV=-c MORE=FRX
FREAD_READS_DIRECTORIES = UnfortunatelyYes
+ FILENO_IS_A_MACRO = UnfortunatelyYes
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
@@ -234,6 +256,7 @@
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
PROCFS_EXECUTABLE_PATH = /proc/curproc/file
FREAD_READS_DIRECTORIES = UnfortunatelyYes
+ FILENO_IS_A_MACRO = UnfortunatelyYes
endif
ifeq ($(uname_S),MirBSD)
NO_STRCASESTR = YesPlease
@@ -267,6 +290,8 @@
INTERNAL_QSORT = UnfortunatelyYes
NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -D_LARGE_FILES
+ FILENO_IS_A_MACRO = UnfortunatelyYes
+ NEED_ACCESS_ROOT_HANDLER = UnfortunatelyYes
ifeq ($(shell expr "$(uname_V)" : '[1234]'),1)
NO_PTHREADS = YesPlease
else
@@ -350,6 +375,19 @@
ifeq ($(uname_S),Windows)
GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ;
+ # Assume that this is built in Git for Windows' SDK
+ ifeq (MINGW32,$(MSYSTEM))
+ prefix = /mingw32
+ else
+ prefix = /mingw64
+ endif
+ # Prepend MSVC 64-bit tool-chain to PATH.
+ #
+ # A regular Git Bash *does not* have cl.exe in its $PATH. As there is a
+ # link.exe next to, and required by, cl.exe, we have to prepend this
+ # onto the existing $PATH.
+ #
+ SANE_TOOL_PATH ?= $(msvc_bin_dir_msys)
HAVE_ALLOCA_H = YesPlease
NO_PREAD = YesPlease
NEEDS_CRYPTO_WITH_SSL = YesPlease
@@ -362,11 +400,14 @@
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
NO_MEMMEM = YesPlease
- # NEEDS_LIBICONV = YesPlease
- NO_ICONV = YesPlease
+ NEEDS_LIBICONV = YesPlease
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
- SNPRINTF_RETURNS_BOGUS = YesPlease
+ NO_INTTYPES_H = YesPlease
+ # VS2015 with UCRT claims that snprintf and friends are C99 compliant,
+ # so we don't need this:
+ #
+ # SNPRINTF_RETURNS_BOGUS = YesPlease
NO_SVN_TESTS = YesPlease
RUNTIME_PREFIX = YesPlease
HAVE_WPGMPTR = YesWeDo
@@ -379,7 +420,6 @@
NO_REGEX = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
- BLK_SHA1 = YesPlease
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
NATIVE_CRLF = YesPlease
@@ -388,24 +428,52 @@
CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl
CFLAGS =
- BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
+ BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
+ compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
+ compat/win32/trace2_win32_process_info.o \
compat/win32/dirent.o
- COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
- BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
- EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
+ COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
+ BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
+ # invalidcontinue.obj allows Git's source code to close the same file
+ # handle twice, or to access the osfhandle of an already-closed stdout
+ # See https://msdn.microsoft.com/en-us/library/ms235330.aspx
+ EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
PTHREAD_LIBS =
lib =
- BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
+ BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes)
ifndef DEBUG
- BASIC_CFLAGS += -GL -Os -MD
- BASIC_LDFLAGS += -LTCG
+ BASIC_CFLAGS += $(vcpkg_rel_lib)
+else
+ BASIC_CFLAGS += $(vcpkg_dbg_lib)
+endif
+ BASIC_CFLAGS += $(sdk_libs) $(msvc_libs)
+
+ifneq ($(USE_MSVC_CRTDBG),)
+ # Optionally enable memory leak reporting.
+ BASIC_CFLAGS += -DUSE_MSVC_CRTDBG
+endif
+ BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
+ # Always give "-Zi" to the compiler and "-debug" to linker (even in
+ # release mode) to force a PDB to be generated (like RelWithDebInfo).
+ BASIC_CFLAGS += -Zi
+ BASIC_LDFLAGS += -debug -Zf
+
+ifdef NO_SAFESEH
+ LDFLAGS += -SAFESEH:NO
+endif
+
+ifndef DEBUG
+ BASIC_CFLAGS += -GL -Gy -O2 -Oy- -MD -DNDEBUG
+ BASIC_LDFLAGS += -release -LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:CV,FIXUP
AR += -LTCG
else
- BASIC_CFLAGS += -Zi -MDd
+ BASIC_CFLAGS += -MDd -DDEBUG -D_DEBUG
endif
X = .exe
+
+compat/msvc.o: compat/msvc.c compat/mingw.c GIT-CFLAGS
endif
ifeq ($(uname_S),Interix)
NO_INITGROUPS = YesPlease
@@ -490,6 +558,7 @@
OLD_ICONV = UnfortunatelyYes
NO_REGEX = NeedsStartEnd
NO_PTHREADS = UnfortunatelyYes
+ FREAD_READS_DIRECTORIES = UnfortunatelyYes
# Not detected (nor checked for) by './configure'.
# We don't have SA_RESTART on NonStop, unfortunalety.
@@ -507,9 +576,7 @@
# RFE 10-120912-4693 submitted to HP NonStop development.
NO_SETITIMER = UnfortunatelyYes
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
- SHELL_PATH = /usr/local/bin/bash
- # as of H06.25/J06.14, we might better use this
- #SHELL_PATH = /usr/coreutils/bin/bash
+ SHELL_PATH = /usr/coreutils/bin/bash
endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
@@ -528,7 +595,6 @@
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
NO_SVN_TESTS = YesPlease
- NO_PERL_MAKEMAKER = YesPlease
RUNTIME_PREFIX = YesPlease
HAVE_WPGMPTR = YesWeDo
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@ -542,9 +608,11 @@
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
+ BASIC_LDFLAGS += -municode
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
+ compat/win32/trace2_win32_process_info.o \
compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
@@ -564,22 +632,33 @@
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease
- COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
+ COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
else
- ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
+ ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
# MSys2
prefix = /usr/
+ # Enable DEP
+ BASIC_LDFLAGS += -Wl,--nxcompat
+ # Enable ASLR (unless debugging)
+ ifneq (,$(findstring -O,$(filter-out -O0 -Og,$(CFLAGS))))
+ BASIC_LDFLAGS += -Wl,--dynamicbase
+ endif
ifeq (MINGW32,$(MSYSTEM))
prefix = /mingw32
+ HOST_CPU = i686
+ BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
endif
ifeq (MINGW64,$(MSYSTEM))
prefix = /mingw64
+ HOST_CPU = x86_64
+ BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
else
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
BASIC_LDFLAGS += -Wl,--large-address-aware
endif
CC = gcc
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
+ -fstack-protector-strong
EXTLIBS += -lntdll
INSTALL = /bin/install
NO_R_TO_GCC_LINKER = YesPlease
@@ -612,3 +691,77 @@
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
endif
+
+vcxproj:
+ # Require clean work tree
+ git update-index -q --refresh && \
+ git diff-files --quiet && \
+ git diff-index --cached --quiet HEAD --
+
+ # Make .vcxproj files and add them
+ unset QUIET_GEN QUIET_BUILT_IN; \
+ perl contrib/buildsystems/generate -g Vcxproj
+ git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
+
+ # Generate the LinkOrCopyBuiltins.targets file
+ (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
+ echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
+ for name in $(BUILT_INS);\
+ do \
+ echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
+ done && \
+ for name in $(REMOTE_CURL_ALIASES); \
+ do \
+ echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
+ done && \
+ echo ' </Target>' && \
+ echo '</Project>') >git/LinkOrCopyBuiltins.targets
+ git add -f git/LinkOrCopyBuiltins.targets
+
+ # Add command-list.h
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h
+ git add -f command-list.h
+
+ # Add scripts
+ rm -f perl/perl.mak
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \
+ $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+ # Strip out the sane tool path, needed only for building
+ sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
+ git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+
+ # Add Perl module
+ $(MAKE) $(LIB_PERL_GEN)
+ git add -f perl/build
+
+ # Add bin-wrappers, for testing
+ rm -rf bin-wrappers/
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(test_bindir_programs)
+ # Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
+ # path of the repository is not hard-coded (GIT_EXEC_PATH will be set
+ # by test-lib.sh according to the current setup)
+ sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
+ \1="$$(cygpath -u "$$\1")"/' \
+ -e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
+ # Ensure that test-* helpers find the .dll files copied to top-level
+ sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
+ # We do not want to force hard-linking builtins
+ sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
+ bin-wrappers/git-{receive-pack,upload-archive}
+ git add -f $(test_bindir_programs)
+ # remote-ext is a builtin, but invoked as if it were external
+ sed 's|receive-pack|remote-ext|g' \
+ <bin-wrappers/git-receive-pack >bin-wrappers/git-remote-ext
+ git add -f bin-wrappers/git-remote-ext
+
+ # Add templates
+ $(MAKE) -C templates
+ git add -f templates/boilerplates.made templates/blt/
+
+ # Add build options
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
+ git add -f GIT-BUILD-OPTIONS
+
+ # Commit the whole shebang
+ git commit -m "Generate Visual Studio solution" \
+ -m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"
diff --git a/configure.ac b/configure.ac
index e0d0da3..a43b476 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,8 +475,18 @@
if test "$git_cv_ld_rpath" = "yes"; then
CC_LD_DYNPATH=-rpath
else
- CC_LD_DYNPATH=
- AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
+ AC_CACHE_CHECK([if linker supports -Wl,+b,], git_cv_ld_wl_b, [
+ SAVE_LDFLAGS="${LDFLAGS}"
+ LDFLAGS="${SAVE_LDFLAGS} -Wl,+b,/"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_b=yes], [git_cv_ld_wl_b=no])
+ LDFLAGS="${SAVE_LDFLAGS}"
+ ])
+ if test "$git_cv_ld_wl_b" = "yes"; then
+ CC_LD_DYNPATH=-Wl,+b,
+ else
+ CC_LD_DYNPATH=
+ AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
+ fi
fi
fi
fi
@@ -763,9 +773,19 @@
GIT_CONF_SUBST([NEEDS_LIBGEN])
test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
-AC_CHECK_LIB([c], [gettext],
-[LIBC_CONTAINS_LIBINTL=YesPlease],
-[LIBC_CONTAINS_LIBINTL=])
+AC_DEFUN([LIBINTL_SRC], [
+AC_LANG_PROGRAM([[
+#include <libintl.h>
+]],[[
+char *msg = gettext("test");
+]])])
+
+AC_MSG_CHECKING([if libc contains libintl])
+AC_LINK_IFELSE([LIBINTL_SRC],
+ [AC_MSG_RESULT([yes])
+ LIBC_CONTAINS_LIBINTL=YesPlease],
+ [AC_MSG_RESULT([no])
+ LIBC_CONTAINS_LIBINTL=])
GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL])
#
diff --git a/connect.c b/connect.c
index 4813f00..da7daa2 100644
--- a/connect.c
+++ b/connect.c
@@ -915,6 +915,10 @@
if (protocol == PROTO_LOCAL)
path = end;
+ else if (protocol == PROTO_FILE && *host != '/' &&
+ !has_dos_drive_prefix(host) &&
+ offset_1st_component(host - 2) > 1)
+ path = host - 2; /* include the leading "//" */
else if (protocol == PROTO_FILE && has_dos_drive_prefix(end))
path = end; /* "file://$(pwd)" may be "file://C:/projects/repo" */
else
@@ -1248,6 +1252,7 @@
conn = NULL;
} else if (protocol == PROTO_GIT) {
conn = git_connect_git(fd, hostandport, path, prog, version, flags);
+ conn->trace2_child_class = "transport/git";
} else {
struct strbuf cmd = STRBUF_INIT;
const char *const *var;
@@ -1290,9 +1295,11 @@
strbuf_release(&cmd);
return NULL;
}
+ conn->trace2_child_class = "transport/ssh";
fill_ssh_args(conn, ssh_host, port, version, flags);
} else {
transport_check_allowed("file");
+ conn->trace2_child_class = "transport/file";
if (version > 0) {
argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
version);
diff --git a/connect.h b/connect.h
index 32aff60..5f2382e 100644
--- a/connect.h
+++ b/connect.h
@@ -7,19 +7,19 @@
#define CONNECT_DIAG_URL (1u << 1)
#define CONNECT_IPV4 (1u << 2)
#define CONNECT_IPV6 (1u << 3)
-extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
-extern int finish_connect(struct child_process *conn);
-extern int git_connection_is_socket(struct child_process *conn);
-extern int server_supports(const char *feature);
-extern int parse_feature_request(const char *features, const char *feature);
-extern const char *server_feature_value(const char *feature, int *len_ret);
-extern int url_is_local_not_ssh(const char *url);
+struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
+int finish_connect(struct child_process *conn);
+int git_connection_is_socket(struct child_process *conn);
+int server_supports(const char *feature);
+int parse_feature_request(const char *features, const char *feature);
+const char *server_feature_value(const char *feature, int *len_ret);
+int url_is_local_not_ssh(const char *url);
struct packet_reader;
-extern enum protocol_version discover_version(struct packet_reader *reader);
+enum protocol_version discover_version(struct packet_reader *reader);
-extern int server_supports_v2(const char *c, int die_on_error);
-extern int server_supports_feature(const char *c, const char *feature,
- int die_on_error);
+int server_supports_v2(const char *c, int die_on_error);
+int server_supports_feature(const char *c, const char *feature,
+ int die_on_error);
#endif
diff --git a/connected.c b/connected.c
index 1bba888..971db00 100644
--- a/connected.c
+++ b/connected.c
@@ -1,9 +1,11 @@
#include "cache.h"
+#include "object-store.h"
#include "run-command.h"
#include "sigchain.h"
#include "connected.h"
#include "transport.h"
#include "packfile.h"
+#include "promisor-remote.h"
/*
* If we feed all the commits we want to verify to this command
@@ -49,6 +51,22 @@
strbuf_release(&idx_file);
}
+ if (opt->check_refs_only) {
+ /*
+ * For partial clones, we don't want to have to do a regular
+ * connectivity check because we have to enumerate and exclude
+ * all promisor objects (slow), and then the connectivity check
+ * itself becomes a no-op because in a partial clone every
+ * object is a promisor object. Instead, just make sure we
+ * received the objects pointed to by each wanted ref.
+ */
+ do {
+ if (!repo_has_object_file(the_repository, &oid))
+ return 1;
+ } while (!fn(cb_data, &oid));
+ return 0;
+ }
+
if (opt->shallow_file) {
argv_array_push(&rev_list.args, "--shallow-file");
argv_array_push(&rev_list.args, opt->shallow_file);
@@ -56,13 +74,14 @@
argv_array_push(&rev_list.args,"rev-list");
argv_array_push(&rev_list.args, "--objects");
argv_array_push(&rev_list.args, "--stdin");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&rev_list.args, "--exclude-promisor-objects");
if (!opt->is_deepening_fetch) {
argv_array_push(&rev_list.args, "--not");
argv_array_push(&rev_list.args, "--all");
}
argv_array_push(&rev_list.args, "--quiet");
+ argv_array_push(&rev_list.args, "--alternate-refs");
if (opt->progress)
argv_array_pushf(&rev_list.args, "--progress=%s",
_("Checking connectivity"));
diff --git a/connected.h b/connected.h
index 8d5a6b3..ce2e7d8 100644
--- a/connected.h
+++ b/connected.h
@@ -46,6 +46,14 @@
* during a fetch.
*/
unsigned is_deepening_fetch : 1;
+
+ /*
+ * If non-zero, only check the top-level objects referenced by the
+ * wanted refs (passed in as cb_data). This is useful for partial
+ * clones, where enumerating and excluding all promisor objects is very
+ * slow and the commit-walk itself becomes a no-op.
+ */
+ unsigned check_refs_only : 1;
};
#define CHECK_CONNECTED_INIT { 0 }
diff --git a/contrib/buildsystems/Generators.pm b/contrib/buildsystems/Generators.pm
index 408ef71..aa4cbaa 100644
--- a/contrib/buildsystems/Generators.pm
+++ b/contrib/buildsystems/Generators.pm
@@ -17,7 +17,7 @@
$me = dirname($me);
if (opendir(D,"$me/Generators")) {
foreach my $gen (readdir(D)) {
- next if ($gen =~ /^\.\.?$/);
+ next unless ($gen =~ /\.pm$/);
require "${me}/Generators/$gen";
$gen =~ s,\.pm,,;
push(@AVAILABLE, $gen);
diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm
index cfa74ad..737647e 100644
--- a/contrib/buildsystems/Generators/Vcproj.pm
+++ b/contrib/buildsystems/Generators/Vcproj.pm
@@ -3,6 +3,7 @@
use strict;
use vars qw($VERSION);
+use Digest::SHA qw(sha256_hex);
our $VERSION = '1.00';
our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE);
@@ -12,59 +13,12 @@
push @EXPORT_OK, qw(generate);
}
-my $guid_index = 0;
-my @GUIDS = (
- "{E07B9989-2BF7-4F21-8918-BE22BA467AC3}",
- "{278FFB51-0296-4A44-A81A-22B87B7C3592}",
- "{7346A2C4-F0FD-444F-9EBE-1AF23B2B5650}",
- "{67F421AC-EB34-4D49-820B-3196807B423F}",
- "{385DCFE1-CC8C-4211-A451-80FCFC31CA51}",
- "{97CC46C5-D2CC-4D26-B634-E75792B79916}",
- "{C7CE21FE-6EF8-4012-A5C7-A22BCEDFBA11}",
- "{51575134-3FDF-42D1-BABD-3FB12669C6C9}",
- "{0AE195E4-9823-4B87-8E6F-20C5614AF2FF}",
- "{4B918255-67CA-43BB-A46C-26704B666E6B}",
- "{18CCFEEF-C8EE-4CC1-A265-26F95C9F4649}",
- "{5D5D90FA-01B7-4973-AFE5-CA88C53AC197}",
- "{1F054320-036D-49E1-B384-FB5DF0BC8AC0}",
- "{7CED65EE-F2D9-4171-825B-C7D561FE5786}",
- "{8D341679-0F07-4664-9A56-3BA0DE88B9BC}",
- "{C189FEDC-2957-4BD7-9FA4-7622241EA145}",
- "{66844203-1B9F-4C53-9274-164FFF95B847}",
- "{E4FEA145-DECC-440D-AEEA-598CF381FD43}",
- "{73300A8E-C8AC-41B0-B555-4F596B681BA7}",
- "{873FDEB1-D01D-40BF-A1BF-8BBC58EC0F51}",
- "{7922C8BE-76C5-4AC6-8BF7-885C0F93B782}",
- "{E245D370-308B-4A49-BFC1-1E527827975F}",
- "{F6FA957B-66FC-4ED7-B260-E59BBE4FE813}",
- "{E6055070-0198-431A-BC49-8DB6CEE770AE}",
- "{54159234-C3EB-43DA-906B-CE5DA5C74654}",
- "{594CFC35-0B60-46F6-B8EF-9983ACC1187D}",
- "{D93FCAB7-1F01-48D2-B832-F761B83231A5}",
- "{DBA5E6AC-E7BE-42D3-8703-4E787141526E}",
- "{6171953F-DD26-44C7-A3BE-CC45F86FC11F}",
- "{9E19DDBE-F5E4-4A26-A2FE-0616E04879B8}",
- "{AE81A615-99E3-4885-9CE0-D9CAA193E867}",
- "{FBF4067E-1855-4F6C-8BCD-4D62E801A04D}",
- "{17007948-6593-4AEB-8106-F7884B4F2C19}",
- "{199D4C8D-8639-4DA6-82EF-08668C35DEE0}",
- "{E085E50E-C140-4CF3-BE4B-094B14F0DDD6}",
- "{00785268-A9CC-4E40-AC29-BAC0019159CE}",
- "{4C06F56A-DCDB-46A6-B67C-02339935CF12}",
- "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}",
- "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}",
- "{9392EB58-D7BA-410B-B1F0-B2FAA6BC89A7}",
- "{2ACAB2D5-E0CE-4027-BCA0-D78B2D7A6C66}",
- "{86E216C3-43CE-481A-BCB2-BE5E62850635}",
- "{FB631291-7923-4B91-9A57-7B18FDBB7A42}",
- "{0A176EC9-E934-45B8-B87F-16C7F4C80039}",
- "{DF55CA80-46E8-4C53-B65B-4990A23DD444}",
- "{3A0F9895-55D2-4710-BE5E-AD7498B5BF44}",
- "{294BDC5A-F448-48B6-8110-DD0A81820F8C}",
- "{4B9F66E9-FAC9-47AB-B1EF-C16756FBFD06}",
- "{72EA49C6-2806-48BD-B81B-D4905102E19C}",
- "{5728EB7E-8929-486C-8CD5-3238D060E768}"
-);
+sub generate_guid ($) {
+ my $hex = sha256_hex($_[0]);
+ $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/;
+ $hex =~ tr/a-z/A-Z/;
+ return $hex;
+}
sub generate {
my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
@@ -92,9 +46,8 @@
$target =~ s/\//_/g;
$target =~ s/\.a//;
- my $uuid = $GUIDS[$guid_index];
+ my $uuid = generate_guid($libname);
$$build_structure{"LIBS_${target}_GUID"} = $uuid;
- $guid_index += 1;
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"LIBS_${libname}_SOURCES"}}));
my @sources;
@@ -106,6 +59,8 @@
my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"LIBS_${libname}_INCLUDES"}})));
my $cflags = join(" ", sort(@{$$build_structure{"LIBS_${libname}_CFLAGS"}}));
$cflags =~ s/\"/"/g;
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
my $cflags_debug = $cflags;
$cflags_debug =~ s/-MT/-MTd/;
@@ -127,6 +82,8 @@
$defines =~ s/-D//g;
$defines =~ s/\"/\\"/g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
$defines =~ s/\'//g;
$includes =~ s/-I//g;
mkdir "$target" || die "Could not create the directory $target for lib project!\n";
@@ -163,9 +120,6 @@
Name="VCXMLDataGeneratorTool"
/>
<Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
@@ -229,9 +183,6 @@
Name="VCXMLDataGeneratorTool"
/>
<Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
@@ -311,9 +262,8 @@
$target =~ s/\//_/g;
$target =~ s/\.exe//;
- my $uuid = $GUIDS[$guid_index];
+ my $uuid = generate_guid($appname);
$$build_structure{"APPS_${target}_GUID"} = $uuid;
- $guid_index += 1;
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"APPS_${appname}_SOURCES"}}));
my @sources;
@@ -325,6 +275,8 @@
my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"APPS_${appname}_INCLUDES"}})));
my $cflags = join(" ", sort(@{$$build_structure{"APPS_${appname}_CFLAGS"}}));
$cflags =~ s/\"/"/g;
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
my $cflags_debug = $cflags;
$cflags_debug =~ s/-MT/-MTd/;
@@ -351,6 +303,8 @@
$defines =~ s/-D//g;
$defines =~ s/\"/\\"/g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
$defines =~ s/\'//g;
$defines =~ s/\\\\/\\/g;
$includes =~ s/-I//g;
@@ -388,9 +342,6 @@
Name="VCXMLDataGeneratorTool"
/>
<Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
@@ -459,9 +410,6 @@
Name="VCXMLDataGeneratorTool"
/>
<Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
@@ -561,20 +509,18 @@
foreach (@apps) {
$_ =~ s/\//_/g;
$_ =~ s/\.exe//;
- push(@tmp, $_);
+ if ($_ eq "git" ) {
+ unshift(@tmp, $_);
+ } else {
+ push(@tmp, $_);
+ }
}
@apps = @tmp;
open F, ">git.sln" || die "Could not open git.sln for writing!\n";
binmode F, ":crlf";
print F "$SLN_HEAD";
- foreach (@libs) {
- my $libname = $_;
- my $uuid = $build_structure{"LIBS_${libname}_GUID"};
- print F "$SLN_PRE";
- print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\"";
- print F "$SLN_POST";
- }
+
my $uuid_libgit = $build_structure{"LIBS_libgit_GUID"};
my $uuid_xdiff_lib = $build_structure{"LIBS_xdiff_lib_GUID"};
foreach (@apps) {
@@ -588,6 +534,13 @@
print F " EndProjectSection";
print F "$SLN_POST";
}
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "$SLN_PRE";
+ print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
print F << "EOM";
Global
@@ -599,17 +552,17 @@
print F << "EOM";
GlobalSection(ProjectConfigurationPlatforms) = postSolution
EOM
- foreach (@libs) {
- my $libname = $_;
- my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n";
print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n";
print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n";
print F "\t\t${uuid}.Release|Win32.Build.0 = Release|Win32\n";
}
- foreach (@apps) {
- my $appname = $_;
- my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n";
print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n";
print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n";
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
new file mode 100644
index 0000000..576ccab
--- /dev/null
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -0,0 +1,388 @@
+package Generators::Vcxproj;
+require Exporter;
+
+use strict;
+use vars qw($VERSION);
+use Digest::SHA qw(sha256_hex);
+
+our $VERSION = '1.00';
+our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE);
+@ISA = qw(Exporter);
+
+BEGIN {
+ push @EXPORT_OK, qw(generate);
+}
+
+sub generate_guid ($) {
+ my $hex = sha256_hex($_[0]);
+ $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/;
+ $hex =~ tr/a-z/A-Z/;
+ return $hex;
+}
+
+sub generate {
+ my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
+ my @libs = @{$build_structure{"LIBS"}};
+ foreach (@libs) {
+ createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 1);
+ }
+
+ my @apps = @{$build_structure{"APPS"}};
+ foreach (@apps) {
+ createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 0);
+ }
+
+ createGlueProject($git_dir, $out_dir, $rel_dir, %build_structure);
+ return 0;
+}
+
+sub createProject {
+ my ($name, $git_dir, $out_dir, $rel_dir, $build_structure, $static_library) = @_;
+ my $label = $static_library ? "lib" : "app";
+ my $prefix = $static_library ? "LIBS_" : "APPS_";
+ my $config_type = $static_library ? "StaticLibrary" : "Application";
+ print "Generate $name vcxproj $label project\n";
+ my $cdup = $name;
+ $cdup =~ s/[^\/]+/../g;
+ $cdup =~ s/\//\\/g;
+ $rel_dir = $rel_dir eq "." ? $cdup : "$cdup\\$rel_dir";
+ $rel_dir =~ s/\//\\/g;
+
+ my $target = $name;
+ if ($static_library) {
+ $target =~ s/\.a//;
+ } else {
+ $target =~ s/\.exe//;
+ }
+
+ my $uuid = generate_guid($name);
+ $$build_structure{"$prefix${target}_GUID"} = $uuid;
+ my $vcxproj = $target;
+ $vcxproj =~ s/(.*\/)?(.*)/$&\/$2.vcxproj/;
+ $vcxproj =~ s/([^\/]*)(\/lib)\/(lib.vcxproj)/$1$2\/$1_$3/;
+ $$build_structure{"$prefix${target}_VCXPROJ"} = $vcxproj;
+
+ my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"$prefix${name}_SOURCES"}}));
+ my @sources;
+ foreach (@srcs) {
+ $_ =~ s/\//\\/g;
+ push(@sources, $_);
+ }
+ my $defines = join(";", sort(@{$$build_structure{"$prefix${name}_DEFINES"}}));
+ my $includes= join(";", sort(map { s/^-I//; s/\//\\/g; File::Spec->file_name_is_absolute($_) ? $_ : "$rel_dir\\$_" } @{$$build_structure{"$prefix${name}_INCLUDES"}}));
+ my $cflags = join(" ", sort(map { s/^-[GLMOWZ].*//; s/.* .*/"$&"/; $_; } @{$$build_structure{"$prefix${name}_CFLAGS"}}));
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
+
+ my $libs_release = "\n ";
+ my $libs_debug = "\n ";
+ if (!$static_library) {
+ $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
+ $libs_debug = $libs_release;
+ $libs_debug =~ s/zlib\.lib/zlibd\.lib/;
+ }
+
+ $defines =~ s/-D//g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
+ $defines =~ s/\'//g;
+
+ die "Could not create the directory $target for $label project!\n" unless (-d "$target" || mkdir "$target");
+
+ open F, ">$vcxproj" or die "Could not open $vcxproj for writing!\n";
+ binmode F, ":crlf :utf8";
+ print F chr(0xFEFF);
+ print F << "EOM";
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>$uuid</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch>
+ <VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch>
+ <VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory>
+ <VCPKGBinDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory>
+ <VCPKGLibDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory>
+ <VCPKGBinDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory>
+ <VCPKGLibDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory>
+ <VCPKGIncludeDirectory>\$(VCPKGArchDirectory)\\include</VCPKGIncludeDirectory>
+ <VCPKGLibs Condition="'\(Configuration)'=='Debug'">$libs_debug</VCPKGLibs>
+ <VCPKGLibs Condition="'\(Configuration)'!='Debug'">$libs_release</VCPKGLibs>
+ </PropertyGroup>
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'\$(Configuration)'=='Debug'" Label="Configuration">
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'\$(Configuration)'=='Release'" Label="Configuration">
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ConfigurationType>$config_type</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <!-- <CharacterSet>UTF-8</CharacterSet> -->
+ <OutDir>..\\</OutDir>
+ <!-- <IntDir>\$(ProjectDir)\$(Configuration)\\</IntDir> -->
+ </PropertyGroup>
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="\$(UserRootDir)\\Microsoft.Cpp.\$(Platform).user.props" Condition="exists('\$(UserRootDir)\\Microsoft.Cpp.\$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <GenerateManifest>false</GenerateManifest>
+ <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalOptions>$cflags %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalIncludeDirectories>$cdup;$cdup\\compat;$cdup\\compat\\regex;$cdup\\compat\\win32;$cdup\\compat\\poll;$cdup\\compat\\vcbuild\\include;\$(VCPKGIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <EnableParallelCodeGeneration />
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <PrecompiledHeader />
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Link>
+ <AdditionalLibraryDirectories>\$(VCPKGLibDirectory);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
+ <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
+ <ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+EOM
+ if ($target eq 'libgit') {
+ print F << "EOM";
+ <PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)\\include\\openssl\\ssl.h')">
+ <Message>Initialize VCPKG</Message>
+ <Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command>
+ <Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat"</Command>
+ </PreBuildEvent>
+EOM
+ }
+ print F << "EOM";
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Platform)'=='Win32'">
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Configuration)'=='Debug'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;$defines;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Configuration)'=='Release'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;$defines;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+EOM
+ foreach(@sources) {
+ print F << "EOM";
+ <ClCompile Include="$_" />
+EOM
+ }
+ print F << "EOM";
+ </ItemGroup>
+EOM
+ if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
+ my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
+ my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
+
+ print F << "EOM";
+ <ItemGroup>
+ <ProjectReference Include="$cdup\\libgit\\libgit.vcxproj">
+ <Project>$uuid_libgit</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ if (!($name =~ 'xdiff')) {
+ print F << "EOM";
+ <ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
+ <Project>$uuid_xdiff_lib</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ }
+ if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
+ my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
+ print F << "EOM";
+ <ProjectReference Include="$cdup\\vcs-svn\\lib\\vcs-svn_lib.vcxproj">
+ <Project>$uuid_vcs_svn_lib</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ }
+ print F << "EOM";
+ </ItemGroup>
+EOM
+ }
+ print F << "EOM";
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.targets" />
+EOM
+ if (!$static_library) {
+ print F << "EOM";
+ <Target Name="${target}_AfterBuild" AfterTargets="AfterBuild">
+ <ItemGroup>
+ <DLLsAndPDBs Include="\$(VCPKGBinDirectory)\\*.dll;\$(VCPKGBinDirectory)\\*.pdb" />
+ </ItemGroup>
+ <Copy SourceFiles="@(DLLsAndPDBs)" DestinationFolder="\$(OutDir)" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
+ <MakeDir Directories="..\\templates\\blt\\branches" />
+ </Target>
+EOM
+ }
+ if ($target eq 'git') {
+ print F " <Import Project=\"LinkOrCopyBuiltins.targets\" />\n";
+ }
+ print F << "EOM";
+</Project>
+EOM
+ close F;
+}
+
+sub createGlueProject {
+ my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
+ print "Generate solutions file\n";
+ $rel_dir = "..\\$rel_dir";
+ $rel_dir =~ s/\//\\/g;
+ my $SLN_HEAD = "Microsoft Visual Studio Solution File, Format Version 11.00\n# Visual Studio 2010\n";
+ my $SLN_PRE = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = ";
+ my $SLN_POST = "\nEndProject\n";
+
+ my @libs = @{$build_structure{"LIBS"}};
+ my @tmp;
+ foreach (@libs) {
+ $_ =~ s/\.a//;
+ push(@tmp, $_);
+ }
+ @libs = @tmp;
+
+ my @apps = @{$build_structure{"APPS"}};
+ @tmp = ();
+ foreach (@apps) {
+ $_ =~ s/\.exe//;
+ if ($_ eq "git" ) {
+ unshift(@tmp, $_);
+ } else {
+ push(@tmp, $_);
+ }
+ }
+ @apps = @tmp;
+
+ open F, ">git.sln" || die "Could not open git.sln for writing!\n";
+ binmode F, ":crlf :utf8";
+ print F chr(0xFEFF);
+ print F "$SLN_HEAD";
+
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ print F "$SLN_PRE";
+ my $vcxproj = $build_structure{"APPS_${appname}_VCXPROJ"};
+ $vcxproj =~ s/\//\\/g;
+ $appname =~ s/.*\///;
+ print F "\"${appname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "$SLN_PRE";
+ my $vcxproj = $build_structure{"LIBS_${libname}_VCXPROJ"};
+ $vcxproj =~ s/\//\\/g;
+ $libname =~ s/\//_/g;
+ print F "\"${libname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
+
+ print F << "EOM";
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+EOM
+ print F << "EOM";
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+EOM
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
+ print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
+ print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
+ print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
+ print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";
+ print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n";
+ }
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
+ print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
+ print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
+ print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
+ print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";
+ print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n";
+ }
+
+ print F << "EOM";
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+EOM
+ close F;
+}
+
+1;
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 23da787..fba8a3f 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -12,6 +12,7 @@
use File::Spec;
use Cwd;
use Generators;
+use Text::ParseWords;
my (%build_structure, %compile_options, @makedry);
my $out_dir = getcwd();
@@ -31,6 +32,7 @@
-g <GENERATOR> --gen <GENERATOR> Specify the buildsystem generator (default: $gen)
Available: $genlist
-o <PATH> --out <PATH> Specify output directory generation (default: .)
+ --make-out <PATH> Write the output of GNU Make into a file
-i <FILE> --in <FILE> Specify input file, instead of running GNU Make
-h,-? --help This help
EOM
@@ -38,6 +40,7 @@
}
# Parse command-line options
+my $make_out;
while (@ARGV) {
my $arg = shift @ARGV;
if ("$arg" eq "-h" || "$arg" eq "--help" || "$arg" eq "-?") {
@@ -45,6 +48,8 @@
exit(0);
} elsif("$arg" eq "--out" || "$arg" eq "-o") {
$out_dir = shift @ARGV;
+ } elsif("$arg" eq "--make-out") {
+ $make_out = shift @ARGV;
} elsif("$arg" eq "--gen" || "$arg" eq "-g") {
$gen = shift @ARGV;
} elsif("$arg" eq "--in" || "$arg" eq "-i") {
@@ -52,6 +57,8 @@
open(F, "<$infile") || die "Couldn't open file $infile";
@makedry = <F>;
close(F);
+ } else {
+ die "Unknown option: " . $arg;
}
}
@@ -72,7 +79,19 @@
EOM
# Pipe a make --dry-run into a variable, if not already loaded from file
-@makedry = `cd $git_dir && make -n MSVC=1 V=1 2>/dev/null` if !@makedry;
+# Capture the make dry stderr to file for review (will be empty for a release build).
+
+my $ErrsFile = "msvc-build-makedryerrors.txt";
+@makedry = `make -C $git_dir -n MSVC=1 SKIP_VCPKG=1 V=1 2>$ErrsFile`
+if !@makedry;
+# test for an empty Errors file and remove it
+unlink $ErrsFile if -f -z $ErrsFile;
+
+if (defined $make_out) {
+ open OUT, ">" . $make_out;
+ print OUT @makedry;
+ close OUT;
+}
# Parse the make output into usable info
parseMakeOutput();
@@ -140,6 +159,12 @@
next;
}
+ if ($text =~ /^(mkdir|msgfmt) /) {
+ # options to the Portable Object translations
+ # the line "mkdir ... && msgfmt ..." contains no linker options
+ next;
+ }
+
if($text =~ / -c /) {
# compilation
handleCompileLine($text, $line);
@@ -231,7 +256,7 @@
sub handleCompileLine
{
my ($line, $lineno) = @_;
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
my $sourcefile;
shift(@parts); # ignore cmd
while (my $part = shift @parts) {
@@ -265,7 +290,7 @@
my (@objfiles, @lflags, $libout, $part);
# kill cmd and rm 'prefix'
$line =~ s/^rm -f .* && .* rcs //;
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
while ($part = shift @parts) {
if ($part =~ /^-/) {
push(@lflags, $part);
@@ -282,7 +307,7 @@
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
@@ -306,7 +331,7 @@
{
my ($line, $lineno) = @_;
my (@objfiles, @lflags, @libs, $appout, $part);
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
shift(@parts); # ignore cmd
while ($part = shift @parts) {
if ($part =~ /^-IGNORE/) {
@@ -317,26 +342,36 @@
$appout = shift @parts;
} elsif ("$part" eq "-lz") {
push(@libs, "zlib.lib");
- } elsif ("$part" eq "-lcrypto") {
+ } elsif ("$part" eq "-lcrypto") {
push(@libs, "libeay32.lib");
} elsif ("$part" eq "-lssl") {
push(@libs, "ssleay32.lib");
- } elsif ($part =~ /^-/) {
+ } elsif ("$part" eq "-lcurl") {
+ push(@libs, "libcurl.lib");
+ } elsif ("$part" eq "-lexpat") {
+ push(@libs, "expat.lib");
+ } elsif ("$part" eq "-liconv") {
+ push(@libs, "libiconv.lib");
+ } elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
$part =~ s/\.a$/.lib/;
push(@libs, $part);
- } elsif ($part =~ /\.(o|obj)$/) {
+ } elsif ($part eq 'invalidcontinue.obj') {
+ # ignore - known to MSVC
+ } elsif ($part =~ /\.o$/) {
push(@objfiles, $part);
+ } elsif ($part =~ /\.obj$/) {
+ # do nothing, 'make' should not be producing .obj, only .o files
} else {
- die "Unhandled lib option @ line $lineno: $part";
+ die "Unhandled link option @ line $lineno: $part";
}
}
# print "AppOut: '$appout'\nLFlags: @lflags\nLibs : @libs\nOfiles: @objfiles\n";
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci
index 0158682..46b8d2e 100644
--- a/contrib/coccinelle/array.cocci
+++ b/contrib/coccinelle/array.cocci
@@ -1,29 +1,60 @@
@@
-type T;
-T *dst;
-T *src;
-expression n;
+expression dst, src, n, E;
@@
-- memcpy(dst, src, (n) * sizeof(*dst));
-+ COPY_ARRAY(dst, src, n);
+ memcpy(dst, src, n * sizeof(
+- E[...]
++ *(E)
+ ))
@@
type T;
-T *dst;
-T *src;
-expression n;
+T *ptr;
+T[] arr;
+expression E, n;
@@
-- memcpy(dst, src, (n) * sizeof(*src));
-+ COPY_ARRAY(dst, src, n);
+(
+ memcpy(ptr, E,
+- n * sizeof(*(ptr))
++ n * sizeof(T)
+ )
+|
+ memcpy(arr, E,
+- n * sizeof(*(arr))
++ n * sizeof(T)
+ )
+|
+ memcpy(E, ptr,
+- n * sizeof(*(ptr))
++ n * sizeof(T)
+ )
+|
+ memcpy(E, arr,
+- n * sizeof(*(arr))
++ n * sizeof(T)
+ )
+)
@@
type T;
-T *dst;
-T *src;
+T *dst_ptr;
+T *src_ptr;
+T[] dst_arr;
+T[] src_arr;
expression n;
@@
-- memcpy(dst, src, (n) * sizeof(T));
-+ COPY_ARRAY(dst, src, n);
+(
+- memcpy(dst_ptr, src_ptr, (n) * sizeof(T))
++ COPY_ARRAY(dst_ptr, src_ptr, n)
+|
+- memcpy(dst_ptr, src_arr, (n) * sizeof(T))
++ COPY_ARRAY(dst_ptr, src_arr, n)
+|
+- memcpy(dst_arr, src_ptr, (n) * sizeof(T))
++ COPY_ARRAY(dst_arr, src_ptr, n)
+|
+- memcpy(dst_arr, src_arr, (n) * sizeof(T))
++ COPY_ARRAY(dst_arr, src_arr, n)
+)
@@
type T;
diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci
index c49aa55..d034533 100644
--- a/contrib/coccinelle/commit.cocci
+++ b/contrib/coccinelle/commit.cocci
@@ -10,19 +10,25 @@
- c->maybe_tree->object.oid.hash
+ get_commit_tree_oid(c)->hash
-// These excluded functions must access c->maybe_tree direcly.
@@
-identifier f !~ "^(get_commit_tree|get_commit_tree_in_graph_one|load_tree_for_commit)$";
+identifier f !~ "^set_commit_tree$";
+expression c;
+expression s;
+@@
+ f(...) {<...
+- c->maybe_tree = s
++ set_commit_tree(c, s)
+ ...>}
+
+// These excluded functions must access c->maybe_tree direcly.
+// Note that if c->maybe_tree is written somewhere outside of these
+// functions, then the recommended transformation will be bogus with
+// repo_get_commit_tree() on the LHS.
+@@
+identifier f !~ "^(repo_get_commit_tree|get_commit_tree_in_graph_one|load_tree_for_commit|set_commit_tree)$";
expression c;
@@
f(...) {<...
- c->maybe_tree
-+ get_commit_tree(c)
++ repo_get_commit_tree(specify_the_right_repo_here, c)
...>}
-
-@@
-expression c;
-expression s;
-@@
-- get_commit_tree(c) = s
-+ c->maybe_tree = s
diff --git a/contrib/coccinelle/flex_alloc.cocci b/contrib/coccinelle/flex_alloc.cocci
new file mode 100644
index 0000000..e9f7f6d
--- /dev/null
+++ b/contrib/coccinelle/flex_alloc.cocci
@@ -0,0 +1,13 @@
+@@
+expression str;
+identifier x, flexname;
+@@
+- FLEX_ALLOC_MEM(x, flexname, str, strlen(str));
++ FLEX_ALLOC_STR(x, flexname, str);
+
+@@
+expression str;
+identifier x, ptrname;
+@@
+- FLEXPTR_ALLOC_MEM(x, ptrname, str, strlen(str));
++ FLEXPTR_ALLOC_STR(x, ptrname, str);
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8b3b5a9..00fbe6c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -37,7 +37,8 @@
# GIT_COMPLETION_CHECKOUT_NO_GUESS
#
# When set to "1", do not include "DWIM" suggestions in git-checkout
-# completion (e.g., completing "foo" when "origin/foo" exists).
+# and git-switch completion (e.g., completing "foo" when "origin/foo"
+# exists).
case "$COMP_WORDBREAKS" in
*:*) : great ;;
@@ -339,7 +340,7 @@
c="$c${4-}"
if [[ $c == "$cur_"* ]]; then
case $c in
- --*=*|*.) ;;
+ --*=|*.) ;;
*) c="$c " ;;
esac
COMPREPLY[i++]="${2-}$c"
@@ -359,7 +360,7 @@
c="$c${4-}"
if [[ $c == "$cur_"* ]]; then
case $c in
- --*=*|*.) ;;
+ *=|*.) ;;
*) c="$c " ;;
esac
COMPREPLY[i++]="${2-}$c"
@@ -400,7 +401,8 @@
if [ -z "$options" ]; then
# leading and trailing spaces are significant to make
# option removal work correctly.
- options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
+ options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return
+
for i in $excl; do
options="${options/ $i / }"
done
@@ -522,7 +524,7 @@
# Even when a directory name itself does not contain
# any special characters, it will still be quoted if
# any of its (stripped) trailing path components do.
- # Because of this we may have seen the same direcory
+ # Because of this we may have seen the same directory
# both quoted and unquoted.
if (p in paths)
# We have seen the same directory unquoted,
@@ -853,6 +855,11 @@
__git_merge_strategies=$(__git_list_merge_strategies)
}
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+ histogram diff-algorithm= ignore-space-change ignore-all-space
+ ignore-space-at-eol renormalize no-renormalize no-renames
+ find-renames find-renames= rename-threshold="
+
__git_complete_revlist_file ()
{
local dequoted_word pfx ls ref cur_="$cur"
@@ -996,12 +1003,21 @@
-s|--strategy)
__gitcomp "$__git_merge_strategies"
return 0
+ ;;
+ -X)
+ __gitcomp "$__git_merge_strategy_options"
+ return 0
+ ;;
esac
case "$cur" in
--strategy=*)
__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
return 0
;;
+ --strategy-option=*)
+ __gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+ return 0
+ ;;
esac
return 1
}
@@ -1010,7 +1026,7 @@
__git_compute_all_commands ()
{
test -n "$__git_all_commands" ||
- __git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
+ __git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
}
# Lists all set config variables starting with the given section prefix,
@@ -1163,6 +1179,7 @@
}
__git_whitespacelist="nowarn warn error error-all fix"
+__git_patchformat="mbox stgit stgit-series hg mboxrd"
__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
_git_am ()
@@ -1177,6 +1194,10 @@
__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
return
;;
+ --patch-format=*)
+ __gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+ return
+ ;;
--*)
__gitcomp_builtin am "" \
"$__git_am_inprogress_options"
@@ -1200,6 +1221,10 @@
_git_add ()
{
case "$cur" in
+ --chmod=*)
+ __gitcomp "+x -x" "" "${cur##--chmod=}"
+ return
+ ;;
--*)
__gitcomp_builtin add
return
@@ -1225,10 +1250,7 @@
return
;;
--*)
- __gitcomp "
- --format= --list --verbose
- --prefix= --remote= --exec= --output
- "
+ __gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
return
;;
esac
@@ -1260,6 +1282,8 @@
esac
}
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
_git_branch ()
{
local i c=1 only_local_ref="n" has_r="n"
@@ -1334,7 +1358,9 @@
esac
}
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
_git_cherry_pick ()
{
@@ -1343,6 +1369,9 @@
__gitcomp "$__git_cherry_pick_inprogress_options"
return
fi
+
+ __git_complete_strategy && return
+
case "$cur" in
--*)
__gitcomp_builtin cherry-pick "" \
@@ -1369,7 +1398,18 @@
_git_clone ()
{
+ case "$prev" in
+ -c|--config)
+ __git_complete_config_variable_name_and_value
+ return
+ ;;
+ esac
case "$cur" in
+ --config=*)
+ __git_complete_config_variable_name_and_value \
+ --cur="${cur##--config=}"
+ return
+ ;;
--*)
__gitcomp_builtin clone
return
@@ -1446,6 +1486,8 @@
--dirstat-by-file= --cumulative
--diff-algorithm=
--submodule --submodule= --ignore-submodules
+ --indent-heuristic --no-indent-heuristic
+ --textconv --no-textconv
"
_git_diff ()
@@ -1473,7 +1515,8 @@
}
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
+ codecompare smerge
"
_git_difftool ()
@@ -1506,6 +1549,10 @@
__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
return
;;
+ --filter=*)
+ __gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+ return
+ ;;
--*)
__gitcomp_builtin fetch
return
@@ -1620,9 +1667,9 @@
esac
if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
then
- __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
+ __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
else
- __gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+ __gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
fi
}
@@ -1702,8 +1749,8 @@
--all-match --invert-grep
"
-__git_log_pretty_formats="oneline short medium full fuller email raw format:"
-__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
_git_log ()
{
@@ -1749,6 +1796,10 @@
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
return
;;
+ --no-walk=*)
+ __gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+ return
+ ;;
--*)
__gitcomp "
$__git_log_common_options
@@ -1756,16 +1807,19 @@
$__git_log_gitk_options
--root --topo-order --date-order --reverse
--follow --full-diff
- --abbrev-commit --abbrev=
+ --abbrev-commit --no-abbrev-commit --abbrev=
--relative-date --date=
--pretty= --format= --oneline
--show-signature
--cherry-mark
--cherry-pick
--graph
- --decorate --decorate=
+ --decorate --decorate= --no-decorate
--walk-reflogs
+ --no-walk --no-walk= --do-walk
--parents --children
+ --expand-tabs --expand-tabs= --no-expand-tabs
+ --patch
$merge
$__git_diff_common_options
--pickaxe-all --pickaxe-regex
@@ -1969,15 +2023,18 @@
__git_complete_revlist
}
+__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
+__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
+
_git_rebase ()
{
__git_find_repo_path
if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
- __gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
+ __gitcomp "$__git_rebase_interactive_inprogress_options"
return
elif [ -d "$__git_repo_path"/rebase-apply ] || \
[ -d "$__git_repo_path"/rebase-merge ]; then
- __gitcomp "--continue --skip --abort --quit --show-current-patch"
+ __gitcomp "$__git_rebase_inprogress_options"
return
fi
__git_complete_strategy && return
@@ -1987,19 +2044,8 @@
return
;;
--*)
- __gitcomp "
- --onto --merge --strategy --interactive
- --rebase-merges --preserve-merges --stat --no-stat
- --committer-date-is-author-date --ignore-date
- --ignore-whitespace --whitespace=
- --autosquash --no-autosquash
- --fork-point --no-fork-point
- --autostash --no-autostash
- --verify --no-verify
- --keep-empty --root --force-rebase --no-ff
- --rerere-autoupdate
- --exec
- "
+ __gitcomp_builtin rebase "" \
+ "$__git_rebase_interactive_inprogress_options"
return
esac
@@ -2126,6 +2172,44 @@
__git_complete_index_file "$complete_opt"
}
+_git_switch ()
+{
+ case "$cur" in
+ --conflict=*)
+ __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ ;;
+ --*)
+ __gitcomp_builtin switch
+ ;;
+ *)
+ # check if --track, --no-track, or --no-guess was specified
+ # if so, disable DWIM mode
+ local track_opt="--track" only_local_ref=n
+ if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+ [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
+ track_opt=''
+ fi
+ # explicit --guess enables DWIM mode regardless of
+ # $GIT_COMPLETION_CHECKOUT_NO_GUESS
+ if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
+ track_opt='--track'
+ fi
+ if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
+ only_local_ref=y
+ else
+ # --guess --detach is invalid combination, no
+ # dwim will be done when --detach is specified
+ track_opt=
+ fi
+ if [ $only_local_ref = y -a -z "$track_opt" ]; then
+ __gitcomp_direct "$(__git_heads "" "$cur" " ")"
+ else
+ __git_complete_refs $track_opt
+ fi
+ ;;
+ esac
+}
+
__git_config_get_set_variables ()
{
local prevword word config_file= c=$cword
@@ -2152,181 +2236,282 @@
__git_compute_config_vars ()
{
test -n "$__git_config_vars" ||
- __git_config_vars="$(git help --config-for-completion | sort | uniq)"
+ __git_config_vars="$(git help --config-for-completion | sort -u)"
}
-_git_config ()
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+# to be completed. Defaults to the previous word on the
+# command line.
+# --cur=<word>: The current value to be completed. Defaults to the current
+# word to be completed.
+__git_complete_config_variable_value ()
{
- local varname
+ local varname="$prev" cur_="$cur"
+
+ while test $# != 0; do
+ case "$1" in
+ --varname=*) varname="${1##--varname=}" ;;
+ --cur=*) cur_="${1##--cur=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
- varname="${prev,,}"
+ varname="${varname,,}"
else
- varname="$(echo "$prev" |tr A-Z a-z)"
+ varname="$(echo "$varname" |tr A-Z a-z)"
fi
case "$varname" in
branch.*.remote|branch.*.pushremote)
- __gitcomp_nl "$(__git_remotes)"
+ __gitcomp_nl "$(__git_remotes)" "" "$cur_"
return
;;
branch.*.merge)
- __git_complete_refs
+ __git_complete_refs --cur="$cur_"
return
;;
branch.*.rebase)
- __gitcomp "false true merges preserve interactive"
+ __gitcomp "false true merges preserve interactive" "" "$cur_"
return
;;
remote.pushdefault)
- __gitcomp_nl "$(__git_remotes)"
+ __gitcomp_nl "$(__git_remotes)" "" "$cur_"
return
;;
remote.*.fetch)
- local remote="${prev#remote.}"
+ local remote="${varname#remote.}"
remote="${remote%.fetch}"
- if [ -z "$cur" ]; then
+ if [ -z "$cur_" ]; then
__gitcomp_nl "refs/heads/" "" "" ""
return
fi
- __gitcomp_nl "$(__git_refs_remotes "$remote")"
+ __gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
return
;;
remote.*.push)
- local remote="${prev#remote.}"
+ local remote="${varname#remote.}"
remote="${remote%.push}"
__gitcomp_nl "$(__git for-each-ref \
- --format='%(refname):%(refname)' refs/heads)"
+ --format='%(refname):%(refname)' refs/heads)" "" "$cur_"
return
;;
pull.twohead|pull.octopus)
__git_compute_merge_strategies
- __gitcomp "$__git_merge_strategies"
- return
- ;;
- color.branch|color.diff|color.interactive|\
- color.showbranch|color.status|color.ui)
- __gitcomp "always never auto"
+ __gitcomp "$__git_merge_strategies" "" "$cur_"
return
;;
color.pager)
- __gitcomp "false true"
+ __gitcomp "false true" "" "$cur_"
return
;;
color.*.*)
__gitcomp "
normal black red green yellow blue magenta cyan white
bold dim ul blink reverse
- "
+ " "" "$cur_"
+ return
+ ;;
+ color.*)
+ __gitcomp "false true always never auto" "" "$cur_"
return
;;
diff.submodule)
- __gitcomp "log short"
+ __gitcomp "$__git_diff_submodule_formats" "" "$cur_"
return
;;
help.format)
- __gitcomp "man info web html"
+ __gitcomp "man info web html" "" "$cur_"
return
;;
log.date)
- __gitcomp "$__git_log_date_formats"
+ __gitcomp "$__git_log_date_formats" "" "$cur_"
return
;;
sendemail.aliasfiletype)
- __gitcomp "mutt mailrc pine elm gnus"
+ __gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
return
;;
sendemail.confirm)
- __gitcomp "$__git_send_email_confirm_options"
+ __gitcomp "$__git_send_email_confirm_options" "" "$cur_"
return
;;
sendemail.suppresscc)
- __gitcomp "$__git_send_email_suppresscc_options"
+ __gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
return
;;
sendemail.transferencoding)
- __gitcomp "7bit 8bit quoted-printable base64"
- return
- ;;
- --get|--get-all|--unset|--unset-all)
- __gitcomp_nl "$(__git_config_get_set_variables)"
+ __gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
return
;;
*.*)
return
;;
esac
- case "$cur" in
- --*)
- __gitcomp_builtin config
- return
- ;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+# completed. Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+# configuration variable name (but not to sections or
+# subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+ local cur_="$cur" sfx
+
+ while test $# != 0; do
+ case "$1" in
+ --cur=*) cur_="${1##--cur=}" ;;
+ --sfx=*) sfx="${1##--sfx=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
+
+ case "$cur_" in
branch.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
return
;;
branch.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur%.*}."
+ cur_="${cur#*.}"
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
- __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+ __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
return
;;
guitool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
__gitcomp "
argPrompt cmd confirm needsFile noConsole noRescan
prompt revPrompt revUnmerged title
- " "$pfx" "$cur_"
+ " "$pfx" "$cur_" "$sfx"
return
;;
difftool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
return
;;
man.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
return
;;
mergetool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
return
;;
pager.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_#*.}"
__git_compute_all_commands
- __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+ __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
return
;;
remote.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
__gitcomp "
url proxy fetch push mirror skipDefaultUpdate
receivepack uploadpack tagOpt pushurl
- " "$pfx" "$cur_"
+ " "$pfx" "$cur_" "$sfx"
return
;;
remote.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_#*.}"
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
- __gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+ __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
return
;;
url.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
return
;;
*.*)
__git_compute_config_vars
- __gitcomp "$__git_config_vars"
+ __gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
;;
*)
__git_compute_config_vars
- __gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
+ __gitcomp "$(echo "$__git_config_vars" |
+ awk -F . '{
+ sections[$1] = 1
+ }
+ END {
+ for (s in sections)
+ print s "."
+ }
+ ')" "" "$cur_"
+ ;;
+ esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+# completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+ local cur_="$cur"
+
+ while test $# != 0; do
+ case "$1" in
+ --cur=*) cur_="${1##--cur=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
+
+ case "$cur_" in
+ *=*)
+ __git_complete_config_variable_value \
+ --varname="${cur_%%=*}" --cur="${cur_#*=}"
+ ;;
+ *)
+ __git_complete_config_variable_name --cur="$cur_" --sfx='='
+ ;;
+ esac
+}
+
+_git_config ()
+{
+ case "$prev" in
+ --get|--get-all|--unset|--unset-all)
+ __gitcomp_nl "$(__git_config_get_set_variables)"
+ return
+ ;;
+ *.*)
+ __git_complete_config_variable_value
+ return
+ ;;
+ esac
+ case "$cur" in
+ --*)
+ __gitcomp_builtin config
+ ;;
+ *)
+ __git_complete_config_variable_name
+ ;;
esac
}
@@ -2388,6 +2573,10 @@
_git_replace ()
{
case "$cur" in
+ --format=*)
+ __gitcomp "short medium long" "" "${cur##--format=}"
+ return
+ ;;
--*)
__gitcomp_builtin replace
return
@@ -2420,7 +2609,22 @@
__git_complete_refs
}
-__git_revert_inprogress_options="--continue --quit --abort"
+_git_restore ()
+{
+ case "$cur" in
+ --conflict=*)
+ __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ ;;
+ --source=*)
+ __git_complete_refs --cur="${cur##--source=}"
+ ;;
+ --*)
+ __gitcomp_builtin restore
+ ;;
+ esac
+}
+
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
_git_revert ()
{
@@ -2429,6 +2633,7 @@
__gitcomp "$__git_revert_inprogress_options"
return
fi
+ __git_complete_strategy && return
case "$cur" in
--*)
__gitcomp_builtin revert "" \
@@ -2487,8 +2692,9 @@
return
;;
--*)
- __gitcomp "--pretty= --format= --abbrev-commit --oneline
- --show-signature
+ __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
+ --oneline --show-signature --patch
+ --expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options
"
return
@@ -2573,7 +2779,7 @@
{
__git_has_doubledash && return
- local subcommands="add status init deinit update set-branch summary foreach sync"
+ local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
case "$cur" in
@@ -2863,7 +3069,11 @@
# Bash filename completion
return
;;
- -c|--namespace)
+ -c)
+ __git_complete_config_variable_name_and_value
+ return
+ ;;
+ --namespace)
# we don't support completing these options' arguments
return
;;
@@ -2891,7 +3101,7 @@
then
__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
else
- __gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+ __gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
fi
;;
esac
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 983e419..1d510cd 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -286,6 +286,37 @@
test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
}
+# see if a cherry-pick or revert is in progress, if the user has committed a
+# conflict resolution with 'git commit' in the middle of a sequence of picks or
+# reverts then CHERRY_PICK_HEAD/REVERT_HEAD will not exist so we have to read
+# the todo file.
+__git_sequencer_status ()
+{
+ local todo
+ if test -f "$g/CHERRY_PICK_HEAD"
+ then
+ r="|CHERRY-PICKING"
+ return 0;
+ elif test -f "$g/REVERT_HEAD"
+ then
+ r="|REVERTING"
+ return 0;
+ elif __git_eread "$g/sequencer/todo" todo
+ then
+ case "$todo" in
+ p[\ \ ]|pick[\ \ ]*)
+ r="|CHERRY-PICKING"
+ return 0
+ ;;
+ revert[\ \ ]*)
+ r="|REVERTING"
+ return 0
+ ;;
+ esac
+ fi
+ return 1
+}
+
# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
# when called from PS1 using command substitution
# in this mode it prints text to add to bash PS1 prompt (includes branch name)
@@ -417,10 +448,8 @@
fi
elif [ -f "$g/MERGE_HEAD" ]; then
r="|MERGING"
- elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
- r="|CHERRY-PICKING"
- elif [ -f "$g/REVERT_HEAD" ]; then
- r="|REVERTING"
+ elif __git_sequencer_status; then
+ :
elif [ -f "$g/BISECT_LOG" ]; then
r="|BISECTING"
fi
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
index 5367545..7440aa1 100644
--- a/contrib/diff-highlight/DiffHighlight.pm
+++ b/contrib/diff-highlight/DiffHighlight.pm
@@ -4,6 +4,11 @@
use warnings FATAL => 'all';
use strict;
+# Use the correct value for both UNIX and Windows (/dev/null vs nul)
+use File::Spec;
+
+my $NULL = File::Spec->devnull();
+
# Highlight by reversing foreground and background. You could do
# other things like bold or underline if you prefer.
my @OLD_HIGHLIGHT = (
@@ -134,7 +139,7 @@
# fallback, which means we will work even if git can't be run.
sub color_config {
my ($key, $default) = @_;
- my $s = `git config --get-color $key 2>/dev/null`;
+ my $s = `git config --get-color $key 2>$NULL`;
return length($s) ? $s : $default;
}
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 147201d..868e18b 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -14,7 +14,7 @@
git subtree merge --prefix=<prefix> <commit>
git subtree pull --prefix=<prefix> <repository> <ref>
git subtree push --prefix=<prefix> <repository> <ref>
-git subtree split --prefix=<prefix> <commit...>
+git subtree split --prefix=<prefix> <commit>
--
h,help show the help
q quiet
@@ -77,6 +77,12 @@
fi
}
+ensure_single_rev () {
+ if test $# -ne 1
+ then
+ die "You must provide exactly one revision. Got: '$@'"
+ fi
+}
while test $# -gt 0
do
@@ -185,6 +191,7 @@
then
revs=$(git rev-parse $default --revs-only "$@") || exit $?
dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $?
+ ensure_single_rev $revs
if test -n "$dirs"
then
die "Error: Use --prefix instead of bare filenames."
@@ -716,9 +723,8 @@
}
cmd_add_commit () {
- revs=$(git rev-parse $default --revs-only "$@") || exit $?
- set -- $revs
- rev="$1"
+ rev=$(git rev-parse $default --revs-only "$@") || exit $?
+ ensure_single_rev $rev
debug "Adding $dir as '$rev'..."
git read-tree --prefix="$dir" $rev || exit $?
@@ -817,16 +823,10 @@
}
cmd_merge () {
- revs=$(git rev-parse $default --revs-only "$@") || exit $?
+ rev=$(git rev-parse $default --revs-only "$@") || exit $?
+ ensure_single_rev $rev
ensure_clean
- set -- $revs
- if test $# -ne 1
- then
- die "You must provide exactly one revision. Got: '$revs'"
- fi
- rev="$1"
-
if test -n "$squash"
then
first_split="$(find_latest_squash "$dir")"
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index a3425f4..19333fc 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -56,7 +56,7 @@
The resulting repository will generally require further processing
to put each project in its own repository and to separate the history
-of each branch. The 'git filter-branch --subdirectory-filter' command
+of each branch. The 'git filter-repo --subdirectory-filter' command
may be useful for this purpose.
BUGS
@@ -67,5 +67,5 @@
SEE ALSO
--------
-git-svn(1), svn2git(1), svk(1), git-filter-branch(1), git-fast-import(1),
+git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1),
https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
diff --git a/convert.c b/convert.c
index 5d0307f..deb6f71 100644
--- a/convert.c
+++ b/convert.c
@@ -8,6 +8,7 @@
#include "pkt-line.h"
#include "sub-process.h"
#include "utf8.h"
+#include "ll-merge.h"
/*
* convert.c - convert a file when checking it out and checking it in.
@@ -731,7 +732,7 @@
if (start_async(&async))
return 0; /* error was already reported */
- if (strbuf_read(&nbuf, async.out, len) < 0) {
+ if (strbuf_read(&nbuf, async.out, 0) < 0) {
err = error(_("read from external filter '%s' failed"), cmd);
}
if (close(async.out)) {
@@ -1293,10 +1294,11 @@
const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
};
+static struct attr_check *check;
+
static void convert_attrs(const struct index_state *istate,
struct conv_attrs *ca, const char *path)
{
- static struct attr_check *check;
struct attr_check_item *ccheck = NULL;
if (!check) {
@@ -1339,6 +1341,23 @@
ca->crlf_action = CRLF_AUTO_INPUT;
}
+void reset_parsed_attributes(void)
+{
+ struct convert_driver *drv, *next;
+
+ attr_check_free(check);
+ check = NULL;
+ reset_merge_attributes();
+
+ for (drv = user_convert; drv; drv = next) {
+ next = drv->next;
+ free((void *)drv->name);
+ free(drv);
+ }
+ user_convert = NULL;
+ user_convert_tail = NULL;
+}
+
int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path)
{
struct conv_attrs ca;
diff --git a/convert.h b/convert.h
index 831559f..3710969 100644
--- a/convert.h
+++ b/convert.h
@@ -94,6 +94,12 @@
int would_convert_to_git_filter_fd(const struct index_state *istate,
const char *path);
+/*
+ * Reset the internal list of attributes used by convert_to_git and
+ * convert_to_working_tree.
+ */
+void reset_parsed_attributes(void);
+
/*****************************************************************
*
* Streaming conversion support
diff --git a/credential-store.c b/credential-store.c
index ac29542..c010497 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -72,15 +72,16 @@
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "%s://", c->protocol);
- strbuf_addstr_urlencode(&buf, c->username, 1);
+ strbuf_addstr_urlencode(&buf, c->username, is_rfc3986_unreserved);
strbuf_addch(&buf, ':');
- strbuf_addstr_urlencode(&buf, c->password, 1);
+ strbuf_addstr_urlencode(&buf, c->password, is_rfc3986_unreserved);
strbuf_addch(&buf, '@');
if (c->host)
- strbuf_addstr_urlencode(&buf, c->host, 1);
+ strbuf_addstr_urlencode(&buf, c->host, is_rfc3986_unreserved);
if (c->path) {
strbuf_addch(&buf, '/');
- strbuf_addstr_urlencode(&buf, c->path, 0);
+ strbuf_addstr_urlencode(&buf, c->path,
+ is_rfc3986_reserved_or_unreserved);
}
rewrite_credential_file(fn, c, &buf);
diff --git a/csum-file.h b/csum-file.h
index 3bf7184..a98b1ee 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -25,22 +25,22 @@
git_hash_ctx ctx;
};
-extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);
-extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
+void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);
+int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
/* finalize_hashfile flags */
#define CSUM_CLOSE 1
#define CSUM_FSYNC 2
#define CSUM_HASH_IN_STREAM 4
-extern struct hashfile *hashfd(int fd, const char *name);
-extern struct hashfile *hashfd_check(const char *name);
-extern struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp);
-extern int finalize_hashfile(struct hashfile *, unsigned char *, unsigned int);
-extern void hashwrite(struct hashfile *, const void *, unsigned int);
-extern void hashflush(struct hashfile *f);
-extern void crc32_begin(struct hashfile *);
-extern uint32_t crc32_end(struct hashfile *);
+struct hashfile *hashfd(int fd, const char *name);
+struct hashfile *hashfd_check(const char *name);
+struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp);
+int finalize_hashfile(struct hashfile *, unsigned char *, unsigned int);
+void hashwrite(struct hashfile *, const void *, unsigned int);
+void hashflush(struct hashfile *f);
+void crc32_begin(struct hashfile *);
+uint32_t crc32_end(struct hashfile *);
static inline void hashwrite_u8(struct hashfile *f, uint8_t data)
{
diff --git a/date.c b/date.c
index 9c5870e..041db7d 100644
--- a/date.c
+++ b/date.c
@@ -128,16 +128,17 @@
gettimeofday(now, NULL);
}
-void show_date_relative(timestamp_t time,
- const struct timeval *now,
- struct strbuf *timebuf)
+void show_date_relative(timestamp_t time, struct strbuf *timebuf)
{
+ struct timeval now;
timestamp_t diff;
- if (now->tv_sec < time) {
+
+ get_time(&now);
+ if (now.tv_sec < time) {
strbuf_addstr(timebuf, _("in the future"));
return;
}
- diff = now->tv_sec - time;
+ diff = now.tv_sec - time;
if (diff < 90) {
strbuf_addf(timebuf,
Q_("%"PRItime" second ago", "%"PRItime" seconds ago", diff), diff);
@@ -240,9 +241,7 @@
/* Show "today" times as just relative times */
if (hide.wday) {
- struct timeval now;
- get_time(&now);
- show_date_relative(time, &now, buf);
+ show_date_relative(time, buf);
return;
}
@@ -313,11 +312,8 @@
}
if (mode->type == DATE_RELATIVE) {
- struct timeval now;
-
strbuf_reset(&timebuf);
- get_time(&now);
- show_date_relative(time, &now, &timebuf);
+ show_date_relative(time, &timebuf);
return timebuf.buf;
}
@@ -921,6 +917,10 @@
return DATE_UNIX;
if (skip_prefix(format, "format", end))
return DATE_STRFTIME;
+ /*
+ * Please update $__git_log_date_formats in
+ * git-completion.bash when you add new formats.
+ */
die("unknown date format %s", format);
}
@@ -1284,15 +1284,18 @@
return (timestamp_t)update_tm(&tm, &now, 0);
}
-timestamp_t approxidate_relative(const char *date, const struct timeval *tv)
+timestamp_t approxidate_relative(const char *date)
{
+ struct timeval tv;
timestamp_t timestamp;
int offset;
int errors = 0;
if (!parse_date_basic(date, ×tamp, &offset))
return timestamp;
- return approxidate_str(date, tv, &errors);
+
+ get_time(&tv);
+ return approxidate_str(date, (const struct timeval *) &tv, &errors);
}
timestamp_t approxidate_careful(const char *date, int *error_ret)
diff --git a/decorate.c b/decorate.c
index de31331..a605b1b 100644
--- a/decorate.c
+++ b/decorate.c
@@ -8,7 +8,7 @@
static unsigned int hash_obj(const struct object *obj, unsigned int n)
{
- return sha1hash(obj->oid.hash) % n;
+ return oidhash(&obj->oid) % n;
}
static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)
diff --git a/decorate.h b/decorate.h
index 9014c1e..ee43dee 100644
--- a/decorate.h
+++ b/decorate.h
@@ -50,12 +50,12 @@
* NULL), returning the previously associated pointer. If there is no previous
* association, this function returns NULL.
*/
-extern void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
+void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
/*
* Return the pointer associated to the given object. If there is no
* association, this function returns NULL.
*/
-extern void *lookup_decoration(struct decoration *n, const struct object *obj);
+void *lookup_decoration(struct decoration *n, const struct object *obj);
#endif
diff --git a/delta-islands.c b/delta-islands.c
index 2186bd0..09dbd3c 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -22,7 +22,7 @@
KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
-static khash_sha1 *island_marks;
+static kh_oid_map_t *island_marks;
static unsigned island_counter;
static unsigned island_counter_core;
@@ -105,7 +105,7 @@
* If we don't have a bitmap for the target, we can delta it
* against anything -- it's not an important object
*/
- trg_pos = kh_get_sha1(island_marks, trg_oid->hash);
+ trg_pos = kh_get_oid_map(island_marks, *trg_oid);
if (trg_pos >= kh_end(island_marks))
return 1;
@@ -113,7 +113,7 @@
* if the source (our delta base) doesn't have a bitmap,
* we don't want to base any deltas on it!
*/
- src_pos = kh_get_sha1(island_marks, src_oid->hash);
+ src_pos = kh_get_oid_map(island_marks, *src_oid);
if (src_pos >= kh_end(island_marks))
return 0;
@@ -129,11 +129,11 @@
if (!island_marks)
return 0;
- a_pos = kh_get_sha1(island_marks, a->hash);
+ a_pos = kh_get_oid_map(island_marks, *a);
if (a_pos < kh_end(island_marks))
a_bitmap = kh_value(island_marks, a_pos);
- b_pos = kh_get_sha1(island_marks, b->hash);
+ b_pos = kh_get_oid_map(island_marks, *b);
if (b_pos < kh_end(island_marks))
b_bitmap = kh_value(island_marks, b_pos);
@@ -154,7 +154,7 @@
khiter_t pos;
int hash_ret;
- pos = kh_put_sha1(island_marks, obj->oid.hash, &hash_ret);
+ pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
if (hash_ret)
kh_value(island_marks, pos) = island_bitmap_new(NULL);
@@ -167,7 +167,7 @@
khiter_t pos;
int hash_ret;
- pos = kh_put_sha1(island_marks, obj->oid.hash, &hash_ret);
+ pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
if (hash_ret) {
/*
* We don't have one yet; make a copy-on-write of the
@@ -279,7 +279,7 @@
struct name_entry entry;
khiter_t pos;
- pos = kh_get_sha1(island_marks, ent->idx.oid.hash);
+ pos = kh_get_oid_map(island_marks, ent->idx.oid);
if (pos >= kh_end(island_marks))
continue;
@@ -296,7 +296,7 @@
if (S_ISGITLINK(entry.mode))
continue;
- obj = lookup_object(r, entry.oid.hash);
+ obj = lookup_object(r, &entry.oid);
if (!obj)
continue;
@@ -454,21 +454,22 @@
free(list);
}
-void load_delta_islands(struct repository *r)
+void load_delta_islands(struct repository *r, int progress)
{
- island_marks = kh_init_sha1();
+ island_marks = kh_init_oid_map();
remote_islands = kh_init_str();
git_config(island_config_callback, NULL);
for_each_ref(find_island_for_ref, NULL);
deduplicate_islands(r);
- fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);
+ if (progress)
+ fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);
}
void propagate_island_marks(struct commit *commit)
{
- khiter_t pos = kh_get_sha1(island_marks, commit->object.oid.hash);
+ khiter_t pos = kh_get_oid_map(island_marks, commit->object.oid);
if (pos < kh_end(island_marks)) {
struct commit_list *p;
@@ -490,7 +491,7 @@
for (i = 0; i < to_pack->nr_objects; ++i) {
struct object_entry *entry = &to_pack->objects[i];
- khiter_t pos = kh_get_sha1(island_marks, entry->idx.oid.hash);
+ khiter_t pos = kh_get_oid_map(island_marks, entry->idx.oid);
oe_set_layer(to_pack, entry, 1);
diff --git a/delta-islands.h b/delta-islands.h
index 3ac8045..eb0f952 100644
--- a/delta-islands.h
+++ b/delta-islands.h
@@ -11,7 +11,7 @@
void resolve_tree_islands(struct repository *r,
int progress,
struct packing_data *to_pack);
-void load_delta_islands(struct repository *r);
+void load_delta_islands(struct repository *r, int progress);
void propagate_island_marks(struct commit *commit);
int compute_pack_layers(struct packing_data *to_pack);
diff --git a/delta.h b/delta.h
index 9b67531..2df5fe1 100644
--- a/delta.h
+++ b/delta.h
@@ -13,7 +13,7 @@
* before free_delta_index() is called. The returned pointer must be freed
* using free_delta_index().
*/
-extern struct delta_index *
+struct delta_index *
create_delta_index(const void *buf, unsigned long bufsize);
/*
@@ -21,14 +21,14 @@
*
* Given pointer must be what create_delta_index() returned, or NULL.
*/
-extern void free_delta_index(struct delta_index *index);
+void free_delta_index(struct delta_index *index);
/*
* sizeof_delta_index: returns memory usage of delta index
*
* Given pointer must be what create_delta_index() returned, or NULL.
*/
-extern unsigned long sizeof_delta_index(struct delta_index *index);
+unsigned long sizeof_delta_index(struct delta_index *index);
/*
* create_delta: create a delta from given index for the given buffer
@@ -40,7 +40,7 @@
* returned and *delta_size is updated with its size. The returned buffer
* must be freed by the caller.
*/
-extern void *
+void *
create_delta(const struct delta_index *index,
const void *buf, unsigned long bufsize,
unsigned long *delta_size, unsigned long max_delta_size);
@@ -75,9 +75,9 @@
* *trg_bufsize is updated with its size. On failure a NULL pointer is
* returned. The returned buffer must be freed by the caller.
*/
-extern void *patch_delta(const void *src_buf, unsigned long src_size,
- const void *delta_buf, unsigned long delta_size,
- unsigned long *dst_size);
+void *patch_delta(const void *src_buf, unsigned long src_size,
+ const void *delta_buf, unsigned long delta_size,
+ unsigned long *dst_size);
/* the smallest possible delta size is 4 bytes */
#define DELTA_SIZE_MIN 4
diff --git a/diff-delta.c b/diff-delta.c
index e496433..77fea08 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -326,6 +326,8 @@
const unsigned char *ref_data, *ref_top, *data, *top;
unsigned char *out;
+ *delta_size = 0;
+
if (!trg_buf || !trg_size)
return NULL;
diff --git a/diff-lib.c b/diff-lib.c
index 23c8d35..61812f4 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -232,7 +232,7 @@
if (!changed && !dirty_submodule) {
ce_mark_uptodate(ce);
- mark_fsmonitor_valid(ce);
+ mark_fsmonitor_valid(istate, ce);
if (!revs->diffopt.flags.find_copies_harder)
continue;
}
@@ -531,7 +531,7 @@
exit(128);
diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
- diffcore_fix_diff_index(&revs->diffopt);
+ diffcore_fix_diff_index();
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
trace_performance_leave("diff-index");
diff --git a/diff-no-index.c b/diff-no-index.c
index 9414e92..7814eab 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -14,6 +14,7 @@
#include "revision.h"
#include "log-tree.h"
#include "builtin.h"
+#include "parse-options.h"
#include "string-list.h"
#include "dir.h"
@@ -233,35 +234,37 @@
}
}
-void diff_no_index(struct repository *r,
- struct rev_info *revs,
- int argc, const char **argv)
+static const char * const diff_no_index_usage[] = {
+ N_("git diff --no-index [<options>] <path> <path>"),
+ NULL
+};
+
+int diff_no_index(struct rev_info *revs,
+ int implicit_no_index,
+ int argc, const char **argv)
{
- int i;
+ int i, no_index;
const char *paths[2];
struct strbuf replacement = STRBUF_INIT;
const char *prefix = revs->prefix;
+ struct option no_index_options[] = {
+ OPT_BOOL_F(0, "no-index", &no_index, "",
+ PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
+ OPT_END(),
+ };
+ struct option *options;
- /*
- * FIXME: --no-index should not look at index and we should be
- * able to pass NULL repo. Maybe later.
- */
- repo_diff_setup(r, &revs->diffopt);
- for (i = 1; i < argc - 2; ) {
- int j;
- if (!strcmp(argv[i], "--no-index"))
- i++;
- else if (!strcmp(argv[i], "--"))
- i++;
- else {
- j = diff_opt_parse(&revs->diffopt, argv + i, argc - i,
- revs->prefix);
- if (j <= 0)
- die("invalid diff option/value: %s", argv[i]);
- i += j;
- }
+ options = parse_options_concat(no_index_options,
+ revs->diffopt.parseopts);
+ argc = parse_options(argc, argv, revs->prefix, options,
+ diff_no_index_usage, 0);
+ if (argc != 2) {
+ if (implicit_no_index)
+ warning(_("Not a git repository. Use --no-index to "
+ "compare two paths outside a working tree"));
+ usage_with_options(diff_no_index_usage, options);
}
-
+ FREE_AND_NULL(options);
for (i = 0; i < 2; i++) {
const char *p = argv[argc - 2 + i];
if (!strcmp(p, "-"))
@@ -293,7 +296,7 @@
revs->diffopt.flags.exit_with_status = 1;
if (queue_diff(&revs->diffopt, paths[0], paths[1]))
- exit(1);
+ return 1;
diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
@@ -304,5 +307,5 @@
* The return code for --no-index imitates diff(1):
* 0 = no changes, 1 = changes, else error
*/
- exit(diff_result_code(&revs->diffopt, 0));
+ return diff_result_code(&revs->diffopt, 0);
}
diff --git a/diff.c b/diff.c
index 5306c48..6db6927 100644
--- a/diff.c
+++ b/diff.c
@@ -23,7 +23,9 @@
#include "argv-array.h"
#include "graph.h"
#include "packfile.h"
+#include "parse-options.h"
#include "help.h"
+#include "promisor-remote.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
@@ -103,11 +105,6 @@
[DIFF_FILE_NEW_BOLD] = "newBold",
};
-static NORETURN void die_want_option(const char *option_name)
-{
- die(_("option '%s' requires a value"), option_name);
-}
-
define_list_config_array_extra(color_diff_slots, {"plain"});
static int parse_diff_color_slot(const char *var)
@@ -178,6 +175,10 @@
options->submodule_format = DIFF_SUBMODULE_SHORT;
else if (!strcmp(value, "diff"))
options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF;
+ /*
+ * Please update $__git_diff_submodule_formats in
+ * git-completion.bash when you add new formats.
+ */
else
return -1;
return 0;
@@ -204,6 +205,10 @@
return XDF_PATIENCE_DIFF;
else if (!strcasecmp(value, "histogram"))
return XDF_HISTOGRAM_DIFF;
+ /*
+ * Please update $__git_diff_algorithms in git-completion.bash
+ * when you add new algorithms.
+ */
return -1;
}
@@ -1613,8 +1618,7 @@
return ws_blank_line(line, len, ecbdata->ws_rule);
}
-static void emit_add_line(const char *reset,
- struct emit_callback *ecbdata,
+static void emit_add_line(struct emit_callback *ecbdata,
const char *line, int len)
{
unsigned flags = WSEH_NEW | ecbdata->ws_rule;
@@ -1624,16 +1628,14 @@
emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
}
-static void emit_del_line(const char *reset,
- struct emit_callback *ecbdata,
+static void emit_del_line(struct emit_callback *ecbdata,
const char *line, int len)
{
unsigned flags = WSEH_OLD | ecbdata->ws_rule;
emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
}
-static void emit_context_line(const char *reset,
- struct emit_callback *ecbdata,
+static void emit_context_line(struct emit_callback *ecbdata,
const char *line, int len)
{
unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
@@ -1671,7 +1673,10 @@
if (ecbdata->opt->flags.dual_color_diffed_diffs)
strbuf_addstr(&msgbuf, reverse);
strbuf_addstr(&msgbuf, frag);
- strbuf_add(&msgbuf, line, ep - line);
+ if (ecbdata->opt->flags.suppress_hunk_header_line_count)
+ strbuf_add(&msgbuf, atat, sizeof(atat));
+ else
+ strbuf_add(&msgbuf, line, ep - line);
strbuf_addstr(&msgbuf, reset);
/*
@@ -1742,7 +1747,6 @@
int prefix, const char *data, int size)
{
const char *endp = NULL;
- const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
while (0 < size) {
int len;
@@ -1751,10 +1755,10 @@
len = endp ? (endp - data + 1) : size;
if (prefix != '+') {
ecb->lno_in_preimage++;
- emit_del_line(reset, ecb, data, len);
+ emit_del_line(ecb, data, len);
} else {
ecb->lno_in_postimage++;
- emit_add_line(reset, ecb, data, len);
+ emit_add_line(ecb, data, len);
}
size -= len;
data += len;
@@ -2291,7 +2295,7 @@
return msgbuf->buf;
}
-static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
+static unsigned long sane_truncate_line(char *line, unsigned long len)
{
const char *cp;
unsigned long allot;
@@ -2325,7 +2329,6 @@
static void fn_out_consume(void *priv, char *line, unsigned long len)
{
struct emit_callback *ecbdata = priv;
- const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
struct diff_options *o = ecbdata->opt;
o->found_changes = 1;
@@ -2356,7 +2359,7 @@
if (line[0] == '@') {
if (ecbdata->diff_words)
diff_words_flush(ecbdata);
- len = sane_truncate_line(ecbdata, line, len);
+ len = sane_truncate_line(line, len);
find_lno(line, ecbdata);
emit_hunk_header(ecbdata, line, len);
return;
@@ -2392,16 +2395,16 @@
switch (line[0]) {
case '+':
ecbdata->lno_in_postimage++;
- emit_add_line(reset, ecbdata, line + 1, len - 1);
+ emit_add_line(ecbdata, line + 1, len - 1);
break;
case '-':
ecbdata->lno_in_preimage++;
- emit_del_line(reset, ecbdata, line + 1, len - 1);
+ emit_del_line(ecbdata, line + 1, len - 1);
break;
case ' ':
ecbdata->lno_in_postimage++;
ecbdata->lno_in_preimage++;
- emit_context_line(reset, ecbdata, line + 1, len - 1);
+ emit_context_line(ecbdata, line + 1, len - 1);
break;
default:
/* incomplete line at the end */
@@ -4183,7 +4186,6 @@
struct diff_filespec *one,
struct diff_filespec *two,
const char *xfrm_msg,
- int complete_rewrite,
struct diff_options *o)
{
struct argv_array argv = ARGV_ARRAY_INIT;
@@ -4207,6 +4209,8 @@
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
+ diff_free_filespec_data(one);
+ diff_free_filespec_data(two);
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
die(_("external diff died, stopping at %s"), name);
@@ -4341,8 +4345,7 @@
}
if (pgm) {
- run_external_diff(pgm, name, other, one, two, xfrm_msg,
- complete_rewrite, o);
+ run_external_diff(pgm, name, other, one, two, xfrm_msg, o);
return;
}
if (one && two)
@@ -4491,6 +4494,8 @@
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
}
+static void prep_parse_options(struct diff_options *options);
+
void repo_diff_setup(struct repository *r, struct diff_options *options)
{
memcpy(options, &default_diff_options, sizeof(*options));
@@ -4532,6 +4537,8 @@
options->color_moved = diff_color_moved_default;
options->color_moved_ws_handling = diff_color_moved_ws_default;
+
+ prep_parse_options(options);
}
void diff_setup_done(struct diff_options *options)
@@ -4635,68 +4642,8 @@
if (!options->use_color || external_diff())
options->color_moved = 0;
-}
-static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
-{
- char c, *eq;
- int len;
-
- if (*arg != '-')
- return 0;
- c = *++arg;
- if (!c)
- return 0;
- if (c == arg_short) {
- c = *++arg;
- if (!c)
- return 1;
- if (val && isdigit(c)) {
- char *end;
- int n = strtoul(arg, &end, 10);
- if (*end)
- return 0;
- *val = n;
- return 1;
- }
- return 0;
- }
- if (c != '-')
- return 0;
- arg++;
- eq = strchrnul(arg, '=');
- len = eq - arg;
- if (!len || strncmp(arg, arg_long, len))
- return 0;
- if (*eq) {
- int n;
- char *end;
- if (!isdigit(*++eq))
- return 0;
- n = strtoul(eq, &end, 10);
- if (*end)
- return 0;
- *val = n;
- }
- return 1;
-}
-
-static int diff_scoreopt_parse(const char *opt);
-
-static inline int short_opt(char opt, const char **argv,
- const char **optarg)
-{
- const char *arg = argv[0];
- if (arg[0] != '-' || arg[1] != opt)
- return 0;
- if (arg[2] != '\0') {
- *optarg = arg + 2;
- return 1;
- }
- if (!argv[1])
- die("Option '%c' requires a value", opt);
- *optarg = argv[1];
- return 2;
+ FREE_AND_NULL(options->parseopts);
}
int parse_long_opt(const char *opt, const char **argv,
@@ -4720,77 +4667,56 @@
return 2;
}
-static int stat_opt(struct diff_options *options, const char **av)
+static int diff_opt_stat(const struct option *opt, const char *value, int unset)
{
- const char *arg = av[0];
- char *end;
+ struct diff_options *options = opt->value;
int width = options->stat_width;
int name_width = options->stat_name_width;
int graph_width = options->stat_graph_width;
int count = options->stat_count;
- int argcount = 1;
+ char *end;
- if (!skip_prefix(arg, "--stat", &arg))
- BUG("stat option does not begin with --stat: %s", arg);
- end = (char *)arg;
+ BUG_ON_OPT_NEG(unset);
- switch (*arg) {
- case '-':
- if (skip_prefix(arg, "-width", &arg)) {
- if (*arg == '=')
- width = strtoul(arg + 1, &end, 10);
- else if (!*arg && !av[1])
- die_want_option("--stat-width");
- else if (!*arg) {
- width = strtoul(av[1], &end, 10);
- argcount = 2;
- }
- } else if (skip_prefix(arg, "-name-width", &arg)) {
- if (*arg == '=')
- name_width = strtoul(arg + 1, &end, 10);
- else if (!*arg && !av[1])
- die_want_option("--stat-name-width");
- else if (!*arg) {
- name_width = strtoul(av[1], &end, 10);
- argcount = 2;
- }
- } else if (skip_prefix(arg, "-graph-width", &arg)) {
- if (*arg == '=')
- graph_width = strtoul(arg + 1, &end, 10);
- else if (!*arg && !av[1])
- die_want_option("--stat-graph-width");
- else if (!*arg) {
- graph_width = strtoul(av[1], &end, 10);
- argcount = 2;
- }
- } else if (skip_prefix(arg, "-count", &arg)) {
- if (*arg == '=')
- count = strtoul(arg + 1, &end, 10);
- else if (!*arg && !av[1])
- die_want_option("--stat-count");
- else if (!*arg) {
- count = strtoul(av[1], &end, 10);
- argcount = 2;
- }
+ if (!strcmp(opt->long_name, "stat")) {
+ if (value) {
+ width = strtoul(value, &end, 10);
+ if (*end == ',')
+ name_width = strtoul(end+1, &end, 10);
+ if (*end == ',')
+ count = strtoul(end+1, &end, 10);
+ if (*end)
+ return error(_("invalid --stat value: %s"), value);
}
- break;
- case '=':
- width = strtoul(arg+1, &end, 10);
- if (*end == ',')
- name_width = strtoul(end+1, &end, 10);
- if (*end == ',')
- count = strtoul(end+1, &end, 10);
- }
+ } else if (!strcmp(opt->long_name, "stat-width")) {
+ width = strtoul(value, &end, 10);
+ if (*end)
+ return error(_("%s expects a numerical value"),
+ opt->long_name);
+ } else if (!strcmp(opt->long_name, "stat-name-width")) {
+ name_width = strtoul(value, &end, 10);
+ if (*end)
+ return error(_("%s expects a numerical value"),
+ opt->long_name);
+ } else if (!strcmp(opt->long_name, "stat-graph-width")) {
+ graph_width = strtoul(value, &end, 10);
+ if (*end)
+ return error(_("%s expects a numerical value"),
+ opt->long_name);
+ } else if (!strcmp(opt->long_name, "stat-count")) {
+ count = strtoul(value, &end, 10);
+ if (*end)
+ return error(_("%s expects a numerical value"),
+ opt->long_name);
+ } else
+ BUG("%s should not get here", opt->long_name);
- /* Important! This checks all the error cases! */
- if (*end)
- return 0;
options->output_format |= DIFF_FORMAT_DIFFSTAT;
options->stat_name_width = name_width;
options->stat_graph_width = graph_width;
options->stat_width = width;
options->stat_count = count;
- return argcount;
+ return 0;
}
static int parse_dirstat_opt(struct diff_options *options, const char *params)
@@ -4808,14 +4734,6 @@
return 1;
}
-static int parse_submodule_opt(struct diff_options *options, const char *value)
-{
- if (parse_submodule_params(options, value))
- die(_("Failed to parse --submodule option parameter: '%s'"),
- value);
- return 1;
-}
-
static const char diff_status_letters[] = {
DIFF_STATUS_ADDED,
DIFF_STATUS_COPIED,
@@ -4847,10 +4765,19 @@
return opt->filter & filter_bit[(int) status];
}
-static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
+unsigned diff_filter_bit(char status)
{
+ prepare_filter_bits();
+ return filter_bit[(int) status];
+}
+
+static int diff_opt_diff_filter(const struct option *option,
+ const char *optarg, int unset)
+{
+ struct diff_options *opt = option->value;
int i, optch;
+ BUG_ON_OPT_NEG(unset);
prepare_filter_bits();
/*
@@ -4881,7 +4808,8 @@
bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
if (!bit)
- return optarg[i];
+ return error(_("unknown change class '%c' in --diff-filter=%s"),
+ optarg[i], optarg);
if (negate)
opt->filter &= ~bit;
else
@@ -4896,25 +4824,29 @@
*fmt |= DIFF_FORMAT_PATCH;
}
-static int parse_ws_error_highlight_opt(struct diff_options *opt, const char *arg)
+static int diff_opt_ws_error_highlight(const struct option *option,
+ const char *arg, int unset)
{
+ struct diff_options *opt = option->value;
int val = parse_ws_error_highlight(arg);
- if (val < 0) {
- error("unknown value after ws-error-highlight=%.*s",
- -1 - val, arg);
- return 0;
- }
+ BUG_ON_OPT_NEG(unset);
+ if (val < 0)
+ return error(_("unknown value after ws-error-highlight=%.*s"),
+ -1 - val, arg);
opt->ws_error_highlight = val;
- return 1;
+ return 0;
}
-static int parse_objfind_opt(struct diff_options *opt, const char *arg)
+static int diff_opt_find_object(const struct option *option,
+ const char *arg, int unset)
{
+ struct diff_options *opt = option->value;
struct object_id oid;
+ BUG_ON_OPT_NEG(unset);
if (get_oid(arg, &oid))
- return error("unable to resolve '%s'", arg);
+ return error(_("unable to resolve '%s'"), arg);
if (!opt->objfind)
opt->objfind = xcalloc(1, sizeof(*opt->objfind));
@@ -4923,207 +4855,384 @@
opt->flags.recursive = 1;
opt->flags.tree_in_recursive = 1;
oidset_insert(opt->objfind, &oid);
- return 1;
+ return 0;
}
-int diff_opt_parse(struct diff_options *options,
- const char **av, int ac, const char *prefix)
+static int diff_opt_anchored(const struct option *opt,
+ const char *arg, int unset)
{
- const char *arg = av[0];
- const char *optarg;
- int argcount;
+ struct diff_options *options = opt->value;
- if (!prefix)
- prefix = "";
+ BUG_ON_OPT_NEG(unset);
+ options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
+ ALLOC_GROW(options->anchors, options->anchors_nr + 1,
+ options->anchors_alloc);
+ options->anchors[options->anchors_nr++] = xstrdup(arg);
+ return 0;
+}
- /* Output format options */
- if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
- || opt_arg(arg, 'U', "unified", &options->context))
- enable_patch_output(&options->output_format);
- else if (!strcmp(arg, "--raw"))
- options->output_format |= DIFF_FORMAT_RAW;
- else if (!strcmp(arg, "--patch-with-raw")) {
- enable_patch_output(&options->output_format);
- options->output_format |= DIFF_FORMAT_RAW;
- } else if (!strcmp(arg, "--numstat"))
- options->output_format |= DIFF_FORMAT_NUMSTAT;
- else if (!strcmp(arg, "--shortstat"))
- options->output_format |= DIFF_FORMAT_SHORTSTAT;
- else if (skip_prefix(arg, "-X", &arg) ||
- skip_to_optional_arg(arg, "--dirstat", &arg))
- return parse_dirstat_opt(options, arg);
- else if (!strcmp(arg, "--cumulative"))
- return parse_dirstat_opt(options, "cumulative");
- else if (skip_to_optional_arg(arg, "--dirstat-by-file", &arg)) {
- parse_dirstat_opt(options, "files");
- return parse_dirstat_opt(options, arg);
- }
- else if (!strcmp(arg, "--check"))
- options->output_format |= DIFF_FORMAT_CHECKDIFF;
- else if (!strcmp(arg, "--summary"))
- options->output_format |= DIFF_FORMAT_SUMMARY;
- else if (!strcmp(arg, "--patch-with-stat")) {
- enable_patch_output(&options->output_format);
- options->output_format |= DIFF_FORMAT_DIFFSTAT;
- } else if (!strcmp(arg, "--name-only"))
- options->output_format |= DIFF_FORMAT_NAME;
- else if (!strcmp(arg, "--name-status"))
- options->output_format |= DIFF_FORMAT_NAME_STATUS;
- else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
- options->output_format |= DIFF_FORMAT_NO_OUTPUT;
- else if (starts_with(arg, "--stat"))
- /* --stat, --stat-width, --stat-name-width, or --stat-count */
- return stat_opt(options, av);
- else if (!strcmp(arg, "--compact-summary")) {
- options->flags.stat_with_summary = 1;
- options->output_format |= DIFF_FORMAT_DIFFSTAT;
- } else if (!strcmp(arg, "--no-compact-summary"))
- options->flags.stat_with_summary = 0;
- else if (skip_prefix(arg, "--output-indicator-new=", &arg))
- options->output_indicators[OUTPUT_INDICATOR_NEW] = arg[0];
- else if (skip_prefix(arg, "--output-indicator-old=", &arg))
- options->output_indicators[OUTPUT_INDICATOR_OLD] = arg[0];
- else if (skip_prefix(arg, "--output-indicator-context=", &arg))
- options->output_indicators[OUTPUT_INDICATOR_CONTEXT] = arg[0];
+static int diff_opt_binary(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
- /* renames options */
- else if (starts_with(arg, "-B") ||
- skip_to_optional_arg(arg, "--break-rewrites", NULL)) {
- if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
- return error("invalid argument to -B: %s", arg+2);
- }
- else if (starts_with(arg, "-M") ||
- skip_to_optional_arg(arg, "--find-renames", NULL)) {
- if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
- return error("invalid argument to -M: %s", arg+2);
- options->detect_rename = DIFF_DETECT_RENAME;
- }
- else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
- options->irreversible_delete = 1;
- }
- else if (starts_with(arg, "-C") ||
- skip_to_optional_arg(arg, "--find-copies", NULL)) {
- if (options->detect_rename == DIFF_DETECT_COPY)
- options->flags.find_copies_harder = 1;
- if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
- return error("invalid argument to -C: %s", arg+2);
- options->detect_rename = DIFF_DETECT_COPY;
- }
- else if (!strcmp(arg, "--no-renames"))
- options->detect_rename = 0;
- else if (!strcmp(arg, "--rename-empty"))
- options->flags.rename_empty = 1;
- else if (!strcmp(arg, "--no-rename-empty"))
- options->flags.rename_empty = 0;
- else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
- options->flags.relative_name = 1;
- if (arg)
- options->prefix = arg;
- }
+ BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
+ enable_patch_output(&options->output_format);
+ options->flags.binary = 1;
+ return 0;
+}
- /* xdiff options */
- else if (!strcmp(arg, "--minimal"))
- DIFF_XDL_SET(options, NEED_MINIMAL);
- else if (!strcmp(arg, "--no-minimal"))
- DIFF_XDL_CLR(options, NEED_MINIMAL);
- else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
- DIFF_XDL_SET(options, IGNORE_WHITESPACE);
- else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
- DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
- else if (!strcmp(arg, "--ignore-space-at-eol"))
- DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
- else if (!strcmp(arg, "--ignore-cr-at-eol"))
- DIFF_XDL_SET(options, IGNORE_CR_AT_EOL);
- else if (!strcmp(arg, "--ignore-blank-lines"))
- DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
- else if (!strcmp(arg, "--indent-heuristic"))
- DIFF_XDL_SET(options, INDENT_HEURISTIC);
- else if (!strcmp(arg, "--no-indent-heuristic"))
- DIFF_XDL_CLR(options, INDENT_HEURISTIC);
- else if (!strcmp(arg, "--patience")) {
- int i;
- options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
- /*
- * Both --patience and --anchored use PATIENCE_DIFF
- * internally, so remove any anchors previously
- * specified.
- */
- for (i = 0; i < options->anchors_nr; i++)
- free(options->anchors[i]);
- options->anchors_nr = 0;
- } else if (!strcmp(arg, "--histogram"))
- options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
- else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
- long value = parse_algorithm_value(optarg);
- if (value < 0)
- return error("option diff-algorithm accepts \"myers\", "
- "\"minimal\", \"patience\" and \"histogram\"");
- /* clear out previous settings */
- DIFF_XDL_CLR(options, NEED_MINIMAL);
- options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
- options->xdl_opts |= value;
- return argcount;
- } else if (skip_prefix(arg, "--anchored=", &arg)) {
- options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
- ALLOC_GROW(options->anchors, options->anchors_nr + 1,
- options->anchors_alloc);
- options->anchors[options->anchors_nr++] = xstrdup(arg);
- }
+static int diff_opt_break_rewrites(const struct option *opt,
+ const char *arg, int unset)
+{
+ int *break_opt = opt->value;
+ int opt1, opt2;
- /* flags options */
- else if (!strcmp(arg, "--binary")) {
- enable_patch_output(&options->output_format);
- options->flags.binary = 1;
+ BUG_ON_OPT_NEG(unset);
+ if (!arg)
+ arg = "";
+ opt1 = parse_rename_score(&arg);
+ if (*arg == 0)
+ opt2 = 0;
+ else if (*arg != '/')
+ return error(_("%s expects <n>/<m> form"), opt->long_name);
+ else {
+ arg++;
+ opt2 = parse_rename_score(&arg);
}
- else if (!strcmp(arg, "--full-index"))
- options->flags.full_index = 1;
- else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
- options->flags.text = 1;
- else if (!strcmp(arg, "-R"))
- options->flags.reverse_diff = 1;
- else if (!strcmp(arg, "--find-copies-harder"))
- options->flags.find_copies_harder = 1;
- else if (!strcmp(arg, "--follow"))
- options->flags.follow_renames = 1;
- else if (!strcmp(arg, "--no-follow")) {
- options->flags.follow_renames = 0;
- options->flags.default_follow_renames = 0;
- } else if (skip_to_optional_arg_default(arg, "--color", &arg, "always")) {
- int value = git_config_colorbool(NULL, arg);
- if (value < 0)
- return error("option `color' expects \"always\", \"auto\", or \"never\"");
- options->use_color = value;
- }
- else if (!strcmp(arg, "--no-color"))
- options->use_color = 0;
- else if (!strcmp(arg, "--color-moved")) {
+ if (*arg != 0)
+ return error(_("%s expects <n>/<m> form"), opt->long_name);
+ *break_opt = opt1 | (opt2 << 16);
+ return 0;
+}
+
+static int diff_opt_char(const struct option *opt,
+ const char *arg, int unset)
+{
+ char *value = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (arg[1])
+ return error(_("%s expects a character, got '%s'"),
+ opt->long_name, arg);
+ *value = arg[0];
+ return 0;
+}
+
+static int diff_opt_color_moved(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ if (unset) {
+ options->color_moved = COLOR_MOVED_NO;
+ } else if (!arg) {
if (diff_color_moved_default)
options->color_moved = diff_color_moved_default;
if (options->color_moved == COLOR_MOVED_NO)
options->color_moved = COLOR_MOVED_DEFAULT;
- } else if (!strcmp(arg, "--no-color-moved"))
- options->color_moved = COLOR_MOVED_NO;
- else if (skip_prefix(arg, "--color-moved=", &arg)) {
+ } else {
int cm = parse_color_moved(arg);
if (cm < 0)
- return error("bad --color-moved argument: %s", arg);
+ return error(_("bad --color-moved argument: %s"), arg);
options->color_moved = cm;
- } else if (!strcmp(arg, "--no-color-moved-ws")) {
+ }
+ return 0;
+}
+
+static int diff_opt_color_moved_ws(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ unsigned cm;
+
+ if (unset) {
options->color_moved_ws_handling = 0;
- } else if (skip_prefix(arg, "--color-moved-ws=", &arg)) {
- unsigned cm = parse_color_moved_ws(arg);
- if (cm & COLOR_MOVED_WS_ERROR)
- return -1;
- options->color_moved_ws_handling = cm;
- } else if (skip_to_optional_arg_default(arg, "--color-words", &options->word_regex, NULL)) {
- options->use_color = 1;
- options->word_diff = DIFF_WORDS_COLOR;
+ return 0;
}
- else if (!strcmp(arg, "--word-diff")) {
- if (options->word_diff == DIFF_WORDS_NONE)
- options->word_diff = DIFF_WORDS_PLAIN;
+
+ cm = parse_color_moved_ws(arg);
+ if (cm & COLOR_MOVED_WS_ERROR)
+ return error(_("invalid mode '%s' in --color-moved-ws"), arg);
+ options->color_moved_ws_handling = cm;
+ return 0;
+}
+
+static int diff_opt_color_words(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ options->use_color = 1;
+ options->word_diff = DIFF_WORDS_COLOR;
+ options->word_regex = arg;
+ return 0;
+}
+
+static int diff_opt_compact_summary(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_ARG(arg);
+ if (unset) {
+ options->flags.stat_with_summary = 0;
+ } else {
+ options->flags.stat_with_summary = 1;
+ options->output_format |= DIFF_FORMAT_DIFFSTAT;
}
- else if (skip_prefix(arg, "--word-diff=", &arg)) {
+ return 0;
+}
+
+static int diff_opt_diff_algorithm(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ long value = parse_algorithm_value(arg);
+
+ BUG_ON_OPT_NEG(unset);
+ if (value < 0)
+ return error(_("option diff-algorithm accepts \"myers\", "
+ "\"minimal\", \"patience\" and \"histogram\""));
+
+ /* clear out previous settings */
+ DIFF_XDL_CLR(options, NEED_MINIMAL);
+ options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
+ options->xdl_opts |= value;
+ return 0;
+}
+
+static int diff_opt_dirstat(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!strcmp(opt->long_name, "cumulative")) {
+ if (arg)
+ BUG("how come --cumulative take a value?");
+ arg = "cumulative";
+ } else if (!strcmp(opt->long_name, "dirstat-by-file"))
+ parse_dirstat_opt(options, "files");
+ parse_dirstat_opt(options, arg ? arg : "");
+ return 0;
+}
+
+static int diff_opt_find_copies(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!arg)
+ arg = "";
+ options->rename_score = parse_rename_score(&arg);
+ if (*arg != 0)
+ return error(_("invalid argument to %s"), opt->long_name);
+
+ if (options->detect_rename == DIFF_DETECT_COPY)
+ options->flags.find_copies_harder = 1;
+ else
+ options->detect_rename = DIFF_DETECT_COPY;
+
+ return 0;
+}
+
+static int diff_opt_find_renames(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!arg)
+ arg = "";
+ options->rename_score = parse_rename_score(&arg);
+ if (*arg != 0)
+ return error(_("invalid argument to %s"), opt->long_name);
+
+ options->detect_rename = DIFF_DETECT_RENAME;
+ return 0;
+}
+
+static int diff_opt_follow(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_ARG(arg);
+ if (unset) {
+ options->flags.follow_renames = 0;
+ options->flags.default_follow_renames = 0;
+ } else {
+ options->flags.follow_renames = 1;
+ }
+ return 0;
+}
+
+static int diff_opt_ignore_submodules(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!arg)
+ arg = "all";
+ options->flags.override_submodule_config = 1;
+ handle_ignore_submodules_arg(options, arg);
+ return 0;
+}
+
+static int diff_opt_line_prefix(const struct option *opt,
+ const char *optarg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ options->line_prefix = optarg;
+ options->line_prefix_length = strlen(options->line_prefix);
+ graph_setup_line_prefix(options);
+ return 0;
+}
+
+static int diff_opt_no_prefix(const struct option *opt,
+ const char *optarg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(optarg);
+ options->a_prefix = "";
+ options->b_prefix = "";
+ return 0;
+}
+
+static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
+ const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ char *path;
+
+ BUG_ON_OPT_NEG(unset);
+ path = prefix_filename(ctx->prefix, arg);
+ options->file = xfopen(path, "w");
+ options->close_file = 1;
+ if (options->use_color != GIT_COLOR_ALWAYS)
+ options->use_color = GIT_COLOR_NEVER;
+ free(path);
+ return 0;
+}
+
+static int diff_opt_patience(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ int i;
+
+ BUG_ON_OPT_NEG(unset);
+ BUG_ON_OPT_ARG(arg);
+ options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
+ /*
+ * Both --patience and --anchored use PATIENCE_DIFF
+ * internally, so remove any anchors previously
+ * specified.
+ */
+ for (i = 0; i < options->anchors_nr; i++)
+ free(options->anchors[i]);
+ options->anchors_nr = 0;
+ return 0;
+}
+
+static int diff_opt_pickaxe_regex(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ options->pickaxe = arg;
+ options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
+ return 0;
+}
+
+static int diff_opt_pickaxe_string(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ options->pickaxe = arg;
+ options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
+ return 0;
+}
+
+static int diff_opt_relative(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ options->flags.relative_name = 1;
+ if (arg)
+ options->prefix = arg;
+ return 0;
+}
+
+static int diff_opt_submodule(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!arg)
+ arg = "log";
+ if (parse_submodule_params(options, arg))
+ return error(_("failed to parse --submodule option parameter: '%s'"),
+ arg);
+ return 0;
+}
+
+static int diff_opt_textconv(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_ARG(arg);
+ if (unset) {
+ options->flags.allow_textconv = 0;
+ } else {
+ options->flags.allow_textconv = 1;
+ options->flags.textconv_set_via_cmdline = 1;
+ }
+ return 0;
+}
+
+static int diff_opt_unified(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ char *s;
+
+ BUG_ON_OPT_NEG(unset);
+
+ if (arg) {
+ options->context = strtol(arg, &s, 10);
+ if (*s)
+ return error(_("%s expects a numerical value"), "--unified");
+ }
+ enable_patch_output(&options->output_format);
+
+ return 0;
+}
+
+static int diff_opt_word_diff(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (arg) {
if (!strcmp(arg, "plain"))
options->word_diff = DIFF_WORDS_PLAIN;
else if (!strcmp(arg, "color")) {
@@ -5135,118 +5244,305 @@
else if (!strcmp(arg, "none"))
options->word_diff = DIFF_WORDS_NONE;
else
- die("bad --word-diff argument: %s", arg);
- }
- else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
+ return error(_("bad --word-diff argument: %s"), arg);
+ } else {
if (options->word_diff == DIFF_WORDS_NONE)
options->word_diff = DIFF_WORDS_PLAIN;
- options->word_regex = optarg;
- return argcount;
}
- else if (!strcmp(arg, "--exit-code"))
- options->flags.exit_with_status = 1;
- else if (!strcmp(arg, "--quiet"))
- options->flags.quick = 1;
- else if (!strcmp(arg, "--ext-diff"))
- options->flags.allow_external = 1;
- else if (!strcmp(arg, "--no-ext-diff"))
- options->flags.allow_external = 0;
- else if (!strcmp(arg, "--textconv")) {
- options->flags.allow_textconv = 1;
- options->flags.textconv_set_via_cmdline = 1;
- } else if (!strcmp(arg, "--no-textconv"))
- options->flags.allow_textconv = 0;
- else if (skip_to_optional_arg_default(arg, "--ignore-submodules", &arg, "all")) {
- options->flags.override_submodule_config = 1;
- handle_ignore_submodules_arg(options, arg);
- } else if (skip_to_optional_arg_default(arg, "--submodule", &arg, "log"))
- return parse_submodule_opt(options, arg);
- else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
- return parse_ws_error_highlight_opt(options, arg);
- else if (!strcmp(arg, "--ita-invisible-in-index"))
- options->ita_invisible_in_index = 1;
- else if (!strcmp(arg, "--ita-visible-in-index"))
- options->ita_invisible_in_index = 0;
+ return 0;
+}
- /* misc options */
- else if (!strcmp(arg, "-z"))
- options->line_termination = 0;
- else if ((argcount = short_opt('l', av, &optarg))) {
- options->rename_limit = strtoul(optarg, NULL, 10);
- return argcount;
- }
- else if ((argcount = short_opt('S', av, &optarg))) {
- options->pickaxe = optarg;
- options->pickaxe_opts |= DIFF_PICKAXE_KIND_S;
- return argcount;
- } else if ((argcount = short_opt('G', av, &optarg))) {
- options->pickaxe = optarg;
- options->pickaxe_opts |= DIFF_PICKAXE_KIND_G;
- return argcount;
- }
- else if (!strcmp(arg, "--pickaxe-all"))
- options->pickaxe_opts |= DIFF_PICKAXE_ALL;
- else if (!strcmp(arg, "--pickaxe-regex"))
- options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
- else if ((argcount = short_opt('O', av, &optarg))) {
- options->orderfile = prefix_filename(prefix, optarg);
- return argcount;
- } else if (skip_prefix(arg, "--find-object=", &arg))
- return parse_objfind_opt(options, arg);
- else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
- int offending = parse_diff_filter_opt(optarg, options);
- if (offending)
- die("unknown change class '%c' in --diff-filter=%s",
- offending, optarg);
- return argcount;
- }
- else if (!strcmp(arg, "--no-abbrev"))
- options->abbrev = 0;
- else if (!strcmp(arg, "--abbrev"))
- options->abbrev = DEFAULT_ABBREV;
- else if (skip_prefix(arg, "--abbrev=", &arg)) {
- options->abbrev = strtoul(arg, NULL, 10);
- if (options->abbrev < MINIMUM_ABBREV)
- options->abbrev = MINIMUM_ABBREV;
- else if (the_hash_algo->hexsz < options->abbrev)
- options->abbrev = the_hash_algo->hexsz;
- }
- else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
- options->a_prefix = optarg;
- return argcount;
- }
- else if ((argcount = parse_long_opt("line-prefix", av, &optarg))) {
- options->line_prefix = optarg;
- options->line_prefix_length = strlen(options->line_prefix);
- graph_setup_line_prefix(options);
- return argcount;
- }
- else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
- options->b_prefix = optarg;
- return argcount;
- }
- else if (!strcmp(arg, "--no-prefix"))
- options->a_prefix = options->b_prefix = "";
- else if (opt_arg(arg, '\0', "inter-hunk-context",
- &options->interhunkcontext))
- ;
- else if (!strcmp(arg, "-W"))
- options->flags.funccontext = 1;
- else if (!strcmp(arg, "--function-context"))
- options->flags.funccontext = 1;
- else if (!strcmp(arg, "--no-function-context"))
- options->flags.funccontext = 0;
- else if ((argcount = parse_long_opt("output", av, &optarg))) {
- char *path = prefix_filename(prefix, optarg);
- options->file = xfopen(path, "w");
- options->close_file = 1;
- if (options->use_color != GIT_COLOR_ALWAYS)
- options->use_color = GIT_COLOR_NEVER;
- free(path);
- return argcount;
- } else
- return 0;
- return 1;
+static int diff_opt_word_diff_regex(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (options->word_diff == DIFF_WORDS_NONE)
+ options->word_diff = DIFF_WORDS_PLAIN;
+ options->word_regex = arg;
+ return 0;
+}
+
+static void prep_parse_options(struct diff_options *options)
+{
+ struct option parseopts[] = {
+ OPT_GROUP(N_("Diff output format options")),
+ OPT_BITOP('p', "patch", &options->output_format,
+ N_("generate patch"),
+ DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
+ OPT_BIT_F('s', "no-patch", &options->output_format,
+ N_("suppress diff output"),
+ DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG),
+ OPT_BITOP('u', NULL, &options->output_format,
+ N_("generate patch"),
+ DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
+ OPT_CALLBACK_F('U', "unified", options, N_("<n>"),
+ N_("generate diffs with <n> lines context"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified),
+ OPT_BOOL('W', "function-context", &options->flags.funccontext,
+ N_("generate diffs with <n> lines context")),
+ OPT_BIT_F(0, "raw", &options->output_format,
+ N_("generate the diff in raw format"),
+ DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
+ OPT_BITOP(0, "patch-with-raw", &options->output_format,
+ N_("synonym for '-p --raw'"),
+ DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
+ DIFF_FORMAT_NO_OUTPUT),
+ OPT_BITOP(0, "patch-with-stat", &options->output_format,
+ N_("synonym for '-p --stat'"),
+ DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
+ DIFF_FORMAT_NO_OUTPUT),
+ OPT_BIT_F(0, "numstat", &options->output_format,
+ N_("machine friendly --stat"),
+ DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "shortstat", &options->output_format,
+ N_("output only the last line of --stat"),
+ DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG),
+ OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."),
+ N_("output the distribution of relative amount of changes for each sub-directory"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_dirstat),
+ OPT_CALLBACK_F(0, "cumulative", options, NULL,
+ N_("synonym for --dirstat=cumulative"),
+ PARSE_OPT_NONEG | PARSE_OPT_NOARG,
+ diff_opt_dirstat),
+ OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
+ N_("synonym for --dirstat=files,param1,param2..."),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_dirstat),
+ OPT_BIT_F(0, "check", &options->output_format,
+ N_("warn if changes introduce conflict markers or whitespace errors"),
+ DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "summary", &options->output_format,
+ N_("condensed summary such as creations, renames and mode changes"),
+ DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "name-only", &options->output_format,
+ N_("show only names of changed files"),
+ DIFF_FORMAT_NAME, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "name-status", &options->output_format,
+ N_("show only names and status of changed files"),
+ DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),
+ OPT_CALLBACK_F(0, "stat", options, N_("<width>[,<name-width>[,<count>]]"),
+ N_("generate diffstat"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_stat),
+ OPT_CALLBACK_F(0, "stat-width", options, N_("<width>"),
+ N_("generate diffstat with a given width"),
+ PARSE_OPT_NONEG, diff_opt_stat),
+ OPT_CALLBACK_F(0, "stat-name-width", options, N_("<width>"),
+ N_("generate diffstat with a given name width"),
+ PARSE_OPT_NONEG, diff_opt_stat),
+ OPT_CALLBACK_F(0, "stat-graph-width", options, N_("<width>"),
+ N_("generate diffstat with a given graph width"),
+ PARSE_OPT_NONEG, diff_opt_stat),
+ OPT_CALLBACK_F(0, "stat-count", options, N_("<count>"),
+ N_("generate diffstat with limited lines"),
+ PARSE_OPT_NONEG, diff_opt_stat),
+ OPT_CALLBACK_F(0, "compact-summary", options, NULL,
+ N_("generate compact summary in diffstat"),
+ PARSE_OPT_NOARG, diff_opt_compact_summary),
+ OPT_CALLBACK_F(0, "binary", options, NULL,
+ N_("output a binary diff that can be applied"),
+ PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary),
+ OPT_BOOL(0, "full-index", &options->flags.full_index,
+ N_("show full pre- and post-image object names on the \"index\" lines")),
+ OPT_COLOR_FLAG(0, "color", &options->use_color,
+ N_("show colored diff")),
+ OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
+ N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
+ PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
+ OPT_SET_INT('z', NULL, &options->line_termination,
+ N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
+ 0),
+ OPT__ABBREV(&options->abbrev),
+ OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
+ N_("show the given source prefix instead of \"a/\""),
+ PARSE_OPT_NONEG),
+ OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
+ N_("show the given destination prefix instead of \"b/\""),
+ PARSE_OPT_NONEG),
+ OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
+ N_("prepend an additional prefix to every line of output"),
+ PARSE_OPT_NONEG, diff_opt_line_prefix),
+ OPT_CALLBACK_F(0, "no-prefix", options, NULL,
+ N_("do not show any source or destination prefix"),
+ PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
+ OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
+ N_("show context between diff hunks up to the specified number of lines"),
+ PARSE_OPT_NONEG),
+ OPT_CALLBACK_F(0, "output-indicator-new",
+ &options->output_indicators[OUTPUT_INDICATOR_NEW],
+ N_("<char>"),
+ N_("specify the character to indicate a new line instead of '+'"),
+ PARSE_OPT_NONEG, diff_opt_char),
+ OPT_CALLBACK_F(0, "output-indicator-old",
+ &options->output_indicators[OUTPUT_INDICATOR_OLD],
+ N_("<char>"),
+ N_("specify the character to indicate an old line instead of '-'"),
+ PARSE_OPT_NONEG, diff_opt_char),
+ OPT_CALLBACK_F(0, "output-indicator-context",
+ &options->output_indicators[OUTPUT_INDICATOR_CONTEXT],
+ N_("<char>"),
+ N_("specify the character to indicate a context instead of ' '"),
+ PARSE_OPT_NONEG, diff_opt_char),
+
+ OPT_GROUP(N_("Diff rename options")),
+ OPT_CALLBACK_F('B', "break-rewrites", &options->break_opt, N_("<n>[/<m>]"),
+ N_("break complete rewrite changes into pairs of delete and create"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_break_rewrites),
+ OPT_CALLBACK_F('M', "find-renames", options, N_("<n>"),
+ N_("detect renames"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_find_renames),
+ OPT_SET_INT_F('D', "irreversible-delete", &options->irreversible_delete,
+ N_("omit the preimage for deletes"),
+ 1, PARSE_OPT_NONEG),
+ OPT_CALLBACK_F('C', "find-copies", options, N_("<n>"),
+ N_("detect copies"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_find_copies),
+ OPT_BOOL(0, "find-copies-harder", &options->flags.find_copies_harder,
+ N_("use unmodified files as source to find copies")),
+ OPT_SET_INT_F(0, "no-renames", &options->detect_rename,
+ N_("disable rename detection"),
+ 0, PARSE_OPT_NONEG),
+ OPT_BOOL(0, "rename-empty", &options->flags.rename_empty,
+ N_("use empty blobs as rename source")),
+ OPT_CALLBACK_F(0, "follow", options, NULL,
+ N_("continue listing the history of a file beyond renames"),
+ PARSE_OPT_NOARG, diff_opt_follow),
+ OPT_INTEGER('l', NULL, &options->rename_limit,
+ N_("prevent rename/copy detection if the number of rename/copy targets exceeds given limit")),
+
+ OPT_GROUP(N_("Diff algorithm options")),
+ OPT_BIT(0, "minimal", &options->xdl_opts,
+ N_("produce the smallest possible diff"),
+ XDF_NEED_MINIMAL),
+ OPT_BIT_F('w', "ignore-all-space", &options->xdl_opts,
+ N_("ignore whitespace when comparing lines"),
+ XDF_IGNORE_WHITESPACE, PARSE_OPT_NONEG),
+ OPT_BIT_F('b', "ignore-space-change", &options->xdl_opts,
+ N_("ignore changes in amount of whitespace"),
+ XDF_IGNORE_WHITESPACE_CHANGE, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "ignore-space-at-eol", &options->xdl_opts,
+ N_("ignore changes in whitespace at EOL"),
+ XDF_IGNORE_WHITESPACE_AT_EOL, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "ignore-cr-at-eol", &options->xdl_opts,
+ N_("ignore carrier-return at the end of line"),
+ XDF_IGNORE_CR_AT_EOL, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
+ N_("ignore changes whose lines are all blank"),
+ XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
+ OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
+ N_("heuristic to shift diff hunk boundaries for easy reading"),
+ XDF_INDENT_HEURISTIC),
+ OPT_CALLBACK_F(0, "patience", options, NULL,
+ N_("generate diff using the \"patience diff\" algorithm"),
+ PARSE_OPT_NONEG | PARSE_OPT_NOARG,
+ diff_opt_patience),
+ OPT_BITOP(0, "histogram", &options->xdl_opts,
+ N_("generate diff using the \"histogram diff\" algorithm"),
+ XDF_HISTOGRAM_DIFF, XDF_DIFF_ALGORITHM_MASK),
+ OPT_CALLBACK_F(0, "diff-algorithm", options, N_("<algorithm>"),
+ N_("choose a diff algorithm"),
+ PARSE_OPT_NONEG, diff_opt_diff_algorithm),
+ OPT_CALLBACK_F(0, "anchored", options, N_("<text>"),
+ N_("generate diff using the \"anchored diff\" algorithm"),
+ PARSE_OPT_NONEG, diff_opt_anchored),
+ OPT_CALLBACK_F(0, "word-diff", options, N_("<mode>"),
+ N_("show word diff, using <mode> to delimit changed words"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_word_diff),
+ OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"),
+ N_("use <regex> to decide what a word is"),
+ PARSE_OPT_NONEG, diff_opt_word_diff_regex),
+ OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
+ N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
+ OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
+ N_("moved lines of code are colored differently"),
+ PARSE_OPT_OPTARG, diff_opt_color_moved),
+ OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
+ N_("how white spaces are ignored in --color-moved"),
+ 0, diff_opt_color_moved_ws),
+
+ OPT_GROUP(N_("Other diff options")),
+ OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
+ N_("when run from subdir, exclude changes outside and show relative paths"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_relative),
+ OPT_BOOL('a', "text", &options->flags.text,
+ N_("treat all files as text")),
+ OPT_BOOL('R', NULL, &options->flags.reverse_diff,
+ N_("swap two inputs, reverse the diff")),
+ OPT_BOOL(0, "exit-code", &options->flags.exit_with_status,
+ N_("exit with 1 if there were differences, 0 otherwise")),
+ OPT_BOOL(0, "quiet", &options->flags.quick,
+ N_("disable all output of the program")),
+ OPT_BOOL(0, "ext-diff", &options->flags.allow_external,
+ N_("allow an external diff helper to be executed")),
+ OPT_CALLBACK_F(0, "textconv", options, NULL,
+ N_("run external text conversion filters when comparing binary files"),
+ PARSE_OPT_NOARG, diff_opt_textconv),
+ OPT_CALLBACK_F(0, "ignore-submodules", options, N_("<when>"),
+ N_("ignore changes to submodules in the diff generation"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_ignore_submodules),
+ OPT_CALLBACK_F(0, "submodule", options, N_("<format>"),
+ N_("specify how differences in submodules are shown"),
+ PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+ diff_opt_submodule),
+ OPT_SET_INT_F(0, "ita-invisible-in-index", &options->ita_invisible_in_index,
+ N_("hide 'git add -N' entries from the index"),
+ 1, PARSE_OPT_NONEG),
+ OPT_SET_INT_F(0, "ita-visible-in-index", &options->ita_invisible_in_index,
+ N_("treat 'git add -N' entries as real in the index"),
+ 0, PARSE_OPT_NONEG),
+ OPT_CALLBACK_F('S', NULL, options, N_("<string>"),
+ N_("look for differences that change the number of occurrences of the specified string"),
+ 0, diff_opt_pickaxe_string),
+ OPT_CALLBACK_F('G', NULL, options, N_("<regex>"),
+ N_("look for differences that change the number of occurrences of the specified regex"),
+ 0, diff_opt_pickaxe_regex),
+ OPT_BIT_F(0, "pickaxe-all", &options->pickaxe_opts,
+ N_("show all changes in the changeset with -S or -G"),
+ DIFF_PICKAXE_ALL, PARSE_OPT_NONEG),
+ OPT_BIT_F(0, "pickaxe-regex", &options->pickaxe_opts,
+ N_("treat <string> in -S as extended POSIX regular expression"),
+ DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
+ OPT_FILENAME('O', NULL, &options->orderfile,
+ N_("control the order in which files appear in the output")),
+ OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
+ N_("look for differences that change the number of occurrences of the specified object"),
+ PARSE_OPT_NONEG, diff_opt_find_object),
+ OPT_CALLBACK_F(0, "diff-filter", options, N_("[(A|C|D|M|R|T|U|X|B)...[*]]"),
+ N_("select files by diff type"),
+ PARSE_OPT_NONEG, diff_opt_diff_filter),
+ { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
+ N_("Output to a specific file"),
+ PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
+
+ OPT_END()
+ };
+
+ ALLOC_ARRAY(options->parseopts, ARRAY_SIZE(parseopts));
+ memcpy(options->parseopts, parseopts, sizeof(parseopts));
+}
+
+int diff_opt_parse(struct diff_options *options,
+ const char **av, int ac, const char *prefix)
+{
+ if (!prefix)
+ prefix = "";
+
+ ac = parse_options(ac, av, prefix, options->parseopts, NULL,
+ PARSE_OPT_KEEP_DASHDASH |
+ PARSE_OPT_KEEP_UNKNOWN |
+ PARSE_OPT_NO_INTERNAL_HELP |
+ PARSE_OPT_ONE_SHOT |
+ PARSE_OPT_STOP_AT_NON_OPTION);
+
+ return ac;
}
int parse_rename_score(const char **cp_p)
@@ -5285,47 +5581,6 @@
return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
}
-static int diff_scoreopt_parse(const char *opt)
-{
- int opt1, opt2, cmd;
-
- if (*opt++ != '-')
- return -1;
- cmd = *opt++;
- if (cmd == '-') {
- /* convert the long-form arguments into short-form versions */
- if (skip_prefix(opt, "break-rewrites", &opt)) {
- if (*opt == 0 || *opt++ == '=')
- cmd = 'B';
- } else if (skip_prefix(opt, "find-copies", &opt)) {
- if (*opt == 0 || *opt++ == '=')
- cmd = 'C';
- } else if (skip_prefix(opt, "find-renames", &opt)) {
- if (*opt == 0 || *opt++ == '=')
- cmd = 'M';
- }
- }
- if (cmd != 'M' && cmd != 'C' && cmd != 'B')
- return -1; /* that is not a -M, -C, or -B option */
-
- opt1 = parse_rename_score(&opt);
- if (cmd != 'B')
- opt2 = 0;
- else {
- if (*opt == 0)
- opt2 = 0;
- else if (*opt != '/')
- return -1; /* we expect -B80/99 or -B80 */
- else {
- opt++;
- opt2 = parse_rename_score(&opt);
- }
- }
- if (*opt != 0)
- return -1;
- return opt1 | (opt2 << 16);
-}
-
struct diff_queue_struct diff_queued_diff;
void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
@@ -5740,6 +5995,22 @@
return dst - line;
}
+void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
+{
+ unsigned char hash[GIT_MAX_RAWSZ];
+ unsigned short carry = 0;
+ int i;
+
+ git_SHA1_Final(hash, ctx);
+ git_SHA1_Init(ctx);
+ /* 20-byte sum, with carry */
+ for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
+ carry += result->hash[i] + hash[i];
+ result->hash[i] = carry;
+ carry >>= 8;
+ }
+}
+
static void patch_id_consume(void *priv, char *line, unsigned long len)
{
struct patch_id_t *data = priv;
@@ -5764,8 +6035,8 @@
git_SHA1_Update(ctx, buf, len);
}
-/* returns 0 upon success, and writes result into sha1 */
-static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
+/* returns 0 upon success, and writes result into oid */
+static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
@@ -5775,6 +6046,7 @@
git_SHA1_Init(&ctx);
memset(&data, 0, sizeof(struct patch_id_t));
data.ctx = &ctx;
+ oidclr(oid);
for (i = 0; i < q->nr; i++) {
xpparam_t xpp;
@@ -5850,17 +6122,22 @@
patch_id_consume, &data, &xpp, &xecfg))
return error("unable to generate patch-id diff for %s",
p->one->path);
+
+ if (stable)
+ flush_one_hunk(oid, &ctx);
}
- git_SHA1_Final(oid->hash, &ctx);
+ if (!stable)
+ git_SHA1_Final(oid->hash, &ctx);
+
return 0;
}
-int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
+int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
- int result = diff_get_patch_id(options, oid, diff_header_only);
+ int result = diff_get_patch_id(options, oid, diff_header_only, stable);
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
@@ -6224,14 +6501,47 @@
return strcmp(name_a, name_b);
}
-void diffcore_fix_diff_index(struct diff_options *options)
+void diffcore_fix_diff_index(void)
{
struct diff_queue_struct *q = &diff_queued_diff;
QSORT(q->queue, q->nr, diffnamecmp);
}
+static void add_if_missing(struct repository *r,
+ struct oid_array *to_fetch,
+ const struct diff_filespec *filespec)
+{
+ if (filespec && filespec->oid_valid &&
+ !S_ISGITLINK(filespec->mode) &&
+ oid_object_info_extended(r, &filespec->oid, NULL,
+ OBJECT_INFO_FOR_PREFETCH))
+ oid_array_append(to_fetch, &filespec->oid);
+}
+
void diffcore_std(struct diff_options *options)
{
+ if (options->repo == the_repository && has_promisor_remote()) {
+ /*
+ * Prefetch the diff pairs that are about to be flushed.
+ */
+ int i;
+ struct diff_queue_struct *q = &diff_queued_diff;
+ struct oid_array to_fetch = OID_ARRAY_INIT;
+
+ for (i = 0; i < q->nr; i++) {
+ struct diff_filepair *p = q->queue[i];
+ add_if_missing(options->repo, &to_fetch, p->one);
+ add_if_missing(options->repo, &to_fetch, p->two);
+ }
+ if (to_fetch.nr)
+ /*
+ * NEEDSWORK: Consider deduplicating the OIDs sent.
+ */
+ promisor_remote_get_direct(options->repo,
+ to_fetch.oid, to_fetch.nr);
+ oid_array_clear(&to_fetch);
+ }
+
/* NOTE please keep the following in sync with diff_tree_combined() */
if (options->skip_stat_unmatch)
diffcore_skip_stat_unmatch(options);
diff --git a/diff.h b/diff.h
index b512d04..c2c3056 100644
--- a/diff.h
+++ b/diff.h
@@ -9,16 +9,17 @@
#include "object.h"
#include "oidset.h"
-struct rev_info;
+struct combine_diff_path;
+struct commit;
+struct diff_filespec;
struct diff_options;
struct diff_queue_struct;
-struct strbuf;
-struct diff_filespec;
-struct userdiff_driver;
struct oid_array;
-struct commit;
-struct combine_diff_path;
+struct option;
struct repository;
+struct rev_info;
+struct strbuf;
+struct userdiff_driver;
typedef int (*pathchange_fn_t)(struct diff_options *options,
struct combine_diff_path *path);
@@ -64,39 +65,40 @@
#define DIFF_FLAGS_INIT { 0 }
struct diff_flags {
- unsigned recursive:1;
- unsigned tree_in_recursive:1;
- unsigned binary:1;
- unsigned text:1;
- unsigned full_index:1;
- unsigned silent_on_remove:1;
- unsigned find_copies_harder:1;
- unsigned follow_renames:1;
- unsigned rename_empty:1;
- unsigned has_changes:1;
- unsigned quick:1;
- unsigned no_index:1;
- unsigned allow_external:1;
- unsigned exit_with_status:1;
- unsigned reverse_diff:1;
- unsigned check_failed:1;
- unsigned relative_name:1;
- unsigned ignore_submodules:1;
- unsigned dirstat_cumulative:1;
- unsigned dirstat_by_file:1;
- unsigned allow_textconv:1;
- unsigned textconv_set_via_cmdline:1;
- unsigned diff_from_contents:1;
- unsigned dirty_submodules:1;
- unsigned ignore_untracked_in_submodules:1;
- unsigned ignore_dirty_submodules:1;
- unsigned override_submodule_config:1;
- unsigned dirstat_by_line:1;
- unsigned funccontext:1;
- unsigned default_follow_renames:1;
- unsigned stat_with_summary:1;
- unsigned suppress_diff_headers:1;
- unsigned dual_color_diffed_diffs:1;
+ unsigned recursive;
+ unsigned tree_in_recursive;
+ unsigned binary;
+ unsigned text;
+ unsigned full_index;
+ unsigned silent_on_remove;
+ unsigned find_copies_harder;
+ unsigned follow_renames;
+ unsigned rename_empty;
+ unsigned has_changes;
+ unsigned quick;
+ unsigned no_index;
+ unsigned allow_external;
+ unsigned exit_with_status;
+ unsigned reverse_diff;
+ unsigned check_failed;
+ unsigned relative_name;
+ unsigned ignore_submodules;
+ unsigned dirstat_cumulative;
+ unsigned dirstat_by_file;
+ unsigned allow_textconv;
+ unsigned textconv_set_via_cmdline;
+ unsigned diff_from_contents;
+ unsigned dirty_submodules;
+ unsigned ignore_untracked_in_submodules;
+ unsigned ignore_dirty_submodules;
+ unsigned override_submodule_config;
+ unsigned dirstat_by_line;
+ unsigned funccontext;
+ unsigned default_follow_renames;
+ unsigned stat_with_summary;
+ unsigned suppress_diff_headers;
+ unsigned dual_color_diffed_diffs;
+ unsigned suppress_hunk_header_line_count;
};
static inline void diff_flags_or(struct diff_flags *a,
@@ -168,7 +170,7 @@
const char *prefix;
int prefix_length;
const char *stat_sep;
- long xdl_opts;
+ int xdl_opts;
/* see Documentation/diff-options.txt */
char **anchors;
@@ -229,8 +231,11 @@
unsigned color_moved_ws_handling;
struct repository *repo;
+ struct option *parseopts;
};
+unsigned diff_filter_bit(char status);
+
void diff_emit_submodule_del(struct diff_options *o, const char *line);
void diff_emit_submodule_add(struct diff_options *o, const char *line);
void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
@@ -294,6 +299,7 @@
char status;
unsigned int mode;
struct object_id oid;
+ struct strbuf path;
} parent[FLEX_ARRAY];
};
#define combine_diff_path_size(n, l) \
@@ -367,7 +373,7 @@
#define DIFF_PICKAXE_IGNORE_CASE 32
void diffcore_std(struct diff_options *);
-void diffcore_fix_diff_index(struct diff_options *);
+void diffcore_fix_diff_index(void);
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
@@ -431,11 +437,13 @@
int run_diff_index(struct rev_info *revs, int cached);
int do_diff_cache(const struct object_id *, struct diff_options *);
-int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
+int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
+void flush_one_hunk(struct object_id *, git_SHA_CTX *);
int diff_result_code(struct diff_options *, int);
-void diff_no_index(struct repository *, struct rev_info *, int, const char **);
+int diff_no_index(struct rev_info *,
+ int implicit_no_index, int, const char **);
int index_differs_from(struct repository *r, const char *def,
const struct diff_flags *flags,
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 07bd34b..9624864 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -23,7 +23,7 @@
first = 0;
last = rename_dst_nr;
while (last > first) {
- int next = (last + first) >> 1;
+ int next = first + ((last - first) >> 1);
struct diff_rename_dst *dst = &(rename_dst[next]);
int cmp = strcmp(two->path, dst->two->path);
if (!cmp)
@@ -83,7 +83,7 @@
first = 0;
last = rename_src_nr;
while (last > first) {
- int next = (last + first) >> 1;
+ int next = first + ((last - first) >> 1);
struct diff_rename_src *src = &(rename_src[next]);
int cmp = strcmp(one->path, src->p->one->path);
if (!cmp)
@@ -266,7 +266,7 @@
hash_object_file(filespec->data, filespec->size, "blob",
&filespec->oid);
}
- return sha1hash(filespec->oid.hash);
+ return oidhash(&filespec->oid);
}
static int find_identical_files(struct hashmap *srcs,
diff --git a/dir-iterator.c b/dir-iterator.c
index f2dcd82..b17e9f9 100644
--- a/dir-iterator.c
+++ b/dir-iterator.c
@@ -4,8 +4,6 @@
#include "dir-iterator.h"
struct dir_iterator_level {
- int initialized;
-
DIR *dir;
/*
@@ -13,16 +11,6 @@
* (including a trailing '/'):
*/
size_t prefix_len;
-
- /*
- * The last action that has been taken with the current entry
- * (needed for directories, which have to be included in the
- * iteration and also iterated into):
- */
- enum {
- DIR_STATE_ITER,
- DIR_STATE_RECURSE
- } dir_state;
};
/*
@@ -34,9 +22,11 @@
struct dir_iterator base;
/*
- * The number of levels currently on the stack. This is always
- * at least 1, because when it becomes zero the iteration is
- * ended and this struct is freed.
+ * The number of levels currently on the stack. After the first
+ * call to dir_iterator_begin(), if it succeeds to open the
+ * first level's dir, this will always be at least 1. Then,
+ * when it comes to zero the iteration is ended and this
+ * struct is freed.
*/
size_t levels_nr;
@@ -48,117 +38,142 @@
* that will be included in this iteration.
*/
struct dir_iterator_level *levels;
+
+ /* Combination of flags for this dir-iterator */
+ unsigned int flags;
};
+/*
+ * Push a level in the iter stack and initialize it with information from
+ * the directory pointed by iter->base->path. It is assumed that this
+ * strbuf points to a valid directory path. Return 0 on success and -1
+ * otherwise, setting errno accordingly and leaving the stack unchanged.
+ */
+static int push_level(struct dir_iterator_int *iter)
+{
+ struct dir_iterator_level *level;
+
+ ALLOC_GROW(iter->levels, iter->levels_nr + 1, iter->levels_alloc);
+ level = &iter->levels[iter->levels_nr++];
+
+ if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
+ strbuf_addch(&iter->base.path, '/');
+ level->prefix_len = iter->base.path.len;
+
+ level->dir = opendir(iter->base.path.buf);
+ if (!level->dir) {
+ int saved_errno = errno;
+ if (errno != ENOENT) {
+ warning_errno("error opening directory '%s'",
+ iter->base.path.buf);
+ }
+ iter->levels_nr--;
+ errno = saved_errno;
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Pop the top level on the iter stack, releasing any resources associated
+ * with it. Return the new value of iter->levels_nr.
+ */
+static int pop_level(struct dir_iterator_int *iter)
+{
+ struct dir_iterator_level *level =
+ &iter->levels[iter->levels_nr - 1];
+
+ if (level->dir && closedir(level->dir))
+ warning_errno("error closing directory '%s'",
+ iter->base.path.buf);
+ level->dir = NULL;
+
+ return --iter->levels_nr;
+}
+
+/*
+ * Populate iter->base with the necessary information on the next iteration
+ * entry, represented by the given dirent de. Return 0 on success and -1
+ * otherwise, setting errno accordingly.
+ */
+static int prepare_next_entry_data(struct dir_iterator_int *iter,
+ struct dirent *de)
+{
+ int err, saved_errno;
+
+ strbuf_addstr(&iter->base.path, de->d_name);
+ /*
+ * We have to reset these because the path strbuf might have
+ * been realloc()ed at the previous strbuf_addstr().
+ */
+ iter->base.relative_path = iter->base.path.buf +
+ iter->levels[0].prefix_len;
+ iter->base.basename = iter->base.path.buf +
+ iter->levels[iter->levels_nr - 1].prefix_len;
+
+ if (iter->flags & DIR_ITERATOR_FOLLOW_SYMLINKS)
+ err = stat(iter->base.path.buf, &iter->base.st);
+ else
+ err = lstat(iter->base.path.buf, &iter->base.st);
+
+ saved_errno = errno;
+ if (err && errno != ENOENT)
+ warning_errno("failed to stat '%s'", iter->base.path.buf);
+
+ errno = saved_errno;
+ return err;
+}
+
int dir_iterator_advance(struct dir_iterator *dir_iterator)
{
struct dir_iterator_int *iter =
(struct dir_iterator_int *)dir_iterator;
+ if (S_ISDIR(iter->base.st.st_mode) && push_level(iter)) {
+ if (errno != ENOENT && iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
+ if (iter->levels_nr == 0)
+ goto error_out;
+ }
+
+ /* Loop until we find an entry that we can give back to the caller. */
while (1) {
+ struct dirent *de;
struct dir_iterator_level *level =
&iter->levels[iter->levels_nr - 1];
- struct dirent *de;
- if (!level->initialized) {
- /*
- * Note: dir_iterator_begin() ensures that
- * path is not the empty string.
- */
- if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
- strbuf_addch(&iter->base.path, '/');
- level->prefix_len = iter->base.path.len;
+ strbuf_setlen(&iter->base.path, level->prefix_len);
+ errno = 0;
+ de = readdir(level->dir);
- level->dir = opendir(iter->base.path.buf);
- if (!level->dir && errno != ENOENT) {
- warning("error opening directory %s: %s",
- iter->base.path.buf, strerror(errno));
- /* Popping the level is handled below */
- }
-
- level->initialized = 1;
- } else if (S_ISDIR(iter->base.st.st_mode)) {
- if (level->dir_state == DIR_STATE_ITER) {
- /*
- * The directory was just iterated
- * over; now prepare to iterate into
- * it.
- */
- level->dir_state = DIR_STATE_RECURSE;
- ALLOC_GROW(iter->levels, iter->levels_nr + 1,
- iter->levels_alloc);
- level = &iter->levels[iter->levels_nr++];
- level->initialized = 0;
- continue;
- } else {
- /*
- * The directory has already been
- * iterated over and iterated into;
- * we're done with it.
- */
- }
- }
-
- if (!level->dir) {
- /*
- * This level is exhausted (or wasn't opened
- * successfully); pop up a level.
- */
- if (--iter->levels_nr == 0)
+ if (!de) {
+ if (errno) {
+ warning_errno("error reading directory '%s'",
+ iter->base.path.buf);
+ if (iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
+ } else if (pop_level(iter) == 0) {
return dir_iterator_abort(dir_iterator);
-
+ }
continue;
}
- /*
- * Loop until we find an entry that we can give back
- * to the caller:
- */
- while (1) {
- strbuf_setlen(&iter->base.path, level->prefix_len);
- errno = 0;
- de = readdir(level->dir);
+ if (is_dot_or_dotdot(de->d_name))
+ continue;
- if (!de) {
- /* This level is exhausted; pop up a level. */
- if (errno) {
- warning("error reading directory %s: %s",
- iter->base.path.buf, strerror(errno));
- } else if (closedir(level->dir))
- warning("error closing directory %s: %s",
- iter->base.path.buf, strerror(errno));
-
- level->dir = NULL;
- if (--iter->levels_nr == 0)
- return dir_iterator_abort(dir_iterator);
- break;
- }
-
- if (is_dot_or_dotdot(de->d_name))
- continue;
-
- strbuf_addstr(&iter->base.path, de->d_name);
- if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
- if (errno != ENOENT)
- warning("error reading path '%s': %s",
- iter->base.path.buf,
- strerror(errno));
- continue;
- }
-
- /*
- * We have to set these each time because
- * the path strbuf might have been realloc()ed.
- */
- iter->base.relative_path =
- iter->base.path.buf + iter->levels[0].prefix_len;
- iter->base.basename =
- iter->base.path.buf + level->prefix_len;
- level->dir_state = DIR_STATE_ITER;
-
- return ITER_OK;
+ if (prepare_next_entry_data(iter, de)) {
+ if (errno != ENOENT && iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
+ continue;
}
+
+ return ITER_OK;
}
+
+error_out:
+ dir_iterator_abort(dir_iterator);
+ return ITER_ERROR;
}
int dir_iterator_abort(struct dir_iterator *dir_iterator)
@@ -170,9 +185,11 @@
&iter->levels[iter->levels_nr - 1];
if (level->dir && closedir(level->dir)) {
+ int saved_errno = errno;
strbuf_setlen(&iter->base.path, level->prefix_len);
- warning("error closing directory %s: %s",
- iter->base.path.buf, strerror(errno));
+ errno = saved_errno;
+ warning_errno("error closing directory '%s'",
+ iter->base.path.buf);
}
}
@@ -182,21 +199,37 @@
return ITER_DONE;
}
-struct dir_iterator *dir_iterator_begin(const char *path)
+struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags)
{
struct dir_iterator_int *iter = xcalloc(1, sizeof(*iter));
struct dir_iterator *dir_iterator = &iter->base;
-
- if (!path || !*path)
- BUG("empty path passed to dir_iterator_begin()");
+ int saved_errno;
strbuf_init(&iter->base.path, PATH_MAX);
strbuf_addstr(&iter->base.path, path);
ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+ iter->levels_nr = 0;
+ iter->flags = flags;
- iter->levels_nr = 1;
- iter->levels[0].initialized = 0;
+ /*
+ * Note: stat already checks for NULL or empty strings and
+ * inexistent paths.
+ */
+ if (stat(iter->base.path.buf, &iter->base.st) < 0) {
+ saved_errno = errno;
+ goto error_out;
+ }
+
+ if (!S_ISDIR(iter->base.st.st_mode)) {
+ saved_errno = ENOTDIR;
+ goto error_out;
+ }
return dir_iterator;
+
+error_out:
+ dir_iterator_abort(dir_iterator);
+ errno = saved_errno;
+ return NULL;
}
diff --git a/dir-iterator.h b/dir-iterator.h
index 970793d..0822915 100644
--- a/dir-iterator.h
+++ b/dir-iterator.h
@@ -8,18 +8,23 @@
*
* Iterate over a directory tree, recursively, including paths of all
* types and hidden paths. Skip "." and ".." entries and don't follow
- * symlinks except for the original path.
+ * symlinks except for the original path. Note that the original path
+ * is not included in the iteration.
*
* Every time dir_iterator_advance() is called, update the members of
* the dir_iterator structure to reflect the next path in the
* iteration. The order that paths are iterated over within a
- * directory is undefined, but directory paths are always iterated
- * over before the subdirectory contents.
+ * directory is undefined, directory paths are always given before
+ * their contents.
*
* A typical iteration looks like this:
*
* int ok;
- * struct iterator *iter = dir_iterator_begin(path);
+ * unsigned int flags = DIR_ITERATOR_PEDANTIC;
+ * struct dir_iterator *iter = dir_iterator_begin(path, flags);
+ *
+ * if (!iter)
+ * goto error_handler;
*
* while ((ok = dir_iterator_advance(iter)) == ITER_OK) {
* if (want_to_stop_iteration()) {
@@ -40,6 +45,29 @@
* dir_iterator_advance() again.
*/
+/*
+ * Flags for dir_iterator_begin:
+ *
+ * - DIR_ITERATOR_PEDANTIC: override dir-iterator's default behavior
+ * in case of an error at dir_iterator_advance(), which is to keep
+ * looking for a next valid entry. With this flag, resources are freed
+ * and ITER_ERROR is returned immediately. In both cases, a meaningful
+ * warning is emitted. Note: ENOENT errors are always ignored so that
+ * the API users may remove files during iteration.
+ *
+ * - DIR_ITERATOR_FOLLOW_SYMLINKS: make dir-iterator follow symlinks.
+ * i.e., linked directories' contents will be iterated over and
+ * iter->base.st will contain information on the referred files,
+ * not the symlinks themselves, which is the default behavior. Broken
+ * symlinks are ignored.
+ *
+ * Warning: circular symlinks are also followed when
+ * DIR_ITERATOR_FOLLOW_SYMLINKS is set. The iteration may end up with
+ * an ELOOP if they happen and DIR_ITERATOR_PEDANTIC is set.
+ */
+#define DIR_ITERATOR_PEDANTIC (1 << 0)
+#define DIR_ITERATOR_FOLLOW_SYMLINKS (1 << 1)
+
struct dir_iterator {
/* The current path: */
struct strbuf path;
@@ -54,28 +82,38 @@
/* The current basename: */
const char *basename;
- /* The result of calling lstat() on path: */
+ /*
+ * The result of calling lstat() on path; or stat(), if the
+ * DIR_ITERATOR_FOLLOW_SYMLINKS flag was set at
+ * dir_iterator's initialization.
+ */
struct stat st;
};
/*
- * Start a directory iteration over path. Return a dir_iterator that
- * holds the internal state of the iteration.
+ * Start a directory iteration over path with the combination of
+ * options specified by flags. On success, return a dir_iterator
+ * that holds the internal state of the iteration. In case of
+ * failure, return NULL and set errno accordingly.
*
* The iteration includes all paths under path, not including path
* itself and not including "." or ".." entries.
*
- * path is the starting directory. An internal copy will be made.
+ * Parameters are:
+ * - path is the starting directory. An internal copy will be made.
+ * - flags is a combination of the possible flags to initialize a
+ * dir-iterator or 0 for default behavior.
*/
-struct dir_iterator *dir_iterator_begin(const char *path);
+struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags);
/*
* Advance the iterator to the first or next item and return ITER_OK.
* If the iteration is exhausted, free the dir_iterator and any
- * resources associated with it and return ITER_DONE. On error, free
- * dir_iterator and associated resources and return ITER_ERROR. It is
- * a bug to use iterator or call this function again after it has
- * returned ITER_DONE or ITER_ERROR.
+ * resources associated with it and return ITER_DONE.
+ *
+ * It is a bug to use iterator or call this function again after it
+ * has returned ITER_DONE or ITER_ERROR (which may be returned iff
+ * the DIR_ITERATOR_PEDANTIC flag was set).
*/
int dir_iterator_advance(struct dir_iterator *iterator);
diff --git a/dir.c b/dir.c
index b2cabad..cab9c2a 100644
--- a/dir.c
+++ b/dir.c
@@ -502,8 +502,7 @@
}
int report_path_error(const char *ps_matched,
- const struct pathspec *pathspec,
- const char *prefix)
+ const struct pathspec *pathspec)
{
/*
* Make sure all pathspec matched; otherwise it is an error.
@@ -562,7 +561,7 @@
return string[simple_length(string)] == '\0';
}
-void parse_exclude_pattern(const char **pattern,
+void parse_path_pattern(const char **pattern,
int *patternlen,
unsigned *flags,
int *nowildcardlen)
@@ -572,20 +571,20 @@
*flags = 0;
if (*p == '!') {
- *flags |= EXC_FLAG_NEGATIVE;
+ *flags |= PATTERN_FLAG_NEGATIVE;
p++;
}
len = strlen(p);
if (len && p[len - 1] == '/') {
len--;
- *flags |= EXC_FLAG_MUSTBEDIR;
+ *flags |= PATTERN_FLAG_MUSTBEDIR;
}
for (i = 0; i < len; i++) {
if (p[i] == '/')
break;
}
if (i == len)
- *flags |= EXC_FLAG_NODIR;
+ *flags |= PATTERN_FLAG_NODIR;
*nowildcardlen = simple_length(p);
/*
* we should have excluded the trailing slash from 'p' too,
@@ -595,35 +594,35 @@
if (*nowildcardlen > len)
*nowildcardlen = len;
if (*p == '*' && no_wildcard(p + 1))
- *flags |= EXC_FLAG_ENDSWITH;
+ *flags |= PATTERN_FLAG_ENDSWITH;
*pattern = p;
*patternlen = len;
}
-void add_exclude(const char *string, const char *base,
- int baselen, struct exclude_list *el, int srcpos)
+void add_pattern(const char *string, const char *base,
+ int baselen, struct pattern_list *pl, int srcpos)
{
- struct exclude *x;
+ struct path_pattern *pattern;
int patternlen;
unsigned flags;
int nowildcardlen;
- parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
- if (flags & EXC_FLAG_MUSTBEDIR) {
- FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen);
+ parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen);
+ if (flags & PATTERN_FLAG_MUSTBEDIR) {
+ FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen);
} else {
- x = xmalloc(sizeof(*x));
- x->pattern = string;
+ pattern = xmalloc(sizeof(*pattern));
+ pattern->pattern = string;
}
- x->patternlen = patternlen;
- x->nowildcardlen = nowildcardlen;
- x->base = base;
- x->baselen = baselen;
- x->flags = flags;
- x->srcpos = srcpos;
- ALLOC_GROW(el->excludes, el->nr + 1, el->alloc);
- el->excludes[el->nr++] = x;
- x->el = el;
+ pattern->patternlen = patternlen;
+ pattern->nowildcardlen = nowildcardlen;
+ pattern->base = base;
+ pattern->baselen = baselen;
+ pattern->flags = flags;
+ pattern->srcpos = srcpos;
+ ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc);
+ pl->patterns[pl->nr++] = pattern;
+ pattern->pl = pl;
}
static int read_skip_worktree_file_from_index(const struct index_state *istate,
@@ -644,19 +643,19 @@
}
/*
- * Frees memory within el which was allocated for exclude patterns and
- * the file buffer. Does not free el itself.
+ * Frees memory within pl which was allocated for exclude patterns and
+ * the file buffer. Does not free pl itself.
*/
-void clear_exclude_list(struct exclude_list *el)
+void clear_pattern_list(struct pattern_list *pl)
{
int i;
- for (i = 0; i < el->nr; i++)
- free(el->excludes[i]);
- free(el->excludes);
- free(el->filebuf);
+ for (i = 0; i < pl->nr; i++)
+ free(pl->patterns[i]);
+ free(pl->patterns);
+ free(pl->filebuf);
- memset(el, 0, sizeof(*el));
+ memset(pl, 0, sizeof(*pl));
}
static void trim_trailing_spaces(char *buf)
@@ -702,7 +701,7 @@
first = 0;
last = dir->dirs_nr;
while (last > first) {
- int cmp, next = (last + first) >> 1;
+ int cmp, next = first + ((last - first) >> 1);
d = dir->dirs[next];
cmp = strncmp(name, d->name, len);
if (!cmp && strlen(d->name) > len)
@@ -763,21 +762,21 @@
dir->dirs[i]->recurse = 0;
}
-static int add_excludes_from_buffer(char *buf, size_t size,
+static int add_patterns_from_buffer(char *buf, size_t size,
const char *base, int baselen,
- struct exclude_list *el);
+ struct pattern_list *pl);
/*
* Given a file with name "fname", read it (either from disk, or from
* an index if 'istate' is non-null), parse it and store the
- * exclude rules in "el".
+ * exclude rules in "pl".
*
* If "ss" is not NULL, compute SHA-1 of the exclude file and fill
- * stat data from disk (only valid if add_excludes returns zero). If
+ * stat data from disk (only valid if add_patterns returns zero). If
* ss_valid is non-zero, "ss" must contain good value as input.
*/
-static int add_excludes(const char *fname, const char *base, int baselen,
- struct exclude_list *el, struct index_state *istate,
+static int add_patterns(const char *fname, const char *base, int baselen,
+ struct pattern_list *pl, struct index_state *istate,
struct oid_stat *oid_stat)
{
struct stat st;
@@ -838,21 +837,21 @@
}
}
- add_excludes_from_buffer(buf, size, base, baselen, el);
+ add_patterns_from_buffer(buf, size, base, baselen, pl);
return 0;
}
-static int add_excludes_from_buffer(char *buf, size_t size,
+static int add_patterns_from_buffer(char *buf, size_t size,
const char *base, int baselen,
- struct exclude_list *el)
+ struct pattern_list *pl)
{
int i, lineno = 1;
char *entry;
- el->filebuf = buf;
+ pl->filebuf = buf;
if (skip_utf8_bom(&buf, size))
- size -= buf - el->filebuf;
+ size -= buf - pl->filebuf;
entry = buf;
@@ -861,7 +860,7 @@
if (entry != buf + i && entry[0] != '#') {
buf[i - (i && buf[i-1] == '\r')] = 0;
trim_trailing_spaces(entry);
- add_exclude(entry, base, baselen, el, lineno);
+ add_pattern(entry, base, baselen, pl, lineno);
}
lineno++;
entry = buf + i + 1;
@@ -870,17 +869,17 @@
return 0;
}
-int add_excludes_from_file_to_list(const char *fname, const char *base,
- int baselen, struct exclude_list *el,
+int add_patterns_from_file_to_list(const char *fname, const char *base,
+ int baselen, struct pattern_list *pl,
struct index_state *istate)
{
- return add_excludes(fname, base, baselen, el, istate, NULL);
+ return add_patterns(fname, base, baselen, pl, istate, NULL);
}
-int add_excludes_from_blob_to_list(
+int add_patterns_from_blob_to_list(
struct object_id *oid,
const char *base, int baselen,
- struct exclude_list *el)
+ struct pattern_list *pl)
{
char *buf;
size_t size;
@@ -890,31 +889,31 @@
if (r != 1)
return r;
- add_excludes_from_buffer(buf, size, base, baselen, el);
+ add_patterns_from_buffer(buf, size, base, baselen, pl);
return 0;
}
-struct exclude_list *add_exclude_list(struct dir_struct *dir,
+struct pattern_list *add_pattern_list(struct dir_struct *dir,
int group_type, const char *src)
{
- struct exclude_list *el;
+ struct pattern_list *pl;
struct exclude_list_group *group;
group = &dir->exclude_list_group[group_type];
- ALLOC_GROW(group->el, group->nr + 1, group->alloc);
- el = &group->el[group->nr++];
- memset(el, 0, sizeof(*el));
- el->src = src;
- return el;
+ ALLOC_GROW(group->pl, group->nr + 1, group->alloc);
+ pl = &group->pl[group->nr++];
+ memset(pl, 0, sizeof(*pl));
+ pl->src = src;
+ return pl;
}
/*
* Used to set up core.excludesfile and .git/info/exclude lists.
*/
-static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
+static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname,
struct oid_stat *oid_stat)
{
- struct exclude_list *el;
+ struct pattern_list *pl;
/*
* catch setup_standard_excludes() that's called before
* dir->untracked is assigned. That function behaves
@@ -922,15 +921,15 @@
*/
if (!dir->untracked)
dir->unmanaged_exclude_files++;
- el = add_exclude_list(dir, EXC_FILE, fname);
- if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0)
+ pl = add_pattern_list(dir, EXC_FILE, fname);
+ if (add_patterns(fname, "", 0, pl, NULL, oid_stat) < 0)
die(_("cannot use %s as an exclude file"), fname);
}
-void add_excludes_from_file(struct dir_struct *dir, const char *fname)
+void add_patterns_from_file(struct dir_struct *dir, const char *fname)
{
dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
- add_excludes_from_file_1(dir, fname, NULL);
+ add_patterns_from_file_1(dir, fname, NULL);
}
int match_basename(const char *basename, int basenamelen,
@@ -941,7 +940,7 @@
if (patternlen == basenamelen &&
!fspathncmp(pattern, basename, basenamelen))
return 1;
- } else if (flags & EXC_FLAG_ENDSWITH) {
+ } else if (flags & PATTERN_FLAG_ENDSWITH) {
/* "*literal" matching against "fooliteral" */
if (patternlen - 1 <= basenamelen &&
!fspathncmp(pattern + 1,
@@ -1022,85 +1021,97 @@
* any, determines the fate. Returns the exclude_list element which
* matched, or NULL for undecided.
*/
-static struct exclude *last_exclude_matching_from_list(const char *pathname,
+static struct path_pattern *last_matching_pattern_from_list(const char *pathname,
int pathlen,
const char *basename,
int *dtype,
- struct exclude_list *el,
+ struct pattern_list *pl,
struct index_state *istate)
{
- struct exclude *exc = NULL; /* undecided */
+ struct path_pattern *res = NULL; /* undecided */
int i;
- if (!el->nr)
+ if (!pl->nr)
return NULL; /* undefined */
- for (i = el->nr - 1; 0 <= i; i--) {
- struct exclude *x = el->excludes[i];
- const char *exclude = x->pattern;
- int prefix = x->nowildcardlen;
+ for (i = pl->nr - 1; 0 <= i; i--) {
+ struct path_pattern *pattern = pl->patterns[i];
+ const char *exclude = pattern->pattern;
+ int prefix = pattern->nowildcardlen;
- if (x->flags & EXC_FLAG_MUSTBEDIR) {
+ if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) {
if (*dtype == DT_UNKNOWN)
*dtype = get_dtype(NULL, istate, pathname, pathlen);
if (*dtype != DT_DIR)
continue;
}
- if (x->flags & EXC_FLAG_NODIR) {
+ if (pattern->flags & PATTERN_FLAG_NODIR) {
if (match_basename(basename,
pathlen - (basename - pathname),
- exclude, prefix, x->patternlen,
- x->flags)) {
- exc = x;
+ exclude, prefix, pattern->patternlen,
+ pattern->flags)) {
+ res = pattern;
break;
}
continue;
}
- assert(x->baselen == 0 || x->base[x->baselen - 1] == '/');
+ assert(pattern->baselen == 0 ||
+ pattern->base[pattern->baselen - 1] == '/');
if (match_pathname(pathname, pathlen,
- x->base, x->baselen ? x->baselen - 1 : 0,
- exclude, prefix, x->patternlen, x->flags)) {
- exc = x;
+ pattern->base,
+ pattern->baselen ? pattern->baselen - 1 : 0,
+ exclude, prefix, pattern->patternlen,
+ pattern->flags)) {
+ res = pattern;
break;
}
}
- return exc;
+ return res;
}
/*
- * Scan the list and let the last match determine the fate.
- * Return 1 for exclude, 0 for include and -1 for undecided.
+ * Scan the list of patterns to determine if the ordered list
+ * of patterns matches on 'pathname'.
+ *
+ * Return 1 for a match, 0 for not matched and -1 for undecided.
*/
-int is_excluded_from_list(const char *pathname,
- int pathlen, const char *basename, int *dtype,
- struct exclude_list *el, struct index_state *istate)
+enum pattern_match_result path_matches_pattern_list(
+ const char *pathname, int pathlen,
+ const char *basename, int *dtype,
+ struct pattern_list *pl,
+ struct index_state *istate)
{
- struct exclude *exclude;
- exclude = last_exclude_matching_from_list(pathname, pathlen, basename,
- dtype, el, istate);
- if (exclude)
- return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
- return -1; /* undecided */
+ struct path_pattern *pattern;
+ pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
+ dtype, pl, istate);
+ if (pattern) {
+ if (pattern->flags & PATTERN_FLAG_NEGATIVE)
+ return NOT_MATCHED;
+ else
+ return MATCHED;
+ }
+
+ return UNDECIDED;
}
-static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir,
- struct index_state *istate,
- const char *pathname, int pathlen, const char *basename,
- int *dtype_p)
+static struct path_pattern *last_matching_pattern_from_lists(
+ struct dir_struct *dir, struct index_state *istate,
+ const char *pathname, int pathlen,
+ const char *basename, int *dtype_p)
{
int i, j;
struct exclude_list_group *group;
- struct exclude *exclude;
+ struct path_pattern *pattern;
for (i = EXC_CMDL; i <= EXC_FILE; i++) {
group = &dir->exclude_list_group[i];
for (j = group->nr - 1; j >= 0; j--) {
- exclude = last_exclude_matching_from_list(
+ pattern = last_matching_pattern_from_list(
pathname, pathlen, basename, dtype_p,
- &group->el[j], istate);
- if (exclude)
- return exclude;
+ &group->pl[j], istate);
+ if (pattern)
+ return pattern;
}
}
return NULL;
@@ -1115,7 +1126,7 @@
const char *base, int baselen)
{
struct exclude_list_group *group;
- struct exclude_list *el;
+ struct pattern_list *pl;
struct exclude_stack *stk = NULL;
struct untracked_cache_dir *untracked;
int current;
@@ -1131,17 +1142,17 @@
if (stk->baselen <= baselen &&
!strncmp(dir->basebuf.buf, base, stk->baselen))
break;
- el = &group->el[dir->exclude_stack->exclude_ix];
+ pl = &group->pl[dir->exclude_stack->exclude_ix];
dir->exclude_stack = stk->prev;
- dir->exclude = NULL;
- free((char *)el->src); /* see strbuf_detach() below */
- clear_exclude_list(el);
+ dir->pattern = NULL;
+ free((char *)pl->src); /* see strbuf_detach() below */
+ clear_pattern_list(pl);
free(stk);
group->nr--;
}
/* Skip traversing into sub directories if the parent is excluded */
- if (dir->exclude)
+ if (dir->pattern)
return;
/*
@@ -1182,7 +1193,7 @@
stk->baselen = cp - base;
stk->exclude_ix = group->nr;
stk->ucd = untracked;
- el = add_exclude_list(dir, EXC_DIRS, NULL);
+ pl = add_pattern_list(dir, EXC_DIRS, NULL);
strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
assert(stk->baselen == dir->basebuf.len);
@@ -1190,15 +1201,15 @@
if (stk->baselen) {
int dt = DT_DIR;
dir->basebuf.buf[stk->baselen - 1] = 0;
- dir->exclude = last_exclude_matching_from_lists(dir,
+ dir->pattern = last_matching_pattern_from_lists(dir,
istate,
dir->basebuf.buf, stk->baselen - 1,
dir->basebuf.buf + current, &dt);
dir->basebuf.buf[stk->baselen - 1] = '/';
- if (dir->exclude &&
- dir->exclude->flags & EXC_FLAG_NEGATIVE)
- dir->exclude = NULL;
- if (dir->exclude) {
+ if (dir->pattern &&
+ dir->pattern->flags & PATTERN_FLAG_NEGATIVE)
+ dir->pattern = NULL;
+ if (dir->pattern) {
dir->exclude_stack = stk;
return;
}
@@ -1224,30 +1235,30 @@
/*
* dir->basebuf gets reused by the traversal, but we
* need fname to remain unchanged to ensure the src
- * member of each struct exclude correctly
+ * member of each struct path_pattern correctly
* back-references its source file. Other invocations
- * of add_exclude_list provide stable strings, so we
+ * of add_pattern_list provide stable strings, so we
* strbuf_detach() and free() here in the caller.
*/
struct strbuf sb = STRBUF_INIT;
strbuf_addbuf(&sb, &dir->basebuf);
strbuf_addstr(&sb, dir->exclude_per_dir);
- el->src = strbuf_detach(&sb, NULL);
- add_excludes(el->src, el->src, stk->baselen, el, istate,
+ pl->src = strbuf_detach(&sb, NULL);
+ add_patterns(pl->src, pl->src, stk->baselen, pl, istate,
untracked ? &oid_stat : NULL);
}
/*
* NEEDSWORK: when untracked cache is enabled, prep_exclude()
* will first be called in valid_cached_dir() then maybe many
- * times more in last_exclude_matching(). When the cache is
- * used, last_exclude_matching() will not be called and
+ * times more in last_matching_pattern(). When the cache is
+ * used, last_matching_pattern() will not be called and
* reading .gitignore content will be a waste.
*
* So when it's called by valid_cached_dir() and we can get
* .gitignore SHA-1 from the index (i.e. .gitignore is not
* modified on work tree), we could delay reading the
* .gitignore content until we absolutely need it in
- * last_exclude_matching(). Be careful about ignore rule
+ * last_matching_pattern(). Be careful about ignore rule
* order, though, if you do that.
*/
if (untracked &&
@@ -1267,7 +1278,7 @@
* Returns the exclude_list element which matched, or NULL for
* undecided.
*/
-struct exclude *last_exclude_matching(struct dir_struct *dir,
+struct path_pattern *last_matching_pattern(struct dir_struct *dir,
struct index_state *istate,
const char *pathname,
int *dtype_p)
@@ -1278,10 +1289,10 @@
prep_exclude(dir, istate, pathname, basename-pathname);
- if (dir->exclude)
- return dir->exclude;
+ if (dir->pattern)
+ return dir->pattern;
- return last_exclude_matching_from_lists(dir, istate, pathname, pathlen,
+ return last_matching_pattern_from_lists(dir, istate, pathname, pathlen,
basename, dtype_p);
}
@@ -1293,10 +1304,10 @@
int is_excluded(struct dir_struct *dir, struct index_state *istate,
const char *pathname, int *dtype_p)
{
- struct exclude *exclude =
- last_exclude_matching(dir, istate, pathname, dtype_p);
- if (exclude)
- return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
+ struct path_pattern *pattern =
+ last_matching_pattern(dir, istate, pathname, dtype_p);
+ if (pattern)
+ return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1;
return 0;
}
@@ -1467,9 +1478,11 @@
return path_none;
}
if (!(dir->flags & DIR_NO_GITLINKS)) {
- struct object_id oid;
- if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0)
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addstr(&sb, dirname);
+ if (is_nonbare_repository_dir(&sb))
return exclude ? path_excluded : path_untracked;
+ strbuf_release(&sb);
}
return path_recurse;
}
@@ -1807,7 +1820,7 @@
/*
* prep_exclude will be called eventually on this directory,
- * but it's called much later in last_exclude_matching(). We
+ * but it's called much later in last_matching_pattern(). We
* need it now to determine the validity of the cache for this
* path. The next calls will be nearly no-op, the way
* prep_exclude() is designed.
@@ -2315,6 +2328,14 @@
return lstat(f, &sb) == 0;
}
+int repo_file_exists(struct repository *repo, const char *path)
+{
+ if (repo != the_repository)
+ BUG("do not know how to check file existence in arbitrary repo");
+
+ return file_exists(path);
+}
+
static int cmp_icase(char a, char b)
{
if (a == b)
@@ -2479,14 +2500,14 @@
if (!excludes_file)
excludes_file = xdg_config_home("ignore");
if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
- add_excludes_from_file_1(dir, excludes_file,
+ add_patterns_from_file_1(dir, excludes_file,
dir->untracked ? &dir->ss_excludes_file : NULL);
/* per repository user preference */
if (startup_info->have_repository) {
const char *path = git_path_info_exclude();
if (!access_or_warn(path, R_OK, 0))
- add_excludes_from_file_1(dir, path,
+ add_patterns_from_file_1(dir, path,
dir->untracked ? &dir->ss_info_exclude : NULL);
}
}
@@ -2518,18 +2539,18 @@
{
int i, j;
struct exclude_list_group *group;
- struct exclude_list *el;
+ struct pattern_list *pl;
struct exclude_stack *stk;
for (i = EXC_CMDL; i <= EXC_FILE; i++) {
group = &dir->exclude_list_group[i];
for (j = 0; j < group->nr; j++) {
- el = &group->el[j];
+ pl = &group->pl[j];
if (i == EXC_DIRS)
- free((char *)el->src);
- clear_exclude_list(el);
+ free((char *)pl->src);
+ clear_pattern_list(pl);
}
- free(group->el);
+ free(group->pl);
}
stk = dir->exclude_stack;
@@ -2545,13 +2566,9 @@
struct stat_data info_exclude_stat;
struct stat_data excludes_file_stat;
uint32_t dir_flags;
- unsigned char info_exclude_sha1[20];
- unsigned char excludes_file_sha1[20];
- char exclude_per_dir[FLEX_ARRAY];
};
#define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
-#define ouc_size(len) (ouc_offset(exclude_per_dir) + len + 1)
struct write_data {
int index; /* number of written untracked_cache_dir */
@@ -2634,20 +2651,21 @@
struct write_data wd;
unsigned char varbuf[16];
int varint_len;
- size_t len = strlen(untracked->exclude_per_dir);
+ const unsigned hashsz = the_hash_algo->rawsz;
- FLEX_ALLOC_MEM(ouc, exclude_per_dir, untracked->exclude_per_dir, len);
+ ouc = xcalloc(1, sizeof(*ouc));
stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
- hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.oid.hash);
- hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.oid.hash);
ouc->dir_flags = htonl(untracked->dir_flags);
varint_len = encode_varint(untracked->ident.len, varbuf);
strbuf_add(out, varbuf, varint_len);
strbuf_addbuf(out, &untracked->ident);
- strbuf_add(out, ouc, ouc_size(len));
+ strbuf_add(out, ouc, sizeof(*ouc));
+ strbuf_add(out, untracked->ss_info_exclude.oid.hash, hashsz);
+ strbuf_add(out, untracked->ss_excludes_file.oid.hash, hashsz);
+ strbuf_add(out, untracked->exclude_per_dir, strlen(untracked->exclude_per_dir) + 1);
FREE_AND_NULL(ouc);
if (!untracked->root) {
@@ -2732,54 +2750,49 @@
struct read_data *rd)
{
struct untracked_cache_dir ud, *untracked;
- const unsigned char *next, *data = rd->data, *end = rd->end;
+ const unsigned char *data = rd->data, *end = rd->end;
+ const unsigned char *eos;
unsigned int value;
- int i, len;
+ int i;
memset(&ud, 0, sizeof(ud));
- next = data;
- value = decode_varint(&next);
- if (next > end)
+ value = decode_varint(&data);
+ if (data > end)
return -1;
ud.recurse = 1;
ud.untracked_alloc = value;
ud.untracked_nr = value;
if (ud.untracked_nr)
ALLOC_ARRAY(ud.untracked, ud.untracked_nr);
- data = next;
- next = data;
- ud.dirs_alloc = ud.dirs_nr = decode_varint(&next);
- if (next > end)
+ ud.dirs_alloc = ud.dirs_nr = decode_varint(&data);
+ if (data > end)
return -1;
ALLOC_ARRAY(ud.dirs, ud.dirs_nr);
- data = next;
- len = strlen((const char *)data);
- next = data + len + 1;
- if (next > rd->end)
+ eos = memchr(data, '\0', end - data);
+ if (!eos || eos == end)
return -1;
- *untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len));
+
+ *untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), eos - data, 1));
memcpy(untracked, &ud, sizeof(ud));
- memcpy(untracked->name, data, len + 1);
- data = next;
+ memcpy(untracked->name, data, eos - data + 1);
+ data = eos + 1;
for (i = 0; i < untracked->untracked_nr; i++) {
- len = strlen((const char *)data);
- next = data + len + 1;
- if (next > rd->end)
+ eos = memchr(data, '\0', end - data);
+ if (!eos || eos == end)
return -1;
- untracked->untracked[i] = xstrdup((const char*)data);
- data = next;
+ untracked->untracked[i] = xmemdupz(data, eos - data);
+ data = eos + 1;
}
rd->ucd[rd->index++] = untracked;
rd->data = data;
for (i = 0; i < untracked->dirs_nr; i++) {
- len = read_one_dir(untracked->dirs + i, rd);
- if (len < 0)
+ if (read_one_dir(untracked->dirs + i, rd) < 0)
return -1;
}
return 0;
@@ -2834,6 +2847,9 @@
int ident_len;
ssize_t len;
const char *exclude_per_dir;
+ const unsigned hashsz = the_hash_algo->rawsz;
+ const unsigned offset = sizeof(struct ondisk_untracked_cache);
+ const unsigned exclude_per_dir_offset = offset + 2 * hashsz;
if (sz <= 1 || end[-1] != '\0')
return NULL;
@@ -2845,7 +2861,7 @@
ident = (const char *)next;
next += ident_len;
- if (next + ouc_size(0) > end)
+ if (next + exclude_per_dir_offset + 1 > end)
return NULL;
uc = xcalloc(1, sizeof(*uc));
@@ -2853,15 +2869,15 @@
strbuf_add(&uc->ident, ident, ident_len);
load_oid_stat(&uc->ss_info_exclude,
next + ouc_offset(info_exclude_stat),
- next + ouc_offset(info_exclude_sha1));
+ next + offset);
load_oid_stat(&uc->ss_excludes_file,
next + ouc_offset(excludes_file_stat),
- next + ouc_offset(excludes_file_sha1));
+ next + offset + hashsz);
uc->dir_flags = get_be32(next + ouc_offset(dir_flags));
- exclude_per_dir = (const char *)next + ouc_offset(exclude_per_dir);
+ exclude_per_dir = (const char *)next + exclude_per_dir_offset;
uc->exclude_per_dir = xstrdup(exclude_per_dir);
/* NUL after exclude_per_dir is covered by sizeof(*ouc) */
- next += ouc_size(strlen(exclude_per_dir));
+ next += exclude_per_dir_offset + strlen(exclude_per_dir) + 1;
if (next >= end)
goto done2;
diff --git a/dir.h b/dir.h
index e3ec261..608696c 100644
--- a/dir.h
+++ b/dir.h
@@ -11,24 +11,24 @@
char name[FLEX_ARRAY]; /* more */
};
-#define EXC_FLAG_NODIR 1
-#define EXC_FLAG_ENDSWITH 4
-#define EXC_FLAG_MUSTBEDIR 8
-#define EXC_FLAG_NEGATIVE 16
+#define PATTERN_FLAG_NODIR 1
+#define PATTERN_FLAG_ENDSWITH 4
+#define PATTERN_FLAG_MUSTBEDIR 8
+#define PATTERN_FLAG_NEGATIVE 16
-struct exclude {
+struct path_pattern {
/*
- * This allows callers of last_exclude_matching() etc.
+ * This allows callers of last_matching_pattern() etc.
* to determine the origin of the matching pattern.
*/
- struct exclude_list *el;
+ struct pattern_list *pl;
const char *pattern;
int patternlen;
int nowildcardlen;
const char *base;
int baselen;
- unsigned flags; /* EXC_FLAG_* */
+ unsigned flags; /* PATTERN_FLAG_* */
/*
* Counting starts from 1 for line numbers in ignore files,
@@ -44,7 +44,7 @@
* can also be used to represent the list of --exclude values passed
* via CLI args.
*/
-struct exclude_list {
+struct pattern_list {
int nr;
int alloc;
@@ -54,7 +54,7 @@
/* origin of list, e.g. path to filename, or descriptive string */
const char *src;
- struct exclude **excludes;
+ struct path_pattern **patterns;
};
/*
@@ -72,7 +72,7 @@
struct exclude_list_group {
int nr, alloc;
- struct exclude_list *el;
+ struct pattern_list *pl;
};
struct oid_stat {
@@ -191,7 +191,7 @@
* matching exclude struct if the directory is excluded.
*/
struct exclude_stack *exclude_stack;
- struct exclude *exclude;
+ struct path_pattern *pattern;
struct strbuf basebuf;
/* Enable untracked file cache if set */
@@ -202,7 +202,7 @@
};
/*Count the number of slashes for string s*/
-extern int count_slashes(const char *s);
+int count_slashes(const char *s);
/*
* The ordering of these constants is significant, with
@@ -213,27 +213,40 @@
#define MATCHED_RECURSIVELY 1
#define MATCHED_FNMATCH 2
#define MATCHED_EXACTLY 3
-extern int simple_length(const char *match);
-extern int no_wildcard(const char *string);
-extern char *common_prefix(const struct pathspec *pathspec);
-extern int match_pathspec(const struct index_state *istate,
- const struct pathspec *pathspec,
- const char *name, int namelen,
- int prefix, char *seen, int is_dir);
-extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
-extern int within_depth(const char *name, int namelen, int depth, int max_depth);
+int simple_length(const char *match);
+int no_wildcard(const char *string);
+char *common_prefix(const struct pathspec *pathspec);
+int match_pathspec(const struct index_state *istate,
+ const struct pathspec *pathspec,
+ const char *name, int namelen,
+ int prefix, char *seen, int is_dir);
+int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
+int within_depth(const char *name, int namelen, int depth, int max_depth);
-extern int fill_directory(struct dir_struct *dir,
- struct index_state *istate,
- const struct pathspec *pathspec);
-extern int read_directory(struct dir_struct *, struct index_state *istate,
- const char *path, int len,
- const struct pathspec *pathspec);
+int fill_directory(struct dir_struct *dir,
+ struct index_state *istate,
+ const struct pathspec *pathspec);
+int read_directory(struct dir_struct *, struct index_state *istate,
+ const char *path, int len,
+ const struct pathspec *pathspec);
-extern int is_excluded_from_list(const char *pathname, int pathlen,
- const char *basename, int *dtype,
- struct exclude_list *el,
- struct index_state *istate);
+enum pattern_match_result {
+ UNDECIDED = -1,
+ NOT_MATCHED = 0,
+ MATCHED = 1,
+};
+
+/*
+ * Scan the list of patterns to determine if the ordered list
+ * of patterns matches on 'pathname'.
+ *
+ * Return 1 for a match, 0 for not matched and -1 for undecided.
+ */
+enum pattern_match_result path_matches_pattern_list(const char *pathname,
+ int pathlen,
+ const char *basename, int *dtype,
+ struct pattern_list *pl,
+ struct index_state *istate);
struct dir_entry *dir_add_ignored(struct dir_struct *dir,
struct index_state *istate,
const char *pathname, int len);
@@ -242,37 +255,39 @@
* these implement the matching logic for dir.c:excluded_from_list and
* attr.c:path_matches()
*/
-extern int match_basename(const char *, int,
- const char *, int, int, unsigned);
-extern int match_pathname(const char *, int,
- const char *, int,
- const char *, int, int, unsigned);
+int match_basename(const char *, int,
+ const char *, int, int, unsigned);
+int match_pathname(const char *, int,
+ const char *, int,
+ const char *, int, int, unsigned);
-extern struct exclude *last_exclude_matching(struct dir_struct *dir,
- struct index_state *istate,
- const char *name, int *dtype);
+struct path_pattern *last_matching_pattern(struct dir_struct *dir,
+ struct index_state *istate,
+ const char *name, int *dtype);
-extern int is_excluded(struct dir_struct *dir,
- struct index_state *istate,
- const char *name, int *dtype);
+int is_excluded(struct dir_struct *dir,
+ struct index_state *istate,
+ const char *name, int *dtype);
-extern struct exclude_list *add_exclude_list(struct dir_struct *dir,
- int group_type, const char *src);
-extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
- struct exclude_list *el, struct index_state *istate);
-extern void add_excludes_from_file(struct dir_struct *, const char *fname);
-extern int add_excludes_from_blob_to_list(struct object_id *oid,
- const char *base, int baselen,
- struct exclude_list *el);
-extern void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
-extern void add_exclude(const char *string, const char *base,
- int baselen, struct exclude_list *el, int srcpos);
-extern void clear_exclude_list(struct exclude_list *el);
-extern void clear_directory(struct dir_struct *dir);
-extern int file_exists(const char *);
+struct pattern_list *add_pattern_list(struct dir_struct *dir,
+ int group_type, const char *src);
+int add_patterns_from_file_to_list(const char *fname, const char *base, int baselen,
+ struct pattern_list *pl, struct index_state *istate);
+void add_patterns_from_file(struct dir_struct *, const char *fname);
+int add_patterns_from_blob_to_list(struct object_id *oid,
+ const char *base, int baselen,
+ struct pattern_list *pl);
+void parse_path_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
+void add_pattern(const char *string, const char *base,
+ int baselen, struct pattern_list *pl, int srcpos);
+void clear_pattern_list(struct pattern_list *pl);
+void clear_directory(struct dir_struct *dir);
-extern int is_inside_dir(const char *dir);
-extern int dir_inside_of(const char *subdir, const char *dir);
+int repo_file_exists(struct repository *repo, const char *path);
+int file_exists(const char *);
+
+int is_inside_dir(const char *dir);
+int dir_inside_of(const char *subdir, const char *dir);
static inline int is_dot_or_dotdot(const char *name)
{
@@ -281,9 +296,9 @@
(name[1] == '.' && name[2] == '\0')));
}
-extern int is_empty_dir(const char *dir);
+int is_empty_dir(const char *dir);
-extern void setup_standard_excludes(struct dir_struct *dir);
+void setup_standard_excludes(struct dir_struct *dir);
/* Constants for remove_dir_recursively: */
@@ -311,26 +326,26 @@
* This function uses path as temporary scratch space, but restores it
* before returning.
*/
-extern int remove_dir_recursively(struct strbuf *path, int flag);
+int remove_dir_recursively(struct strbuf *path, int flag);
/* tries to remove the path with empty directories along it, ignores ENOENT */
-extern int remove_path(const char *path);
+int remove_path(const char *path);
-extern int fspathcmp(const char *a, const char *b);
-extern int fspathncmp(const char *a, const char *b, size_t count);
+int fspathcmp(const char *a, const char *b);
+int fspathncmp(const char *a, const char *b, size_t count);
/*
* The prefix part of pattern must not contains wildcards.
*/
struct pathspec_item;
-extern int git_fnmatch(const struct pathspec_item *item,
- const char *pattern, const char *string,
- int prefix);
+int git_fnmatch(const struct pathspec_item *item,
+ const char *pattern, const char *string,
+ int prefix);
-extern int submodule_path_match(const struct index_state *istate,
- const struct pathspec *ps,
- const char *submodule_name,
- char *seen);
+int submodule_path_match(const struct index_state *istate,
+ const struct pathspec *ps,
+ const char *submodule_name,
+ char *seen);
static inline int ce_path_match(const struct index_state *istate,
const struct cache_entry *ce,
@@ -372,10 +387,10 @@
* When `recurse_into_nested` is set, recurse into any nested submodules,
* connecting them as well.
*/
-extern void connect_work_tree_and_git_dir(const char *work_tree,
- const char *git_dir,
- int recurse_into_nested);
-extern void relocate_gitdir(const char *path,
- const char *old_git_dir,
- const char *new_git_dir);
+void connect_work_tree_and_git_dir(const char *work_tree,
+ const char *git_dir,
+ int recurse_into_nested);
+void relocate_gitdir(const char *path,
+ const char *old_git_dir,
+ const char *new_git_dir);
#endif
diff --git a/editor.c b/editor.c
index c985eee..f079abb 100644
--- a/editor.c
+++ b/editor.c
@@ -78,6 +78,7 @@
p.argv = args;
p.env = env;
p.use_shell = 1;
+ p.trace2_child_class = "editor";
if (start_command(&p) < 0)
return error("unable to start editor '%s'", editor);
@@ -95,10 +96,10 @@
if (print_waiting_for_editor && !is_terminal_dumb())
/*
- * Go back to the beginning and erase the entire line to
- * avoid wasting the vertical space.
+ * Erase the entire line to avoid wasting the
+ * vertical space.
*/
- fputs("\r\033[K", stderr);
+ term_clear_line();
}
if (!buffer)
diff --git a/entry.c b/entry.c
index 6fd72b3..53380bb 100644
--- a/entry.c
+++ b/entry.c
@@ -373,7 +373,7 @@
if (lstat(ce->name, &st) < 0)
return error_errno("unable to stat just-written file %s",
ce->name);
- fill_stat_cache_info(ce, &st);
+ fill_stat_cache_info(state->istate, ce, &st);
ce->ce_flags |= CE_UPDATE_IN_BASE;
mark_fsmonitor_invalid(state->istate, ce);
state->istate->cache_changed |= CE_ENTRY_CHANGED;
@@ -441,6 +441,17 @@
static struct strbuf path = STRBUF_INIT;
struct stat st;
+ if (ce->ce_flags & CE_WT_REMOVE) {
+ if (topath)
+ /*
+ * No content and thus no path to create, so we have
+ * no pathname to return.
+ */
+ BUG("Can't remove entry to a path");
+ unlink_entry(ce);
+ return 0;
+ }
+
if (topath)
return write_entry(ce, topath, state, 1);
@@ -510,3 +521,18 @@
(*nr_checkouts)++;
return write_entry(ce, path.buf, state, 0);
}
+
+void unlink_entry(const struct cache_entry *ce)
+{
+ const struct submodule *sub = submodule_from_ce(ce);
+ if (sub) {
+ /* state.force is set at the caller. */
+ submodule_move_head(ce->name, "HEAD", NULL,
+ SUBMODULE_MOVE_HEAD_FORCE);
+ }
+ if (!check_leading_path(ce->name, ce_namelen(ce)))
+ return;
+ if (remove_or_warn(ce->ce_mode, ce->name))
+ return;
+ schedule_dir_for_removal(ce->name, ce_namelen(ce));
+}
diff --git a/environment.c b/environment.c
index 89af47c..efa0726 100644
--- a/environment.c
+++ b/environment.c
@@ -31,8 +31,6 @@
int warn_on_object_refname_ambiguity = 1;
int ref_paranoia = -1;
int repository_format_precious_objects;
-char *repository_format_partial_clone;
-const char *core_partial_clone_filter_default;
int repository_format_worktree_config;
const char *git_commit_encoding;
const char *git_log_output_encoding;
diff --git a/exec-cmd.c b/exec-cmd.c
index 4f81f44..7deeab3 100644
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -209,6 +209,8 @@
return -1;
}
+ trace2_cmd_path(buf->buf);
+
return 0;
}
diff --git a/exec-cmd.h b/exec-cmd.h
index 2522453..8cd1df2 100644
--- a/exec-cmd.h
+++ b/exec-cmd.h
@@ -3,14 +3,14 @@
struct argv_array;
-extern void git_set_exec_path(const char *exec_path);
-extern void git_resolve_executable_dir(const char *path);
-extern const char *git_exec_path(void);
-extern void setup_path(void);
-extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);
-extern int execv_git_cmd(const char **argv); /* NULL terminated */
+void git_set_exec_path(const char *exec_path);
+void git_resolve_executable_dir(const char *path);
+const char *git_exec_path(void);
+void setup_path(void);
+const char **prepare_git_cmd(struct argv_array *out, const char **argv);
+int execv_git_cmd(const char **argv); /* NULL terminated */
LAST_ARG_MUST_BE_NULL
-extern int execl_git_cmd(const char *cmd, ...);
-extern char *system_path(const char *path);
+int execl_git_cmd(const char *cmd, ...);
+char *system_path(const char *path);
#endif /* GIT_EXEC_CMD_H */
diff --git a/fast-import.c b/fast-import.c
index b7ba755..1f9160b 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -29,6 +29,13 @@
*/
#define NO_DELTA S_ISUID
+/*
+ * The amount of additional space required in order to write an object into the
+ * current pack. This is the hash lengths at the end of the pack, plus the
+ * length of one object ID.
+ */
+#define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3)
+
struct object_entry {
struct pack_idx_entry idx;
struct object_entry *next;
@@ -637,7 +644,7 @@
struct tree_content *r = new_tree_content(t->entry_count + amt);
r->entry_count = t->entry_count;
r->delta_depth = t->delta_depth;
- memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
+ COPY_ARRAY(r->entries, t->entries, t->entry_count);
release_tree_content(t);
return r;
}
@@ -742,7 +749,8 @@
if (c != last)
die("internal consistency error creating the index");
- tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, pack_data->sha1);
+ tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts,
+ pack_data->hash);
free(idx);
return tmpfile;
}
@@ -753,7 +761,7 @@
struct strbuf name = STRBUF_INIT;
int keep_fd;
- odb_pack_name(&name, pack_data->sha1, "keep");
+ odb_pack_name(&name, pack_data->hash, "keep");
keep_fd = odb_pack_keep(name.buf);
if (keep_fd < 0)
die_errno("cannot create keep file");
@@ -761,11 +769,11 @@
if (close(keep_fd))
die_errno("failed to write keep file");
- odb_pack_name(&name, pack_data->sha1, "pack");
+ odb_pack_name(&name, pack_data->hash, "pack");
if (finalize_object_file(pack_data->pack_name, name.buf))
die("cannot store pack file");
- odb_pack_name(&name, pack_data->sha1, "idx");
+ odb_pack_name(&name, pack_data->hash, "idx");
if (finalize_object_file(curr_index_name, name.buf))
die("cannot store index file");
free((void *)curr_index_name);
@@ -779,7 +787,7 @@
for (k = 0; k < pack_id; k++) {
struct packed_git *p = all_packs[k];
- odb_pack_name(&name, p->sha1, "keep");
+ odb_pack_name(&name, p->hash, "keep");
unlink_or_warn(name.buf);
}
strbuf_release(&name);
@@ -821,9 +829,9 @@
close_pack_windows(pack_data);
finalize_hashfile(pack_file, cur_pack_oid.hash, 0);
- fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
- pack_data->pack_name, object_count,
- cur_pack_oid.hash, pack_size);
+ fixup_pack_header_footer(pack_data->pack_fd, pack_data->hash,
+ pack_data->pack_name, object_count,
+ cur_pack_oid.hash, pack_size);
if (object_count <= unpack_limit) {
if (!loosen_small_pack(pack_data)) {
@@ -948,8 +956,9 @@
git_deflate_end(&s);
/* Determine if we should auto-checkpoint. */
- if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
- || (pack_size + 60 + s.total_out) < pack_size) {
+ if ((max_packsize
+ && (pack_size + PACK_SIZE_THRESHOLD + s.total_out) > max_packsize)
+ || (pack_size + PACK_SIZE_THRESHOLD + s.total_out) < pack_size) {
/* This new object needs to *not* have the current pack_id. */
e->pack_id = pack_id + 1;
@@ -1044,8 +1053,9 @@
int status = Z_OK;
/* Determine if we should auto-checkpoint. */
- if ((max_packsize && (pack_size + 60 + len) > max_packsize)
- || (pack_size + 60 + len) < pack_size)
+ if ((max_packsize
+ && (pack_size + PACK_SIZE_THRESHOLD + len) > max_packsize)
+ || (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size)
cycle_packfile();
hashfile_checkpoint(pack_file, &checkpoint);
@@ -1240,7 +1250,7 @@
c += e->name->str_len + 1;
hashcpy(e->versions[0].oid.hash, (unsigned char *)c);
hashcpy(e->versions[1].oid.hash, (unsigned char *)c);
- c += GIT_SHA1_RAWSZ;
+ c += the_hash_algo->rawsz;
}
free(buf);
}
@@ -1287,7 +1297,7 @@
strbuf_addf(b, "%o %s%c",
(unsigned int)(e->versions[v].mode & ~NO_DELTA),
e->name->str_dat, '\0');
- strbuf_add(b, e->versions[v].oid.hash, GIT_SHA1_RAWSZ);
+ strbuf_add(b, e->versions[v].oid.hash, the_hash_algo->rawsz);
}
}
@@ -1748,14 +1758,11 @@
}
for (;;) {
- const char *p;
-
if (unread_command_buf) {
unread_command_buf = 0;
} else {
struct recent_command *rc;
- strbuf_detach(&command_buf, NULL);
stdin_eof = strbuf_getline_lf(&command_buf, stdin);
if (stdin_eof)
return EOF;
@@ -1776,20 +1783,12 @@
free(rc->buf);
}
- rc->buf = command_buf.buf;
+ rc->buf = xstrdup(command_buf.buf);
rc->prev = cmd_tail;
rc->next = cmd_hist.prev;
rc->prev->next = rc;
cmd_tail = rc;
}
- if (skip_prefix(command_buf.buf, "get-mark ", &p)) {
- parse_get_mark(p);
- continue;
- }
- if (skip_prefix(command_buf.buf, "cat-blob ", &p)) {
- parse_cat_blob(p);
- continue;
- }
if (command_buf.buf[0] == '#')
continue;
return 0;
@@ -1833,7 +1832,6 @@
char *term = xstrdup(data);
size_t term_len = command_buf.len - (data - command_buf.buf);
- strbuf_detach(&command_buf, NULL);
for (;;) {
if (strbuf_getline_lf(&command_buf, stdin) == EOF)
die("EOF in data (terminator '%s' not found)", term);
@@ -2046,7 +2044,9 @@
unsigned int i, tmp_hex_oid_len, tmp_fullpath_len;
uintmax_t num_notes = 0;
struct object_id oid;
- char realpath[60];
+ /* hex oid + '/' between each pair of hex digits + NUL */
+ char realpath[GIT_MAX_HEXSZ + ((GIT_MAX_HEXSZ / 2) - 1) + 1];
+ const unsigned hexsz = the_hash_algo->hexsz;
if (!root->tree)
load_tree(root);
@@ -2066,7 +2066,7 @@
* of 2 chars.
*/
if (!e->versions[1].mode ||
- tmp_hex_oid_len > GIT_SHA1_HEXSZ ||
+ tmp_hex_oid_len > hexsz ||
e->name->str_len % 2)
continue;
@@ -2080,7 +2080,7 @@
tmp_fullpath_len += e->name->str_len;
fullpath[tmp_fullpath_len] = '\0';
- if (tmp_hex_oid_len == GIT_SHA1_HEXSZ && !get_oid_hex(hex_oid, &oid)) {
+ if (tmp_hex_oid_len == hexsz && !get_oid_hex(hex_oid, &oid)) {
/* This is a note entry */
if (fanout == 0xff) {
/* Counting mode, no rename */
@@ -2254,8 +2254,15 @@
strbuf_addstr(&uq, p);
p = uq.buf;
}
- read_next_command();
- parse_and_store_blob(&last_blob, &oid, 0);
+ while (read_next_command() != EOF) {
+ const char *v;
+ if (skip_prefix(command_buf.buf, "cat-blob ", &v))
+ parse_cat_blob(v);
+ else {
+ parse_and_store_blob(&last_blob, &oid, 0);
+ break;
+ }
+ }
} else {
enum object_type expected = S_ISDIR(mode) ?
OBJ_TREE: OBJ_BLOB;
@@ -2351,7 +2358,7 @@
struct object_entry *oe;
struct branch *s;
struct object_id oid, commit_oid;
- char path[60];
+ char path[GIT_MAX_RAWSZ * 3];
uint16_t inline_data = 0;
unsigned char new_fanout;
@@ -2401,10 +2408,11 @@
oidcpy(&commit_oid, &commit_oe->idx.oid);
} else if (!get_oid(p, &commit_oid)) {
unsigned long size;
- char *buf = read_object_with_reference(&commit_oid,
+ char *buf = read_object_with_reference(the_repository,
+ &commit_oid,
commit_type, &size,
&commit_oid);
- if (!buf || size < 46)
+ if (!buf || size < the_hash_algo->hexsz + 6)
die("Not a valid commit: %s", p);
free(buf);
} else
@@ -2455,7 +2463,7 @@
static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
{
- if (!buf || size < GIT_SHA1_HEXSZ + 6)
+ if (!buf || size < the_hash_algo->hexsz + 6)
die("Not a valid commit: %s", oid_to_hex(&b->oid));
if (memcmp("tree ", buf, 5)
|| get_oid_hex(buf + 5, &b->branch_tree.versions[1].oid))
@@ -2473,7 +2481,8 @@
unsigned long size;
char *buf;
- buf = read_object_with_reference(&b->oid, commit_type, &size,
+ buf = read_object_with_reference(the_repository,
+ &b->oid, commit_type, &size,
&b->oid);
parse_from_commit(b, buf, size);
free(buf);
@@ -2551,10 +2560,11 @@
oidcpy(&n->oid, &oe->idx.oid);
} else if (!get_oid(from, &n->oid)) {
unsigned long size;
- char *buf = read_object_with_reference(&n->oid,
+ char *buf = read_object_with_reference(the_repository,
+ &n->oid,
commit_type,
&size, &n->oid);
- if (!buf || size < 46)
+ if (!buf || size < the_hash_algo->hexsz + 6)
die("Not a valid commit: %s", from);
free(buf);
} else
@@ -2576,6 +2586,7 @@
struct branch *b;
char *author = NULL;
char *committer = NULL;
+ char *encoding = NULL;
struct hash_list *merge_list = NULL;
unsigned int merge_count;
unsigned char prev_fanout, new_fanout;
@@ -2598,6 +2609,10 @@
}
if (!committer)
die("Expected committer but didn't get one");
+ if (skip_prefix(command_buf.buf, "encoding ", &v)) {
+ encoding = xstrdup(v);
+ read_next_command();
+ }
parse_data(&msg, 0, NULL);
read_next_command();
parse_from(b);
@@ -2627,6 +2642,8 @@
file_change_deleteall(b);
else if (skip_prefix(command_buf.buf, "ls ", &v))
parse_ls(v, b);
+ else if (skip_prefix(command_buf.buf, "cat-blob ", &v))
+ parse_cat_blob(v);
else {
unread_command_buf = 1;
break;
@@ -2659,12 +2676,17 @@
}
strbuf_addf(&new_data,
"author %s\n"
- "committer %s\n"
- "\n",
+ "committer %s\n",
author ? author : committer, committer);
+ if (encoding)
+ strbuf_addf(&new_data,
+ "encoding %s\n",
+ encoding);
+ strbuf_addch(&new_data, '\n');
strbuf_addbuf(&new_data, &msg);
free(author);
free(committer);
+ free(encoding);
if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark))
b->pack_id = pack_id;
@@ -2841,7 +2863,7 @@
die("Unknown mark: %s", command_buf.buf);
xsnprintf(output, sizeof(output), "%s\n", oid_to_hex(&oe->idx.oid));
- cat_blob_write(output, GIT_SHA1_HEXSZ + 1);
+ cat_blob_write(output, the_hash_algo->hexsz + 1);
}
static void parse_cat_blob(const char *p)
@@ -2871,6 +2893,8 @@
{
unsigned long size;
char *buf = NULL;
+ const unsigned hexsz = the_hash_algo->hexsz;
+
if (!oe) {
enum object_type type = oid_object_info(the_repository, oid,
NULL);
@@ -2904,12 +2928,12 @@
/* Peel one layer. */
switch (oe->type) {
case OBJ_TAG:
- if (size < GIT_SHA1_HEXSZ + strlen("object ") ||
+ if (size < hexsz + strlen("object ") ||
get_oid_hex(buf + strlen("object "), oid))
die("Invalid SHA1 in tag: %s", command_buf.buf);
break;
case OBJ_COMMIT:
- if (size < GIT_SHA1_HEXSZ + strlen("tree ") ||
+ if (size < hexsz + strlen("tree ") ||
get_oid_hex(buf + strlen("tree "), oid))
die("Invalid SHA1 in commit: %s", command_buf.buf);
}
@@ -2941,7 +2965,7 @@
return e;
}
-static void print_ls(int mode, const unsigned char *sha1, const char *path)
+static void print_ls(int mode, const unsigned char *hash, const char *path)
{
static struct strbuf line = STRBUF_INIT;
@@ -2961,7 +2985,7 @@
/* mode SP type SP object_name TAB path LF */
strbuf_reset(&line);
strbuf_addf(&line, "%06o %s %s\t",
- mode & ~NO_DELTA, type, sha1_to_hex(sha1));
+ mode & ~NO_DELTA, type, hash_to_hex(hash));
quote_c_style(path, &line, NULL, 0);
strbuf_addch(&line, '\n');
}
@@ -3303,14 +3327,18 @@
const char *v;
if (!strcmp("blob", command_buf.buf))
parse_new_blob();
- else if (skip_prefix(command_buf.buf, "ls ", &v))
- parse_ls(v, NULL);
else if (skip_prefix(command_buf.buf, "commit ", &v))
parse_new_commit(v);
else if (skip_prefix(command_buf.buf, "tag ", &v))
parse_new_tag(v);
else if (skip_prefix(command_buf.buf, "reset ", &v))
parse_reset_branch(v);
+ else if (skip_prefix(command_buf.buf, "ls ", &v))
+ parse_ls(v, NULL);
+ else if (skip_prefix(command_buf.buf, "cat-blob ", &v))
+ parse_cat_blob(v);
+ else if (skip_prefix(command_buf.buf, "get-mark ", &v))
+ parse_get_mark(v);
else if (!strcmp("checkpoint", command_buf.buf))
parse_checkpoint();
else if (!strcmp("done", command_buf.buf))
diff --git a/fetch-negotiator.c b/fetch-negotiator.c
index d6d685c..0a1357d 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -2,19 +2,20 @@
#include "fetch-negotiator.h"
#include "negotiator/default.h"
#include "negotiator/skipping.h"
+#include "repository.h"
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
- const char *algorithm)
+void fetch_negotiator_init(struct repository *r,
+ struct fetch_negotiator *negotiator)
{
- if (algorithm) {
- if (!strcmp(algorithm, "skipping")) {
- skipping_negotiator_init(negotiator);
- return;
- } else if (!strcmp(algorithm, "default")) {
- /* Fall through to default initialization */
- } else {
- die("unknown fetch negotiation algorithm '%s'", algorithm);
- }
+ prepare_repo_settings(r);
+ switch(r->settings.fetch_negotiation_algorithm) {
+ case FETCH_NEGOTIATION_SKIPPING:
+ skipping_negotiator_init(negotiator);
+ return;
+
+ case FETCH_NEGOTIATION_DEFAULT:
+ default:
+ default_negotiator_init(negotiator);
+ return;
}
- default_negotiator_init(negotiator);
}
diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index 9e3967c..ea78868 100644
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -2,6 +2,7 @@
#define FETCH_NEGOTIATOR_H
struct commit;
+struct repository;
/*
* An object that supplies the information needed to negotiate the contents of
@@ -52,7 +53,7 @@
void *data;
};
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
- const char *algorithm);
+void fetch_negotiator_init(struct repository *r,
+ struct fetch_negotiator *negotiator);
#endif
diff --git a/fetch-object.c b/fetch-object.c
deleted file mode 100644
index 4266548..0000000
--- a/fetch-object.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "cache.h"
-#include "packfile.h"
-#include "pkt-line.h"
-#include "strbuf.h"
-#include "transport.h"
-#include "fetch-object.h"
-
-static void fetch_refs(const char *remote_name, struct ref *ref)
-{
- struct remote *remote;
- struct transport *transport;
- int original_fetch_if_missing = fetch_if_missing;
-
- fetch_if_missing = 0;
- remote = remote_get(remote_name);
- if (!remote->url[0])
- die(_("Remote with no URL"));
- transport = transport_get(remote, remote->url[0]);
-
- transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
- transport_fetch_refs(transport, ref);
- fetch_if_missing = original_fetch_if_missing;
-}
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
- int oid_nr)
-{
- struct ref *ref = NULL;
- int i;
-
- for (i = 0; i < oid_nr; i++) {
- struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
- oidcpy(&new_ref->old_oid, &oids[i]);
- new_ref->exact_oid = 1;
- new_ref->next = ref;
- ref = new_ref;
- }
- fetch_refs(remote_name, ref);
-}
diff --git a/fetch-object.h b/fetch-object.h
deleted file mode 100644
index d6444ca..0000000
--- a/fetch-object.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef FETCH_OBJECT_H
-#define FETCH_OBJECT_H
-
-struct object_id;
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
- int oid_nr);
-
-#endif
diff --git a/fetch-pack.c b/fetch-pack.c
index 812be15..6ccc629 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -36,7 +36,6 @@
static int server_supports_filtering;
static struct lock_file shallow_lock;
static const char *alternate_shallow_file;
-static char *negotiation_algorithm;
static struct strbuf fsck_msg_types = STRBUF_INIT;
/* Remember to update object flag allocation in object.h */
@@ -191,8 +190,10 @@
if (args->stateless_rpc) {
send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
packet_flush(fd);
- } else
- write_or_die(fd, buf->buf, buf->len);
+ } else {
+ if (write_in_full(fd, buf->buf, buf->len) < 0)
+ die_errno(_("unable to write to remote"));
+ }
}
static void insert_one_alternate_object(struct fetch_negotiator *negotiator,
@@ -284,7 +285,7 @@
* we cannot trust the object flags).
*/
if (!args->no_dependents &&
- ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
+ ((o = lookup_object(the_repository, remote)) != NULL) &&
(o->flags & COMPLETE)) {
continue;
}
@@ -337,12 +338,9 @@
}
}
if (server_supports_filtering && args->filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&args->filter_options,
- &expanded_filter_spec);
- packet_buf_write(&req_buf, "filter %s",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ const char *spec =
+ expand_list_objects_filter_spec(&args->filter_options);
+ packet_buf_write(&req_buf, "filter %s", spec);
}
packet_buf_flush(&req_buf);
state_len = req_buf.len;
@@ -362,7 +360,7 @@
if (skip_prefix(reader.line, "unshallow ", &arg)) {
if (get_oid_hex(arg, &oid))
die(_("invalid unshallow line: %s"), reader.line);
- if (!lookup_object(the_repository, oid.hash))
+ if (!lookup_object(the_repository, &oid))
die(_("object not found: %s"), reader.line);
/* make sure that it is parsed as shallow */
if (!parse_object(the_repository, &oid))
@@ -571,9 +569,14 @@
next = ref->next;
if (starts_with(ref->name, "refs/") &&
- check_refname_format(ref->name, 0))
- ; /* trash */
- else {
+ check_refname_format(ref->name, 0)) {
+ /*
+ * trash or a peeled value; do not even add it to
+ * unmatched list
+ */
+ free_one_ref(ref);
+ continue;
+ } else {
while (i < nr_sought) {
int cmp = strcmp(ref->name, sought[i]->name);
if (cmp < 0)
@@ -628,10 +631,7 @@
}
oidset_clear(&tip_oids);
- for (ref = unmatched; ref; ref = next) {
- next = ref->next;
- free(ref);
- }
+ free_refs(unmatched);
*refs = newlist;
}
@@ -703,7 +703,7 @@
for (ref = *refs; ref; ref = ref->next) {
struct object *o = deref_tag(the_repository,
lookup_object(the_repository,
- ref->old_oid.hash),
+ &ref->old_oid),
NULL, 0);
if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
@@ -730,7 +730,7 @@
const struct object_id *remote = &ref->old_oid;
struct object *o;
- o = lookup_object(the_repository, remote->hash);
+ o = lookup_object(the_repository, remote);
if (!o || !(o->flags & COMPLETE)) {
retval = 0;
print_verbose(args, "want %s (%s)", oid_to_hex(remote),
@@ -888,82 +888,96 @@
struct shallow_info *si,
char **pack_lockfile)
{
+ struct repository *r = the_repository;
struct ref *ref = copy_ref_list(orig_ref);
struct object_id oid;
const char *agent_feature;
int agent_len;
struct fetch_negotiator negotiator;
- fetch_negotiator_init(&negotiator, negotiation_algorithm);
+ fetch_negotiator_init(r, &negotiator);
sort_ref_list(&ref, ref_compare_name);
QSORT(sought, nr_sought, cmp_ref_by_name);
- if ((args->depth > 0 || is_repository_shallow(the_repository)) && !server_supports("shallow"))
- die(_("Server does not support shallow clients"));
- if (args->depth > 0 || args->deepen_since || args->deepen_not)
- args->deepen = 1;
- if (server_supports("multi_ack_detailed")) {
- print_verbose(args, _("Server supports multi_ack_detailed"));
- multi_ack = 2;
- if (server_supports("no-done")) {
- print_verbose(args, _("Server supports no-done"));
- if (args->stateless_rpc)
- no_done = 1;
- }
- }
- else if (server_supports("multi_ack")) {
- print_verbose(args, _("Server supports multi_ack"));
- multi_ack = 1;
- }
- if (server_supports("side-band-64k")) {
- print_verbose(args, _("Server supports side-band-64k"));
- use_sideband = 2;
- }
- else if (server_supports("side-band")) {
- print_verbose(args, _("Server supports side-band"));
- use_sideband = 1;
- }
- if (server_supports("allow-tip-sha1-in-want")) {
- print_verbose(args, _("Server supports allow-tip-sha1-in-want"));
- allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
- }
- if (server_supports("allow-reachable-sha1-in-want")) {
- print_verbose(args, _("Server supports allow-reachable-sha1-in-want"));
- allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
- }
- if (!server_supports("thin-pack"))
- args->use_thin_pack = 0;
- if (!server_supports("no-progress"))
- args->no_progress = 0;
- if (!server_supports("include-tag"))
- args->include_tag = 0;
- if (server_supports("ofs-delta"))
- print_verbose(args, _("Server supports ofs-delta"));
- else
- prefer_ofs_delta = 0;
-
- if (server_supports("filter")) {
- server_supports_filtering = 1;
- print_verbose(args, _("Server supports filter"));
- } else if (args->filter_options.choice) {
- warning("filtering not recognized by server, ignoring");
- }
-
if ((agent_feature = server_feature_value("agent", &agent_len))) {
agent_supported = 1;
if (agent_len)
print_verbose(args, _("Server version is %.*s"),
agent_len, agent_feature);
}
- if (server_supports("deepen-since"))
+
+ if (server_supports("shallow"))
+ print_verbose(args, _("Server supports %s"), "shallow");
+ else if (args->depth > 0 || is_repository_shallow(r))
+ die(_("Server does not support shallow clients"));
+ if (args->depth > 0 || args->deepen_since || args->deepen_not)
+ args->deepen = 1;
+ if (server_supports("multi_ack_detailed")) {
+ print_verbose(args, _("Server supports %s"), "multi_ack_detailed");
+ multi_ack = 2;
+ if (server_supports("no-done")) {
+ print_verbose(args, _("Server supports %s"), "no-done");
+ if (args->stateless_rpc)
+ no_done = 1;
+ }
+ }
+ else if (server_supports("multi_ack")) {
+ print_verbose(args, _("Server supports %s"), "multi_ack");
+ multi_ack = 1;
+ }
+ if (server_supports("side-band-64k")) {
+ print_verbose(args, _("Server supports %s"), "side-band-64k");
+ use_sideband = 2;
+ }
+ else if (server_supports("side-band")) {
+ print_verbose(args, _("Server supports %s"), "side-band");
+ use_sideband = 1;
+ }
+ if (server_supports("allow-tip-sha1-in-want")) {
+ print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want");
+ allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
+ }
+ if (server_supports("allow-reachable-sha1-in-want")) {
+ print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want");
+ allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
+ }
+ if (server_supports("thin-pack"))
+ print_verbose(args, _("Server supports %s"), "thin-pack");
+ else
+ args->use_thin_pack = 0;
+ if (server_supports("no-progress"))
+ print_verbose(args, _("Server supports %s"), "no-progress");
+ else
+ args->no_progress = 0;
+ if (server_supports("include-tag"))
+ print_verbose(args, _("Server supports %s"), "include-tag");
+ else
+ args->include_tag = 0;
+ if (server_supports("ofs-delta"))
+ print_verbose(args, _("Server supports %s"), "ofs-delta");
+ else
+ prefer_ofs_delta = 0;
+
+ if (server_supports("filter")) {
+ server_supports_filtering = 1;
+ print_verbose(args, _("Server supports %s"), "filter");
+ } else if (args->filter_options.choice) {
+ warning("filtering not recognized by server, ignoring");
+ }
+
+ if (server_supports("deepen-since")) {
+ print_verbose(args, _("Server supports %s"), "deepen-since");
deepen_since_ok = 1;
- else if (args->deepen_since)
+ } else if (args->deepen_since)
die(_("Server does not support --shallow-since"));
- if (server_supports("deepen-not"))
+ if (server_supports("deepen-not")) {
+ print_verbose(args, _("Server supports %s"), "deepen-not");
deepen_not_ok = 1;
- else if (args->deepen_not)
+ } else if (args->deepen_not)
die(_("Server does not support --shallow-exclude"));
- if (!server_supports("deepen-relative") && args->deepen_relative)
+ if (server_supports("deepen-relative"))
+ print_verbose(args, _("Server supports %s"), "deepen-relative");
+ else if (args->deepen_relative)
die(_("Server does not support --deepen"));
if (!args->no_dependents) {
@@ -1044,7 +1058,7 @@
* we cannot trust the object flags).
*/
if (!no_dependents &&
- ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
+ ((o = lookup_object(the_repository, remote)) != NULL) &&
(o->flags & COMPLETE)) {
continue;
}
@@ -1095,7 +1109,7 @@
}
static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
- const struct fetch_pack_args *args,
+ struct fetch_pack_args *args,
const struct ref *wants, struct oidset *common,
int *haves_to_send, int *in_vain,
int sideband_all)
@@ -1111,7 +1125,7 @@
server_supports_v2("server-option", 1)) {
int i;
for (i = 0; i < args->server_options->nr; i++)
- packet_write_fmt(fd_out, "server-option=%s",
+ packet_buf_write(&req_buf, "server-option=%s",
args->server_options->items[i].string);
}
@@ -1136,13 +1150,10 @@
/* Add filter */
if (server_supports_feature("fetch", "filter", 0) &&
args->filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
+ const char *spec =
+ expand_list_objects_filter_spec(&args->filter_options);
print_verbose(args, _("Server supports filter"));
- expand_list_objects_filter_spec(&args->filter_options,
- &expanded_filter_spec);
- packet_buf_write(&req_buf, "filter %s",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ packet_buf_write(&req_buf, "filter %s", spec);
} else if (args->filter_options.choice) {
warning("filtering not recognized by server, ignoring");
}
@@ -1163,7 +1174,8 @@
/* Send request */
packet_buf_flush(&req_buf);
- write_or_die(fd_out, req_buf.buf, req_buf.len);
+ if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0)
+ die_errno(_("unable to write request to remote"));
strbuf_release(&req_buf);
return ret;
@@ -1250,9 +1262,11 @@
}
static void receive_shallow_info(struct fetch_pack_args *args,
- struct packet_reader *reader)
+ struct packet_reader *reader,
+ struct oid_array *shallows,
+ struct shallow_info *si)
{
- int line_received = 0;
+ int unshallow_received = 0;
process_section_header(reader, "shallow-info", 0);
while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
@@ -1262,21 +1276,20 @@
if (skip_prefix(reader->line, "shallow ", &arg)) {
if (get_oid_hex(arg, &oid))
die(_("invalid shallow line: %s"), reader->line);
- register_shallow(the_repository, &oid);
- line_received = 1;
+ oid_array_append(shallows, &oid);
continue;
}
if (skip_prefix(reader->line, "unshallow ", &arg)) {
if (get_oid_hex(arg, &oid))
die(_("invalid unshallow line: %s"), reader->line);
- if (!lookup_object(the_repository, oid.hash))
+ if (!lookup_object(the_repository, &oid))
die(_("object not found: %s"), reader->line);
/* make sure that it is parsed as shallow */
if (!parse_object(the_repository, &oid))
die(_("error in object: %s"), reader->line);
if (unregister_shallow(&oid))
die(_("no shallow found: %s"), reader->line);
- line_received = 1;
+ unshallow_received = 1;
continue;
}
die(_("expected shallow/unshallow, got %s"), reader->line);
@@ -1286,15 +1299,41 @@
reader->status != PACKET_READ_DELIM)
die(_("error processing shallow info: %d"), reader->status);
- if (line_received) {
+ if (args->deepen || unshallow_received) {
+ /*
+ * Treat these as shallow lines caused by our depth settings.
+ * In v0, these lines cannot cause refs to be rejected; do the
+ * same.
+ */
+ int i;
+
+ for (i = 0; i < shallows->nr; i++)
+ register_shallow(the_repository, &shallows->oid[i]);
setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
NULL);
args->deepen = 1;
+ } else if (shallows->nr) {
+ /*
+ * Treat these as shallow lines caused by the remote being
+ * shallow. In v0, remote refs that reach these objects are
+ * rejected (unless --update-shallow is set); do the same.
+ */
+ prepare_shallow_info(si, shallows);
+ if (si->nr_ours || si->nr_theirs)
+ alternate_shallow_file =
+ setup_temporary_shallow(si->shallow);
+ else
+ alternate_shallow_file = NULL;
} else {
alternate_shallow_file = NULL;
}
}
+static int cmp_name_ref(const void *name, const void *ref)
+{
+ return strcmp(name, (*(struct ref **)ref)->name);
+}
+
static void receive_wanted_refs(struct packet_reader *reader,
struct ref **sought, int nr_sought)
{
@@ -1302,20 +1341,16 @@
while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
struct object_id oid;
const char *end;
- int i;
+ struct ref **found;
if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
die(_("expected wanted-ref, got '%s'"), reader->line);
- for (i = 0; i < nr_sought; i++) {
- if (!strcmp(end, sought[i]->name)) {
- oidcpy(&sought[i]->old_oid, &oid);
- break;
- }
- }
-
- if (i == nr_sought)
+ found = bsearch(end, sought, nr_sought, sizeof(*sought),
+ cmp_name_ref);
+ if (!found)
die(_("unexpected wanted-ref: '%s'"), reader->line);
+ oidcpy(&(*found)->old_oid, &oid);
}
if (reader->status != PACKET_READ_DELIM)
@@ -1334,8 +1369,11 @@
int fd[2],
const struct ref *orig_ref,
struct ref **sought, int nr_sought,
+ struct oid_array *shallows,
+ struct shallow_info *si,
char **pack_lockfile)
{
+ struct repository *r = the_repository;
struct ref *ref = copy_ref_list(orig_ref);
enum fetch_state state = FETCH_CHECK_LOCAL;
struct oidset common = OIDSET_INIT;
@@ -1343,7 +1381,7 @@
int in_vain = 0;
int haves_to_send = INITIAL_FLUSH;
struct fetch_negotiator negotiator;
- fetch_negotiator_init(&negotiator, negotiation_algorithm);
+ fetch_negotiator_init(r, &negotiator);
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
@@ -1408,7 +1446,7 @@
case FETCH_GET_PACK:
/* Check for shallow-info section */
if (process_section_header(&reader, "shallow-info", 1))
- receive_shallow_info(args, &reader);
+ receive_shallow_info(args, &reader, shallows, si);
if (process_section_header(&reader, "wanted-refs", 1))
receive_wanted_refs(&reader, sought, nr_sought);
@@ -1462,8 +1500,6 @@
git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
- git_config_get_string("fetch.negotiationalgorithm",
- &negotiation_algorithm);
git_config(fetch_pack_config_cb, NULL);
}
@@ -1612,9 +1648,8 @@
}
struct ref *fetch_pack(struct fetch_pack_args *args,
- int fd[], struct child_process *conn,
+ int fd[],
const struct ref *ref,
- const char *dest,
struct ref **sought, int nr_sought,
struct oid_array *shallow,
char **pack_lockfile,
@@ -1622,6 +1657,7 @@
{
struct ref *ref_cpy;
struct shallow_info si;
+ struct oid_array shallows_scratch = OID_ARRAY_INIT;
fetch_pack_setup();
if (nr_sought)
@@ -1645,13 +1681,18 @@
packet_flush(fd[1]);
die(_("no matching remote head"));
}
- prepare_shallow_info(&si, shallow);
- if (version == protocol_v2)
+ if (version == protocol_v2) {
+ if (shallow->nr)
+ BUG("Protocol V2 does not provide shallows at this point in the fetch");
+ memset(&si, 0, sizeof(si));
ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought,
+ &shallows_scratch, &si,
pack_lockfile);
- else
+ } else {
+ prepare_shallow_info(&si, shallow);
ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
&si, pack_lockfile);
+ }
reprepare_packed_git(the_repository);
if (!args->cloning && args->deepen) {
@@ -1673,6 +1714,7 @@
update_shallow(args, sought, nr_sought, &si);
cleanup:
clear_shallow_info(&si);
+ oid_array_clear(&shallows_scratch);
return ref_cpy;
}
diff --git a/fetch-pack.h b/fetch-pack.h
index 43ec344..67f6842 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -78,9 +78,8 @@
* marked as such.
*/
struct ref *fetch_pack(struct fetch_pack_args *args,
- int fd[], struct child_process *conn,
+ int fd[],
const struct ref *ref,
- const char *dest,
struct ref **sought,
int nr_sought,
struct oid_array *shallow,
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index b28d3a6..01e3aa8 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -2,6 +2,6 @@
#define FMT_MERGE_MSG_H
extern int merge_log_config;
-extern int fmt_merge_msg_config(const char *key, const char *value, void *cb);
+int fmt_merge_msg_config(const char *key, const char *value, void *cb);
#endif /* FMT_MERGE_MSG_H */
diff --git a/fsck.c b/fsck.c
index 2260adb..cdb7d8d 100644
--- a/fsck.c
+++ b/fsck.c
@@ -181,41 +181,6 @@
return msg_type;
}
-static void init_skiplist(struct fsck_options *options, const char *path)
-{
- FILE *fp;
- struct strbuf sb = STRBUF_INIT;
- struct object_id oid;
-
- fp = fopen(path, "r");
- if (!fp)
- die("Could not open skip list: %s", path);
- while (!strbuf_getline(&sb, fp)) {
- const char *p;
- const char *hash;
-
- /*
- * Allow trailing comments, leading whitespace
- * (including before commits), and empty or whitespace
- * only lines.
- */
- hash = strchr(sb.buf, '#');
- if (hash)
- strbuf_setlen(&sb, hash - sb.buf);
- strbuf_trim(&sb);
- if (!sb.len)
- continue;
-
- if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
- die("Invalid SHA-1: %s", sb.buf);
- oidset_insert(&options->skiplist, &oid);
- }
- if (ferror(fp))
- die_errno("Could not read '%s'", path);
- fclose(fp);
- strbuf_release(&sb);
-}
-
static int parse_msg_type(const char *str)
{
if (!strcmp(str, "error"))
@@ -284,7 +249,7 @@
if (!strcmp(buf, "skiplist")) {
if (equal == len)
die("skiplist requires a path");
- init_skiplist(options, buf + equal + 1);
+ oidset_parse_file(&options->skiplist, buf + equal + 1);
buf += len + 1;
continue;
}
@@ -604,7 +569,7 @@
o_name = NULL;
while (desc.size) {
- unsigned mode;
+ unsigned short mode;
const char *name;
const struct object_id *oid;
@@ -1092,7 +1057,7 @@
blob = lookup_blob(the_repository, oid);
if (!blob) {
- struct object *obj = lookup_unknown_object(oid->hash);
+ struct object *obj = lookup_unknown_object(oid);
ret |= report(options, obj,
FSCK_MSG_GITMODULES_BLOB,
"non-blob found at .gitmodules");
diff --git a/fsmonitor.c b/fsmonitor.c
index 665bd2d..231e83a 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -56,7 +56,7 @@
void fill_fsmonitor_bitmap(struct index_state *istate)
{
- int i;
+ unsigned int i;
istate->fsmonitor_dirty = ewah_new();
for (i = 0; i < istate->cache_nr; i++)
if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
@@ -129,17 +129,16 @@
void refresh_fsmonitor(struct index_state *istate)
{
- static int has_run_once = 0;
struct strbuf query_result = STRBUF_INIT;
int query_success = 0;
size_t bol; /* beginning of line */
uint64_t last_update;
char *buf;
- int i;
+ unsigned int i;
- if (!core_fsmonitor || has_run_once)
+ if (!core_fsmonitor || istate->fsmonitor_has_run_once)
return;
- has_run_once = 1;
+ istate->fsmonitor_has_run_once = 1;
trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
/*
@@ -193,7 +192,7 @@
void add_fsmonitor(struct index_state *istate)
{
- int i;
+ unsigned int i;
if (!istate->fsmonitor_last_update) {
trace_printf_key(&trace_fsmonitor, "add fsmonitor");
@@ -226,7 +225,7 @@
void tweak_fsmonitor(struct index_state *istate)
{
- int i;
+ unsigned int i;
int fsmonitor_enabled = git_config_get_fsmonitor();
if (istate->fsmonitor_dirty) {
diff --git a/fsmonitor.h b/fsmonitor.h
index 01017c4..739318a 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -10,31 +10,31 @@
* Read the fsmonitor index extension and (if configured) restore the
* CE_FSMONITOR_VALID state.
*/
-extern int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz);
+int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz);
/*
* Fill the fsmonitor_dirty ewah bits with their state from the index,
* before it is split during writing.
*/
-extern void fill_fsmonitor_bitmap(struct index_state *istate);
+void fill_fsmonitor_bitmap(struct index_state *istate);
/*
* Write the CE_FSMONITOR_VALID state into the fsmonitor index
* extension. Reads from the fsmonitor_dirty ewah in the index.
*/
-extern void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate);
+void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate);
/*
* Add/remove the fsmonitor index extension
*/
-extern void add_fsmonitor(struct index_state *istate);
-extern void remove_fsmonitor(struct index_state *istate);
+void add_fsmonitor(struct index_state *istate);
+void remove_fsmonitor(struct index_state *istate);
/*
* Add/remove the fsmonitor index extension as necessary based on the current
* core.fsmonitor setting.
*/
-extern void tweak_fsmonitor(struct index_state *istate);
+void tweak_fsmonitor(struct index_state *istate);
/*
* Run the configured fsmonitor integration script and clear the
@@ -42,16 +42,17 @@
* any corresponding untracked cache directory structures. Optimized to only
* run the first time it is called.
*/
-extern void refresh_fsmonitor(struct index_state *istate);
+void refresh_fsmonitor(struct index_state *istate);
/*
* Set the given cache entries CE_FSMONITOR_VALID bit. This should be
* called any time the cache entry has been updated to reflect the
* current state of the file on disk.
*/
-static inline void mark_fsmonitor_valid(struct cache_entry *ce)
+static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
{
- if (core_fsmonitor) {
+ if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
+ istate->cache_changed = 1;
ce->ce_flags |= CE_FSMONITOR_VALID;
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
}
diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c
index cf790c9..0157acb 100644
--- a/fuzz-commit-graph.c
+++ b/fuzz-commit-graph.c
@@ -1,4 +1,5 @@
#include "commit-graph.h"
+#include "repository.h"
struct commit_graph *parse_commit_graph(void *graph_map, int fd,
size_t graph_size);
@@ -9,7 +10,9 @@
{
struct commit_graph *g;
+ initialize_the_repository();
g = parse_commit_graph((void *)data, -1, size);
+ repo_clear(the_repository);
free(g);
return 0;
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 709d674..71158f7 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -6,7 +6,7 @@
}
command_list () {
- grep -v '^#' "$1"
+ eval "grep -ve '^#' $exclude_programs" <"$1"
}
get_categories () {
@@ -93,6 +93,14 @@
EOF
}
+exclude_programs=
+while test "--exclude-program" = "$1"
+do
+ shift
+ exclude_programs="$exclude_programs -e \"^$1 \""
+ shift
+done
+
echo "/* Automatically generated by generate-cmdlist.sh */
struct cmdname_help {
const char *name;
diff --git a/gettext.c b/gettext.c
index d4021d6..35d2c12 100644
--- a/gettext.c
+++ b/gettext.c
@@ -12,7 +12,25 @@
#ifndef NO_GETTEXT
# include <locale.h>
# include <libintl.h>
-# ifdef HAVE_LIBCHARSET_H
+# ifdef GIT_WINDOWS_NATIVE
+
+static const char *locale_charset(void)
+{
+ const char *env = getenv("LC_ALL"), *dot;
+
+ if (!env || !*env)
+ env = getenv("LC_CTYPE");
+ if (!env || !*env)
+ env = getenv("LANG");
+
+ if (!env)
+ return "UTF-8";
+
+ dot = strchr(env, '.');
+ return !dot ? env : dot + 1;
+}
+
+# elif defined HAVE_LIBCHARSET_H
# include <libcharset.h>
# else
# include <langinfo.h>
@@ -50,10 +68,8 @@
int use_gettext_poison(void)
{
static int poison_requested = -1;
- if (poison_requested == -1) {
- const char *v = getenv("GIT_TEST_GETTEXT_POISON");
- poison_requested = v && strlen(v) ? 1 : 0;
- }
+ if (poison_requested == -1)
+ poison_requested = git_env_bool("GIT_TEST_GETTEXT_POISON", 0);
return poison_requested;
}
diff --git a/gettext.h b/gettext.h
index 71255e5..bee52eb 100644
--- a/gettext.h
+++ b/gettext.h
@@ -28,11 +28,11 @@
#define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
-extern int use_gettext_poison(void);
+int use_gettext_poison(void);
#ifndef NO_GETTEXT
-extern void git_setup_gettext(void);
-extern int gettext_width(const char *s);
+void git_setup_gettext(void);
+int gettext_width(const char *s);
#else
static inline void git_setup_gettext(void)
{
@@ -87,6 +87,6 @@
#endif
const char *get_preferred_languages(void);
-extern int is_utf8_locale(void);
+int is_utf8_locale(void);
#endif
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 20eb81c..c20ae9e 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -149,6 +149,20 @@
FILTER => undef,
IS_REVERSE => 0,
},
+ 'worktree_head' => {
+ DIFF => 'diff-index -p',
+ APPLY => sub { apply_patch 'apply -R', @_ },
+ APPLY_CHECK => 'apply -R',
+ FILTER => undef,
+ IS_REVERSE => 1,
+ },
+ 'worktree_nothead' => {
+ DIFF => 'diff-index -R -p',
+ APPLY => sub { apply_patch 'apply', @_ },
+ APPLY_CHECK => 'apply',
+ FILTER => undef,
+ IS_REVERSE => 0,
+ },
);
$patch_mode = 'stage';
@@ -972,7 +986,11 @@
next;
}
if ($ofs_delta) {
- $n_ofs += $ofs_delta;
+ if ($patch_mode_flavour{IS_REVERSE}) {
+ $o_ofs -= $ofs_delta;
+ } else {
+ $n_ofs += $ofs_delta;
+ }
$_->{TEXT}->[0] = format_hunk_header($o_ofs, $o_cnt,
$n_ofs, $n_cnt);
}
@@ -1050,6 +1068,12 @@
checkout_nothead => N__(
"If the patch applies cleanly, the edited hunk will immediately be
marked for applying."),
+ worktree_head => N__(
+"If the patch applies cleanly, the edited hunk will immediately be
+marked for discarding."),
+ worktree_nothead => N__(
+"If the patch applies cleanly, the edited hunk will immediately be
+marked for applying."),
);
sub recount_edited_hunk {
@@ -1260,6 +1284,18 @@
q - quit; do not apply this hunk or any of the remaining ones
a - apply this hunk and all later hunks in the file
d - do not apply this hunk or any of the later hunks in the file"),
+ worktree_head => N__(
+"y - discard this hunk from worktree
+n - do not discard this hunk from worktree
+q - quit; do not discard this hunk or any of the remaining ones
+a - discard this hunk and all later hunks in the file
+d - do not discard this hunk or any of the later hunks in the file"),
+ worktree_nothead => N__(
+"y - apply this hunk to worktree
+n - do not apply this hunk to worktree
+q - quit; do not apply this hunk or any of the remaining ones
+a - apply this hunk and all later hunks in the file
+d - do not apply this hunk or any of the later hunks in the file"),
);
sub help_patch_cmd {
@@ -1421,6 +1457,16 @@
deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
},
+ worktree_head => {
+ mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
+ deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+ hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+ },
+ worktree_nothead => {
+ mode => N__("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
+ deletion => N__("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
+ hunk => N__("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
+ },
);
sub patch_update_file {
@@ -1756,6 +1802,16 @@
'checkout_head' : 'checkout_nothead');
$arg = shift @ARGV or die __("missing --");
}
+ } elsif ($1 eq 'worktree') {
+ $arg = shift @ARGV or die __("missing --");
+ if ($arg eq '--') {
+ $patch_mode = 'checkout_index';
+ } else {
+ $patch_mode_revision = $arg;
+ $patch_mode = ($arg eq 'HEAD' ?
+ 'worktree_head' : 'worktree_nothead');
+ $arg = shift @ARGV or die __("missing --");
+ }
} elsif ($1 eq 'stage' or $1 eq 'stash') {
$patch_mode = $1;
$arg = shift @ARGV or die __("missing --");
diff --git a/git-compat-util.h b/git-compat-util.h
index 29a1990..f0d13e4 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1,6 +1,15 @@
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
+#ifdef USE_MSVC_CRTDBG
+/*
+ * For these to work they must appear very early in each
+ * file -- before most of the standard header files.
+ */
+#include <stdlib.h>
+#include <crtdbg.h>
+#endif
+
#define _FILE_OFFSET_BITS 64
@@ -200,6 +209,7 @@
#include "compat/win32/path-utils.h"
#include "compat/mingw.h"
#elif defined(_MSC_VER)
+#include "compat/win32/path-utils.h"
#include "compat/msvc.h"
#else
#include <sys/utsname.h>
@@ -249,7 +259,7 @@
#ifdef MKDIR_WO_TRAILING_SLASH
#define mkdir(a,b) compat_mkdir_wo_trailing_slash((a),(b))
-extern int compat_mkdir_wo_trailing_slash(const char*, mode_t);
+int compat_mkdir_wo_trailing_slash(const char*, mode_t);
#endif
#ifdef NO_STRUCT_ITIMERVAL
@@ -267,9 +277,9 @@
#include <libgen.h>
#else
#define basename gitbasename
-extern char *gitbasename(char *);
+char *gitbasename(char *);
#define dirname gitdirname
-extern char *gitdirname(char *);
+char *gitdirname(char *);
#endif
#ifndef NO_ICONV
@@ -446,15 +456,15 @@
struct strbuf;
/* General helper functions */
-extern void vreportf(const char *prefix, const char *err, va_list params);
-extern NORETURN void usage(const char *err);
-extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
-extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
+void vreportf(const char *prefix, const char *err, va_list params);
+NORETURN void usage(const char *err);
+NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
+NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
+NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
+void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
#ifndef NO_OPENSSL
#ifdef APPLE_COMMON_CRYPTO
@@ -482,15 +492,15 @@
#define error_errno(...) (error_errno(__VA_ARGS__), const_error())
#endif
-extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
-extern void set_error_routine(void (*routine)(const char *err, va_list params));
+void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
+void set_error_routine(void (*routine)(const char *err, va_list params));
extern void (*get_error_routine(void))(const char *err, va_list params);
-extern void set_warn_routine(void (*routine)(const char *warn, va_list params));
+void set_warn_routine(void (*routine)(const char *warn, va_list params));
extern void (*get_warn_routine(void))(const char *warn, va_list params);
-extern void set_die_is_recursing_routine(int (*routine)(void));
+void set_die_is_recursing_routine(int (*routine)(void));
-extern int starts_with(const char *str, const char *prefix);
-extern int istarts_with(const char *str, const char *prefix);
+int starts_with(const char *str, const char *prefix);
+int istarts_with(const char *str, const char *prefix);
/*
* If the string "str" begins with the string found in "prefix", return 1.
@@ -613,8 +623,8 @@
#define mmap git_mmap
#define munmap git_munmap
-extern void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
-extern int git_munmap(void *start, size_t length);
+void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
+int git_munmap(void *start, size_t length);
#else /* NO_MMAP || USE_WIN32_MMAP */
@@ -668,17 +678,17 @@
#undef stat
#endif
#define stat(path, buf) git_stat(path, buf)
-extern int git_stat(const char *, struct stat *);
+int git_stat(const char *, struct stat *);
#ifdef fstat
#undef fstat
#endif
#define fstat(fd, buf) git_fstat(fd, buf)
-extern int git_fstat(int, struct stat *);
+int git_fstat(int, struct stat *);
#ifdef lstat
#undef lstat
#endif
#define lstat(path, buf) git_lstat(path, buf)
-extern int git_lstat(const char *, struct stat *);
+int git_lstat(const char *, struct stat *);
#endif
#define DEFAULT_PACKED_GIT_LIMIT \
@@ -686,50 +696,50 @@
#ifdef NO_PREAD
#define pread git_pread
-extern ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
+ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
#endif
/*
* Forward decl that will remind us if its twin in cache.h changes.
* This function is used in compat/pread.c. But we can't include
* cache.h there.
*/
-extern ssize_t read_in_full(int fd, void *buf, size_t count);
+ssize_t read_in_full(int fd, void *buf, size_t count);
#ifdef NO_SETENV
#define setenv gitsetenv
-extern int gitsetenv(const char *, const char *, int);
+int gitsetenv(const char *, const char *, int);
#endif
#ifdef NO_MKDTEMP
#define mkdtemp gitmkdtemp
-extern char *gitmkdtemp(char *);
+char *gitmkdtemp(char *);
#endif
#ifdef NO_UNSETENV
#define unsetenv gitunsetenv
-extern void gitunsetenv(const char *);
+void gitunsetenv(const char *);
#endif
#ifdef NO_STRCASESTR
#define strcasestr gitstrcasestr
-extern char *gitstrcasestr(const char *haystack, const char *needle);
+char *gitstrcasestr(const char *haystack, const char *needle);
#endif
#ifdef NO_STRLCPY
#define strlcpy gitstrlcpy
-extern size_t gitstrlcpy(char *, const char *, size_t);
+size_t gitstrlcpy(char *, const char *, size_t);
#endif
#ifdef NO_STRTOUMAX
#define strtoumax gitstrtoumax
-extern uintmax_t gitstrtoumax(const char *, char **, int);
+uintmax_t gitstrtoumax(const char *, char **, int);
#define strtoimax gitstrtoimax
-extern intmax_t gitstrtoimax(const char *, char **, int);
+intmax_t gitstrtoimax(const char *, char **, int);
#endif
#ifdef NO_HSTRERROR
#define hstrerror githstrerror
-extern const char *githstrerror(int herror);
+const char *githstrerror(int herror);
#endif
#ifdef NO_MEMMEM
@@ -761,7 +771,7 @@
# endif
# define fopen(a,b) git_fopen(a,b)
# endif
-extern FILE *git_fopen(const char*, const char*);
+FILE *git_fopen(const char*, const char*);
#endif
#ifdef SNPRINTF_RETURNS_BOGUS
@@ -769,14 +779,14 @@
#undef snprintf
#endif
#define snprintf git_snprintf
-extern int git_snprintf(char *str, size_t maxsize,
- const char *format, ...);
+int git_snprintf(char *str, size_t maxsize,
+ const char *format, ...);
#ifdef vsnprintf
#undef vsnprintf
#endif
#define vsnprintf git_vsnprintf
-extern int git_vsnprintf(char *str, size_t maxsize,
- const char *format, va_list ap);
+int git_vsnprintf(char *str, size_t maxsize,
+ const char *format, va_list ap);
#endif
#ifdef __GLIBC_PREREQ
@@ -805,12 +815,9 @@
#ifdef NO_PTHREADS
#define atexit git_atexit
-extern int git_atexit(void (*handler)(void));
+int git_atexit(void (*handler)(void));
#endif
-typedef void (*try_to_free_t)(size_t);
-extern try_to_free_t set_try_to_free_routine(try_to_free_t);
-
static inline size_t st_add(size_t a, size_t b)
{
if (unsigned_add_overflows(a, b))
@@ -845,28 +852,28 @@
# define xalloca(size) (xmalloc(size))
# define xalloca_free(p) (free(p))
#endif
-extern char *xstrdup(const char *str);
-extern void *xmalloc(size_t size);
-extern void *xmallocz(size_t size);
-extern void *xmallocz_gently(size_t size);
-extern void *xmemdupz(const void *data, size_t len);
-extern char *xstrndup(const char *str, size_t len);
-extern void *xrealloc(void *ptr, size_t size);
-extern void *xcalloc(size_t nmemb, size_t size);
-extern void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
-extern void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
-extern int xopen(const char *path, int flags, ...);
-extern ssize_t xread(int fd, void *buf, size_t len);
-extern ssize_t xwrite(int fd, const void *buf, size_t len);
-extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
-extern int xdup(int fd);
-extern FILE *xfopen(const char *path, const char *mode);
-extern FILE *xfdopen(int fd, const char *mode);
-extern int xmkstemp(char *temp_filename);
-extern int xmkstemp_mode(char *temp_filename, int mode);
-extern char *xgetcwd(void);
-extern FILE *fopen_for_writing(const char *path);
-extern FILE *fopen_or_warn(const char *path, const char *mode);
+char *xstrdup(const char *str);
+void *xmalloc(size_t size);
+void *xmallocz(size_t size);
+void *xmallocz_gently(size_t size);
+void *xmemdupz(const void *data, size_t len);
+char *xstrndup(const char *str, size_t len);
+void *xrealloc(void *ptr, size_t size);
+void *xcalloc(size_t nmemb, size_t size);
+void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
+void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
+int xopen(const char *path, int flags, ...);
+ssize_t xread(int fd, void *buf, size_t len);
+ssize_t xwrite(int fd, const void *buf, size_t len);
+ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
+int xdup(int fd);
+FILE *xfopen(const char *path, const char *mode);
+FILE *xfdopen(int fd, const char *mode);
+int xmkstemp(char *temp_filename);
+int xmkstemp_mode(char *temp_filename, int mode);
+char *xgetcwd(void);
+FILE *fopen_for_writing(const char *path);
+FILE *fopen_or_warn(const char *path, const char *mode);
/*
* FREE_AND_NULL(ptr) is like free(ptr) followed by ptr = NULL. Note
@@ -966,13 +973,13 @@
}
__attribute__((format (printf, 3, 4)))
-extern int xsnprintf(char *dst, size_t max, const char *fmt, ...);
+int xsnprintf(char *dst, size_t max, const char *fmt, ...);
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 256
#endif
-extern int xgethostname(char *buf, size_t len);
+int xgethostname(char *buf, size_t len);
/* in ctype.c, for kwset users */
extern const unsigned char tolower_trans_tbl[256];
@@ -1234,6 +1241,24 @@
#define getc_unlocked(fh) getc(fh)
#endif
+#ifdef FILENO_IS_A_MACRO
+int git_fileno(FILE *stream);
+# ifndef COMPAT_CODE_FILENO
+# undef fileno
+# define fileno(p) git_fileno(p)
+# endif
+#endif
+
+#ifdef NEED_ACCESS_ROOT_HANDLER
+int git_access(const char *path, int mode);
+# ifndef COMPAT_CODE_ACCESS
+# ifdef access
+# undef access
+# endif
+# define access(path, mode) git_access(path, mode)
+# endif
+#endif
+
/*
* Our code often opens a path to an optional file, to work on its
* contents when we can successfully open it. We can ignore a failure
@@ -1249,7 +1274,14 @@
return (errno_ == ENOENT || errno_ == ENOTDIR);
}
-extern int cmd_main(int, const char **);
+int cmd_main(int, const char **);
+
+/*
+ * Intercept all calls to exit() and route them to trace2 to
+ * optionally emit a message before calling the real exit().
+ */
+int trace2_cmd_exit_fl(const char *file, int line, int code);
+#define exit(code) exit(trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
/*
* You can mark a stack variable with UNLEAK(var) to avoid it being
@@ -1265,7 +1297,7 @@
* an annotation, and does nothing in non-leak-checking builds.
*/
#ifdef SUPPRESS_ANNOTATED_LEAKS
-extern void unleak_memory(const void *ptr, size_t len);
+void unleak_memory(const void *ptr, size_t len);
#define UNLEAK(var) unleak_memory(&(var), sizeof(var))
#else
#define UNLEAK(var) do {} while (0)
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index d13f02d..fc00d59 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -431,6 +431,7 @@
sub safe_pipe_capture {
my @output;
if (my $pid = open my $child, '-|') {
+ binmode($child, ":crlf");
@output = (<$child>);
close $child or die join(' ',@_).": $! $?";
} else {
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 7bfb673..46af3e6 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -71,7 +71,7 @@
then
merge_tool="$GIT_DIFF_TOOL"
else
- merge_tool="$(get_merge_tool)" || exit
+ merge_tool="$(get_merge_tool)"
fi
fi
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 5c5afa2..fea7964 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -83,6 +83,20 @@
finish_ident COMMITTER
}
+if test -z "$FILTER_BRANCH_SQUELCH_WARNING$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS"
+then
+ cat <<EOF
+WARNING: git-filter-branch has a glut of gotchas generating mangled history
+ rewrites. Hit Ctrl-C before proceeding to abort, then use an
+ alternative filtering tool such as 'git filter-repo'
+ (https://github.com/newren/git-filter-repo/) instead. See the
+ filter-branch manual page for more details; to squelch this warning,
+ set FILTER_BRANCH_SQUELCH_WARNING=1.
+EOF
+ sleep 10
+ printf "Proceeding with filter-branch...\n\n"
+fi
+
USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
[--tree-filter <command>] [--index-filter <command>]
[--parent-filter <command>] [--msg-filter <command>]
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 6de74ce..fd476b6 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1340,6 +1340,7 @@
set PARENT {}
set MERGE_HEAD [list]
set commit_type {}
+set commit_type_is_amend 0
set empty_tree {}
set current_branch {}
set is_detached 0
@@ -1347,8 +1348,9 @@
set is_3way_diff 0
set is_submodule_diff 0
set is_conflict_diff 0
-set selected_commit_type new
set diff_empty_count 0
+set last_revert {}
+set last_revert_enc {}
set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001"
@@ -1434,7 +1436,7 @@
}
proc force_amend {} {
- global selected_commit_type
+ global commit_type_is_amend
global HEAD PARENT MERGE_HEAD commit_type
repository_state newType newHEAD newMERGE_HEAD
@@ -1443,7 +1445,7 @@
set MERGE_HEAD $newMERGE_HEAD
set commit_type $newType
- set selected_commit_type amend
+ set commit_type_is_amend 1
do_select_commit_type
}
@@ -2494,7 +2496,7 @@
proc toggle_or_diff {mode w args} {
global file_states file_lists current_diff_path ui_index ui_workdir
- global last_clicked selected_paths
+ global last_clicked selected_paths file_lists_last_clicked
if {$mode eq "click"} {
foreach {x y} $args break
@@ -2551,6 +2553,8 @@
$ui_index tag remove in_sel 0.0 end
$ui_workdir tag remove in_sel 0.0 end
+ set file_lists_last_clicked($w) $path
+
# Determine the state of the file
if {[info exists file_states($path)]} {
set state [lindex $file_states($path) 0]
@@ -2664,6 +2668,32 @@
}
}
+proc focus_widget {widget} {
+ global file_lists last_clicked selected_paths
+ global file_lists_last_clicked
+
+ if {[llength $file_lists($widget)] > 0} {
+ set path $file_lists_last_clicked($widget)
+ set index [lsearch -sorted -exact $file_lists($widget) $path]
+ if {$index < 0} {
+ set index 0
+ set path [lindex $file_lists($widget) $index]
+ }
+
+ focus $widget
+ set last_clicked [list $widget [expr $index + 1]]
+ array unset selected_paths
+ set selected_paths($path) 1
+ show_diff $path $widget
+ }
+}
+
+proc toggle_commit_type {} {
+ global commit_type_is_amend
+ set commit_type_is_amend [expr !$commit_type_is_amend]
+ do_select_commit_type
+}
+
######################################################################
##
## ui construction
@@ -2852,19 +2882,11 @@
menu .mbar.commit
if {![is_enabled nocommit]} {
- .mbar.commit add radiobutton \
- -label [mc "New Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value new
- lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
-
- .mbar.commit add radiobutton \
+ .mbar.commit add checkbutton \
-label [mc "Amend Last Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value amend
+ -accelerator $M1T-E \
+ -variable commit_type_is_amend \
+ -command do_select_commit_type
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
@@ -3030,8 +3052,23 @@
wm protocol . WM_DELETE_WINDOW do_quit
bind all <$M1B-Key-q> do_quit
bind all <$M1B-Key-Q> do_quit
-bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
+
+set m1b_w_script {
+ set toplvl_win [winfo toplevel %W]
+
+ # If we are destroying the main window, we should call do_quit to take
+ # care of cleanup before exiting the program.
+ if {$toplvl_win eq "."} {
+ do_quit
+ } else {
+ destroy $toplvl_win
+ }
+}
+
+bind all <$M1B-Key-w> $m1b_w_script
+bind all <$M1B-Key-W> $m1b_w_script
+
+unset m1b_w_script
set subcommand_args {}
proc usage {} {
@@ -3337,18 +3374,10 @@
set ui_coml .vpane.lower.commarea.buffer.header.l
if {![is_enabled nocommit]} {
- ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
- -text [mc "New Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value new
- lappend disable_on_lock \
- [list .vpane.lower.commarea.buffer.header.new conf -state]
- ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
+ ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
-text [mc "Amend Last Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value amend
+ -variable commit_type_is_amend \
+ -command do_select_commit_type
lappend disable_on_lock \
[list .vpane.lower.commarea.buffer.header.amend conf -state]
}
@@ -3373,7 +3402,6 @@
if {![is_enabled nocommit]} {
pack .vpane.lower.commarea.buffer.header.amend -side right
- pack .vpane.lower.commarea.buffer.header.new -side right
}
textframe .vpane.lower.commarea.buffer.frame
@@ -3387,10 +3415,16 @@
-relief sunken \
-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
-font font_diff \
+ -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
+${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
+ -orient horizontal \
+ -command [list $ui_comm xview]
${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
+ -orient vertical \
-command [list $ui_comm yview]
+pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
pack $ui_comm -side left -fill y
pack .vpane.lower.commarea.buffer.header -side top -fill x
@@ -3606,16 +3640,32 @@
menu $ctxm -tearoff 0
$ctxm add command \
-label [mc "Apply/Reverse Hunk"] \
- -command {apply_hunk $cursorX $cursorY}
+ -command {apply_or_revert_hunk $cursorX $cursorY 0}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
$ctxm add command \
-label [mc "Apply/Reverse Line"] \
- -command {apply_range_or_line $cursorX $cursorY; do_rescan}
+ -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan}
set ui_diff_applyline [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
$ctxm add separator
$ctxm add command \
+ -label [mc "Revert Hunk"] \
+ -command {apply_or_revert_hunk $cursorX $cursorY 1}
+set ui_diff_reverthunk [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state]
+$ctxm add command \
+ -label [mc "Revert Line"] \
+ -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan}
+set ui_diff_revertline [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
+$ctxm add command \
+ -label [mc "Undo Last Revert"] \
+ -command {undo_last_revert; do_rescan}
+set ui_diff_undorevert [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state]
+$ctxm add separator
+$ctxm add command \
-label [mc "Show Less Context"] \
-command show_less_context
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
@@ -3693,7 +3743,7 @@
}
proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
- global current_diff_path file_states
+ global current_diff_path file_states last_revert
set ::cursorX $x
set ::cursorY $y
if {[info exists file_states($current_diff_path)]} {
@@ -3707,19 +3757,28 @@
tk_popup $ctxmsm $X $Y
} else {
set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
+ set u [mc "Undo Last Revert"]
if {$::ui_index eq $::current_diff_side} {
set l [mc "Unstage Hunk From Commit"]
+ set h [mc "Revert Hunk"]
+
if {$has_range} {
set t [mc "Unstage Lines From Commit"]
+ set r [mc "Revert Lines"]
} else {
set t [mc "Unstage Line From Commit"]
+ set r [mc "Revert Line"]
}
} else {
set l [mc "Stage Hunk For Commit"]
+ set h [mc "Revert Hunk"]
+
if {$has_range} {
set t [mc "Stage Lines For Commit"]
+ set r [mc "Revert Lines"]
} else {
set t [mc "Stage Line For Commit"]
+ set r [mc "Revert Line"]
}
}
if {$::is_3way_diff
@@ -3730,11 +3789,35 @@
|| [string match {T?} $state]
|| [has_textconv $current_diff_path]} {
set s disabled
+ set revert_state disabled
} else {
set s normal
+
+ # Only allow reverting changes in the working tree. If
+ # the user wants to revert changes in the index, they
+ # need to unstage those first.
+ if {$::ui_workdir eq $::current_diff_side} {
+ set revert_state normal
+ } else {
+ set revert_state disabled
+ }
}
+
+ if {$last_revert eq {}} {
+ set undo_state disabled
+ } else {
+ set undo_state normal
+ }
+
$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
$ctxm entryconf $::ui_diff_applyline -state $s -label $t
+ $ctxm entryconf $::ui_diff_revertline -state $revert_state \
+ -label $r
+ $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \
+ -label $h
+ $ctxm entryconf $::ui_diff_undorevert -state $undo_state \
+ -label $u
+
tk_popup $ctxm $X $Y
}
}
@@ -3861,6 +3944,8 @@
bind . <$M1B-Key-J> do_revert_selection
bind . <$M1B-Key-i> do_add_all
bind . <$M1B-Key-I> do_add_all
+bind . <$M1B-Key-e> toggle_commit_type
+bind . <$M1B-Key-E> toggle_commit_type
bind . <$M1B-Key-minus> {show_less_context;break}
bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
bind . <$M1B-Key-equal> {show_more_context;break}
@@ -3877,6 +3962,14 @@
}
unset i
+bind . <Alt-Key-1> {focus_widget $::ui_workdir}
+bind . <Alt-Key-2> {focus_widget $::ui_index}
+bind . <Alt-Key-3> {focus $::ui_diff}
+bind . <Alt-Key-4> {focus $::ui_comm}
+
+set file_lists_last_clicked($ui_index) {}
+set file_lists_last_clicked($ui_workdir) {}
+
set file_lists($ui_index) [list]
set file_lists($ui_workdir) [list]
diff --git a/git-gui/lib/checkout_op.tcl b/git-gui/lib/checkout_op.tcl
index 9e7412c..a522829 100644
--- a/git-gui/lib/checkout_op.tcl
+++ b/git-gui/lib/checkout_op.tcl
@@ -389,7 +389,7 @@
}
method _after_readtree {} {
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type HEAD MERGE_HEAD PARENT
global current_branch is_detached
global ui_comm
@@ -490,12 +490,12 @@
# amend mode our file lists are accurate and we can avoid
# the rescan.
#
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT
global ui_comm
unlock_index
set name [_name $this]
- set selected_commit_type new
+ set commit_type_is_amend 0
if {[string match amend* $commit_type]} {
$ui_comm delete 0.0 end
$ui_comm edit reset
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 75ea965..b516aa2 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -333,7 +333,7 @@
proc commit_committree {fd_wt curHEAD msg_p} {
global HEAD PARENT MERGE_HEAD commit_type commit_author
global current_branch
- global ui_comm selected_commit_type
+ global ui_comm commit_type_is_amend
global file_states selected_paths rescan_active
global repo_config
global env
@@ -467,8 +467,8 @@
# -- Update in memory status
#
- set selected_commit_type new
set commit_type normal
+ set commit_type_is_amend 0
set HEAD $cmt_id
set PARENT $cmt_id
set MERGE_HEAD [list]
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 68c4a6c..958a0fa 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -55,7 +55,7 @@
proc force_diff_encoding {enc} {
global current_diff_path
-
+
if {$current_diff_path ne {}} {
force_path_encoding $current_diff_path $enc
reshow_diff
@@ -567,24 +567,31 @@
}
}
-proc apply_hunk {x y} {
+proc apply_or_revert_hunk {x y revert} {
global current_diff_path current_diff_header current_diff_side
- global ui_diff ui_index file_states
+ global ui_diff ui_index file_states last_revert last_revert_enc
if {$current_diff_path eq {} || $current_diff_header eq {}} return
if {![lock_index apply_hunk]} return
- set apply_cmd {apply --cached --whitespace=nowarn}
+ set apply_cmd {apply --whitespace=nowarn}
set mi [lindex $file_states($current_diff_path) 0]
if {$current_diff_side eq $ui_index} {
set failed_msg [mc "Failed to unstage selected hunk."]
- lappend apply_cmd --reverse
+ lappend apply_cmd --reverse --cached
if {[string index $mi 0] ne {M}} {
unlock_index
return
}
} else {
- set failed_msg [mc "Failed to stage selected hunk."]
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected hunk."]
+ lappend apply_cmd --reverse
+ } else {
+ set failed_msg [mc "Failed to stage selected hunk."]
+ lappend apply_cmd --cached
+ }
+
if {[string index $mi 1] ne {M}} {
unlock_index
return
@@ -603,29 +610,40 @@
set e_lno end
}
+ set wholepatch "$current_diff_header[$ui_diff get $s_lno $e_lno]"
+
if {[catch {
set enc [get_path_encoding $current_diff_path]
set p [eval git_write $apply_cmd]
fconfigure $p -translation binary -encoding $enc
- puts -nonewline $p $current_diff_header
- puts -nonewline $p [$ui_diff get $s_lno $e_lno]
+ puts -nonewline $p $wholepatch
close $p} err]} {
error_popup "$failed_msg\n\n$err"
unlock_index
return
}
+ if {$revert} {
+ # Save a copy of this patch for undoing reverts.
+ set last_revert $wholepatch
+ set last_revert_enc $enc
+ }
+
$ui_diff conf -state normal
$ui_diff delete $s_lno $e_lno
$ui_diff conf -state disabled
+ # Check if the hunk was the last one in the file.
if {[$ui_diff get 1.0 end] eq "\n"} {
set o _
} else {
set o ?
}
- if {$current_diff_side eq $ui_index} {
+ # Update the status flags.
+ if {$revert} {
+ set mi [string index $mi 0]$o
+ } elseif {$current_diff_side eq $ui_index} {
set mi ${o}M
} elseif {[string index $mi 0] eq {_}} {
set mi M$o
@@ -640,9 +658,9 @@
}
}
-proc apply_range_or_line {x y} {
+proc apply_or_revert_range_or_line {x y revert} {
global current_diff_path current_diff_header current_diff_side
- global ui_diff ui_index file_states
+ global ui_diff ui_index file_states last_revert
set selected [$ui_diff tag nextrange sel 0.0]
@@ -660,19 +678,27 @@
if {$current_diff_path eq {} || $current_diff_header eq {}} return
if {![lock_index apply_hunk]} return
- set apply_cmd {apply --cached --whitespace=nowarn}
+ set apply_cmd {apply --whitespace=nowarn}
set mi [lindex $file_states($current_diff_path) 0]
if {$current_diff_side eq $ui_index} {
set failed_msg [mc "Failed to unstage selected line."]
set to_context {+}
- lappend apply_cmd --reverse
+ lappend apply_cmd --reverse --cached
if {[string index $mi 0] ne {M}} {
unlock_index
return
}
} else {
- set failed_msg [mc "Failed to stage selected line."]
- set to_context {-}
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected line."]
+ set to_context {+}
+ lappend apply_cmd --reverse
+ } else {
+ set failed_msg [mc "Failed to stage selected line."]
+ set to_context {-}
+ lappend apply_cmd --cached
+ }
+
if {[string index $mi 1] ne {M}} {
unlock_index
return
@@ -830,7 +856,47 @@
puts -nonewline $p $wholepatch
close $p} err]} {
error_popup "$failed_msg\n\n$err"
+ unlock_index
+ return
}
+ if {$revert} {
+ # Save a copy of this patch for undoing reverts.
+ set last_revert $current_diff_header$wholepatch
+ set last_revert_enc $enc
+ }
+
+ unlock_index
+}
+
+# Undo the last line/hunk reverted. When hunks and lines are reverted, a copy
+# of the diff applied is saved. Re-apply that diff to undo the revert.
+#
+# Right now, we only use a single variable to hold the copy, and not a
+# stack/deque for simplicity, so multiple undos are not possible. Maybe this
+# can be added if the need for something like this is felt in the future.
+proc undo_last_revert {} {
+ global last_revert current_diff_path current_diff_header
+ global last_revert_enc
+
+ if {$last_revert eq {}} return
+ if {![lock_index apply_hunk]} return
+
+ set apply_cmd {apply --whitespace=nowarn}
+ set failed_msg [mc "Failed to undo last revert."]
+
+ if {[catch {
+ set enc $last_revert_enc
+ set p [eval git_write $apply_cmd]
+ fconfigure $p -translation binary -encoding $enc
+ puts -nonewline $p $last_revert
+ close $p} err]} {
+ error_popup "$failed_msg\n\n$err"
+ unlock_index
+ return
+ }
+
+ set last_revert {}
+
unlock_index
}
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index b588db1..e07b7a3 100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
@@ -466,19 +466,19 @@
}
proc do_select_commit_type {} {
- global commit_type selected_commit_type
+ global commit_type commit_type_is_amend
- if {$selected_commit_type eq {new}
+ if {$commit_type_is_amend == 0
&& [string match amend* $commit_type]} {
create_new_commit
- } elseif {$selected_commit_type eq {amend}
+ } elseif {$commit_type_is_amend == 1
&& ![string match amend* $commit_type]} {
load_last_commit
# The amend request was rejected...
#
if {![string match amend* $commit_type]} {
- set selected_commit_type new
+ set commit_type_is_amend 0
}
}
}
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
deleted file mode 100755
index 8d6c9ac..0000000
--- a/git-legacy-rebase.sh
+++ /dev/null
@@ -1,776 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Junio C Hamano.
-#
-
-SUBDIRECTORY_OK=Yes
-OPTIONS_KEEPDASHDASH=
-OPTIONS_STUCKLONG=t
-OPTIONS_SPEC="\
-git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git rebase --continue | --abort | --skip | --edit-todo
---
- Available options are
-v,verbose! display a diffstat of what changed upstream
-q,quiet! be quiet. implies --no-stat
-autostash automatically stash/stash pop before and after
-fork-point use 'merge-base --fork-point' to refine upstream
-onto=! rebase onto given branch instead of upstream
-r,rebase-merges? try to rebase merges instead of skipping them
-p,preserve-merges! try to recreate merges instead of ignoring them
-s,strategy=! use the given merge strategy
-X,strategy-option=! pass the argument through to the merge strategy
-no-ff! cherry-pick all commits, even if unchanged
-f,force-rebase! cherry-pick all commits, even if unchanged
-m,merge! use merging strategies to rebase
-i,interactive! let the user edit the list of commits to rebase
-x,exec=! add exec lines after each commit of the editable list
-y=! same as --reschedule-failed-exec -x
-k,keep-empty preserve empty commits during rebase
-allow-empty-message allow rebasing commits with empty messages
-stat! display a diffstat of what changed upstream
-n,no-stat! do not show diffstat of what changed upstream
-verify allow pre-rebase hook to run
-rerere-autoupdate allow rerere to update index with resolved conflicts
-root! rebase all reachable commits up to the root(s)
-autosquash move commits that begin with squash!/fixup! under -i
-signoff add a Signed-off-by: line to each commit
-committer-date-is-author-date! passed to 'git am'
-ignore-date! passed to 'git am'
-whitespace=! passed to 'git apply'
-ignore-whitespace! passed to 'git apply'
-C=! passed to 'git apply'
-S,gpg-sign? GPG-sign commits
- Actions:
-continue! continue
-abort! abort and check out the original branch
-skip! skip current patch and continue
-edit-todo! edit the todo list during an interactive rebase
-quit! abort but keep HEAD where it is
-show-current-patch! show the patch file being applied or merged
-reschedule-failed-exec automatically reschedule failed exec commands
-"
-. git-sh-setup
-set_reflog_action rebase
-require_work_tree_exists
-cd_to_toplevel
-
-LF='
-'
-ok_to_skip_pre_rebase=
-
-squash_onto=
-unset onto
-unset restrict_revision
-cmd=
-strategy=
-strategy_opts=
-do_merge=
-merge_dir="$GIT_DIR"/rebase-merge
-apply_dir="$GIT_DIR"/rebase-apply
-verbose=
-diffstat=
-test "$(git config --bool rebase.stat)" = true && diffstat=t
-autostash="$(git config --bool rebase.autostash || echo false)"
-fork_point=auto
-git_am_opt=
-git_format_patch_opt=
-rebase_root=
-force_rebase=
-allow_rerere_autoupdate=
-# Non-empty if a rebase was in progress when 'git rebase' was invoked
-in_progress=
-# One of {am, merge, interactive}
-type=
-# One of {"$GIT_DIR"/rebase-apply, "$GIT_DIR"/rebase-merge}
-state_dir=
-# One of {'', continue, skip, abort}, as parsed from command line
-action=
-rebase_merges=
-rebase_cousins=
-preserve_merges=
-autosquash=
-keep_empty=
-allow_empty_message=--allow-empty-message
-signoff=
-reschedule_failed_exec=
-test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
-case "$(git config --bool commit.gpgsign)" in
-true) gpg_sign_opt=-S ;;
-*) gpg_sign_opt= ;;
-esac
-test "$(git config --bool rebase.reschedulefailedexec)" = "true" &&
-reschedule_failed_exec=--reschedule-failed-exec
-. git-rebase--common
-
-read_basic_state () {
- test -f "$state_dir/head-name" &&
- test -f "$state_dir/onto" &&
- head_name=$(cat "$state_dir"/head-name) &&
- onto=$(cat "$state_dir"/onto) &&
- # We always write to orig-head, but interactive rebase used to write to
- # head. Fall back to reading from head to cover for the case that the
- # user upgraded git with an ongoing interactive rebase.
- if test -f "$state_dir"/orig-head
- then
- orig_head=$(cat "$state_dir"/orig-head)
- else
- orig_head=$(cat "$state_dir"/head)
- fi &&
- test -f "$state_dir"/quiet && GIT_QUIET=t
- test -f "$state_dir"/verbose && verbose=t
- test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
- test -f "$state_dir"/strategy_opts &&
- strategy_opts="$(cat "$state_dir"/strategy_opts)"
- test -f "$state_dir"/allow_rerere_autoupdate &&
- allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)"
- test -f "$state_dir"/gpg_sign_opt &&
- gpg_sign_opt="$(cat "$state_dir"/gpg_sign_opt)"
- test -f "$state_dir"/signoff && {
- signoff="$(cat "$state_dir"/signoff)"
- force_rebase=t
- }
- test -f "$state_dir"/reschedule-failed-exec &&
- reschedule_failed_exec=t
-}
-
-finish_rebase () {
- rm -f "$(git rev-parse --git-path REBASE_HEAD)"
- apply_autostash &&
- { git gc --auto || true; } &&
- rm -rf "$state_dir"
-}
-
-run_interactive () {
- GIT_CHERRY_PICK_HELP="$resolvemsg"
- export GIT_CHERRY_PICK_HELP
-
- test -n "$keep_empty" && keep_empty="--keep-empty"
- test -n "$rebase_merges" && rebase_merges="--rebase-merges"
- test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins"
- test -n "$autosquash" && autosquash="--autosquash"
- test -n "$verbose" && verbose="--verbose"
- test -n "$force_rebase" && force_rebase="--no-ff"
- test -n "$restrict_revision" && \
- restrict_revision="--restrict-revision=^$restrict_revision"
- test -n "$upstream" && upstream="--upstream=$upstream"
- test -n "$onto" && onto="--onto=$onto"
- test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto"
- test -n "$onto_name" && onto_name="--onto-name=$onto_name"
- test -n "$head_name" && head_name="--head-name=$head_name"
- test -n "$strategy" && strategy="--strategy=$strategy"
- test -n "$strategy_opts" && strategy_opts="--strategy-opts=$strategy_opts"
- test -n "$switch_to" && switch_to="--switch-to=$switch_to"
- test -n "$cmd" && cmd="--cmd=$cmd"
- test -n "$action" && action="--$action"
-
- exec git rebase--interactive "$action" "$keep_empty" "$rebase_merges" "$rebase_cousins" \
- "$upstream" "$onto" "$squash_onto" "$restrict_revision" \
- "$allow_empty_message" "$autosquash" "$verbose" \
- "$force_rebase" "$onto_name" "$head_name" "$strategy" \
- "$strategy_opts" "$cmd" "$switch_to" \
- "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" \
- "$reschedule_failed_exec"
-}
-
-run_specific_rebase () {
- if [ "$interactive_rebase" = implied ]; then
- GIT_SEQUENCE_EDITOR=:
- export GIT_SEQUENCE_EDITOR
- autosquash=
- fi
-
- if test -n "$interactive_rebase" -a -z "$preserve_merges"
- then
- run_interactive
- else
- . git-rebase--$type
-
- if test -z "$preserve_merges"
- then
- git_rebase__$type
- else
- git_rebase__preserve_merges
- fi
- fi
-
- ret=$?
- if test $ret -eq 0
- then
- finish_rebase
- elif test $ret -eq 2 # special exit status for rebase -p
- then
- apply_autostash &&
- rm -rf "$state_dir" &&
- die "Nothing to do"
- fi
- exit $ret
-}
-
-run_pre_rebase_hook () {
- if test -z "$ok_to_skip_pre_rebase" &&
- test -x "$(git rev-parse --git-path hooks/pre-rebase)"
- then
- "$(git rev-parse --git-path hooks/pre-rebase)" ${1+"$@"} ||
- die "$(gettext "The pre-rebase hook refused to rebase.")"
- fi
-}
-
-test -f "$apply_dir"/applying &&
- die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
-
-if test -d "$apply_dir"
-then
- type=am
- state_dir="$apply_dir"
-elif test -d "$merge_dir"
-then
- type=interactive
- if test -d "$merge_dir"/rewritten
- then
- type=preserve-merges
- interactive_rebase=explicit
- preserve_merges=t
- elif test -f "$merge_dir"/interactive
- then
- interactive_rebase=explicit
- fi
- state_dir="$merge_dir"
-fi
-test -n "$type" && in_progress=t
-
-total_argc=$#
-while test $# != 0
-do
- case "$1" in
- --no-verify)
- ok_to_skip_pre_rebase=yes
- ;;
- --verify)
- ok_to_skip_pre_rebase=
- ;;
- --continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
- test $total_argc -eq 2 || usage
- action=${1##--}
- ;;
- --onto=*)
- onto="${1#--onto=}"
- ;;
- --exec=*)
- cmd="${cmd}exec ${1#--exec=}${LF}"
- test -z "$interactive_rebase" && interactive_rebase=implied
- ;;
- -y*)
- reschedule_failed_exec=--reschedule-failed-exec
- cmd="${cmd}exec ${1#-y}${LF}"
- test -z "$interactive_rebase" && interactive_rebase=implied
- ;;
- --interactive)
- interactive_rebase=explicit
- ;;
- --keep-empty)
- keep_empty=yes
- ;;
- --allow-empty-message)
- allow_empty_message=--allow-empty-message
- ;;
- --no-keep-empty)
- keep_empty=
- ;;
- --rebase-merges)
- rebase_merges=t
- test -z "$interactive_rebase" && interactive_rebase=implied
- ;;
- --rebase-merges=*)
- rebase_merges=t
- case "${1#*=}" in
- rebase-cousins) rebase_cousins=t;;
- no-rebase-cousins) rebase_cousins=;;
- *) die "Unknown mode: $1";;
- esac
- test -z "$interactive_rebase" && interactive_rebase=implied
- ;;
- --preserve-merges)
- preserve_merges=t
- test -z "$interactive_rebase" && interactive_rebase=implied
- ;;
- --autosquash)
- autosquash=t
- ;;
- --no-autosquash)
- autosquash=
- ;;
- --fork-point)
- fork_point=t
- ;;
- --no-fork-point)
- fork_point=
- ;;
- --merge)
- do_merge=t
- ;;
- --strategy-option=*)
- strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)"
- do_merge=t
- test -z "$strategy" && strategy=recursive
- ;;
- --strategy=*)
- strategy="${1#--strategy=}"
- do_merge=t
- ;;
- --no-stat)
- diffstat=
- ;;
- --stat)
- diffstat=t
- ;;
- --autostash)
- autostash=true
- ;;
- --no-autostash)
- autostash=false
- ;;
- --verbose)
- verbose=t
- diffstat=t
- GIT_QUIET=
- ;;
- --quiet)
- GIT_QUIET=t
- git_am_opt="$git_am_opt -q"
- verbose=
- diffstat=
- ;;
- --whitespace=*)
- git_am_opt="$git_am_opt --whitespace=${1#--whitespace=}"
- case "${1#--whitespace=}" in
- fix|strip)
- force_rebase=t
- ;;
- warn|nowarn|error|error-all)
- ;; # okay, known whitespace option
- *)
- die "fatal: Invalid whitespace option: '${1#*=}'"
- ;;
- esac
- ;;
- --ignore-whitespace)
- git_am_opt="$git_am_opt $1"
- ;;
- --signoff)
- signoff=--signoff
- ;;
- --no-signoff)
- signoff=
- ;;
- --committer-date-is-author-date|--ignore-date)
- git_am_opt="$git_am_opt $1"
- force_rebase=t
- ;;
- -C*[!0-9]*)
- die "fatal: switch \`C' expects a numerical value"
- ;;
- -C*)
- git_am_opt="$git_am_opt $1"
- ;;
- --root)
- rebase_root=t
- ;;
- --force-rebase|--no-ff)
- force_rebase=t
- ;;
- --rerere-autoupdate|--no-rerere-autoupdate)
- allow_rerere_autoupdate="$1"
- ;;
- --gpg-sign)
- gpg_sign_opt=-S
- ;;
- --gpg-sign=*)
- gpg_sign_opt="-S${1#--gpg-sign=}"
- ;;
- --reschedule-failed-exec)
- reschedule_failed_exec=--reschedule-failed-exec
- ;;
- --no-reschedule-failed-exec)
- reschedule_failed_exec=
- ;;
- --)
- shift
- break
- ;;
- *)
- usage
- ;;
- esac
- shift
-done
-test $# -gt 2 && usage
-
-if test -n "$action"
-then
- test -z "$in_progress" && die "$(gettext "No rebase in progress?")"
- # Only interactive rebase uses detailed reflog messages
- if test -n "$interactive_rebase" && test "$GIT_REFLOG_ACTION" = rebase
- then
- GIT_REFLOG_ACTION="rebase -i ($action)"
- export GIT_REFLOG_ACTION
- fi
-fi
-
-if test "$action" = "edit-todo" && test -z "$interactive_rebase"
-then
- die "$(gettext "The --edit-todo action can only be used during interactive rebase.")"
-fi
-
-case "$action" in
-continue)
- # Sanity check
- git rev-parse --verify HEAD >/dev/null ||
- die "$(gettext "Cannot read HEAD")"
- git update-index --ignore-submodules --refresh &&
- git diff-files --quiet --ignore-submodules || {
- echo "$(gettext "You must edit all merge conflicts and then
-mark them as resolved using git add")"
- exit 1
- }
- read_basic_state
- run_specific_rebase
- ;;
-skip)
- output git reset --hard HEAD || exit $?
- read_basic_state
- run_specific_rebase
- ;;
-abort)
- git rerere clear
- read_basic_state
- case "$head_name" in
- refs/*)
- git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
- die "$(eval_gettext "Could not move back to \$head_name")"
- ;;
- esac
- output git reset --hard $orig_head
- finish_rebase
- exit
- ;;
-quit)
- exec rm -rf "$state_dir"
- ;;
-edit-todo)
- run_specific_rebase
- ;;
-show-current-patch)
- run_specific_rebase
- die "BUG: run_specific_rebase is not supposed to return here"
- ;;
-esac
-
-# Make sure no rebase is in progress
-if test -n "$in_progress"
-then
- state_dir_base=${state_dir##*/}
- cmd_live_rebase="git rebase (--continue | --abort | --skip)"
- cmd_clear_stale_rebase="rm -fr \"$state_dir\""
- die "
-$(eval_gettext 'It seems that there is already a $state_dir_base directory, and
-I wonder if you are in the middle of another rebase. If that is the
-case, please try
- $cmd_live_rebase
-If that is not the case, please
- $cmd_clear_stale_rebase
-and run me again. I am stopping in case you still have something
-valuable there.')"
-fi
-
-if test -n "$rebase_root" && test -z "$onto"
-then
- test -z "$interactive_rebase" && interactive_rebase=implied
-fi
-
-if test -n "$keep_empty"
-then
- test -z "$interactive_rebase" && interactive_rebase=implied
-fi
-
-actually_interactive=
-if test -n "$interactive_rebase"
-then
- if test -z "$preserve_merges"
- then
- type=interactive
- else
- type=preserve-merges
- fi
- actually_interactive=t
- state_dir="$merge_dir"
-elif test -n "$do_merge"
-then
- interactive_rebase=implied
- type=interactive
- state_dir="$merge_dir"
-else
- type=am
- state_dir="$apply_dir"
-fi
-
-if test -t 2 && test -z "$GIT_QUIET"
-then
- git_format_patch_opt="$git_format_patch_opt --progress"
-fi
-
-incompatible_opts=$(echo " $git_am_opt " | \
- sed -e 's/ -q / /g' -e 's/^ \(.*\) $/\1/')
-if test -n "$incompatible_opts"
-then
- if test -n "$actually_interactive" || test "$do_merge"
- then
- die "$(gettext "fatal: cannot combine am options with either interactive or merge options")"
- fi
-fi
-
-if test -n "$signoff"
-then
- test -n "$preserve_merges" &&
- die "$(gettext "fatal: cannot combine '--signoff' with '--preserve-merges'")"
- git_am_opt="$git_am_opt $signoff"
- force_rebase=t
-fi
-
-if test -n "$preserve_merges"
-then
- # Note: incompatibility with --signoff handled in signoff block above
- # Note: incompatibility with --interactive is just a strong warning;
- # git-rebase.txt caveats with "unless you know what you are doing"
- test -n "$rebase_merges" &&
- die "$(gettext "fatal: cannot combine '--preserve-merges' with '--rebase-merges'")"
-
- test -n "$reschedule_failed_exec" &&
- die "$(gettext "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'")"
-fi
-
-if test -n "$rebase_merges"
-then
- test -n "$strategy_opts" &&
- die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy-option'")"
- test -n "$strategy" &&
- die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy'")"
-fi
-
-if test -z "$rebase_root"
-then
- case "$#" in
- 0)
- if ! upstream_name=$(git rev-parse --symbolic-full-name \
- --verify -q @{upstream} 2>/dev/null)
- then
- . git-parse-remote
- error_on_missing_default_upstream "rebase" "rebase" \
- "against" "git rebase $(gettext '<branch>')"
- fi
-
- test "$fork_point" = auto && fork_point=t
- ;;
- *) upstream_name="$1"
- if test "$upstream_name" = "-"
- then
- upstream_name="@{-1}"
- fi
- shift
- ;;
- esac
- upstream=$(peel_committish "${upstream_name}") ||
- die "$(eval_gettext "invalid upstream '\$upstream_name'")"
- upstream_arg="$upstream_name"
-else
- if test -z "$onto"
- then
- empty_tree=$(git hash-object -t tree /dev/null)
- onto=$(git commit-tree $empty_tree </dev/null)
- squash_onto="$onto"
- fi
- unset upstream_name
- unset upstream
- test $# -gt 1 && usage
- upstream_arg=--root
-fi
-
-# Make sure the branch to rebase onto is valid.
-onto_name=${onto-"$upstream_name"}
-case "$onto_name" in
-*...*)
- if left=${onto_name%...*} right=${onto_name#*...} &&
- onto=$(git merge-base --all ${left:-HEAD} ${right:-HEAD})
- then
- case "$onto" in
- ?*"$LF"?*)
- die "$(eval_gettext "\$onto_name: there are more than one merge bases")"
- ;;
- '')
- die "$(eval_gettext "\$onto_name: there is no merge base")"
- ;;
- esac
- else
- die "$(eval_gettext "\$onto_name: there is no merge base")"
- fi
- ;;
-*)
- onto=$(peel_committish "$onto_name") ||
- die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"
- ;;
-esac
-
-# If the branch to rebase is given, that is the branch we will rebase
-# $branch_name -- branch/commit being rebased, or HEAD (already detached)
-# $orig_head -- commit object name of tip of the branch before rebasing
-# $head_name -- refs/heads/<that-branch> or "detached HEAD"
-switch_to=
-case "$#" in
-1)
- # Is it "rebase other $branchname" or "rebase other $commit"?
- branch_name="$1"
- switch_to="$1"
-
- # Is it a local branch?
- if git show-ref --verify --quiet -- "refs/heads/$branch_name" &&
- orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name")
- then
- head_name="refs/heads/$branch_name"
- # If not is it a valid ref (branch or commit)?
- elif orig_head=$(git rev-parse -q --verify "$branch_name")
- then
- head_name="detached HEAD"
-
- else
- die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")"
- fi
- ;;
-0)
- # Do not need to switch branches, we are already on it.
- if branch_name=$(git symbolic-ref -q HEAD)
- then
- head_name=$branch_name
- branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)')
- else
- head_name="detached HEAD"
- branch_name=HEAD
- fi
- orig_head=$(git rev-parse --verify HEAD) || exit
- ;;
-*)
- die "BUG: unexpected number of arguments left to parse"
- ;;
-esac
-
-if test "$fork_point" = t
-then
- new_upstream=$(git merge-base --fork-point "$upstream_name" \
- "${switch_to:-HEAD}")
- if test -n "$new_upstream"
- then
- restrict_revision=$new_upstream
- fi
-fi
-
-if test "$autostash" = true && ! (require_clean_work_tree) 2>/dev/null
-then
- stash_sha1=$(git stash create "autostash") ||
- die "$(gettext 'Cannot autostash')"
-
- mkdir -p "$state_dir" &&
- echo $stash_sha1 >"$state_dir/autostash" &&
- stash_abbrev=$(git rev-parse --short $stash_sha1) &&
- echo "$(eval_gettext 'Created autostash: $stash_abbrev')" &&
- git reset --hard
-fi
-
-require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")"
-
-# Now we are rebasing commits $upstream..$orig_head (or with --root,
-# everything leading up to $orig_head) on top of $onto
-
-# Check if we are already based on $onto with linear history,
-# but this should be done only when upstream and onto are the same
-# and if this is not an interactive rebase.
-mb=$(git merge-base "$onto" "$orig_head")
-if test -z "$actually_interactive" && test "$upstream" = "$onto" &&
- test "$mb" = "$onto" && test -z "$restrict_revision" &&
- # linear history?
- ! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null
-then
- if test -z "$force_rebase"
- then
- # Lazily switch to the target branch if needed...
- test -z "$switch_to" ||
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
- git checkout -q "$switch_to" --
- if test "$branch_name" = "HEAD" &&
- ! git symbolic-ref -q HEAD
- then
- say "$(eval_gettext "HEAD is up to date.")"
- else
- say "$(eval_gettext "Current branch \$branch_name is up to date.")"
- fi
- finish_rebase
- exit 0
- else
- if test "$branch_name" = "HEAD" &&
- ! git symbolic-ref -q HEAD
- then
- say "$(eval_gettext "HEAD is up to date, rebase forced.")"
- else
- say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
- fi
- fi
-fi
-
-# If a hook exists, give it a chance to interrupt
-run_pre_rebase_hook "$upstream_arg" "$@"
-
-if test -n "$diffstat"
-then
- if test -n "$verbose"
- then
- if test -z "$mb"
- then
- echo "$(eval_gettext "Changes to \$onto:")"
- else
- echo "$(eval_gettext "Changes from \$mb to \$onto:")"
- fi
- fi
- mb_tree="${mb:-$(git hash-object -t tree /dev/null)}"
- # We want color (if set), but no pager
- GIT_PAGER='' git diff --stat --summary "$mb_tree" "$onto"
-fi
-
-if test -z "$actually_interactive" && test "$mb" = "$orig_head"
-then
- say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
- git checkout -q "$onto^0" || die "could not detach HEAD"
- # If the $onto is a proper descendant of the tip of the branch, then
- # we just fast-forwarded.
- git update-ref ORIG_HEAD $orig_head
- move_to_original_branch
- finish_rebase
- exit 0
-fi
-
-test -n "$interactive_rebase" && run_specific_rebase
-
-# Detach HEAD and reset the tree
-say "$(gettext "First, rewinding head to replay your work on top of it...")"
-
-GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
- git checkout -q "$onto^0" || die "could not detach HEAD"
-git update-ref ORIG_HEAD $orig_head
-
-if test -n "$rebase_root"
-then
- revisions="$onto..$orig_head"
-else
- revisions="${restrict_revision-$upstream}..$orig_head"
-fi
-
-run_specific_rebase
diff --git a/git-stash.sh b/git-legacy-stash.sh
similarity index 97%
rename from git-stash.sh
rename to git-legacy-stash.sh
index 789ce2f..f60e9b3 100755
--- a/git-stash.sh
+++ b/git-legacy-stash.sh
@@ -80,6 +80,28 @@
fi
}
+maybe_quiet () {
+ case "$1" in
+ --keep-stdout)
+ shift
+ if test -n "$GIT_QUIET"
+ then
+ "$@" 2>/dev/null
+ else
+ "$@"
+ fi
+ ;;
+ *)
+ if test -n "$GIT_QUIET"
+ then
+ "$@" >/dev/null 2>&1
+ else
+ "$@"
+ fi
+ ;;
+ esac
+}
+
create_stash () {
prepare_fallback_ident
@@ -112,15 +134,18 @@
done
git update-index -q --refresh
- if no_changes "$@"
+ if maybe_quiet no_changes "$@"
then
exit 0
fi
# state of the base commit
- if b_commit=$(git rev-parse --verify HEAD)
+ if b_commit=$(maybe_quiet --keep-stdout git rev-parse --verify HEAD)
then
head=$(git rev-list --oneline -n 1 HEAD --)
+ elif test -n "$GIT_QUIET"
+ then
+ exit 1
else
die "$(gettext "You do not have the initial commit yet")"
fi
@@ -315,7 +340,7 @@
test -n "$untracked" || git ls-files --error-unmatch -- "$@" >/dev/null || exit 1
git update-index -q --refresh
- if no_changes "$@"
+ if maybe_quiet no_changes "$@"
then
say "$(gettext "No local changes to save")"
exit 0
@@ -370,6 +395,9 @@
while test $# != 0
do
case "$1" in
+ -q|--quiet)
+ GIT_QUIET=t
+ ;;
--)
shift
break
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 83bf524..204a5ac 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -80,14 +80,18 @@
}
}
-diff_mode() {
+diff_mode () {
test "$TOOL_MODE" = diff
}
-merge_mode() {
+merge_mode () {
test "$TOOL_MODE" = merge
}
+gui_mode () {
+ test "$GIT_MERGETOOL_GUI" = true
+}
+
translate_merge_tool_path () {
echo "$1"
}
@@ -279,6 +283,7 @@
fi
tools="$tools gvimdiff diffuse diffmerge ecmerge"
tools="$tools p4merge araxis bc codecompare"
+ tools="$tools smerge"
fi
case "${VISUAL:-$EDITOR}" in
*vim*)
@@ -350,20 +355,36 @@
}
get_configured_merge_tool () {
- # If first argument is true, find the guitool instead
- if test "$1" = true
- then
- gui_prefix=gui
- fi
-
- # Diff mode first tries diff.(gui)tool and falls back to merge.(gui)tool.
- # Merge mode only checks merge.(gui)tool
+ keys=
if diff_mode
then
- merge_tool=$(git config diff.${gui_prefix}tool || git config merge.${gui_prefix}tool)
+ if gui_mode
+ then
+ keys="diff.guitool merge.guitool diff.tool merge.tool"
+ else
+ keys="diff.tool merge.tool"
+ fi
else
- merge_tool=$(git config merge.${gui_prefix}tool)
+ if gui_mode
+ then
+ keys="merge.guitool merge.tool"
+ else
+ keys="merge.tool"
+ fi
fi
+
+ merge_tool=$(
+ IFS=' '
+ for key in $keys
+ do
+ selected=$(git config $key)
+ if test -n "$selected"
+ then
+ echo "$selected"
+ return
+ fi
+ done)
+
if test -n "$merge_tool" && ! valid_tool "$merge_tool"
then
echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool"
@@ -403,14 +424,17 @@
}
get_merge_tool () {
+ is_guessed=false
# Check if a merge tool has been configured
merge_tool=$(get_configured_merge_tool)
# Try to guess an appropriate merge tool if no tool has been set.
if test -z "$merge_tool"
then
merge_tool=$(guess_merge_tool) || exit
+ is_guessed=true
fi
echo "$merge_tool"
+ test "$is_guessed" = false
}
mergetool_find_win32_cmd () {
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 01b9ad5..e3f6d54 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -228,9 +228,8 @@
}
checkout_staged_file () {
- tmpfile=$(expr \
- "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
- : '\([^ ]*\) ')
+ tmpfile="$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" &&
+ tmpfile=${tmpfile%%' '*}
if test $? -eq 0 && test -n "$tmpfile"
then
@@ -255,13 +254,16 @@
return 1
fi
- if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$')
- then
- ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$')
- else
+ # extract file extension from the last path component
+ case "${MERGED##*/}" in
+ *.*)
+ ext=.${MERGED##*.}
+ BASE=${MERGED%"$ext"}
+ ;;
+ *)
BASE=$MERGED
ext=
- fi
+ esac
mergetool_tmpdir_init
@@ -277,15 +279,30 @@
REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
- base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
- local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
- remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')
+ base_mode= local_mode= remote_mode=
+
+ # here, $IFS is just a LF
+ for line in $f
+ do
+ mode=${line%% *} # 1st word
+ sha1=${line#"$mode "}
+ sha1=${sha1%% *} # 2nd word
+ case "${line#$mode $sha1 }" in # remainder
+ '1 '*)
+ base_mode=$mode
+ ;;
+ '2 '*)
+ local_mode=$mode local_sha1=$sha1
+ ;;
+ '3 '*)
+ remote_mode=$mode remote_sha1=$sha1
+ ;;
+ esac
+ done
if is_submodule "$local_mode" || is_submodule "$remote_mode"
then
echo "Submodule merge conflict for '$MERGED':"
- local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
- remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
describe_file "$local_mode" "local" "$local_sha1"
describe_file "$remote_mode" "remote" "$remote_sha1"
resolve_submodule_merge
@@ -389,7 +406,7 @@
main () {
prompt=$(git config --bool mergetool.prompt)
- gui_tool=false
+ GIT_MERGETOOL_GUI=false
guessed_merge_tool=false
orderfile=
@@ -406,7 +423,7 @@
-t|--tool*)
case "$#,$1" in
*,*=*)
- merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)')
+ merge_tool=${1#*=}
;;
1,*)
usage ;;
@@ -416,10 +433,10 @@
esac
;;
--no-gui)
- gui_tool=false
+ GIT_MERGETOOL_GUI=false
;;
-g|--gui)
- gui_tool=true
+ GIT_MERGETOOL_GUI=true
;;
-y|--no-prompt)
prompt=false
@@ -449,12 +466,8 @@
if test -z "$merge_tool"
then
- # Check if a merge tool has been configured
- merge_tool=$(get_configured_merge_tool $gui_tool)
- # Try to guess an appropriate merge tool if no tool has been set.
- if test -z "$merge_tool"
+ if ! merge_tool=$(get_merge_tool)
then
- merge_tool=$(guess_merge_tool) || exit
guessed_merge_tool=true
fi
fi
diff --git a/git-p4.py b/git-p4.py
index 5b79920..3991e7d 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -737,7 +737,7 @@
## fixme: title is first line of commit, not 1st paragraph.
foundTitle = False
- for log in read_pipe_lines("git cat-file commit %s" % commit):
+ for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
if not foundTitle:
if len(log) == 1:
foundTitle = True
@@ -1309,14 +1309,14 @@
class Command:
delete_actions = ( "delete", "move/delete", "purge" )
- add_actions = ( "add", "move/add" )
+ add_actions = ( "add", "branch", "move/add" )
def __init__(self):
self.usage = "usage: %prog [options]"
self.needsGit = True
self.verbose = False
- # This is required for the "append" cloneExclude action
+ # This is required for the "append" update_shelve action
def ensure_value(self, attr, value):
if not hasattr(self, attr) or getattr(self, attr) is None:
setattr(self, attr, value)
@@ -2530,6 +2530,11 @@
die( "Error: %s is not found in client spec path" % depot_path )
return ""
+def cloneExcludeCallback(option, opt_str, value, parser):
+ # prepend "/" because the first "/" was consumed as part of the option itself.
+ # ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
+ parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
+
class P4Sync(Command, P4UserMap):
def __init__(self):
@@ -2553,7 +2558,7 @@
optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
help="Only sync files that are included in the Perforce Client Spec"),
optparse.make_option("-/", dest="cloneExclude",
- action="append", type="string",
+ action="callback", callback=cloneExcludeCallback, type="string",
help="exclude depot path"),
]
self.description = """Imports from Perforce into a git repository.\n
@@ -2618,20 +2623,25 @@
if self.verbose:
print("checkpoint finished: " + out)
+ def isPathWanted(self, path):
+ for p in self.cloneExclude:
+ if p.endswith("/"):
+ if p4PathStartsWith(path, p):
+ return False
+ # "-//depot/file1" without a trailing "/" should only exclude "file1", but not "file111" or "file1_dir/file2"
+ elif path.lower() == p.lower():
+ return False
+ for p in self.depotPaths:
+ if p4PathStartsWith(path, p):
+ return True
+ return False
+
def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
- self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
- for path in self.cloneExclude]
files = []
fnum = 0
while "depotFile%s" % fnum in commit:
path = commit["depotFile%s" % fnum]
-
- if [p for p in self.cloneExclude
- if p4PathStartsWith(path, p)]:
- found = False
- else:
- found = [p for p in self.depotPaths
- if p4PathStartsWith(path, p)]
+ found = self.isPathWanted(path)
if not found:
fnum = fnum + 1
continue
@@ -2668,7 +2678,7 @@
path = self.clientSpecDirs.map_in_client(path)
if self.detectBranches:
for b in self.knownBranches:
- if path.startswith(b + "/"):
+ if p4PathStartsWith(path, b + "/"):
path = path[len(b)+1:]
elif self.keepRepoPath:
@@ -2700,8 +2710,7 @@
fnum = 0
while "depotFile%s" % fnum in commit:
path = commit["depotFile%s" % fnum]
- found = [p for p in self.depotPaths
- if p4PathStartsWith(path, p)]
+ found = self.isPathWanted(path)
if not found:
fnum = fnum + 1
continue
@@ -2723,7 +2732,7 @@
for branch in self.knownBranches.keys():
# add a trailing slash so that a commit into qt/4.2foo
# doesn't end up in qt/4.2, e.g.
- if relPath.startswith(branch + "/"):
+ if p4PathStartsWith(relPath, branch + "/"):
if branch not in branches:
branches[branch] = []
branches[branch].append(file)
@@ -3325,7 +3334,9 @@
if currentChange < change:
earliestCommit = "^%s" % next
else:
- latestCommit = "%s" % next
+ if next == latestCommit:
+ die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change))
+ latestCommit = "%s^@" % next
return ""
@@ -3888,7 +3899,6 @@
self.cloneDestination = depotPaths[-1]
depotPaths = depotPaths[:-1]
- self.cloneExclude = ["/"+p for p in self.cloneExclude]
for p in depotPaths:
if not p.startswith("//"):
sys.stderr.write('Depot paths must start with "//": %s\n' % p)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
deleted file mode 100644
index 6416716..0000000
--- a/git-rebase--am.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-# This shell script fragment is sourced by git-rebase to implement
-# its default, fast, patch-based, non-interactive mode.
-#
-# Copyright (c) 2010 Junio C Hamano.
-#
-
-git_rebase__am () {
-
-case "$action" in
-continue)
- git am --resolved --resolvemsg="$resolvemsg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} &&
- move_to_original_branch
- return
- ;;
-skip)
- git am --skip --resolvemsg="$resolvemsg" &&
- move_to_original_branch
- return
- ;;
-show-current-patch)
- exec git am --show-current-patch
- ;;
-esac
-
-if test -z "$rebase_root"
- # this is now equivalent to ! -z "$upstream"
-then
- revisions=$upstream...$orig_head
-else
- revisions=$onto...$orig_head
-fi
-
-ret=0
-rm -f "$GIT_DIR/rebased-patches"
-
-git format-patch -k --stdout --full-index --cherry-pick --right-only \
- --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
- --pretty=mboxrd --topo-order \
- $git_format_patch_opt \
- "$revisions" ${restrict_revision+^$restrict_revision} \
- >"$GIT_DIR/rebased-patches"
-ret=$?
-
-if test 0 != $ret
-then
- rm -f "$GIT_DIR/rebased-patches"
- case "$head_name" in
- refs/heads/*)
- git checkout -q "$head_name"
- ;;
- *)
- git checkout -q "$orig_head"
- ;;
- esac
-
- cat >&2 <<-EOF
-
- git encountered an error while preparing the patches to replay
- these revisions:
-
- $revisions
-
- As a result, git cannot rebase them.
- EOF
- return $ret
-fi
-
-git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
- --patch-format=mboxrd \
- $allow_rerere_autoupdate \
- ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
-ret=$?
-
-rm -f "$GIT_DIR/rebased-patches"
-
-if test 0 != $ret
-then
- test -d "$state_dir" && write_basic_state
- return $ret
-fi
-
-move_to_original_branch
-
-}
diff --git a/git-rebase--common.sh b/git-rebase--common.sh
deleted file mode 100644
index f00e13e..0000000
--- a/git-rebase--common.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-
-resolvemsg="
-$(gettext 'Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".')
-"
-
-write_basic_state () {
- echo "$head_name" > "$state_dir"/head-name &&
- echo "$onto" > "$state_dir"/onto &&
- echo "$orig_head" > "$state_dir"/orig-head &&
- test t = "$GIT_QUIET" && : > "$state_dir"/quiet
- test t = "$verbose" && : > "$state_dir"/verbose
- test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
- test -n "$strategy_opts" && echo "$strategy_opts" > \
- "$state_dir"/strategy_opts
- test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
- "$state_dir"/allow_rerere_autoupdate
- test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
- test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
- test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
-}
-
-apply_autostash () {
- if test -f "$state_dir/autostash"
- then
- stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 >/dev/null 2>&1
- then
- echo "$(gettext 'Applied autostash.')" >&2
- else
- git stash store -m "autostash" -q $stash_sha1 ||
- die "$(eval_gettext "Cannot store \$stash_sha1")"
- gettext 'Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-' >&2
- fi
- fi
-}
-
-move_to_original_branch () {
- case "$head_name" in
- refs/*)
- message="rebase finished: $head_name onto $onto"
- git update-ref -m "$message" \
- $head_name $(git rev-parse HEAD) $orig_head &&
- git symbolic-ref \
- -m "rebase finished: returning to $head_name" \
- HEAD $head_name ||
- die "$(eval_gettext "Could not move back to \$head_name")"
- ;;
- esac
-}
-
-output () {
- case "$verbose" in
- '')
- output=$("$@" 2>&1 )
- status=$?
- test $status != 0 && printf "%s\n" "$output"
- return $status
- ;;
- *)
- "$@"
- ;;
- esac
-}
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
index afbb657..dec90e9 100644
--- a/git-rebase--preserve-merges.sh
+++ b/git-rebase--preserve-merges.sh
@@ -77,6 +77,61 @@
# and leaves CR at the end instead.
cr=$(printf "\015")
+resolvemsg="
+$(gettext 'Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".')
+"
+
+write_basic_state () {
+ echo "$head_name" > "$state_dir"/head-name &&
+ echo "$onto" > "$state_dir"/onto &&
+ echo "$orig_head" > "$state_dir"/orig-head &&
+ test t = "$GIT_QUIET" && : > "$state_dir"/quiet
+ test t = "$verbose" && : > "$state_dir"/verbose
+ test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
+ test -n "$strategy_opts" && echo "$strategy_opts" > \
+ "$state_dir"/strategy_opts
+ test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
+ "$state_dir"/allow_rerere_autoupdate
+ test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
+ test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
+ test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
+}
+
+apply_autostash () {
+ if test -f "$state_dir/autostash"
+ then
+ stash_sha1=$(cat "$state_dir/autostash")
+ if git stash apply $stash_sha1 >/dev/null 2>&1
+ then
+ echo "$(gettext 'Applied autostash.')" >&2
+ else
+ git stash store -m "autostash" -q $stash_sha1 ||
+ die "$(eval_gettext "Cannot store \$stash_sha1")"
+ gettext 'Applying autostash resulted in conflicts.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+' >&2
+ fi
+ fi
+}
+
+output () {
+ case "$verbose" in
+ '')
+ output=$("$@" 2>&1 )
+ status=$?
+ test $status != 0 && printf "%s\n" "$output"
+ return $status
+ ;;
+ *)
+ "$@"
+ ;;
+ esac
+}
+
strategy_args=${strategy:+--strategy=$strategy}
test -n "$strategy_opts" &&
eval '
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 13c172b..2d0e446 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -65,6 +65,8 @@
headrev=$(git rev-parse --verify --quiet "$head"^0)
test -z "$headrev" && die "fatal: Ambiguous revision: $local"
+local_sha1=$(git rev-parse --verify --quiet "$head")
+
# Was it a branch with a description?
branch_name=${head#refs/heads/}
if test "z$branch_name" = "z$headref" ||
@@ -77,43 +79,53 @@
die "fatal: No commits in common between $base and $head"
# $head is the refname from the command line.
-# If a ref with the same name as $head exists at the remote
-# and their values match, use that.
-#
-# Otherwise find a random ref that matches $headrev.
+# Find a ref with the same name as $head that exists at the remote
+# and points to the same commit as the local object.
find_matching_ref='
my ($head,$headrev) = (@ARGV);
- my ($found);
+ my $pattern = qr{/\Q$head\E$};
+ my ($remote_sha1, $found);
while (<STDIN>) {
chomp;
my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
- my ($pattern);
- next unless ($sha1 eq $headrev);
- $pattern="/$head\$";
- if ($ref eq $head) {
- $found = $ref;
- }
- if ($ref =~ /$pattern/) {
- $found = $ref;
- }
if ($sha1 eq $head) {
- $found = $sha1;
+ $found = $remote_sha1 = $sha1;
+ break;
+ }
+
+ if ($ref eq $head || $ref =~ $pattern) {
+ if ($deref eq "") {
+ # Remember the matching object on the remote side
+ $remote_sha1 = $sha1;
+ }
+ if ($sha1 eq $headrev) {
+ $found = $ref;
+ break;
+ }
}
}
if ($found) {
- print "$found\n";
+ $remote_sha1 = $headrev if ! defined $remote_sha1;
+ print "$remote_sha1 $found\n";
}
'
-ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
+set fnord $(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
+remote_sha1=$2
+ref=$3
if test -z "$ref"
then
echo "warn: No match for commit $headrev found at $url" >&2
echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2
status=1
+elif test "$local_sha1" != "$remote_sha1"
+then
+ echo "warn: $head found at $url but points to a different object" >&2
+ echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2
+ status=1
fi
# Special case: turn "for_linus" to "tags/for_linus" when it is correct
diff --git a/git-send-email.perl b/git-send-email.perl
index 8eb63b5..5f92c89 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -177,11 +177,15 @@
my $re_encoded_word = qr/=\?($re_token)\?($re_token)\?($re_encoded_text)\?=/;
# Variables we fill in automatically, or via prompting:
-my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh,
+my (@to,@cc,@xh,$envelope_sender,
$initial_in_reply_to,$reply_to,$initial_subject,@files,
- $author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time);
-
-my $envelope_sender;
+ $author,$sender,$smtp_authpass,$annotate,$compose,$time);
+# Things we either get from config, *or* are overridden on the
+# command-line.
+my ($no_cc, $no_to, $no_bcc, $no_identity);
+my (@config_to, @getopt_to);
+my (@config_cc, @getopt_cc);
+my (@config_bcc, @getopt_bcc);
# Example reply to:
#$initial_in_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
@@ -228,33 +232,37 @@
}
# Variables with corresponding config settings
-my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc);
+my ($suppress_from, $signed_off_by_cc);
my ($cover_cc, $cover_to);
my ($to_cmd, $cc_cmd);
my ($smtp_server, $smtp_server_port, @smtp_server_options);
my ($smtp_authuser, $smtp_encryption, $smtp_ssl_cert_path);
my ($batch_size, $relogin_delay);
my ($identity, $aliasfiletype, @alias_files, $smtp_domain, $smtp_auth);
-my ($validate, $confirm);
+my ($confirm);
my (@suppress_cc);
my ($auto_8bit_encoding);
my ($compose_encoding);
+# Variables with corresponding config settings & hardcoded defaults
+my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
+my $thread = 1;
+my $chain_reply_to = 0;
+my $use_xmailer = 1;
+my $validate = 1;
my $target_xfer_encoding = 'auto';
-my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
-
my %config_bool_settings = (
- "thread" => [\$thread, 1],
- "chainreplyto" => [\$chain_reply_to, 0],
- "suppressfrom" => [\$suppress_from, undef],
- "signedoffbycc" => [\$signed_off_by_cc, undef],
- "cccover" => [\$cover_cc, undef],
- "tocover" => [\$cover_to, undef],
- "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
- "validate" => [\$validate, 1],
- "multiedit" => [\$multiedit, undef],
- "annotate" => [\$annotate, undef],
- "xmailer" => [\$use_xmailer, 1]
+ "thread" => \$thread,
+ "chainreplyto" => \$chain_reply_to,
+ "suppressfrom" => \$suppress_from,
+ "signedoffbycc" => \$signed_off_by_cc,
+ "cccover" => \$cover_cc,
+ "tocover" => \$cover_to,
+ "signedoffcc" => \$signed_off_by_cc,
+ "validate" => \$validate,
+ "multiedit" => \$multiedit,
+ "annotate" => \$annotate,
+ "xmailer" => \$use_xmailer,
);
my %config_settings = (
@@ -267,12 +275,12 @@
"smtpauth" => \$smtp_auth,
"smtpbatchsize" => \$batch_size,
"smtprelogindelay" => \$relogin_delay,
- "to" => \@initial_to,
+ "to" => \@config_to,
"tocmd" => \$to_cmd,
- "cc" => \@initial_cc,
+ "cc" => \@config_cc,
"cccmd" => \$cc_cmd,
"aliasfiletype" => \$aliasfiletype,
- "bcc" => \@bcclist,
+ "bcc" => \@config_bcc,
"suppresscc" => \@suppress_cc,
"envelopesender" => \$envelope_sender,
"confirm" => \$confirm,
@@ -315,13 +323,87 @@
$SIG{TERM} = \&signal_handler;
$SIG{INT} = \&signal_handler;
+# Read our sendemail.* config
+sub read_config {
+ my ($configured, $prefix) = @_;
+
+ foreach my $setting (keys %config_bool_settings) {
+ my $target = $config_bool_settings{$setting};
+ my $v = Git::config_bool(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+
+ foreach my $setting (keys %config_path_settings) {
+ my $target = $config_path_settings{$setting};
+ if (ref($target) eq "ARRAY") {
+ my @values = Git::config_path(@repo, "$prefix.$setting");
+ next unless @values;
+ next if $configured->{$setting}++;
+ @$target = @values;
+ }
+ else {
+ my $v = Git::config_path(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+ }
+
+ foreach my $setting (keys %config_settings) {
+ my $target = $config_settings{$setting};
+ if (ref($target) eq "ARRAY") {
+ my @values = Git::config(@repo, "$prefix.$setting");
+ next unless @values;
+ next if $configured->{$setting}++;
+ @$target = @values;
+ }
+ else {
+ my $v = Git::config(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+ }
+
+ if (!defined $smtp_encryption) {
+ my $setting = "$prefix.smtpencryption";
+ my $enc = Git::config(@repo, $setting);
+ return unless defined $enc;
+ return if $configured->{$setting}++;
+ if (defined $enc) {
+ $smtp_encryption = $enc;
+ } elsif (Git::config_bool(@repo, "$prefix.smtpssl")) {
+ $smtp_encryption = 'ssl';
+ }
+ }
+}
+
+# sendemail.identity yields to --identity. We must parse this
+# special-case first before the rest of the config is read.
+$identity = Git::config(@repo, "sendemail.identity");
+my $rc = GetOptions(
+ "identity=s" => \$identity,
+ "no-identity" => \$no_identity,
+);
+usage() unless $rc;
+undef $identity if $no_identity;
+
+# Now we know enough to read the config
+{
+ my %configured;
+ read_config(\%configured, "sendemail.$identity") if defined $identity;
+ read_config(\%configured, "sendemail");
+}
+
# Begin by accumulating all the variables (defined above), that we will end up
# needing, first, from the command line:
my $help;
my $git_completion_helper;
-my $rc = GetOptions("h" => \$help,
- "dump-aliases" => \$dump_aliases);
+$rc = GetOptions("h" => \$help,
+ "dump-aliases" => \$dump_aliases);
usage() unless $rc;
die __("--dump-aliases incompatible with other options\n")
if !$help and $dump_aliases and @ARGV;
@@ -330,12 +412,12 @@
"in-reply-to=s" => \$initial_in_reply_to,
"reply-to=s" => \$reply_to,
"subject=s" => \$initial_subject,
- "to=s" => \@initial_to,
+ "to=s" => \@getopt_to,
"to-cmd=s" => \$to_cmd,
"no-to" => \$no_to,
- "cc=s" => \@initial_cc,
+ "cc=s" => \@getopt_cc,
"no-cc" => \$no_cc,
- "bcc=s" => \@bcclist,
+ "bcc=s" => \@getopt_bcc,
"no-bcc" => \$no_bcc,
"chain-reply-to!" => \$chain_reply_to,
"no-chain-reply-to" => sub {$chain_reply_to = 0},
@@ -351,7 +433,6 @@
"smtp-domain:s" => \$smtp_domain,
"smtp-auth=s" => \$smtp_auth,
"no-smtp-auth" => sub {$smtp_auth = 'none'},
- "identity=s" => \$identity,
"annotate!" => \$annotate,
"no-annotate" => sub {$annotate = 0},
"compose" => \$compose,
@@ -386,6 +467,11 @@
"git-completion-helper" => \$git_completion_helper,
);
+# Munge any "either config or getopt, not both" variables
+my @initial_to = @getopt_to ? @getopt_to : ($no_to ? () : @config_to);
+my @initial_cc = @getopt_cc ? @getopt_cc : ($no_cc ? () : @config_cc);
+my @initial_bcc = @getopt_bcc ? @getopt_bcc : ($no_bcc ? () : @config_bcc);
+
usage() if $help;
completion_helper() if $git_completion_helper;
unless ($rc) {
@@ -399,65 +485,6 @@
"(via command-line or configuration option)\n")
if defined $relogin_delay and not defined $batch_size;
-# Now, let's fill any that aren't set in with defaults:
-
-sub read_config {
- my ($prefix) = @_;
-
- foreach my $setting (keys %config_bool_settings) {
- my $target = $config_bool_settings{$setting}->[0];
- $$target = Git::config_bool(@repo, "$prefix.$setting") unless (defined $$target);
- }
-
- foreach my $setting (keys %config_path_settings) {
- my $target = $config_path_settings{$setting};
- if (ref($target) eq "ARRAY") {
- unless (@$target) {
- my @values = Git::config_path(@repo, "$prefix.$setting");
- @$target = @values if (@values && defined $values[0]);
- }
- }
- else {
- $$target = Git::config_path(@repo, "$prefix.$setting") unless (defined $$target);
- }
- }
-
- foreach my $setting (keys %config_settings) {
- my $target = $config_settings{$setting};
- next if $setting eq "to" and defined $no_to;
- next if $setting eq "cc" and defined $no_cc;
- next if $setting eq "bcc" and defined $no_bcc;
- if (ref($target) eq "ARRAY") {
- unless (@$target) {
- my @values = Git::config(@repo, "$prefix.$setting");
- @$target = @values if (@values && defined $values[0]);
- }
- }
- else {
- $$target = Git::config(@repo, "$prefix.$setting") unless (defined $$target);
- }
- }
-
- if (!defined $smtp_encryption) {
- my $enc = Git::config(@repo, "$prefix.smtpencryption");
- if (defined $enc) {
- $smtp_encryption = $enc;
- } elsif (Git::config_bool(@repo, "$prefix.smtpssl")) {
- $smtp_encryption = 'ssl';
- }
- }
-}
-
-# read configuration from [sendemail "$identity"], fall back on [sendemail]
-$identity = Git::config(@repo, "sendemail.identity") unless (defined $identity);
-read_config("sendemail.$identity") if (defined $identity);
-read_config("sendemail");
-
-# fall back on builtin bool defaults
-foreach my $setting (values %config_bool_settings) {
- ${$setting->[0]} = $setting->[1] unless (defined (${$setting->[0]}));
-}
-
# 'default' encryption is none -- this only prevents a warning
$smtp_encryption = '' unless (defined $smtp_encryption);
@@ -465,6 +492,8 @@
my(%suppress_cc);
if (@suppress_cc) {
foreach my $entry (@suppress_cc) {
+ # Please update $__git_send_email_suppresscc_options
+ # in git-completion.bash when you add new options.
die sprintf(__("Unknown --suppress-cc field: '%s'\n"), $entry)
unless $entry =~ /^(?:all|cccmd|cc|author|self|sob|body|bodycc|misc-by)$/;
$suppress_cc{$entry} = 1;
@@ -494,6 +523,8 @@
if ($confirm_unconfigured) {
$confirm = scalar %suppress_cc ? 'compose' : 'auto';
};
+# Please update $__git_send_email_confirm_options in
+# git-completion.bash when you add new options.
die sprintf(__("Unknown --confirm setting: '%s'\n"), $confirm)
unless $confirm =~ /^(?:auto|cc|compose|always|never)/;
@@ -587,6 +618,8 @@
if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) {
$aliases{$1} = [ $2 ];
}}}
+ # Please update _git_config() in git-completion.bash when you
+ # add new MUAs.
);
if (@alias_files and $aliasfiletype and defined $parse_alias{$aliasfiletype}) {
@@ -935,7 +968,7 @@
@initial_to = process_address_list(@initial_to);
@initial_cc = process_address_list(@initial_cc);
-@bcclist = process_address_list(@bcclist);
+@initial_bcc = process_address_list(@initial_bcc);
if ($thread && !defined $initial_in_reply_to && $prompting) {
$initial_in_reply_to = ask(
@@ -1358,7 +1391,7 @@
}
@cc);
my $to = join (",\n\t", @recipients);
- @recipients = unique_email_list(@recipients,@cc,@bcclist);
+ @recipients = unique_email_list(@recipients,@cc,@initial_bcc);
@recipients = (map { extract_valid_address_or_die($_) } @recipients);
my $date = format_2822_time($time++);
my $gitversion = '@@GIT_VERSION@@';
@@ -1693,7 +1726,7 @@
# Now parse the message body
while(<$fh>) {
$message .= $_;
- if (/^([a-z-]*-by|Cc): (.*)/i) {
+ if (/^([a-z][a-z-]*-by|Cc): (.*)/i) {
chomp;
my ($what, $c) = ($1, $2);
# strip garbage for the address we'll use:
@@ -1866,7 +1899,7 @@
$message = MIME::Base64::decode($message)
if ($from eq 'base64');
- $to = ($message =~ /.{999,}/) ? 'quoted-printable' : '8bit'
+ $to = ($message =~ /(?:.{999,}|\r)/) ? 'quoted-printable' : '8bit'
if $to eq 'auto';
die __("cannot send message as 7bit")
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e1d917f..8eef60b 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,7 +17,9 @@
# First decide what scheme to use...
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_TEST_GETTEXT_POISON"
+if test -n "$GIT_TEST_GETTEXT_POISON" &&
+ git env--helper --type=bool --default=0 --exit-code \
+ GIT_TEST_GETTEXT_POISON
then
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
elif test -n "@@USE_GETTEXT_SCHEME@@"
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 3789285..10d9764 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -101,6 +101,7 @@
case "$1" in
-h)
echo "$LONG_USAGE"
+ case "$0" in *git-legacy-stash) exit 129;; esac
exit
esac
fi
diff --git a/git-submodule.sh b/git-submodule.sh
index 470f681..c7f58c5 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -5,7 +5,8 @@
# Copyright (c) 2007 Lars Hjemli
dashless=$(basename "$0" | sed -e 's/-/ /')
-USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+USAGE="[--quiet] [--cached]
+ or: $dashless [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: $dashless [--quiet] init [--] [<path>...]
or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
@@ -231,6 +232,13 @@
die "$(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")"
fi
+ if test -d "$sm_path" &&
+ test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null)
+ then
+ git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null ||
+ die "$(eval_gettext "'\$sm_path' does not have a commit checked out")"
+ fi
+
if test -z "$force" &&
! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1
then
@@ -346,7 +354,7 @@
shift
done
- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} "$@"
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
}
#
@@ -377,7 +385,7 @@
shift
done
- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper init ${GIT_QUIET:+--quiet} "$@"
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper init ${GIT_QUIET:+--quiet} -- "$@"
}
#
@@ -413,7 +421,7 @@
shift
done
- git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} ${force:+--force} ${deinit_all:+--all} "$@"
+ git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} ${force:+--force} ${deinit_all:+--all} -- "$@"
}
is_tip_reachable () (
@@ -542,6 +550,7 @@
${depth:+--depth "$depth"} \
$recommend_shallow \
$jobs \
+ -- \
"$@" || echo "#unmatched" $?
} | {
err=
@@ -594,7 +603,7 @@
# is not reachable from a ref.
is_tip_reachable "$sm_path" "$sha1" ||
fetch_in_submodule "$sm_path" $depth ||
- say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
+ say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")"
# Now we tried the usual fetch, but $sha1 may
# not be reachable from any of the refs
@@ -1000,7 +1009,7 @@
shift
done
- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} "$@"
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@"
}
#
# Sync remote urls for submodules
@@ -1033,7 +1042,7 @@
esac
done
- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} "$@"
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
}
cmd_absorbgitdirs()
diff --git a/git.c b/git.c
index 2dd5886..c1ee712 100644
--- a/git.c
+++ b/git.c
@@ -33,7 +33,8 @@
const char git_more_info_string[] =
N_("'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.");
+ "to read about a specific subcommand or concept.\n"
+ "See 'git help git' for an overview of the system.");
static int use_pager = -1;
@@ -62,6 +63,13 @@
{
struct string_list list = STRING_LIST_INIT_DUP;
int i;
+ int nongit;
+
+ /*
+ * Set up the repository so we can pick up any repo-level config (like
+ * completion.commands).
+ */
+ setup_git_directory_gently(&nongit);
while (*spec) {
const char *sep = strchrnul(spec, ',');
@@ -147,16 +155,20 @@
git_set_exec_path(cmd + 1);
else {
puts(git_exec_path());
+ trace2_cmd_name("_query_");
exit(0);
}
} else if (!strcmp(cmd, "--html-path")) {
puts(system_path(GIT_HTML_PATH));
+ trace2_cmd_name("_query_");
exit(0);
} else if (!strcmp(cmd, "--man-path")) {
puts(system_path(GIT_MAN_PATH));
+ trace2_cmd_name("_query_");
exit(0);
} else if (!strcmp(cmd, "--info-path")) {
puts(system_path(GIT_INFO_PATH));
+ trace2_cmd_name("_query_");
exit(0);
} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
use_pager = 1;
@@ -285,6 +297,7 @@
(*argv)++;
(*argc)--;
} else if (skip_prefix(cmd, "--list-cmds=", &cmd)) {
+ trace2_cmd_name("_query_");
if (!strcmp(cmd, "parseopt")) {
struct string_list list = STRING_LIST_INIT_DUP;
int i;
@@ -332,9 +345,14 @@
commit_pager_choice();
child.use_shell = 1;
+ child.trace2_child_class = "shell_alias";
argv_array_push(&child.args, alias_string + 1);
argv_array_pushv(&child.args, (*argv) + 1);
+ trace2_cmd_alias(alias_command, child.args.argv);
+ trace2_cmd_list_config();
+ trace2_cmd_name("_run_shell_alias_");
+
ret = run_command(&child);
if (ret >= 0) /* normal exit */
exit(ret);
@@ -369,6 +387,9 @@
/* insert after command name */
memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
+ trace2_cmd_alias(alias_command, new_argv);
+ trace2_cmd_list_config();
+
*argv = new_argv;
*argcp += count - 1;
@@ -417,6 +438,8 @@
setup_work_tree();
trace_argv_printf(argv, "trace: built-in: git");
+ trace2_cmd_name(p->cmd);
+ trace2_cmd_list_config();
validate_cache_entries(the_repository->index);
status = p->fn(argc, argv, prefix);
@@ -476,7 +499,8 @@
{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
{ "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT },
{ "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT },
- { "difftool", cmd_difftool, RUN_SETUP | NEED_WORK_TREE },
+ { "difftool", cmd_difftool, RUN_SETUP_GENTLY },
+ { "env--helper", cmd_env__helper },
{ "fast-export", cmd_fast_export, RUN_SETUP },
{ "fetch", cmd_fetch, RUN_SETUP },
{ "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT },
@@ -527,12 +551,7 @@
{ "push", cmd_push, RUN_SETUP },
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
- /*
- * NEEDSWORK: Until the rebase is independent and needs no redirection
- * to rebase shell script this is kept as is, then should be changed to
- * RUN_SETUP | NEED_WORK_TREE
- */
- { "rebase", cmd_rebase },
+ { "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
@@ -543,21 +562,28 @@
{ "replace", cmd_replace, RUN_SETUP },
{ "rerere", cmd_rerere, RUN_SETUP },
{ "reset", cmd_reset, RUN_SETUP },
+ { "restore", cmd_restore, RUN_SETUP | NEED_WORK_TREE },
{ "rev-list", cmd_rev_list, RUN_SETUP | NO_PARSEOPT },
{ "rev-parse", cmd_rev_parse, NO_PARSEOPT },
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
{ "rm", cmd_rm, RUN_SETUP },
{ "send-pack", cmd_send_pack, RUN_SETUP },
- { "serve", cmd_serve, RUN_SETUP },
{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
{ "show", cmd_show, RUN_SETUP },
{ "show-branch", cmd_show_branch, RUN_SETUP },
{ "show-index", cmd_show_index },
{ "show-ref", cmd_show_ref, RUN_SETUP },
{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
+ /*
+ * NEEDSWORK: Until the builtin stash is thoroughly robust and no
+ * longer needs redirection to the stash shell script this is kept as
+ * is, then should be changed to RUN_SETUP | NEED_WORK_TREE
+ */
+ { "stash", cmd_stash },
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
{ "stripspace", cmd_stripspace },
{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT },
+ { "switch", cmd_switch, RUN_SETUP | NEED_WORK_TREE },
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
{ "unpack-file", cmd_unpack_file, RUN_SETUP | NO_PARSEOPT },
@@ -666,7 +692,14 @@
cmd.clean_on_exit = 1;
cmd.wait_after_clean = 1;
cmd.silent_exec_failure = 1;
+ cmd.trace2_child_class = "dashed";
+ trace2_cmd_name("_run_dashed_");
+
+ /*
+ * The code in run_command() logs trace2 child_start/child_exit
+ * events, so we do not need to report exec/exec_result events here.
+ */
trace_argv_printf(cmd.args.argv, "trace: exec:");
/*
@@ -676,6 +709,12 @@
* the program.
*/
status = run_command(&cmd);
+
+ /*
+ * If the child process ran and we are now going to exit, emit a
+ * generic string as our trace2 command verb to indicate that we
+ * launched a dashed command.
+ */
if (status >= 0)
exit(status);
else if (errno != ENOENT)
@@ -700,6 +739,40 @@
*/
if (!done_alias)
handle_builtin(*argcp, *argv);
+ else if (get_builtin(**argv)) {
+ struct argv_array args = ARGV_ARRAY_INIT;
+ int i;
+
+ /*
+ * The current process is committed to launching a
+ * child process to run the command named in (**argv)
+ * and exiting. Log a generic string as the trace2
+ * command verb to indicate this. Note that the child
+ * process will log the actual verb when it runs.
+ */
+ trace2_cmd_name("_run_git_alias_");
+
+ if (get_super_prefix())
+ die("%s doesn't support --super-prefix", **argv);
+
+ commit_pager_choice();
+
+ argv_array_push(&args, "git");
+ for (i = 0; i < *argcp; i++)
+ argv_array_push(&args, (*argv)[i]);
+
+ trace_argv_printf(args.argv, "trace: exec:");
+
+ /*
+ * if we fail because the command is not found, it is
+ * OK to return. Otherwise, we just pass along the status code.
+ */
+ i = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE |
+ RUN_CLEAN_ON_EXIT, "git_alias");
+ if (i >= 0 || errno != ENOENT)
+ exit(i);
+ die("could not execute builtin %s", **argv);
+ }
/* .. then try the external ones */
execv_dashed_external(*argv);
diff --git a/git.rc b/git.rc
index 49002e0..cc3fdc6 100644
--- a/git.rc
+++ b/git.rc
@@ -20,3 +20,5 @@
VALUE "Translation", 0x409, 1200
END
END
+
+1 RT_MANIFEST "compat/win32/git.manifest"
diff --git a/gitk-git/gitk b/gitk-git/gitk
index a14d7a1..abe4805 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -3404,6 +3404,8 @@
}
image create bitmap reficon-H -background black -foreground "#00ff00" \
-data $rectdata -maskdata $rectmask
+image create bitmap reficon-R -background black -foreground "#ffddaa" \
+ -data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
@@ -7016,6 +7018,7 @@
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
+# Also look for URLs of the form "http[s]://..." and make them web links.
proc appendwithlinks {text tags} {
global ctext linknum curview
@@ -7032,6 +7035,18 @@
setlink $linkid link$linknum
incr linknum
}
+ set wlinks [regexp -indices -all -inline -line \
+ {https?://[^[:space:]]+} $text]
+ foreach l $wlinks {
+ set s2 [lindex $l 0]
+ set e2 [lindex $l 1]
+ set url [string range $text $s2 $e2]
+ incr e2
+ $ctext tag delete link$linknum
+ $ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c"
+ setwlink $url link$linknum
+ incr linknum
+ }
}
proc setlink {id lk} {
@@ -7064,6 +7079,18 @@
}
}
+proc setwlink {url lk} {
+ global ctext
+ global linkfgcolor
+ global web_browser
+
+ if {$web_browser eq {}} return
+ $ctext tag conf $lk -foreground $linkfgcolor -underline 1
+ $ctext tag bind $lk <1> [list browseweb $url]
+ $ctext tag bind $lk <Enter> {linkcursor %W 1}
+ $ctext tag bind $lk <Leave> {linkcursor %W -1}
+}
+
proc appendshortlink {id {pre {}} {post {}}} {
global ctext linknum
@@ -7098,6 +7125,16 @@
}
}
+proc browseweb {url} {
+ global web_browser
+
+ if {$web_browser eq {}} return
+ # Use eval here in case $web_browser is a command plus some arguments
+ if {[catch {eval exec $web_browser [list $url] &} err]} {
+ error_popup "[mc "Error starting web browser:"] $err"
+ }
+}
+
proc viewnextline {dir} {
global canv linespc
@@ -8191,11 +8228,11 @@
} else {
$ctext insert end "$line\n" filesep
}
- } elseif {![string compare -length 3 " >" $line]} {
+ } elseif {$currdiffsubmod != "" && ![string compare -length 3 " >" $line]} {
set $currdiffsubmod ""
set line [encoding convertfrom $diffencoding $line]
$ctext insert end "$line\n" dresult
- } elseif {![string compare -length 3 " <" $line]} {
+ } elseif {$currdiffsubmod != "" && ![string compare -length 3 " <" $line]} {
set $currdiffsubmod ""
set line [encoding convertfrom $diffencoding $line]
$ctext insert end "$line\n" d0
@@ -10022,6 +10059,7 @@
set n [lindex $ref 0]
switch -- [lindex $ref 1] {
"H" {selbyid $headids($n)}
+ "R" {selbyid $headids($n)}
"T" {selbyid $tagids($n)}
"o" {selbyid $otherrefids($n)}
}
@@ -10051,7 +10089,11 @@
foreach n [array names headids] {
if {[string match $reflistfilter $n]} {
if {[commitinview $headids($n) $curview]} {
- lappend refs [list $n H]
+ if {[string match "remotes/*" $n]} {
+ lappend refs [list $n R]
+ } else {
+ lappend refs [list $n H]
+ }
} else {
interestedin $headids($n) {run refill_reflist}
}
@@ -11488,7 +11530,7 @@
proc prefspage_general {notebook} {
global NS maxwidth maxgraphpct showneartags showlocalchanges
global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
- global hideremotes want_ttk have_ttk maxrefs
+ global hideremotes want_ttk have_ttk maxrefs web_browser
set page [create_prefs_page $notebook.general]
@@ -11539,6 +11581,13 @@
pack configure $page.extdifff.l -padx 10
grid x $page.extdifff $page.extdifft -sticky ew
+ ${NS}::entry $page.webbrowser -textvariable web_browser
+ ${NS}::frame $page.webbrowserf
+ ${NS}::label $page.webbrowserf.l -text [mc "Web browser" ]
+ pack $page.webbrowserf.l -side left
+ pack configure $page.webbrowserf.l -padx 10
+ grid x $page.webbrowserf $page.webbrowser -sticky ew
+
${NS}::label $page.lgen -text [mc "General options"]
grid $page.lgen - -sticky w -pady 10
${NS}::checkbutton $page.want_ttk -variable want_ttk \
@@ -12310,6 +12359,7 @@
set bgcolor SystemWindow
set fgcolor SystemWindowText
set selectbgcolor SystemHighlight
+ set web_browser "cmd /c start"
} else {
set uicolor grey85
set uifgcolor black
@@ -12317,6 +12367,11 @@
set bgcolor white
set fgcolor black
set selectbgcolor gray85
+ if {[tk windowingsystem] eq "aqua"} {
+ set web_browser "open"
+ } else {
+ set web_browser "xdg-open"
+ }
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
@@ -12390,6 +12445,7 @@
filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
indexcirclecolor circlecolors linkfgcolor circleoutlinecolor
+ web_browser
}
foreach var $config_variables {
config_init_trace $var
diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po
index 407d555..87ab1fa 100644
--- a/gitk-git/po/bg.po
+++ b/gitk-git/po/bg.po
@@ -1,15 +1,15 @@
# Bulgarian translation of gitk po-file.
-# Copyright (C) 2014, 2015 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2019 Alexander Shopov <ash@kambanaria.org>.
# This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2019.
#
#
msgid ""
msgstr ""
"Project-Id-Version: gitk master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-19 11:48+0200\n"
-"PO-Revision-Date: 2015-12-19 11:49+0200\n"
+"POT-Creation-Date: 2019-03-04 11:27+0100\n"
+"PO-Revision-Date: 2019-03-04 11:39+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -22,17 +22,17 @@
msgid "Couldn't get list of unmerged files:"
msgstr "Списъкът с неслети файлове не може да бъде получен:"
-#: gitk:212 gitk:2399
+#: gitk:212 gitk:2403
msgid "Color words"
msgstr "Оцветяване на думите"
-#: gitk:217 gitk:2399 gitk:8239 gitk:8272
+#: gitk:217 gitk:2403 gitk:8249 gitk:8282
msgid "Markup words"
msgstr "Отбелязване на думите"
#: gitk:324
msgid "Error parsing revisions:"
-msgstr "Грешка при разбор на версиите:"
+msgstr "Грешка при анализ на версиите:"
#: gitk:380
msgid "Error executing --argscmd command:"
@@ -59,314 +59,318 @@
msgid "Reading"
msgstr "Прочитане"
-#: gitk:496 gitk:4544
+#: gitk:496 gitk:4549
msgid "Reading commits..."
msgstr "Прочитане на подаванията…"
-#: gitk:499 gitk:1637 gitk:4547
+#: gitk:499 gitk:1641 gitk:4552
msgid "No commits selected"
msgstr "Не са избрани подавания"
-#: gitk:1445 gitk:4064 gitk:12469
+#: gitk:1449 gitk:4069 gitk:12583
msgid "Command line"
msgstr "Команден ред"
-#: gitk:1511
+#: gitk:1515
msgid "Can't parse git log output:"
msgstr "Изходът от „git log“ не може да се анализира:"
-#: gitk:1740
+#: gitk:1744
msgid "No commit information available"
msgstr "Липсва информация за подавания"
-#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
+#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
msgid "OK"
msgstr "Добре"
-#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
-#: gitk:11275 gitk:11555
+#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
+#: gitk:11389 gitk:11669
msgid "Cancel"
msgstr "Отказ"
-#: gitk:2083
+#: gitk:2087
msgid "&Update"
msgstr "&Обновяване"
-#: gitk:2084
+#: gitk:2088
msgid "&Reload"
msgstr "&Презареждане"
-#: gitk:2085
+#: gitk:2089
msgid "Reread re&ferences"
-msgstr "&Наново прочитане на настройките"
+msgstr "&Наново прочитане"
-#: gitk:2086
+#: gitk:2090
msgid "&List references"
msgstr "&Изброяване на указателите"
-#: gitk:2088
+#: gitk:2092
msgid "Start git &gui"
msgstr "&Стартиране на „git gui“"
-#: gitk:2090
+#: gitk:2094
msgid "&Quit"
msgstr "&Спиране на програмата"
-#: gitk:2082
+#: gitk:2086
msgid "&File"
msgstr "&Файл"
-#: gitk:2094
+#: gitk:2098
msgid "&Preferences"
msgstr "&Настройки"
-#: gitk:2093
+#: gitk:2097
msgid "&Edit"
msgstr "&Редактиране"
-#: gitk:2098
+#: gitk:2102
msgid "&New view..."
msgstr "&Нов изглед…"
-#: gitk:2099
+#: gitk:2103
msgid "&Edit view..."
msgstr "&Редактиране на изгледа…"
-#: gitk:2100
+#: gitk:2104
msgid "&Delete view"
msgstr "&Изтриване на изгледа"
-#: gitk:2102
+#: gitk:2106
msgid "&All files"
msgstr "&Всички файлове"
-#: gitk:2097
+#: gitk:2101
msgid "&View"
msgstr "&Изглед"
-#: gitk:2107 gitk:2117
+#: gitk:2111 gitk:2121
msgid "&About gitk"
msgstr "&Относно gitk"
-#: gitk:2108 gitk:2122
+#: gitk:2112 gitk:2126
msgid "&Key bindings"
msgstr "&Клавишни комбинации"
-#: gitk:2106 gitk:2121
+#: gitk:2110 gitk:2125
msgid "&Help"
msgstr "Помо&щ"
-#: gitk:2199 gitk:8671
+#: gitk:2203 gitk:8681
msgid "SHA1 ID:"
msgstr "SHA1:"
-#: gitk:2243
+#: gitk:2247
msgid "Row"
msgstr "Ред"
-#: gitk:2281
+#: gitk:2285
msgid "Find"
msgstr "Търсене"
-#: gitk:2309
+#: gitk:2313
msgid "commit"
msgstr "подаване"
-#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
-#: gitk:6931
+#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
+#: gitk:6936
msgid "containing:"
msgstr "съдържащо:"
-#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
+#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
msgid "touching paths:"
-msgstr "засягащо пътищата:"
+msgstr "в пътищата:"
-#: gitk:2317 gitk:4796
+#: gitk:2321 gitk:4801
msgid "adding/removing string:"
msgstr "добавящо/премахващо низ"
-#: gitk:2318 gitk:4798
+#: gitk:2322 gitk:4803
msgid "changing lines matching:"
msgstr "променящо редове напасващи:"
-#: gitk:2327 gitk:2329 gitk:4785
+#: gitk:2331 gitk:2333 gitk:4790
msgid "Exact"
msgstr "Точно"
-#: gitk:2329 gitk:4873 gitk:6742
+#: gitk:2333 gitk:4878 gitk:6747
msgid "IgnCase"
msgstr "Без регистър"
-#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
+#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
msgid "Regexp"
msgstr "Рег. израз"
-#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
+#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
msgid "All fields"
msgstr "Всички полета"
-#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
+#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
msgid "Headline"
msgstr "Първи ред"
-#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
+#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
msgid "Comments"
msgstr "Коментари"
-#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
-#: gitk:8864
+#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
+#: gitk:8874
msgid "Author"
msgstr "Автор"
-#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
+#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
msgid "Committer"
msgstr "Подаващ"
-#: gitk:2367
+#: gitk:2371
msgid "Search"
msgstr "Търсене"
-#: gitk:2375
+#: gitk:2379
msgid "Diff"
msgstr "Разлики"
-#: gitk:2377
+#: gitk:2381
msgid "Old version"
msgstr "Стара версия"
-#: gitk:2379
+#: gitk:2383
msgid "New version"
msgstr "Нова версия"
-#: gitk:2382
+#: gitk:2386
msgid "Lines of context"
msgstr "Контекст в редове"
-#: gitk:2392
+#: gitk:2396
msgid "Ignore space change"
msgstr "Празните знаци без значение"
-#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
+#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
msgid "Line diff"
msgstr "Поредови разлики"
-#: gitk:2463
+#: gitk:2467
msgid "Patch"
msgstr "Кръпка"
-#: gitk:2465
+#: gitk:2469
msgid "Tree"
msgstr "Дърво"
-#: gitk:2635 gitk:2656
+#: gitk:2639 gitk:2660
msgid "Diff this -> selected"
msgstr "Разлики между това и избраното"
-#: gitk:2636 gitk:2657
+#: gitk:2640 gitk:2661
msgid "Diff selected -> this"
msgstr "Разлики между избраното и това"
-#: gitk:2637 gitk:2658
+#: gitk:2641 gitk:2662
msgid "Make patch"
msgstr "Създаване на кръпка"
-#: gitk:2638 gitk:9273
+#: gitk:2642 gitk:9283
msgid "Create tag"
msgstr "Създаване на етикет"
-#: gitk:2639
+#: gitk:2643
msgid "Copy commit summary"
msgstr "Копиране на информацията за подаване"
-#: gitk:2640 gitk:9404
+#: gitk:2644 gitk:9414
msgid "Write commit to file"
msgstr "Запазване на подаването във файл"
-#: gitk:2641 gitk:9461
+#: gitk:2645
msgid "Create new branch"
msgstr "Създаване на нов клон"
-#: gitk:2642
+#: gitk:2646
msgid "Cherry-pick this commit"
msgstr "Отбиране на това подаване"
-#: gitk:2643
+#: gitk:2647
msgid "Reset HEAD branch to here"
msgstr "Привеждане на върха на клона към текущото подаване"
-#: gitk:2644
+#: gitk:2648
msgid "Mark this commit"
msgstr "Отбелязване на това подаване"
-#: gitk:2645
+#: gitk:2649
msgid "Return to mark"
msgstr "Връщане към отбелязаното подаване"
-#: gitk:2646
+#: gitk:2650
msgid "Find descendant of this and mark"
msgstr "Откриване и отбелязване на наследниците"
-#: gitk:2647
+#: gitk:2651
msgid "Compare with marked commit"
msgstr "Сравнение с отбелязаното подаване"
-#: gitk:2648 gitk:2659
+#: gitk:2652 gitk:2663
msgid "Diff this -> marked commit"
msgstr "Разлики между това и отбелязаното"
-#: gitk:2649 gitk:2660
+#: gitk:2653 gitk:2664
msgid "Diff marked commit -> this"
msgstr "Разлики между отбелязаното и това"
-#: gitk:2650
+#: gitk:2654
msgid "Revert this commit"
msgstr "Отмяна на това подаване"
-#: gitk:2666
+#: gitk:2670
msgid "Check out this branch"
msgstr "Изтегляне на този клон"
-#: gitk:2667
+#: gitk:2671
+msgid "Rename this branch"
+msgstr "Преименуване на този клон"
+
+#: gitk:2672
msgid "Remove this branch"
msgstr "Изтриване на този клон"
-#: gitk:2668
+#: gitk:2673
msgid "Copy branch name"
msgstr "Копиране на името на клона"
-#: gitk:2675
+#: gitk:2680
msgid "Highlight this too"
msgstr "Отбелязване и на това"
-#: gitk:2676
+#: gitk:2681
msgid "Highlight this only"
msgstr "Отбелязване само на това"
-#: gitk:2677
+#: gitk:2682
msgid "External diff"
msgstr "Външна програма за разлики"
-#: gitk:2678
+#: gitk:2683
msgid "Blame parent commit"
msgstr "Анотиране на родителското подаване"
-#: gitk:2679
+#: gitk:2684
msgid "Copy path"
msgstr "Копиране на пътя"
-#: gitk:2686
+#: gitk:2691
msgid "Show origin of this line"
msgstr "Показване на произхода на този ред"
-#: gitk:2687
+#: gitk:2692
msgid "Run git gui blame on this line"
msgstr "Изпълнение на „git gui blame“ върху този ред"
-#: gitk:3031
+#: gitk:3036
msgid "About gitk"
msgstr "Относно gitk"
-#: gitk:3033
+#: gitk:3038
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@@ -382,324 +386,324 @@
"\n"
"Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
-#: gitk:3041 gitk:3108 gitk:9890
+#: gitk:3046 gitk:3113 gitk:10004
msgid "Close"
msgstr "Затваряне"
-#: gitk:3062
+#: gitk:3067
msgid "Gitk key bindings"
msgstr "Клавишни комбинации"
-#: gitk:3065
+#: gitk:3070
msgid "Gitk key bindings:"
msgstr "Клавишни комбинации:"
-#: gitk:3067
+#: gitk:3072
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tСпиране на програмата"
-#: gitk:3068
+#: gitk:3073
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-W>\t\tЗатваряне на прозореца"
-#: gitk:3069
+#: gitk:3074
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tКъм първото подаване"
-#: gitk:3070
+#: gitk:3075
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tКъм последното подаване"
-#: gitk:3071
+#: gitk:3076
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Up>, p, k\tЕдно подаване нагоре"
-#: gitk:3072
+#: gitk:3077
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Down>, n, j\tЕдно подаване надолу"
-#: gitk:3073
+#: gitk:3078
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Left>, z, h\tНазад в историята"
-#: gitk:3074
+#: gitk:3079
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\tНапред в историята"
-#: gitk:3075
+#: gitk:3080
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
-#: gitk:3076
+#: gitk:3081
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
-#: gitk:3077
+#: gitk:3082
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
-#: gitk:3078
+#: gitk:3083
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
-#: gitk:3079
+#: gitk:3084
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tКъм края на списъка с подаванията"
-#: gitk:3080
+#: gitk:3085
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
-#: gitk:3081
+#: gitk:3086
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tРед надолу в списъка с подавания"
-#: gitk:3082
+#: gitk:3087
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
-#: gitk:3083
+#: gitk:3088
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
-#: gitk:3084
+#: gitk:3089
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
-#: gitk:3085
+#: gitk:3090
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr ""
"<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
-#: gitk:3086
+#: gitk:3091
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
-#: gitk:3087
+#: gitk:3092
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
-#: gitk:3088
+#: gitk:3093
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
-#: gitk:3089
+#: gitk:3094
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\t18 реда нагоре в изгледа за разлики"
-#: gitk:3090
+#: gitk:3095
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\t18 реда надолу в изгледа за разлики"
-#: gitk:3091
+#: gitk:3096
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tТърсене"
-#: gitk:3092
+#: gitk:3097
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tКъм следващата поява"
-#: gitk:3093
+#: gitk:3098
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tКъм следващата поява"
-#: gitk:3094
+#: gitk:3099
msgid "g\t\tGo to commit"
msgstr "g\t\tКъм последното подаване"
-#: gitk:3095
+#: gitk:3100
msgid "/\t\tFocus the search box"
msgstr "/\t\tФокус върху полето за търсене"
-#: gitk:3096
+#: gitk:3101
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tКъм предишната поява"
-#: gitk:3097
+#: gitk:3102
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tСледващ файл в изгледа за разлики"
-#: gitk:3098
+#: gitk:3103
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
-#: gitk:3099
+#: gitk:3104
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
-#: gitk:3100
+#: gitk:3105
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tПо-голям размер на шрифта"
-#: gitk:3101
+#: gitk:3106
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tПо-голям размер на шрифта"
-#: gitk:3102
+#: gitk:3107
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tПо-малък размер на шрифта"
-#: gitk:3103
+#: gitk:3108
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tПо-малък размер на шрифта"
-#: gitk:3104
+#: gitk:3109
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tОбновяване"
-#: gitk:3569 gitk:3578
+#: gitk:3574 gitk:3583
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Грешка при създаването на временната директория „%s“:"
-#: gitk:3591
+#: gitk:3596
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Грешка при получаването на „%s“ от %s:"
-#: gitk:3654
+#: gitk:3659
msgid "command failed:"
msgstr "неуспешно изпълнение на команда:"
-#: gitk:3803
+#: gitk:3808
msgid "No such commit"
msgstr "Такова подаване няма"
-#: gitk:3817
+#: gitk:3822
msgid "git gui blame: command failed:"
msgstr "„git gui blame“: неуспешно изпълнение на команда:"
-#: gitk:3848
+#: gitk:3853
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Върхът за сливане не може да бъде прочетен: %s"
-#: gitk:3856
+#: gitk:3861
#, tcl-format
msgid "Error reading index: %s"
msgstr "Грешка при прочитане на индекса: %s"
-#: gitk:3881
+#: gitk:3886
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Командата „git blame“ не може да бъде стартирана: %s"
-#: gitk:3884 gitk:6773
+#: gitk:3889 gitk:6778
msgid "Searching"
msgstr "Търсене"
-#: gitk:3916
+#: gitk:3921
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Грешка при изпълнението на „git blame“: %s"
-#: gitk:3944
+#: gitk:3949
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Този ред идва от подаването %s, което не е в изгледа"
-#: gitk:3958
+#: gitk:3963
msgid "External diff viewer failed:"
msgstr "Неуспешно изпълнение на външната програма за разлики:"
-#: gitk:4062
+#: gitk:4067
msgid "All files"
msgstr "Всички файлове"
-#: gitk:4086
+#: gitk:4091
msgid "View"
msgstr "Изглед"
-#: gitk:4089
+#: gitk:4094
msgid "Gitk view definition"
msgstr "Дефиниция на изглед в Gitk"
-#: gitk:4093
+#: gitk:4098
msgid "Remember this view"
msgstr "Запазване на този изглед"
-#: gitk:4094
+#: gitk:4099
msgid "References (space separated list):"
msgstr "Указатели (списък с разделител интервал):"
-#: gitk:4095
+#: gitk:4100
msgid "Branches & tags:"
msgstr "Клони и етикети:"
-#: gitk:4096
+#: gitk:4101
msgid "All refs"
msgstr "Всички указатели"
-#: gitk:4097
+#: gitk:4102
msgid "All (local) branches"
msgstr "Всички (локални) клони"
-#: gitk:4098
+#: gitk:4103
msgid "All tags"
msgstr "Всички етикети"
-#: gitk:4099
+#: gitk:4104
msgid "All remote-tracking branches"
msgstr "Всички следящи клони"
-#: gitk:4100
+#: gitk:4105
msgid "Commit Info (regular expressions):"
msgstr "Информация за подаване (рег. изр.):"
-#: gitk:4101
+#: gitk:4106
msgid "Author:"
msgstr "Автор:"
-#: gitk:4102
+#: gitk:4107
msgid "Committer:"
msgstr "Подал:"
-#: gitk:4103
+#: gitk:4108
msgid "Commit Message:"
msgstr "Съобщение при подаване:"
-#: gitk:4104
+#: gitk:4109
msgid "Matches all Commit Info criteria"
msgstr "Съвпадение по всички характеристики на подаването"
-#: gitk:4105
+#: gitk:4110
msgid "Matches no Commit Info criteria"
msgstr "Не съвпада по никоя от характеристиките на подаването"
-#: gitk:4106
+#: gitk:4111
msgid "Changes to Files:"
msgstr "Промени по файловете:"
-#: gitk:4107
+#: gitk:4112
msgid "Fixed String"
msgstr "Дословен низ"
-#: gitk:4108
+#: gitk:4113
msgid "Regular Expression"
msgstr "Регулярен израз"
-#: gitk:4109
+#: gitk:4114
msgid "Search string:"
msgstr "Низ за търсене:"
-#: gitk:4110
+#: gitk:4115
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@@ -707,204 +711,204 @@
"Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
"„March 17, 2009 15:27:38“):"
-#: gitk:4111
+#: gitk:4116
msgid "Since:"
msgstr "От:"
-#: gitk:4112
+#: gitk:4117
msgid "Until:"
msgstr "До:"
-#: gitk:4113
+#: gitk:4118
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr ""
"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
"число):"
-#: gitk:4114
+#: gitk:4119
msgid "Number to show:"
msgstr "Брой показани:"
-#: gitk:4115
+#: gitk:4120
msgid "Number to skip:"
msgstr "Брой прескочени:"
-#: gitk:4116
+#: gitk:4121
msgid "Miscellaneous options:"
msgstr "Разни:"
-#: gitk:4117
+#: gitk:4122
msgid "Strictly sort by date"
msgstr "Подреждане по дата"
-#: gitk:4118
+#: gitk:4123
msgid "Mark branch sides"
msgstr "Отбелязване на страните по клона"
-#: gitk:4119
+#: gitk:4124
msgid "Limit to first parent"
msgstr "Само първия родител"
-#: gitk:4120
+#: gitk:4125
msgid "Simple history"
msgstr "Опростена история"
-#: gitk:4121
+#: gitk:4126
msgid "Additional arguments to git log:"
msgstr "Допълнителни аргументи към „git log“:"
-#: gitk:4122
+#: gitk:4127
msgid "Enter files and directories to include, one per line:"
msgstr "Въведете файловете и директориите за включване, по елемент на ред"
-#: gitk:4123
+#: gitk:4128
msgid "Command to generate more commits to include:"
msgstr ""
"Команда за генерирането на допълнителни подавания, които да бъдат включени:"
-#: gitk:4247
+#: gitk:4252
msgid "Gitk: edit view"
msgstr "Gitk: редактиране на изглед"
-#: gitk:4255
+#: gitk:4260
msgid "-- criteria for selecting revisions"
msgstr "— критерии за избор на версии"
-#: gitk:4260
+#: gitk:4265
msgid "View Name"
msgstr "Име на изглед"
-#: gitk:4335
+#: gitk:4340
msgid "Apply (F5)"
msgstr "Прилагане (F5)"
-#: gitk:4373
+#: gitk:4378
msgid "Error in commit selection arguments:"
msgstr "Грешка в аргументите за избор на подавания:"
-#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
+#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
msgid "None"
msgstr "Няма"
-#: gitk:5040 gitk:5045
+#: gitk:5045 gitk:5050
msgid "Descendant"
msgstr "Наследник"
-#: gitk:5041
+#: gitk:5046
msgid "Not descendant"
msgstr "Не е наследник"
-#: gitk:5048 gitk:5053
+#: gitk:5053 gitk:5058
msgid "Ancestor"
msgstr "Предшественик"
-#: gitk:5049
+#: gitk:5054
msgid "Not ancestor"
msgstr "Не е предшественик"
-#: gitk:5343
+#: gitk:5348
msgid "Local changes checked in to index but not committed"
msgstr "Локални промени добавени към индекса, но неподадени"
-#: gitk:5379
+#: gitk:5384
msgid "Local uncommitted changes, not checked in to index"
msgstr "Локални промени извън индекса"
-#: gitk:7153
+#: gitk:7158
msgid "and many more"
msgstr "и още много"
-#: gitk:7156
+#: gitk:7161
msgid "many"
msgstr "много"
-#: gitk:7347
+#: gitk:7352
msgid "Tags:"
msgstr "Етикети:"
-#: gitk:7364 gitk:7370 gitk:8844
+#: gitk:7369 gitk:7375 gitk:8854
msgid "Parent"
msgstr "Родител"
-#: gitk:7375
+#: gitk:7380
msgid "Child"
msgstr "Дете"
-#: gitk:7384
+#: gitk:7389
msgid "Branch"
msgstr "Клон"
-#: gitk:7387
+#: gitk:7392
msgid "Follows"
msgstr "Следва"
-#: gitk:7390
+#: gitk:7395
msgid "Precedes"
msgstr "Предшества"
-#: gitk:7985
+#: gitk:7990
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Грешка при получаването на разликите: %s"
-#: gitk:8669
+#: gitk:8679
msgid "Goto:"
msgstr "Към ред:"
-#: gitk:8690
+#: gitk:8700
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Съкратената сума по SHA1 %s не е еднозначна"
-#: gitk:8697
+#: gitk:8707
#, tcl-format
msgid "Revision %s is not known"
msgstr "Непозната версия %s"
-#: gitk:8707
+#: gitk:8717
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "Непозната сума по SHA1 %s"
-#: gitk:8709
+#: gitk:8719
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "Версия %s не е в текущия изглед"
-#: gitk:8851 gitk:8866
+#: gitk:8861 gitk:8876
msgid "Date"
msgstr "Дата"
-#: gitk:8854
+#: gitk:8864
msgid "Children"
msgstr "Деца"
-#: gitk:8917
+#: gitk:8927
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Зануляване на клона „%s“ към текущото подаване"
-#: gitk:8919
+#: gitk:8929
msgid "Detached head: can't reset"
msgstr "Несвързан връх: невъзможно зануляване"
-#: gitk:9024 gitk:9030
+#: gitk:9034 gitk:9040
msgid "Skipping merge commit "
msgstr "Пропускане на подаването на сливането"
-#: gitk:9039 gitk:9044
+#: gitk:9049 gitk:9054
msgid "Error getting patch ID for "
msgstr "Грешка при получаването на идентификатора на "
-#: gitk:9040 gitk:9045
+#: gitk:9050 gitk:9055
msgid " - stopping\n"
msgstr " — спиране\n"
-#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
+#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
msgid "Commit "
msgstr "Подаване"
-#: gitk:9054
+#: gitk:9064
msgid ""
" is the same patch as\n"
" "
@@ -912,7 +916,7 @@
" е същата кръпка като\n"
" "
-#: gitk:9062
+#: gitk:9072
msgid ""
" differs from\n"
" "
@@ -920,7 +924,7 @@
" се различава от\n"
" "
-#: gitk:9064
+#: gitk:9074
msgid ""
"Diff of commits:\n"
"\n"
@@ -928,130 +932,147 @@
"Разлика между подаванията:\n"
"\n"
-#: gitk:9076 gitk:9085
+#: gitk:9086 gitk:9095
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " има %s деца — спиране\n"
-#: gitk:9104
+#: gitk:9114
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Грешка при запазването на подаването във файл: %s"
-#: gitk:9110
+#: gitk:9120
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Грешка при изчисляването на разликите между подаванията: %s"
-#: gitk:9156
+#: gitk:9166
msgid "Top"
msgstr "Най-горе"
-#: gitk:9157
+#: gitk:9167
msgid "From"
msgstr "От"
-#: gitk:9162
+#: gitk:9172
msgid "To"
msgstr "До"
-#: gitk:9186
+#: gitk:9196
msgid "Generate patch"
msgstr "Генериране на кръпка"
-#: gitk:9188
+#: gitk:9198
msgid "From:"
msgstr "От:"
-#: gitk:9197
+#: gitk:9207
msgid "To:"
msgstr "До:"
-#: gitk:9206
+#: gitk:9216
msgid "Reverse"
msgstr "Обръщане"
-#: gitk:9208 gitk:9418
+#: gitk:9218 gitk:9428
msgid "Output file:"
msgstr "Запазване във файла:"
-#: gitk:9214
+#: gitk:9224
msgid "Generate"
msgstr "Генериране"
-#: gitk:9252
+#: gitk:9262
msgid "Error creating patch:"
msgstr "Грешка при създаването на кръпка:"
-#: gitk:9275 gitk:9406 gitk:9463
+#: gitk:9285 gitk:9416 gitk:9504
msgid "ID:"
msgstr "Идентификатор:"
-#: gitk:9284
+#: gitk:9294
msgid "Tag name:"
msgstr "Име на етикет:"
-#: gitk:9287
+#: gitk:9297
msgid "Tag message is optional"
msgstr "Съобщението за етикет е незадължително"
-#: gitk:9289
+#: gitk:9299
msgid "Tag message:"
msgstr "Съобщение за етикет:"
-#: gitk:9293 gitk:9472
+#: gitk:9303 gitk:9474
msgid "Create"
msgstr "Създаване"
-#: gitk:9311
+#: gitk:9321
msgid "No tag name specified"
msgstr "Липсва име на етикет"
-#: gitk:9315
+#: gitk:9325
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Етикетът „%s“ вече съществува"
-#: gitk:9325
+#: gitk:9335
msgid "Error creating tag:"
msgstr "Грешка при създаването на етикет:"
-#: gitk:9415
+#: gitk:9425
msgid "Command:"
msgstr "Команда:"
-#: gitk:9423
+#: gitk:9433
msgid "Write"
msgstr "Запазване"
-#: gitk:9441
+#: gitk:9451
msgid "Error writing commit:"
msgstr "Грешка при запазването на подаването:"
-#: gitk:9468
+#: gitk:9473
+msgid "Create branch"
+msgstr "Създаване на клон"
+
+#: gitk:9489
+#, tcl-format
+msgid "Rename branch %s"
+msgstr "Преименуване на клона „%s“"
+
+#: gitk:9490
+msgid "Rename"
+msgstr "Преименуване"
+
+#: gitk:9514
msgid "Name:"
msgstr "Име:"
-#: gitk:9491
+#: gitk:9538
msgid "Please specify a name for the new branch"
msgstr "Укажете име за новия клон"
-#: gitk:9496
+#: gitk:9543
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?"
-#: gitk:9563
+#: gitk:9587
+msgid "Please specify a new name for the branch"
+msgstr "Укажете ново име за клона"
+
+#: gitk:9650
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?"
-#: gitk:9568
+#: gitk:9655
msgid "Cherry-picking"
msgstr "Отбиране"
-#: gitk:9577
+#: gitk:9664
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1060,7 +1081,7 @@
"Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
"Подайте, занулете или ги скатайте и пробвайте отново."
-#: gitk:9583
+#: gitk:9670
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -1068,29 +1089,29 @@
"Неуспешно отбиране поради конфликти при сливане.\n"
"Искате ли да ги коригирате чрез „git citool“?"
-#: gitk:9599 gitk:9657
+#: gitk:9686 gitk:9744
msgid "No changes committed"
msgstr "Не са подадени промени"
-#: gitk:9626
+#: gitk:9713
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?"
-#: gitk:9631
+#: gitk:9718
msgid "Reverting"
msgstr "Отмяна"
-#: gitk:9639
+#: gitk:9726
#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
"commit, reset or stash your changes and try again."
msgstr ""
"Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
-"Подайте, занулете или ги скатайте и пробвайте отново.<"
+"Подайте, занулете или ги скатайте и пробвайте отново."
-#: gitk:9643
+#: gitk:9730
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
@@ -1098,66 +1119,71 @@
"Неуспешно отмяна поради конфликти при сливане.\n"
"Искате ли да ги коригирате чрез „git citool“?"
-#: gitk:9686
+#: gitk:9773
msgid "Confirm reset"
msgstr "Потвърждаване на зануляването"
-#: gitk:9688
+#: gitk:9775
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Да се занули ли клонът „%s“ към „%s“?"
-#: gitk:9690
+#: gitk:9777
msgid "Reset type:"
msgstr "Вид зануляване:"
-#: gitk:9693
+#: gitk:9780
msgid "Soft: Leave working tree and index untouched"
msgstr "Слабо: работното дърво и индекса остават същите"
-#: gitk:9696
+#: gitk:9783
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Смесено: работното дърво остава същото, индексът се занулява"
-#: gitk:9699
+#: gitk:9786
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Силно: зануляване и на работното дърво, и на индекса\n"
-"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)"
+"(ВСИЧКИ локални промени ще бъдат безвъзвратно загубени)"
-#: gitk:9716
+#: gitk:9803
msgid "Resetting"
msgstr "Зануляване"
-#: gitk:9776
+#: gitk:9876
+#, tcl-format
+msgid "A local branch named %s exists already"
+msgstr "Вече съществува локален клон „%s“."
+
+#: gitk:9884
msgid "Checking out"
msgstr "Изтегляне"
-#: gitk:9829
+#: gitk:9943
msgid "Cannot delete the currently checked-out branch"
msgstr "Текущо изтегленият клон не може да бъде изтрит"
-#: gitk:9835
+#: gitk:9949
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Really delete branch %s?"
msgstr ""
"Подаванията на клона „%s“ не са на никой друг клон.\n"
-"Наистина ли да се изтрие клонът „%s“?"
+"Наистина ли искате да изтриете клона „%s“?"
-#: gitk:9866
+#: gitk:9980
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Етикети и върхове: %s"
-#: gitk:9883
+#: gitk:9997
msgid "Filter"
msgstr "Филтриране"
-#: gitk:10179
+#: gitk:10293
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -1165,201 +1191,201 @@
"Грешка при прочитането на топологията на подаванията. Информацията за клона "
"и предшестващите/следващите етикети ще е непълна."
-#: gitk:11156
+#: gitk:11270
msgid "Tag"
msgstr "Етикет"
-#: gitk:11160
+#: gitk:11274
msgid "Id"
msgstr "Идентификатор"
-#: gitk:11243
+#: gitk:11357
msgid "Gitk font chooser"
msgstr "Избор на шрифт за Gitk"
-#: gitk:11260
+#: gitk:11374
msgid "B"
msgstr "Ч"
-#: gitk:11263
+#: gitk:11377
msgid "I"
msgstr "К"
-#: gitk:11381
+#: gitk:11495
msgid "Commit list display options"
msgstr "Настройки на списъка с подавания"
-#: gitk:11384
+#: gitk:11498
msgid "Maximum graph width (lines)"
msgstr "Максимална широчина на графа (в редове)"
-#: gitk:11388
+#: gitk:11502
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Максимална широчина на графа (% от панела)"
-#: gitk:11391
+#: gitk:11505
msgid "Show local changes"
msgstr "Показване на локалните промени"
-#: gitk:11394
+#: gitk:11508
msgid "Auto-select SHA1 (length)"
msgstr "Автоматично избиране на SHA1 (дължина)"
-#: gitk:11398
+#: gitk:11512
msgid "Hide remote refs"
msgstr "Скриване на отдалечените указатели"
-#: gitk:11402
+#: gitk:11516
msgid "Diff display options"
msgstr "Настройки на показването на разликите"
-#: gitk:11404
+#: gitk:11518
msgid "Tab spacing"
msgstr "Широчина на табулатора"
-#: gitk:11407
+#: gitk:11521
msgid "Display nearby tags/heads"
msgstr "Извеждане на близките етикети и върхове"
-#: gitk:11410
+#: gitk:11524
msgid "Maximum # tags/heads to show"
msgstr "Максимален брой етикети/върхове за показване"
-#: gitk:11413
+#: gitk:11527
msgid "Limit diffs to listed paths"
msgstr "Разлика само в избраните пътища"
-#: gitk:11416
+#: gitk:11530
msgid "Support per-file encodings"
msgstr "Поддръжка на различни кодирания за всеки файл"
-#: gitk:11422 gitk:11569
+#: gitk:11536 gitk:11683
msgid "External diff tool"
msgstr "Външен инструмент за разлики"
-#: gitk:11423
+#: gitk:11537
msgid "Choose..."
msgstr "Избор…"
-#: gitk:11428
+#: gitk:11542
msgid "General options"
msgstr "Общи настройки"
-#: gitk:11431
+#: gitk:11545
msgid "Use themed widgets"
msgstr "Използване на тема за графичните обекти"
-#: gitk:11433
+#: gitk:11547
msgid "(change requires restart)"
msgstr "(промяната изисква рестартиране на Gitk)"
-#: gitk:11435
+#: gitk:11549
msgid "(currently unavailable)"
msgstr "(в момента недостъпно)"
-#: gitk:11446
+#: gitk:11560
msgid "Colors: press to choose"
msgstr "Цветове: избира се с натискане"
-#: gitk:11449
+#: gitk:11563
msgid "Interface"
msgstr "Интерфейс"
-#: gitk:11450
+#: gitk:11564
msgid "interface"
msgstr "интерфейс"
-#: gitk:11453
+#: gitk:11567
msgid "Background"
msgstr "Фон"
-#: gitk:11454 gitk:11484
+#: gitk:11568 gitk:11598
msgid "background"
msgstr "фон"
-#: gitk:11457
+#: gitk:11571
msgid "Foreground"
msgstr "Знаци"
-#: gitk:11458
+#: gitk:11572
msgid "foreground"
msgstr "знаци"
-#: gitk:11461
+#: gitk:11575
msgid "Diff: old lines"
msgstr "Разлика: стари редове"
-#: gitk:11462
+#: gitk:11576
msgid "diff old lines"
msgstr "разлика, стари редове"
-#: gitk:11466
+#: gitk:11580
msgid "Diff: new lines"
msgstr "Разлика: нови редове"
-#: gitk:11467
+#: gitk:11581
msgid "diff new lines"
msgstr "разлика, нови редове"
-#: gitk:11471
+#: gitk:11585
msgid "Diff: hunk header"
msgstr "Разлика: начало на парче"
-#: gitk:11473
+#: gitk:11587
msgid "diff hunk header"
msgstr "разлика, начало на парче"
-#: gitk:11477
+#: gitk:11591
msgid "Marked line bg"
msgstr "Фон на отбелязан ред"
-#: gitk:11479
+#: gitk:11593
msgid "marked line background"
msgstr "фон на отбелязан ред"
-#: gitk:11483
+#: gitk:11597
msgid "Select bg"
msgstr "Избор на фон"
-#: gitk:11492
+#: gitk:11606
msgid "Fonts: press to choose"
msgstr "Шрифтове: избира се с натискане"
-#: gitk:11494
+#: gitk:11608
msgid "Main font"
msgstr "Основен шрифт"
-#: gitk:11495
+#: gitk:11609
msgid "Diff display font"
msgstr "Шрифт за разликите"
-#: gitk:11496
+#: gitk:11610
msgid "User interface font"
msgstr "Шрифт на интерфейса"
-#: gitk:11518
+#: gitk:11632
msgid "Gitk preferences"
msgstr "Настройки на Gitk"
-#: gitk:11527
+#: gitk:11641
msgid "General"
msgstr "Общи"
-#: gitk:11528
+#: gitk:11642
msgid "Colors"
msgstr "Цветове"
-#: gitk:11529
+#: gitk:11643
msgid "Fonts"
msgstr "Шрифтове"
-#: gitk:11579
+#: gitk:11693
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: избор на цвят на „%s“"
-#: gitk:12092
+#: gitk:12206
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@@ -1367,15 +1393,15 @@
"Тази версия на Tcl/Tk не се поддържа от Gitk.\n"
" Необходима ви е поне Tcl/Tk 8.4."
-#: gitk:12302
+#: gitk:12416
msgid "Cannot find a git repository here."
msgstr "Тук липсва хранилище на Git."
-#: gitk:12349
+#: gitk:12463
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
-#: gitk:12361
+#: gitk:12475
msgid "Bad arguments to gitk:"
msgstr "Неправилни аргументи на gitk:"
diff --git a/gitk-git/po/zh_cn.po b/gitk-git/po/zh_cn.po
new file mode 100644
index 0000000..17b7f89
--- /dev/null
+++ b/gitk-git/po/zh_cn.po
@@ -0,0 +1,1367 @@
+# Translation of gitk to Simplified Chinese.
+#
+# Translators:
+# YanKe <imyanke@163.com>, 2017
+
+msgid ""
+msgstr ""
+"Project-Id-Version: Git Chinese Localization Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-28 23:11+0800\n"
+"PO-Revision-Date: 2017-03-11 02:27+0800\n"
+"Last-Translator: YanKe <imyanke@163.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "不能获取未合并文件列表："
+
+#: gitk:212 gitk:2403
+msgid "Color words"
+msgstr "着色显示差异"
+
+#: gitk:217 gitk:2403 gitk:8249 gitk:8282
+msgid "Markup words"
+msgstr "标记显示差异"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "解析版本错误："
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "运行 --argscmd命令出错"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr "没有选中文件：--指定merge参数但没有未合并的文件。"
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr "没有选中文件：--指定merge参数但没有未合并的文件在文件中"
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "执行git log命令出错："
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "读取中"
+
+#: gitk:496 gitk:4549
+msgid "Reading commits..."
+msgstr "提交记录读取中..."
+
+#: gitk:499 gitk:1641 gitk:4552
+msgid "No commits selected"
+msgstr "未选中任何提交"
+
+#: gitk:1449 gitk:4069 gitk:12583
+msgid "Command line"
+msgstr "命令行"
+
+#: gitk:1515
+msgid "Can't parse git log output:"
+msgstr "不能解析git log输出："
+
+#: gitk:1744
+msgid "No commit information available"
+msgstr "无可用提交信息"
+
+#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
+msgid "OK"
+msgstr "确定"
+
+#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
+#: gitk:11389 gitk:11669
+msgid "Cancel"
+msgstr "取消"
+
+#: gitk:2087
+msgid "&Update"
+msgstr "更新"
+
+#: gitk:2088
+msgid "&Reload"
+msgstr "重新加载"
+
+#: gitk:2089
+msgid "Reread re&ferences"
+msgstr "重新读取引用"
+
+#: gitk:2090
+msgid "&List references"
+msgstr "列出引用(分支以及tag)"
+
+#: gitk:2092
+msgid "Start git &gui"
+msgstr "启动git gui客户端"
+
+#: gitk:2094
+msgid "&Quit"
+msgstr "退出"
+
+#: gitk:2086
+msgid "&File"
+msgstr "文件"
+
+#: gitk:2098
+msgid "&Preferences"
+msgstr "偏好设置"
+
+#: gitk:2097
+msgid "&Edit"
+msgstr "编辑"
+
+#: gitk:2102
+msgid "&New view..."
+msgstr "新视图..."
+
+#: gitk:2103
+msgid "&Edit view..."
+msgstr "编辑视图..."
+
+#: gitk:2104
+msgid "&Delete view"
+msgstr "删除视图"
+
+#: gitk:2106
+msgid "&All files"
+msgstr "所有文件"
+
+#: gitk:2101
+msgid "&View"
+msgstr "视图"
+
+#: gitk:2111 gitk:2121
+msgid "&About gitk"
+msgstr "关于gitk"
+
+#: gitk:2112 gitk:2126
+msgid "&Key bindings"
+msgstr "快捷键"
+
+#: gitk:2110 gitk:2125
+msgid "&Help"
+msgstr "帮助"
+
+#: gitk:2203 gitk:8681
+msgid "SHA1 ID:"
+msgstr "SHA1 ID："
+
+#: gitk:2247
+msgid "Row"
+msgstr "行"
+
+#: gitk:2285
+msgid "Find"
+msgstr "查找"
+
+#: gitk:2313
+msgid "commit"
+msgstr "提交"
+
+#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
+#: gitk:6936
+msgid "containing:"
+msgstr "包含："
+
+#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
+msgid "touching paths:"
+msgstr "影响路径："
+
+#: gitk:2321 gitk:4801
+msgid "adding/removing string:"
+msgstr "增加/删除字符串："
+
+#: gitk:2322 gitk:4803
+msgid "changing lines matching:"
+msgstr "改变行匹配："
+
+#: gitk:2331 gitk:2333 gitk:4790
+msgid "Exact"
+msgstr "精确匹配"
+
+#: gitk:2333 gitk:4878 gitk:6747
+msgid "IgnCase"
+msgstr "忽略大小写"
+
+#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
+msgid "Regexp"
+msgstr "正则"
+
+#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
+msgid "All fields"
+msgstr "所有字段"
+
+#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
+msgid "Headline"
+msgstr "标题"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
+msgid "Comments"
+msgstr "提交注释"
+
+#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
+#: gitk:8874
+msgid "Author"
+msgstr "作者"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
+msgid "Committer"
+msgstr "提交者"
+
+#: gitk:2371
+msgid "Search"
+msgstr "搜索"
+
+#: gitk:2379
+msgid "Diff"
+msgstr "差异"
+
+#: gitk:2381
+msgid "Old version"
+msgstr "老版本"
+
+#: gitk:2383
+msgid "New version"
+msgstr "新版本"
+
+#: gitk:2386
+msgid "Lines of context"
+msgstr "Diff上下文显示行数"
+
+#: gitk:2396
+msgid "Ignore space change"
+msgstr "忽略空格修改"
+
+#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
+msgid "Line diff"
+msgstr "按行显示差异"
+
+#: gitk:2467
+msgid "Patch"
+msgstr "补丁"
+
+#: gitk:2469
+msgid "Tree"
+msgstr "树"
+
+#: gitk:2639 gitk:2660
+msgid "Diff this -> selected"
+msgstr "比较从当前提交到选中提交的差异"
+
+#: gitk:2640 gitk:2661
+msgid "Diff selected -> this"
+msgstr "比较从选中提交到当前提交的差异"
+
+#: gitk:2641 gitk:2662
+msgid "Make patch"
+msgstr "制作补丁"
+
+#: gitk:2642 gitk:9283
+msgid "Create tag"
+msgstr "创建tag"
+
+#: gitk:2643
+msgid "Copy commit summary"
+msgstr "复制提交摘要"
+
+#: gitk:2644 gitk:9414
+msgid "Write commit to file"
+msgstr "写入提交到文件"
+
+#: gitk:2645
+msgid "Create new branch"
+msgstr "创建新分支"
+
+#: gitk:2646
+msgid "Cherry-pick this commit"
+msgstr "在此提交运用补丁(cherry-pick)命令"
+
+#: gitk:2647
+msgid "Reset HEAD branch to here"
+msgstr "将分支头(HEAD)重置到此处"
+
+#: gitk:2648
+msgid "Mark this commit"
+msgstr "标记此提交"
+
+#: gitk:2649
+msgid "Return to mark"
+msgstr "返回到标记"
+
+#: gitk:2650
+msgid "Find descendant of this and mark"
+msgstr "查找本次提交的子提交并标记"
+
+#: gitk:2651
+msgid "Compare with marked commit"
+msgstr "和已标记的提交作比较"
+
+#: gitk:2652 gitk:2663
+msgid "Diff this -> marked commit"
+msgstr "比较从当前提交到已标记提交的差异"
+
+#: gitk:2653 gitk:2664
+msgid "Diff marked commit -> this"
+msgstr "比较从已标记提交到当前提交的差异"
+
+#: gitk:2654
+msgid "Revert this commit"
+msgstr "撤销(revert)此提交"
+
+#: gitk:2670
+msgid "Check out this branch"
+msgstr "检出(checkout)此分支"
+
+#: gitk:2671
+msgid "Rename this branch"
+msgstr "重命名(Rename)此分支"
+
+#: gitk:2672
+msgid "Remove this branch"
+msgstr "删除(Remove)此分支"
+
+#: gitk:2673
+msgid "Copy branch name"
+msgstr "复制分支名称"
+
+#: gitk:2680
+msgid "Highlight this too"
+msgstr "高亮此处"
+
+#: gitk:2681
+msgid "Highlight this only"
+msgstr "只高亮此处"
+
+#: gitk:2682
+msgid "External diff"
+msgstr "外部diff"
+
+#: gitk:2683
+msgid "Blame parent commit"
+msgstr "Blame父提交"
+
+#: gitk:2684
+msgid "Copy path"
+msgstr "复制路径"
+
+#: gitk:2691
+msgid "Show origin of this line"
+msgstr "显示此行原始提交"
+
+#: gitk:2692
+msgid "Run git gui blame on this line"
+msgstr "在此行运行git gui客户端的blame"
+
+#: gitk:3036
+msgid "About gitk"
+msgstr "关于gitk"
+
+#: gitk:3038
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2016 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr "\nGitk — 一个git的提交查看器\n\n© 2005-2016 Paul Mackerras\n\n在GNU许可证下使用以及分发"
+
+#: gitk:3046 gitk:3113 gitk:10004
+msgid "Close"
+msgstr "关闭"
+
+#: gitk:3067
+msgid "Gitk key bindings"
+msgstr "Gitk快捷键"
+
+#: gitk:3070
+msgid "Gitk key bindings:"
+msgstr "Gitk快捷键："
+
+#: gitk:3072
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\t退出"
+
+#: gitk:3073
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\t关闭窗口"
+
+#: gitk:3074
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\t移动到第一次提交"
+
+#: gitk:3075
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\t移动到最后一次提交"
+
+#: gitk:3076
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, k\t移动到上一次提交"
+
+#: gitk:3077
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, j\t移动到下一次提交"
+
+#: gitk:3078
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, h\t历史列表的上一项"
+
+#: gitk:3079
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\t历史列表的下一项"
+
+#: gitk:3080
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr "<%s-n>\t在历史列表中前往本次提交的第n个父提交"
+
+#: gitk:3081
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\t上一页提交列表"
+
+#: gitk:3082
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\t下一页提交列表"
+
+#: gitk:3083
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\t滚动到提交列表顶部"
+
+#: gitk:3084
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\t滚动到提交列表底部"
+
+#: gitk:3085
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\t向上滚动一行提交列表"
+
+#: gitk:3086
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\t向下滚动一行提交列表"
+
+#: gitk:3087
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\t向上滚动一页提交列表"
+
+#: gitk:3088
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\t向下滚动一页提交列表"
+
+#: gitk:3089
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\t向后查找(向上的，更晚的提交)"
+
+#: gitk:3090
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Down>\t向前查找(向下的，更早的提交)"
+
+#: gitk:3091
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\t向上滚动diff视图一页"
+
+#: gitk:3092
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\t向上滚动diff视图一页"
+
+#: gitk:3093
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Space>\t\t向下滚动diff视图一页"
+
+#: gitk:3094
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\t向上滚动diff视图18行"
+
+#: gitk:3095
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\t向下滚动diff视图18行"
+
+#: gitk:3096
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\t查找"
+
+#: gitk:3097
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\t移动到下一次查找命中"
+
+#: gitk:3098
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\t移动到下一次查找命中"
+
+#: gitk:3099
+msgid "g\t\tGo to commit"
+msgstr "g\t\t转到提交"
+
+#: gitk:3100
+msgid "/\t\tFocus the search box"
+msgstr "/\t\t选中搜索框"
+
+#: gitk:3101
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\t移动到上一次查找命中"
+
+#: gitk:3102
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\t滚动diff视图到下一个文件"
+
+#: gitk:3103
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\t在diff视图中查找下一此命中"
+
+#: gitk:3104
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\t在diff视图中查找上一次命中"
+
+#: gitk:3105
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\t增大字体大小"
+
+#: gitk:3106
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\t增大字体大小"
+
+#: gitk:3107
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\t减小字体大小"
+
+#: gitk:3108
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\t减小字体大小"
+
+#: gitk:3109
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\t更新"
+
+#: gitk:3574 gitk:3583
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "创建临时目录出错%s："
+
+#: gitk:3596
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "从%s获取\"%s\"出错："
+
+#: gitk:3659
+msgid "command failed:"
+msgstr "执行命令失败："
+
+#: gitk:3808
+msgid "No such commit"
+msgstr "无此提交"
+
+#: gitk:3822
+msgid "git gui blame: command failed:"
+msgstr "git gui blame：执行命令失败："
+
+#: gitk:3853
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "不能读取合并头(merge head)：%s"
+
+#: gitk:3861
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "读取索引出错：%s"
+
+#: gitk:3886
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "不能执行git blame：%s"
+
+#: gitk:3889 gitk:6778
+msgid "Searching"
+msgstr "搜索中"
+
+#: gitk:3921
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "运行git blame出错：%s"
+
+#: gitk:3949
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr "此行来自提交%s，不在此视图中"
+
+#: gitk:3963
+msgid "External diff viewer failed:"
+msgstr "外部diff查看器失败："
+
+#: gitk:4067
+msgid "All files"
+msgstr "所有文件"
+
+#: gitk:4091
+msgid "View"
+msgstr "视图"
+
+#: gitk:4094
+msgid "Gitk view definition"
+msgstr "Gitk视图定义"
+
+#: gitk:4098
+msgid "Remember this view"
+msgstr "记住此视图"
+
+#: gitk:4099
+msgid "References (space separated list):"
+msgstr "引用(空格切分的列表)："
+
+#: gitk:4100
+msgid "Branches & tags:"
+msgstr "分支和tags"
+
+#: gitk:4101
+msgid "All refs"
+msgstr "所有引用"
+
+#: gitk:4102
+msgid "All (local) branches"
+msgstr "所有(本地)分支"
+
+#: gitk:4103
+msgid "All tags"
+msgstr "所有tag"
+
+#: gitk:4104
+msgid "All remote-tracking branches"
+msgstr "所有远程跟踪分支"
+
+#: gitk:4105
+msgid "Commit Info (regular expressions):"
+msgstr "提交信息 (正则表达式)："
+
+#: gitk:4106
+msgid "Author:"
+msgstr "作者："
+
+#: gitk:4107
+msgid "Committer:"
+msgstr "提交者："
+
+#: gitk:4108
+msgid "Commit Message:"
+msgstr "提交信息："
+
+#: gitk:4109
+msgid "Matches all Commit Info criteria"
+msgstr "匹配所有提交信息标准"
+
+#: gitk:4110
+msgid "Matches no Commit Info criteria"
+msgstr "匹配无提交信息标准"
+
+#: gitk:4111
+msgid "Changes to Files:"
+msgstr "文件修改列表："
+
+#: gitk:4112
+msgid "Fixed String"
+msgstr "固定字符串"
+
+#: gitk:4113
+msgid "Regular Expression"
+msgstr "正则表达式："
+
+#: gitk:4114
+msgid "Search string:"
+msgstr "搜索字符串："
+
+#: gitk:4115
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):"
+
+#: gitk:4116
+msgid "Since:"
+msgstr "自："
+
+#: gitk:4117
+msgid "Until:"
+msgstr "到："
+
+#: gitk:4118
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "限制 且/或 跳过一定数量的版本(正整数)："
+
+#: gitk:4119
+msgid "Number to show:"
+msgstr "显示数量："
+
+#: gitk:4120
+msgid "Number to skip:"
+msgstr "跳过数量："
+
+#: gitk:4121
+msgid "Miscellaneous options:"
+msgstr "其他选项："
+
+#: gitk:4122
+msgid "Strictly sort by date"
+msgstr "严格按日期整理"
+
+#: gitk:4123
+msgid "Mark branch sides"
+msgstr "标记分支边界"
+
+#: gitk:4124
+msgid "Limit to first parent"
+msgstr "限制到第一个父提交"
+
+#: gitk:4125
+msgid "Simple history"
+msgstr "简易历史"
+
+#: gitk:4126
+msgid "Additional arguments to git log:"
+msgstr "git log命令的额外参数："
+
+#: gitk:4127
+msgid "Enter files and directories to include, one per line:"
+msgstr "输入文件和文件夹来引用，每行一个："
+
+#: gitk:4128
+msgid "Command to generate more commits to include:"
+msgstr "命令产生更多的提交来引用："
+
+#: gitk:4252
+msgid "Gitk: edit view"
+msgstr "Gitk: 编辑视图"
+
+#: gitk:4260
+msgid "-- criteria for selecting revisions"
+msgstr "-- 用来选择版本的规则"
+
+#: gitk:4265
+msgid "View Name"
+msgstr "视图名称"
+
+#: gitk:4340
+msgid "Apply (F5)"
+msgstr "应用(F5)"
+
+#: gitk:4378
+msgid "Error in commit selection arguments:"
+msgstr "提交选择参数错误："
+
+#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
+msgid "None"
+msgstr "无"
+
+#: gitk:5045 gitk:5050
+msgid "Descendant"
+msgstr "子提交"
+
+#: gitk:5046
+msgid "Not descendant"
+msgstr "非子提交"
+
+#: gitk:5053 gitk:5058
+msgid "Ancestor"
+msgstr "父提交"
+
+#: gitk:5054
+msgid "Not ancestor"
+msgstr "非父提交"
+
+#: gitk:5348
+msgid "Local changes checked in to index but not committed"
+msgstr "已添加到索引但未提交的修改"
+
+#: gitk:5384
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "未添加到索引且未提交的修改"
+
+#: gitk:7158
+msgid "and many more"
+msgstr "更多"
+
+#: gitk:7161
+msgid "many"
+msgstr "很多"
+
+#: gitk:7352
+msgid "Tags:"
+msgstr "Tags:"
+
+#: gitk:7369 gitk:7375 gitk:8854
+msgid "Parent"
+msgstr "父节点"
+
+#: gitk:7380
+msgid "Child"
+msgstr "子节点"
+
+#: gitk:7389
+msgid "Branch"
+msgstr "分支"
+
+#: gitk:7392
+msgid "Follows"
+msgstr "之后的tag"
+
+#: gitk:7395
+msgid "Precedes"
+msgstr "之前的tag"
+
+#: gitk:7990
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "获取差异错误：%s"
+
+#: gitk:8679
+msgid "Goto:"
+msgstr "转到："
+
+#: gitk:8700
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "短格式的SHA1提交号%s不明确、有歧义"
+
+#: gitk:8707
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "版本%s未知"
+
+#: gitk:8717
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "提交号(SHA1 id)%s未知"
+
+#: gitk:8719
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "版本%s不在当前视图中"
+
+#: gitk:8861 gitk:8876
+msgid "Date"
+msgstr "日期"
+
+#: gitk:8864
+msgid "Children"
+msgstr "子节点"
+
+#: gitk:8927
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "重置分支%s到此处"
+
+#: gitk:8929
+msgid "Detached head: can't reset"
+msgstr "分离的头(head)：不能重置(reset)"
+
+#: gitk:9034 gitk:9040
+msgid "Skipping merge commit "
+msgstr "跳过合并提交"
+
+#: gitk:9049 gitk:9054
+msgid "Error getting patch ID for "
+msgstr "获取补丁ID出错"
+
+#: gitk:9050 gitk:9055
+msgid " - stopping\n"
+msgstr " — 停止中\n"
+
+#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
+msgid "Commit "
+msgstr "提交"
+
+#: gitk:9064
+msgid ""
+" is the same patch as\n"
+" "
+msgstr " 是相同的补丁(patch)\n "
+
+#: gitk:9072
+msgid ""
+" differs from\n"
+" "
+msgstr " 差异来自\n "
+
+#: gitk:9074
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr "提交的差异(Diff)：\n\n"
+
+#: gitk:9086 gitk:9095
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr "有%s子节点 — 停止中\n"
+
+#: gitk:9114
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "写入提交到文件出错：%s"
+
+#: gitk:9120
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "比较提交差异出错：%s"
+
+#: gitk:9166
+msgid "Top"
+msgstr "顶部"
+
+#: gitk:9167
+msgid "From"
+msgstr "从"
+
+#: gitk:9172
+msgid "To"
+msgstr "到"
+
+#: gitk:9196
+msgid "Generate patch"
+msgstr "生成补丁(patch)"
+
+#: gitk:9198
+msgid "From:"
+msgstr "从："
+
+#: gitk:9207
+msgid "To:"
+msgstr "到："
+
+#: gitk:9216
+msgid "Reverse"
+msgstr "反向(Reverse)"
+
+#: gitk:9218 gitk:9428
+msgid "Output file:"
+msgstr "输出文件："
+
+#: gitk:9224
+msgid "Generate"
+msgstr "生成"
+
+#: gitk:9262
+msgid "Error creating patch:"
+msgstr "创建补丁(patch)出错："
+
+#: gitk:9285 gitk:9416 gitk:9504
+msgid "ID:"
+msgstr "ID:"
+
+#: gitk:9294
+msgid "Tag name:"
+msgstr "Tag名称："
+
+#: gitk:9297
+msgid "Tag message is optional"
+msgstr "Tag信息是可选的"
+
+#: gitk:9299
+msgid "Tag message:"
+msgstr "Tag信息："
+
+#: gitk:9303 gitk:9474
+msgid "Create"
+msgstr "创建"
+
+#: gitk:9321
+msgid "No tag name specified"
+msgstr "未指定tag名称"
+
+#: gitk:9325
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Tag\"%s\"已经存在"
+
+#: gitk:9335
+msgid "Error creating tag:"
+msgstr "创建tag出错："
+
+#: gitk:9425
+msgid "Command:"
+msgstr "命令："
+
+#: gitk:9433
+msgid "Write"
+msgstr "写入"
+
+#: gitk:9451
+msgid "Error writing commit:"
+msgstr "写入提交出错："
+
+#: gitk:9473
+msgid "Create branch"
+msgstr "创建分支"
+
+#: gitk:9489
+#, tcl-format
+msgid "Rename branch %s"
+msgstr "重命名分支%s"
+
+#: gitk:9490
+msgid "Rename"
+msgstr "重命名"
+
+#: gitk:9514
+msgid "Name:"
+msgstr "名称："
+
+#: gitk:9538
+msgid "Please specify a name for the new branch"
+msgstr "请指定新分支的名称"
+
+#: gitk:9543
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "分支\"%s\"已经存在。覆盖它？"
+
+#: gitk:9587
+msgid "Please specify a new name for the branch"
+msgstr "请重新指定新分支的名称"
+
+#: gitk:9650
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "提交%s已经存在于分支%s。确定重新应用它？"
+
+#: gitk:9655
+msgid "Cherry-picking"
+msgstr "打补丁中(Cherry-picking)"
+
+#: gitk:9664
+#, tcl-format
+msgid ""
+"Cherry-pick failed because of local changes to file '%s'.\n"
+"Please commit, reset or stash your changes and try again."
+msgstr "打补丁(Cherry-pick)失败，因为本地修改了文件\"%s\"。\n请提交(commit)、重置(reset)或暂存(stash)修改后重试。"
+
+#: gitk:9670
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr "打补丁(Cherry-pick)失败因为合并冲突。\n你是否希望运行git citool 来解决冲突？"
+
+#: gitk:9686 gitk:9744
+msgid "No changes committed"
+msgstr "无已经提交的修改"
+
+#: gitk:9713
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "提交%s不包含在分支%s中，确认回滚(revert)它？"
+
+#: gitk:9718
+msgid "Reverting"
+msgstr "回滚中(Reverting)"
+
+#: gitk:9726
+#, tcl-format
+msgid ""
+"Revert failed because of local changes to the following files:%s Please "
+"commit, reset or stash your changes and try again."
+msgstr "回滚(revert)失败，因为如下的本地文件修改：%s\n请提交(commit)、重置(reset)或者暂存(stash)改变后重试。"
+
+#: gitk:9730
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr "回滚(revert)失败，因为合并冲突。\n你是否希望运行git citool来解决冲突？"
+
+#: gitk:9773
+msgid "Confirm reset"
+msgstr "确认重置(reset)"
+
+#: gitk:9775
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "重置(reset)分支%s到%s？"
+
+#: gitk:9777
+msgid "Reset type:"
+msgstr "重置(reset)类型："
+
+#: gitk:9780
+msgid "Soft: Leave working tree and index untouched"
+msgstr "软性：离开工作树，索引未改变"
+
+#: gitk:9783
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "混合：离开工作树(未改变)，索引重置"
+
+#: gitk:9786
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr "硬性：重置工作树和索引\n(丢弃所有的本地修改)"
+
+#: gitk:9803
+msgid "Resetting"
+msgstr "重置中(Resetting)"
+
+#: gitk:9876
+#, tcl-format
+msgid "A local branch named %s exists already"
+msgstr "本地分支%s已经存在"
+
+#: gitk:9884
+msgid "Checking out"
+msgstr "检出中(Checking out)"
+
+#: gitk:9943
+msgid "Cannot delete the currently checked-out branch"
+msgstr "不能删除当前检出(checkout)分支"
+
+#: gitk:9949
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr "在分支%s上的提交不在其他任何分支上。\n确认删除分支%s？"
+
+#: gitk:9980
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Tags和头指针(heads)：%s"
+
+#: gitk:9997
+msgid "Filter"
+msgstr "过滤器"
+
+#: gitk:10293
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr "读取提交拓扑信息出错；分支和之前/之后的tag信息将不能完成。"
+
+#: gitk:11270
+msgid "Tag"
+msgstr "标签(Tag)"
+
+#: gitk:11274
+msgid "Id"
+msgstr "Id"
+
+#: gitk:11357
+msgid "Gitk font chooser"
+msgstr "Gitk字体选择"
+
+#: gitk:11374
+msgid "B"
+msgstr "粗体"
+
+#: gitk:11377
+msgid "I"
+msgstr "斜体"
+
+#: gitk:11495
+msgid "Commit list display options"
+msgstr "提交列表展示选项"
+
+#: gitk:11498
+msgid "Maximum graph width (lines)"
+msgstr "最大图宽度(行数)"
+
+#: gitk:11502
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "最大图宽度(%窗口百分比)"
+
+#: gitk:11505
+msgid "Show local changes"
+msgstr "显示本地修改"
+
+#: gitk:11508
+msgid "Auto-select SHA1 (length)"
+msgstr "自动选择SHA1(长度)"
+
+#: gitk:11512
+msgid "Hide remote refs"
+msgstr "隐藏远程引用"
+
+#: gitk:11516
+msgid "Diff display options"
+msgstr "差异(Diff)展示选项"
+
+#: gitk:11518
+msgid "Tab spacing"
+msgstr "制表符宽度"
+
+#: gitk:11521
+msgid "Display nearby tags/heads"
+msgstr "显示临近的tags/heads"
+
+#: gitk:11524
+msgid "Maximum # tags/heads to show"
+msgstr "最大tags/heads展示数量"
+
+#: gitk:11527
+msgid "Limit diffs to listed paths"
+msgstr "diff中列出文件限制"
+
+#: gitk:11530
+msgid "Support per-file encodings"
+msgstr "单独文件编码支持"
+
+#: gitk:11536 gitk:11683
+msgid "External diff tool"
+msgstr "外部差异(diff)工具"
+
+#: gitk:11537
+msgid "Choose..."
+msgstr "选择..."
+
+#: gitk:11542
+msgid "General options"
+msgstr "常规选项"
+
+#: gitk:11545
+msgid "Use themed widgets"
+msgstr "使用主题小部件"
+
+#: gitk:11547
+msgid "(change requires restart)"
+msgstr "(需重启生效)"
+
+#: gitk:11549
+msgid "(currently unavailable)"
+msgstr "(当前不可用)"
+
+#: gitk:11560
+msgid "Colors: press to choose"
+msgstr "颜色：点击来选择"
+
+#: gitk:11563
+msgid "Interface"
+msgstr "界面"
+
+#: gitk:11564
+msgid "interface"
+msgstr "界面"
+
+#: gitk:11567
+msgid "Background"
+msgstr "背景"
+
+#: gitk:11568 gitk:11598
+msgid "background"
+msgstr "背景"
+
+#: gitk:11571
+msgid "Foreground"
+msgstr "前景"
+
+#: gitk:11572
+msgid "foreground"
+msgstr "前景"
+
+#: gitk:11575
+msgid "Diff: old lines"
+msgstr "差异(Diff)：老代码行"
+
+#: gitk:11576
+msgid "diff old lines"
+msgstr "差异(diff)老代码行"
+
+#: gitk:11580
+msgid "Diff: new lines"
+msgstr "差异(Diff)：新代码行"
+
+#: gitk:11581
+msgid "diff new lines"
+msgstr "差异(diff)新代码行"
+
+#: gitk:11585
+msgid "Diff: hunk header"
+msgstr "差异(Diff)：补丁片段头信息"
+
+#: gitk:11587
+msgid "diff hunk header"
+msgstr "差异(diff)补丁片段头信息"
+
+#: gitk:11591
+msgid "Marked line bg"
+msgstr "已标记代码行背景"
+
+#: gitk:11593
+msgid "marked line background"
+msgstr "已标记代码行背景"
+
+#: gitk:11597
+msgid "Select bg"
+msgstr "选择背景"
+
+#: gitk:11606
+msgid "Fonts: press to choose"
+msgstr "字体：点击来选择"
+
+#: gitk:11608
+msgid "Main font"
+msgstr "主字体"
+
+#: gitk:11609
+msgid "Diff display font"
+msgstr "差异(Diff)显示字体"
+
+#: gitk:11610
+msgid "User interface font"
+msgstr "用户界面字体"
+
+#: gitk:11632
+msgid "Gitk preferences"
+msgstr "Gitk偏好设置"
+
+#: gitk:11641
+msgid "General"
+msgstr "常规"
+
+#: gitk:11642
+msgid "Colors"
+msgstr "颜色"
+
+#: gitk:11643
+msgid "Fonts"
+msgstr "字体"
+
+#: gitk:11693
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk：选择颜色用于%s"
+
+#: gitk:12206
+msgid ""
+"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+" Gitk requires at least Tcl/Tk 8.4."
+msgstr "对不起，gitk不能运行在当前版本的Tcl/Tk中。\nGitk运行需要最低版本为Tcl/Tk8.4。"
+
+#: gitk:12416
+msgid "Cannot find a git repository here."
+msgstr "在此位置未发现git仓库。"
+
+#: gitk:12463
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "不明确有歧义的参数\"%s\"：版本和文件名称"
+
+#: gitk:12475
+msgid "Bad arguments to gitk:"
+msgstr "运行gitk参数错误："
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2594a4b..7fef19f 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -788,6 +788,38 @@
# ======================================================================
# input validation and dispatch
+# Various hash size-related values.
+my $sha1_len = 40;
+my $sha256_extra_len = 24;
+my $sha256_len = $sha1_len + $sha256_extra_len;
+
+# A regex matching $len hex characters. $len may be a range (e.g. 7,64).
+sub oid_nlen_regex {
+ my $len = shift;
+ my $hchr = qr/[0-9a-fA-F]/;
+ return qr/(?:(?:$hchr){$len})/;
+}
+
+# A regex matching two sets of $nlen hex characters, prefixed by the literal
+# string $prefix and with the literal string $infix between them.
+sub oid_nlen_prefix_infix_regex {
+ my $nlen = shift;
+ my $prefix = shift;
+ my $infix = shift;
+
+ my $rx = oid_nlen_regex($nlen);
+
+ return qr/^\Q$prefix\E$rx\Q$infix\E$rx$/;
+}
+
+# A regex matching a valid object ID.
+our $oid_regex;
+{
+ my $x = oid_nlen_regex($sha1_len);
+ my $y = oid_nlen_regex($sha256_extra_len);
+ $oid_regex = qr/(?:$x(?:$y)?)/;
+}
+
# input parameters can be collected from a variety of sources (presently, CGI
# and PATH_INFO), so we define an %input_params hash that collects them all
# together during validation: this allows subsequent uses (e.g. href()) to be
@@ -1516,7 +1548,7 @@
return undef unless defined $input;
# textual hashes are O.K.
- if ($input =~ m/^[0-9a-fA-F]{40}$/) {
+ if ($input =~ m/^$oid_regex$/) {
return 1;
}
# it must be correct pathname
@@ -2028,6 +2060,9 @@
sub format_log_line_html {
my $line = shift;
+ # Potentially abbreviated OID.
+ my $regex = oid_nlen_regex("7,64");
+
$line = esc_html($line, -nbsp=>1);
$line =~ s{
\b
@@ -2037,10 +2072,10 @@
(?<!-) # see strbuf_check_tag_ref(). Tags can't start with -
[A-Za-z0-9.-]+
(?!\.) # refs can't end with ".", see check_refname_format()
- -g[0-9a-fA-F]{7,40}
+ -g$regex
|
# Just a normal looking Git SHA1
- [0-9a-fA-F]{7,40}
+ $regex
)
\b
}{
@@ -2286,7 +2321,8 @@
')</span>';
}
# match <hash>
- if ($line =~ m/^index [0-9a-fA-F]{40},[0-9a-fA-F]{40}/) {
+ if ($line =~ oid_nlen_prefix_infix_regex($sha1_len, "index ", ",") |
+ $line =~ oid_nlen_prefix_infix_regex($sha256_len, "index ", ",")) {
# can match only for combined diff
$line = 'index ';
for (my $i = 0; $i < $diffinfo->{'nparents'}; $i++) {
@@ -2308,7 +2344,8 @@
$line .= '0' x 7;
}
- } elsif ($line =~ m/^index [0-9a-fA-F]{40}..[0-9a-fA-F]{40}/) {
+ } elsif ($line =~ oid_nlen_prefix_infix_regex($sha1_len, "index ", "..") |
+ $line =~ oid_nlen_prefix_infix_regex($sha256_len, "index ", "..")) {
# can match only for ordinary diff
my ($from_link, $to_link);
if ($from->{'href'}) {
@@ -2834,7 +2871,7 @@
}
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
- $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t/;
+ $line =~ m/^([0-9]+) (.+) ($oid_regex)\t/;
if (defined $type && $type ne $2) {
# type doesn't match
return undef;
@@ -3333,7 +3370,7 @@
while (my $line = <$fd>) {
chomp $line;
- if ($line =~ m!^([0-9a-fA-F]{40})\srefs/($type.*)$!) {
+ if ($line =~ m!^($oid_regex)\srefs/($type.*)$!) {
if (defined $refs{$1}) {
push @{$refs{$1}}, $2;
} else {
@@ -3407,7 +3444,7 @@
$tag{'id'} = $tag_id;
while (my $line = <$fd>) {
chomp $line;
- if ($line =~ m/^object ([0-9a-fA-F]{40})$/) {
+ if ($line =~ m/^object ($oid_regex)$/) {
$tag{'object'} = $1;
} elsif ($line =~ m/^type (.+)$/) {
$tag{'type'} = $1;
@@ -3451,15 +3488,15 @@
}
my $header = shift @commit_lines;
- if ($header !~ m/^[0-9a-fA-F]{40}/) {
+ if ($header !~ m/^$oid_regex/) {
return;
}
($co{'id'}, my @parents) = split ' ', $header;
while (my $line = shift @commit_lines) {
last if $line eq "\n";
- if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
+ if ($line =~ m/^tree ($oid_regex)$/) {
$co{'tree'} = $1;
- } elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
+ } elsif ((!defined $withparents) && ($line =~ m/^parent ($oid_regex)$/)) {
push @parents, $1;
} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
$co{'author'} = to_utf8($1);
@@ -3591,7 +3628,7 @@
# ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M ls-files.c'
# ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M rev-tree.c'
- if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/) {
+ if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ($oid_regex) ($oid_regex) (.)([0-9]{0,3})\t(.*)$/) {
$res{'from_mode'} = $1;
$res{'to_mode'} = $2;
$res{'from_id'} = $3;
@@ -3606,7 +3643,7 @@
}
# '::100755 100755 100755 60e79ca1b01bc8b057abe17ddab484699a7f5fdb 94067cc5f73388f33722d52ae02f44692bc07490 94067cc5f73388f33722d52ae02f44692bc07490 MR git-gui/git-gui.sh'
# combined diff (for merge commit)
- elsif ($line =~ s/^(::+)((?:[0-7]{6} )+)((?:[0-9a-fA-F]{40} )+)([a-zA-Z]+)\t(.*)$//) {
+ elsif ($line =~ s/^(::+)((?:[0-7]{6} )+)((?:$oid_regex )+)([a-zA-Z]+)\t(.*)$//) {
$res{'nparents'} = length($1);
$res{'from_mode'} = [ split(' ', $2) ];
$res{'to_mode'} = pop @{$res{'from_mode'}};
@@ -3616,7 +3653,7 @@
$res{'to_file'} = unquote($5);
}
# 'c512b523472485aef4fff9e57b229d9d243c967f'
- elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
+ elsif ($line =~ m/^($oid_regex)$/) {
$res{'commit'} = $1;
}
@@ -3644,7 +3681,7 @@
if ($opts{'-l'}) {
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa 16717 panic.c'
- $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40}) +(-|[0-9]+)\t(.+)$/s;
+ $line =~ m/^([0-9]+) (.+) ($oid_regex) +(-|[0-9]+)\t(.+)$/s;
$res{'mode'} = $1;
$res{'type'} = $2;
@@ -3657,7 +3694,7 @@
}
} else {
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
- $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/s;
+ $line =~ m/^([0-9]+) (.+) ($oid_regex)\t(.+)$/s;
$res{'mode'} = $1;
$res{'type'} = $2;
@@ -4799,7 +4836,7 @@
sub is_deleted {
my $diffinfo = shift;
- return $diffinfo->{'to_id'} eq ('0' x 40);
+ return $diffinfo->{'to_id'} eq ('0' x 40) || $diffinfo->{'to_id'} eq ('0' x 64);
}
# does patch correspond to [previous] difftree raw line
@@ -6285,7 +6322,7 @@
-class => "list subject"},
chop_and_escape_str($co{'title'}, 50) . "<br/>");
} elsif (defined $set{'to_id'}) {
- next if ($set{'to_id'} =~ m/^0{40}$/);
+ next if is_deleted(\%set);
print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
@@ -6829,7 +6866,7 @@
# the header: <SHA-1> <src lineno> <dst lineno> [<lines in group>]
# no <lines in group> for subsequent lines in group of lines
my ($full_rev, $orig_lineno, $lineno, $group_size) =
- ($line =~ /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/);
+ ($line =~ /^($oid_regex) (\d+) (\d+)(?: (\d+))?$/);
if (!exists $metainfo{$full_rev}) {
$metainfo{$full_rev} = { 'nprevious' => 0 };
}
@@ -6879,7 +6916,7 @@
}
# 'previous' <sha1 of parent commit> <filename at commit>
if (exists $meta->{'previous'} &&
- $meta->{'previous'} =~ /^([a-fA-F0-9]{40}) (.*)$/) {
+ $meta->{'previous'} =~ /^($oid_regex) (.*)$/) {
$meta->{'parent'} = $1;
$meta->{'file_parent'} = unquote($2);
}
@@ -6996,7 +7033,7 @@
} else {
die_error(400, "No file name defined");
}
- } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+ } elsif ($hash =~ m/^$oid_regex$/) {
# blobs defined by non-textual hash id's can be cached
$expires = "+1d";
}
@@ -7057,7 +7094,7 @@
} else {
die_error(400, "No file name defined");
}
- } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+ } elsif ($hash =~ m/^$oid_regex$/) {
# blobs defined by non-textual hash id's can be cached
$expires = "+1d";
}
@@ -7515,7 +7552,7 @@
# non-textual hash id's can be cached
my $expires;
- if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+ if ($hash =~ m/^$oid_regex$/) {
$expires = "+1d";
}
my $refs = git_get_references();
@@ -7609,7 +7646,7 @@
close $fd;
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
- unless ($line && $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t/) {
+ unless ($line && $line =~ m/^([0-9]+) (.+) ($oid_regex)\t/) {
die_error(404, "File or directory for given base does not exist");
}
$type = $2;
@@ -7649,7 +7686,7 @@
or die_error(404, "Blob diff not found");
} elsif (defined $hash &&
- $hash =~ /[0-9a-fA-F]{40}/) {
+ $hash =~ $oid_regex) {
# try to find filename from $hash
# read filtered raw output
@@ -7659,7 +7696,7 @@
@difftree =
# ':100644 100644 03b21826... 3b93d5e7... M ls-files.c'
# $hash == to_id
- grep { /^:[0-7]{6} [0-7]{6} [0-9a-fA-F]{40} $hash/ }
+ grep { /^:[0-7]{6} [0-7]{6} $oid_regex $hash/ }
map { chomp; $_ } <$fd>;
close $fd
or die_error(404, "Reading git-diff-tree failed");
@@ -7682,8 +7719,8 @@
$hash ||= $diffinfo{'to_id'};
# non-textual hash id's can be cached
- if ($hash_base =~ m/^[0-9a-fA-F]{40}$/ &&
- $hash_parent_base =~ m/^[0-9a-fA-F]{40}$/) {
+ if ($hash_base =~ m/^$oid_regex$/ &&
+ $hash_parent_base =~ m/^$oid_regex$/) {
$expires = '+1d';
}
@@ -7819,7 +7856,7 @@
$hash_parent ne '-c' && $hash_parent ne '--cc') {
# commitdiff with two commits given
my $hash_parent_short = $hash_parent;
- if ($hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
+ if ($hash_parent =~ m/^$oid_regex$/) {
$hash_parent_short = substr($hash_parent, 0, 7);
}
$formats_nav .=
@@ -7928,7 +7965,7 @@
# non-textual hash id's can be cached
my $expires;
- if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+ if ($hash =~ m/^$oid_regex$/) {
$expires = "+1d";
}
diff --git a/gpg-interface.c b/gpg-interface.c
index 8ed2745..d60115c 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -116,6 +116,9 @@
for (line = buf; *line; line = strchrnul(line+1, '\n')) {
while (*line == '\n')
line++;
+ if (!*line)
+ break;
+
/* Skip lines that don't start with GNUPG status */
if (!skip_prefix(line, "[GNUPG:] ", &line))
continue;
diff --git a/grep.c b/grep.c
index 0d50598..9dd2908 100644
--- a/grep.c
+++ b/grep.c
@@ -421,7 +421,7 @@
static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
regmatch_t *match, int eflags)
{
- int ovector[30], ret, flags = 0;
+ int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK;
if (eflags & REG_NOTBOL)
flags |= PCRE_NOTBOL;
@@ -559,7 +559,7 @@
pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack);
} else if (p->pcre2_jit_on != 0) {
BUG("The pcre2_jit_on variable should be 0 or 1, not %d",
- p->pcre1_jit_on);
+ p->pcre2_jit_on);
}
}
@@ -1780,6 +1780,10 @@
enum grep_context ctx = GREP_CONTEXT_HEAD;
xdemitconf_t xecfg;
+ if (!opt->status_only && gs->name == NULL)
+ BUG("grep call which could print a name requires "
+ "grep_source.name be non-NULL");
+
if (!opt->output)
opt->output = std_output;
diff --git a/grep.h b/grep.h
index fb04893..9c8797a 100644
--- a/grep.h
+++ b/grep.h
@@ -3,6 +3,9 @@
#include "color.h"
#ifdef USE_LIBPCRE1
#include <pcre.h>
+#ifndef PCRE_NO_UTF8_CHECK
+#define PCRE_NO_UTF8_CHECK 0
+#endif
#ifdef PCRE_CONFIG_JIT
#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
#ifndef NO_LIBPCRE1_JIT
@@ -186,17 +189,17 @@
void *output_priv;
};
-extern void init_grep_defaults(struct repository *);
-extern int grep_config(const char *var, const char *value, void *);
-extern void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
+void init_grep_defaults(struct repository *);
+int grep_config(const char *var, const char *value, void *);
+void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt);
-extern void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
-extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
-extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
-extern void compile_grep_patterns(struct grep_opt *opt);
-extern void free_grep_patterns(struct grep_opt *opt);
-extern int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
+void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
+void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
+void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
+void compile_grep_patterns(struct grep_opt *opt);
+void free_grep_patterns(struct grep_opt *opt);
+int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
struct grep_source {
char *name;
@@ -226,8 +229,8 @@
int grep_source(struct grep_opt *opt, struct grep_source *gs);
-extern struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
-extern int grep_threads_ok(const struct grep_opt *opt);
+struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
+int grep_threads_ok(const struct grep_opt *opt);
/*
* Mutex used around access to the attributes machinery if
diff --git a/hash.h b/hash.h
index adde708..52a4f1a 100644
--- a/hash.h
+++ b/hash.h
@@ -131,10 +131,36 @@
int hash_algo_by_name(const char *name);
/* Identical, except based on the format ID. */
int hash_algo_by_id(uint32_t format_id);
+/* Identical, except based on the length. */
+int hash_algo_by_length(int len);
/* Identical, except for a pointer to struct git_hash_algo. */
static inline int hash_algo_by_ptr(const struct git_hash_algo *p)
{
return p - hash_algos;
}
+/* The length in bytes and in hex digits of an object name (SHA-1 value). */
+#define GIT_SHA1_RAWSZ 20
+#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
+/* The block size of SHA-1. */
+#define GIT_SHA1_BLKSZ 64
+
+/* The length in bytes and in hex digits of an object name (SHA-256 value). */
+#define GIT_SHA256_RAWSZ 32
+#define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
+/* The block size of SHA-256. */
+#define GIT_SHA256_BLKSZ 64
+
+/* The length in byte and in hex digits of the largest possible hash value. */
+#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
+#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
+/* The largest possible block size for any supported hash. */
+#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
+
+struct object_id {
+ unsigned char hash[GIT_MAX_RAWSZ];
+};
+
+#define the_hash_algo the_repository->hash_algo
+
#endif
diff --git a/hashmap.h b/hashmap.h
index d375d9c..8424911 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -1,6 +1,8 @@
#ifndef HASHMAP_H
#define HASHMAP_H
+#include "hash.h"
+
/*
* Generic implementation of hash-based key-value mappings.
*
@@ -104,11 +106,11 @@
* `memihash_cont` is a variant of `memihash` that allows a computation to be
* continued with another chunk of data.
*/
-extern unsigned int strhash(const char *buf);
-extern unsigned int strihash(const char *buf);
-extern unsigned int memhash(const void *buf, size_t len);
-extern unsigned int memihash(const void *buf, size_t len);
-extern unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
+unsigned int strhash(const char *buf);
+unsigned int strihash(const char *buf);
+unsigned int memhash(const void *buf, size_t len);
+unsigned int memihash(const void *buf, size_t len);
+unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
/*
* Converts a cryptographic hash (e.g. SHA-1) into an int-sized hash code
@@ -118,14 +120,14 @@
* the results will be different on big-endian and little-endian
* platforms, so they should not be stored or transferred over the net.
*/
-static inline unsigned int sha1hash(const unsigned char *sha1)
+static inline unsigned int oidhash(const struct object_id *oid)
{
/*
- * Equivalent to 'return *(unsigned int *)sha1;', but safe on
+ * Equivalent to 'return *(unsigned int *)oid->hash;', but safe on
* platforms that don't support unaligned reads.
*/
unsigned int hash;
- memcpy(&hash, sha1, sizeof(hash));
+ memcpy(&hash, oid->hash, sizeof(hash));
return hash;
}
@@ -216,7 +218,7 @@
* parameter may be used to preallocate a sufficiently large table and thus
* prevent expensive resizing. If 0, the table is dynamically resized.
*/
-extern void hashmap_init(struct hashmap *map,
+void hashmap_init(struct hashmap *map,
hashmap_cmp_fn equals_function,
const void *equals_function_data,
size_t initial_size);
@@ -227,7 +229,7 @@
* If `free_entries` is true, each hashmap_entry in the map is freed as well
* using stdlibs free().
*/
-extern void hashmap_free(struct hashmap *map, int free_entries);
+void hashmap_free(struct hashmap *map, int free_entries);
/* hashmap_entry functions */
@@ -284,7 +286,7 @@
* If an entry with matching hash code is found, `key` and `keydata` are passed
* to `hashmap_cmp_fn` to decide whether the entry matches the key.
*/
-extern void *hashmap_get(const struct hashmap *map, const void *key,
+void *hashmap_get(const struct hashmap *map, const void *key,
const void *keydata);
/*
@@ -316,7 +318,7 @@
* `entry` is the hashmap_entry to start the search from, obtained via a previous
* call to `hashmap_get` or `hashmap_get_next`.
*/
-extern void *hashmap_get_next(const struct hashmap *map, const void *entry);
+void *hashmap_get_next(const struct hashmap *map, const void *entry);
/*
* Adds a hashmap entry. This allows to add duplicate entries (i.e.
@@ -325,7 +327,7 @@
* `map` is the hashmap structure.
* `entry` is the entry to add.
*/
-extern void hashmap_add(struct hashmap *map, void *entry);
+void hashmap_add(struct hashmap *map, void *entry);
/*
* Adds or replaces a hashmap entry. If the hashmap contains duplicate
@@ -335,7 +337,7 @@
* `entry` is the entry to add or replace.
* Returns the replaced entry, or NULL if not found (i.e. the entry was added).
*/
-extern void *hashmap_put(struct hashmap *map, void *entry);
+void *hashmap_put(struct hashmap *map, void *entry);
/*
* Removes a hashmap entry matching the specified key. If the hashmap contains
@@ -344,7 +346,7 @@
*
* Argument explanation is the same as in `hashmap_get`.
*/
-extern void *hashmap_remove(struct hashmap *map, const void *key,
+void *hashmap_remove(struct hashmap *map, const void *key,
const void *keydata);
/*
@@ -365,10 +367,10 @@
};
/* Initializes a `hashmap_iter` structure. */
-extern void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter);
+void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter);
/* Returns the next hashmap_entry, or NULL if there are no more entries. */
-extern void *hashmap_iter_next(struct hashmap_iter *iter);
+void *hashmap_iter_next(struct hashmap_iter *iter);
/* Initializes the iterator and returns the first entry, if any. */
static inline void *hashmap_iter_first(struct hashmap *map,
@@ -429,7 +431,7 @@
*
* Uses a hashmap to store the pool of interned strings.
*/
-extern const void *memintern(const void *data, size_t len);
+const void *memintern(const void *data, size_t len);
static inline const char *strintern(const char *string)
{
return memintern(string, strlen(string));
diff --git a/help.c b/help.c
index 520c908..9ff2be6 100644
--- a/help.c
+++ b/help.c
@@ -375,13 +375,6 @@
{
const char *cmd_list;
- /*
- * There's no actual repository setup at this point (and even
- * if there is, we don't really care; only global config
- * matters). If we accidentally set up a repository, it's ok
- * too since the caller (git --list-cmds=) should exit shortly
- * anyway.
- */
if (git_config_get_string_const("completion.commands", &cmd_list))
return;
@@ -393,8 +386,8 @@
const char *p = strchrnul(cmd_list, ' ');
strbuf_add(&sb, cmd_list, p - cmd_list);
- if (*cmd_list == '-')
- string_list_remove(list, cmd_list + 1, 0);
+ if (sb.buf[0] == '-')
+ string_list_remove(list, sb.buf + 1, 0);
else
string_list_insert(list, sb.buf);
strbuf_release(&sb);
@@ -761,19 +754,19 @@
{
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
char *branch = strrchr(refname, '/') + 1;
- const char *remote;
/* A remote branch of the same name is deemed similar */
- if (skip_prefix(refname, "refs/remotes/", &remote) &&
+ if (starts_with(refname, "refs/remotes/") &&
!strcmp(branch, cb->base_ref))
- string_list_append(cb->similar_refs, remote);
+ string_list_append_nodup(cb->similar_refs,
+ shorten_unambiguous_ref(refname, 1));
return 0;
}
static struct string_list guess_refs(const char *ref)
{
struct similar_ref_cb ref_cb;
- struct string_list similar_refs = STRING_LIST_INIT_NODUP;
+ struct string_list similar_refs = STRING_LIST_INIT_DUP;
ref_cb.base_ref = ref;
ref_cb.similar_refs = &similar_refs;
@@ -781,7 +774,8 @@
return similar_refs;
}
-void help_unknown_ref(const char *ref, const char *cmd, const char *error)
+NORETURN void help_unknown_ref(const char *ref, const char *cmd,
+ const char *error)
{
int i;
struct string_list suggested_refs = guess_refs(ref);
diff --git a/help.h b/help.h
index a141e20..7a455be 100644
--- a/help.h
+++ b/help.h
@@ -19,31 +19,31 @@
putchar(c);
}
-extern void list_common_cmds_help(void);
-extern void list_all_cmds_help(void);
-extern void list_common_guides_help(void);
-extern void list_config_help(int for_human);
+void list_common_cmds_help(void);
+void list_all_cmds_help(void);
+void list_common_guides_help(void);
+void list_config_help(int for_human);
-extern void list_all_main_cmds(struct string_list *list);
-extern void list_all_other_cmds(struct string_list *list);
-extern void list_cmds_by_category(struct string_list *list,
- const char *category);
-extern void list_cmds_by_config(struct string_list *list);
-extern const char *help_unknown_cmd(const char *cmd);
-extern void load_command_list(const char *prefix,
- struct cmdnames *main_cmds,
- struct cmdnames *other_cmds);
-extern void add_cmdname(struct cmdnames *cmds, const char *name, int len);
+void list_all_main_cmds(struct string_list *list);
+void list_all_other_cmds(struct string_list *list);
+void list_cmds_by_category(struct string_list *list,
+ const char *category);
+void list_cmds_by_config(struct string_list *list);
+const char *help_unknown_cmd(const char *cmd);
+void load_command_list(const char *prefix,
+ struct cmdnames *main_cmds,
+ struct cmdnames *other_cmds);
+void add_cmdname(struct cmdnames *cmds, const char *name, int len);
/* Here we require that excludes is a sorted list. */
-extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
-extern int is_in_cmdlist(struct cmdnames *cmds, const char *name);
-extern void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
+void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
+int is_in_cmdlist(struct cmdnames *cmds, const char *name);
+void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
/*
* call this to die(), when it is suspected that the user mistyped a
* ref to the command, to give suggested "correct" refs.
*/
-extern void help_unknown_ref(const char *ref, const char *cmd, const char *error);
+NORETURN void help_unknown_ref(const char *ref, const char *cmd, const char *error);
static inline void list_config_item(struct string_list *list,
const char *prefix,
diff --git a/http-backend.c b/http-backend.c
index 29e68e3..ec3144b 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -711,8 +711,11 @@
{"GET", "/objects/info/http-alternates$", get_text_file},
{"GET", "/objects/info/packs$", get_info_packs},
{"GET", "/objects/[0-9a-f]{2}/[0-9a-f]{38}$", get_loose_object},
+ {"GET", "/objects/[0-9a-f]{2}/[0-9a-f]{62}$", get_loose_object},
{"GET", "/objects/pack/pack-[0-9a-f]{40}\\.pack$", get_pack_file},
+ {"GET", "/objects/pack/pack-[0-9a-f]{64}\\.pack$", get_pack_file},
{"GET", "/objects/pack/pack-[0-9a-f]{40}\\.idx$", get_idx_file},
+ {"GET", "/objects/pack/pack-[0-9a-f]{64}\\.idx$", get_idx_file},
{"POST", "/git-upload-pack$", service_rpc},
{"POST", "/git-receive-pack$", service_rpc}
diff --git a/http-push.c b/http-push.c
index b22c7ca..0353f9f 100644
--- a/http-push.c
+++ b/http-push.c
@@ -145,7 +145,7 @@
char *url;
char *owner;
char *token;
- char tmpfile_suffix[41];
+ char tmpfile_suffix[GIT_MAX_HEXSZ + 1];
time_t start_time;
long timeout;
int refreshing;
@@ -315,7 +315,8 @@
return;
}
- fprintf(stderr, "Fetching pack %s\n", sha1_to_hex(target->sha1));
+ fprintf(stderr, "Fetching pack %s\n",
+ hash_to_hex(target->hash));
fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
preq = new_http_pack_request(target, repo->url);
@@ -398,7 +399,7 @@
request->dest = strbuf_detach(&buf, NULL);
append_remote_object_url(&buf, repo->url, hex, 0);
- strbuf_add(&buf, request->lock->tmpfile_suffix, 41);
+ strbuf_add(&buf, request->lock->tmpfile_suffix, the_hash_algo->hexsz + 1);
request->url = strbuf_detach(&buf, NULL);
slot = get_active_slot();
@@ -525,8 +526,8 @@
if (request->headers != NULL)
curl_slist_free_all(request->headers);
- /* URL is reused for MOVE after PUT */
- if (request->state != RUN_PUT) {
+ /* URL is reused for MOVE after PUT and used during FETCH */
+ if (request->state != RUN_PUT && request->state != RUN_FETCH_PACKED) {
FREE_AND_NULL(request->url);
}
@@ -722,7 +723,7 @@
{
struct object *obj;
- obj = lookup_object(the_repository, oid->hash);
+ obj = lookup_object(the_repository, oid);
if (!obj)
obj = parse_object(the_repository, oid);
@@ -757,8 +758,8 @@
static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed)
{
struct remote_lock *lock = (struct remote_lock *)ctx->userData;
- git_SHA_CTX sha_ctx;
- unsigned char lock_token_sha1[20];
+ git_hash_ctx hash_ctx;
+ unsigned char lock_token_hash[GIT_MAX_RAWSZ];
if (tag_closed && ctx->cdata) {
if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) {
@@ -770,12 +771,12 @@
} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) {
lock->token = xstrdup(ctx->cdata);
- git_SHA1_Init(&sha_ctx);
- git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token));
- git_SHA1_Final(lock_token_sha1, &sha_ctx);
+ the_hash_algo->init_fn(&hash_ctx);
+ the_hash_algo->update_fn(&hash_ctx, lock->token, strlen(lock->token));
+ the_hash_algo->final_fn(lock_token_hash, &hash_ctx);
lock->tmpfile_suffix[0] = '_';
- memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40);
+ memcpy(lock->tmpfile_suffix + 1, hash_to_hex(lock_token_hash), the_hash_algo->hexsz);
}
}
}
@@ -1017,7 +1018,7 @@
/* extract hex from sharded "xx/x{38}" filename */
static int get_oid_hex_from_objpath(const char *path, struct object_id *oid)
{
- if (strlen(path) != GIT_SHA1_HEXSZ + 1)
+ if (strlen(path) != the_hash_algo->hexsz + 1)
return -1;
if (hex_to_bytes(oid->hash, path, 1))
@@ -1025,7 +1026,7 @@
path += 2;
path++; /* skip '/' */
- return hex_to_bytes(oid->hash + 1, path, GIT_SHA1_RAWSZ - 1);
+ return hex_to_bytes(oid->hash + 1, path, the_hash_algo->rawsz - 1);
}
static void process_ls_object(struct remote_ls_ctx *ls)
@@ -1373,7 +1374,7 @@
return count;
}
-static int update_remote(unsigned char *sha1, struct remote_lock *lock)
+static int update_remote(const struct object_id *oid, struct remote_lock *lock)
{
struct active_request_slot *slot;
struct slot_results results;
@@ -1382,7 +1383,7 @@
dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
- strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
+ strbuf_addf(&out_buffer.buf, "%s\n", oid_to_hex(oid));
slot = get_active_slot();
slot->results = &results;
@@ -1431,7 +1432,7 @@
* may be required for updating server info later.
*/
if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) {
- obj = lookup_unknown_object(ref->old_oid.hash);
+ obj = lookup_unknown_object(&ref->old_oid);
fprintf(stderr, " fetch %s for %s\n",
oid_to_hex(&ref->old_oid), refname);
add_fetch_request(obj);
@@ -1947,7 +1948,7 @@
run_request_queue();
/* Update the remote branch if all went well */
- if (aborted || !update_remote(ref->new_oid.hash, ref_lock))
+ if (aborted || !update_remote(&ref->new_oid, ref_lock))
rc = 1;
if (!rc)
diff --git a/http-walker.c b/http-walker.c
index 8ae5d76..fe15e32 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -98,6 +98,11 @@
process_http_object_request(obj_req->req);
obj_req->state = COMPLETE;
+ normalize_curl_result(&obj_req->req->curl_result,
+ obj_req->req->http_code,
+ obj_req->req->errorstr,
+ sizeof(obj_req->req->errorstr));
+
/* Use alternates if necessary */
if (missing_target(obj_req->req)) {
fetch_alternates(walker, alt->base);
@@ -208,6 +213,9 @@
char *data;
int i = 0;
+ normalize_curl_result(&slot->curl_result, slot->http_code,
+ curl_errorstr, sizeof(curl_errorstr));
+
if (alt_req->http_specific) {
if (slot->curl_result != CURLE_OK ||
!alt_req->buffer->len) {
@@ -434,9 +442,9 @@
if (walker->get_verbosely) {
fprintf(stderr, "Getting pack %s\n",
- sha1_to_hex(target->sha1));
+ hash_to_hex(target->hash));
fprintf(stderr, " which contains %s\n",
- sha1_to_hex(sha1));
+ hash_to_hex(sha1));
}
preq = new_http_pack_request(target, repo->base);
@@ -473,9 +481,9 @@
release_object_request(obj_req);
}
-static int fetch_object(struct walker *walker, unsigned char *sha1)
+static int fetch_object(struct walker *walker, unsigned char *hash)
{
- char *hex = sha1_to_hex(sha1);
+ char *hex = hash_to_hex(hash);
int ret = 0;
struct object_request *obj_req = NULL;
struct http_object_request *req;
@@ -483,7 +491,7 @@
list_for_each(pos, head) {
obj_req = list_entry(pos, struct object_request, node);
- if (hasheq(obj_req->oid.hash, sha1))
+ if (hasheq(obj_req->oid.hash, hash))
break;
}
if (obj_req == NULL)
@@ -518,17 +526,8 @@
req->localfile = -1;
}
- /*
- * we turned off CURLOPT_FAILONERROR to avoid losing a
- * persistent connection and got CURLE_OK.
- */
- if (req->http_code >= 300 && req->curl_result == CURLE_OK &&
- (starts_with(req->url, "http://") ||
- starts_with(req->url, "https://"))) {
- req->curl_result = CURLE_HTTP_RETURNED_ERROR;
- xsnprintf(req->errorstr, sizeof(req->errorstr),
- "HTTP request failed");
- }
+ normalize_curl_result(&req->curl_result, req->http_code,
+ req->errorstr, sizeof(req->errorstr));
if (obj_req->state == ABORTED) {
ret = error("Request for %s aborted", hex);
@@ -557,20 +556,20 @@
return ret;
}
-static int fetch(struct walker *walker, unsigned char *sha1)
+static int fetch(struct walker *walker, unsigned char *hash)
{
struct walker_data *data = walker->data;
struct alt_base *altbase = data->alt;
- if (!fetch_object(walker, sha1))
+ if (!fetch_object(walker, hash))
return 0;
while (altbase) {
- if (!http_fetch_pack(walker, altbase, sha1))
+ if (!http_fetch_pack(walker, altbase, hash))
return 0;
fetch_alternates(walker, data->alt->base);
altbase = altbase->next;
}
- return error("Unable to find %s under %s", sha1_to_hex(sha1),
+ return error("Unable to find %s under %s", hash_to_hex(hash),
data->alt->base);
}
diff --git a/http.c b/http.c
index a32ad36..027a86d 100644
--- a/http.c
+++ b/http.c
@@ -176,7 +176,7 @@
memcpy(ptr, buffer->buf.buf + buffer->posn, size);
buffer->posn += size;
- return size;
+ return size / eltsize;
}
#ifndef NO_CURL_IOCTL
@@ -204,12 +204,12 @@
struct strbuf *buffer = buffer_;
strbuf_add(buffer, ptr, size);
- return size;
+ return nmemb;
}
size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf)
{
- return eltsize * nmemb;
+ return nmemb;
}
static void closedown_active_slot(struct active_request_slot *slot)
@@ -513,9 +513,11 @@
#else
struct strbuf s = STRBUF_INIT;
- strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
+ strbuf_addstr_urlencode(&s, proxy_auth.username,
+ is_rfc3986_unreserved);
strbuf_addch(&s, ':');
- strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
+ strbuf_addstr_urlencode(&s, proxy_auth.password,
+ is_rfc3986_unreserved);
curl_proxyuserpwd = strbuf_detach(&s, NULL);
curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
#endif
@@ -1073,6 +1075,7 @@
git_config(urlmatch_config_entry, &config);
free(normalized_url);
+ string_list_clear(&config.vars, 1);
#if LIBCURL_VERSION_NUM >= 0x073800
if (http_ssl_backend) {
@@ -1544,7 +1547,8 @@
return strbuf_detach(&buf, NULL);
}
-static int handle_curl_result(struct slot_results *results)
+void normalize_curl_result(CURLcode *result, long http_code,
+ char *errorstr, size_t errorlen)
{
/*
* If we see a failing http code with CURLE_OK, we have turned off
@@ -1554,19 +1558,24 @@
* Likewise, if we see a redirect (30x code), that means we turned off
* redirect-following, and we should treat the result as an error.
*/
- if (results->curl_result == CURLE_OK &&
- results->http_code >= 300) {
- results->curl_result = CURLE_HTTP_RETURNED_ERROR;
+ if (*result == CURLE_OK && http_code >= 300) {
+ *result = CURLE_HTTP_RETURNED_ERROR;
/*
* Normally curl will already have put the "reason phrase"
* from the server into curl_errorstr; unfortunately without
* FAILONERROR it is lost, so we can give only the numeric
* status code.
*/
- xsnprintf(curl_errorstr, sizeof(curl_errorstr),
+ xsnprintf(errorstr, errorlen,
"The requested URL returned error: %ld",
- results->http_code);
+ http_code);
}
+}
+
+static int handle_curl_result(struct slot_results *results)
+{
+ normalize_curl_result(&results->curl_result, results->http_code,
+ curl_errorstr, sizeof(curl_errorstr));
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
@@ -2065,7 +2074,7 @@
url = quote_ref_url(base, ref->name);
if (http_get_strbuf(url, &buffer, &options) == HTTP_OK) {
strbuf_rtrim(&buffer);
- if (buffer.len == 40)
+ if (buffer.len == the_hash_algo->hexsz)
ret = get_oid_hex(buffer.buf, &ref->old_oid);
else if (starts_with(buffer.buf, "ref: ")) {
ref->symref = xstrdup(buffer.buf + 5);
@@ -2079,19 +2088,19 @@
}
/* Helpers for fetching packs */
-static char *fetch_pack_index(unsigned char *sha1, const char *base_url)
+static char *fetch_pack_index(unsigned char *hash, const char *base_url)
{
char *url, *tmp;
struct strbuf buf = STRBUF_INIT;
if (http_is_verbose)
- fprintf(stderr, "Getting index for pack %s\n", sha1_to_hex(sha1));
+ fprintf(stderr, "Getting index for pack %s\n", hash_to_hex(hash));
end_url_with_slash(&buf, base_url);
- strbuf_addf(&buf, "objects/pack/pack-%s.idx", sha1_to_hex(sha1));
+ strbuf_addf(&buf, "objects/pack/pack-%s.idx", hash_to_hex(hash));
url = strbuf_detach(&buf, NULL);
- strbuf_addf(&buf, "%s.temp", sha1_pack_index_name(sha1));
+ strbuf_addf(&buf, "%s.temp", sha1_pack_index_name(hash));
tmp = strbuf_detach(&buf, NULL);
if (http_get_file(url, tmp, NULL) != HTTP_OK) {
@@ -2147,11 +2156,11 @@
int http_get_info_packs(const char *base_url, struct packed_git **packs_head)
{
struct http_get_options options = {0};
- int ret = 0, i = 0;
- char *url, *data;
+ int ret = 0;
+ char *url;
+ const char *data;
struct strbuf buf = STRBUF_INIT;
- unsigned char hash[GIT_MAX_RAWSZ];
- const unsigned hexsz = the_hash_algo->hexsz;
+ struct object_id oid;
end_url_with_slash(&buf, base_url);
strbuf_addstr(&buf, "objects/info/packs");
@@ -2163,24 +2172,17 @@
goto cleanup;
data = buf.buf;
- while (i < buf.len) {
- switch (data[i]) {
- case 'P':
- i++;
- if (i + hexsz + 12 <= buf.len &&
- starts_with(data + i, " pack-") &&
- starts_with(data + i + hexsz + 6, ".pack\n")) {
- get_sha1_hex(data + i + 6, hash);
- fetch_and_setup_pack_index(packs_head, hash,
- base_url);
- i += hexsz + 11;
- break;
- }
- default:
- while (i < buf.len && data[i] != '\n')
- i++;
+ while (*data) {
+ if (skip_prefix(data, "P pack-", &data) &&
+ !parse_oid_hex(data, &oid, &data) &&
+ skip_prefix(data, ".pack", &data) &&
+ (*data == '\n' || *data == '\0')) {
+ fetch_and_setup_pack_index(packs_head, oid.hash, base_url);
+ } else {
+ data = strchrnul(data, '\n');
}
- i++;
+ if (*data)
+ data++; /* skip past newline */
}
cleanup:
@@ -2236,10 +2238,10 @@
return -1;
}
- unlink(sha1_pack_index_name(p->sha1));
+ unlink(sha1_pack_index_name(p->hash));
- if (finalize_object_file(preq->tmpfile.buf, sha1_pack_name(p->sha1))
- || finalize_object_file(tmp_idx, sha1_pack_index_name(p->sha1))) {
+ if (finalize_object_file(preq->tmpfile.buf, sha1_pack_name(p->hash))
+ || finalize_object_file(tmp_idx, sha1_pack_index_name(p->hash))) {
free(tmp_idx);
return -1;
}
@@ -2262,10 +2264,10 @@
end_url_with_slash(&buf, base_url);
strbuf_addf(&buf, "objects/pack/pack-%s.pack",
- sha1_to_hex(target->sha1));
+ hash_to_hex(target->hash));
preq->url = strbuf_detach(&buf, NULL);
- strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(target->sha1));
+ strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(target->hash));
preq->packfile = fopen(preq->tmpfile.buf, "a");
if (!preq->packfile) {
error("Unable to open local file %s for pack",
@@ -2289,7 +2291,8 @@
if (http_is_verbose)
fprintf(stderr,
"Resuming fetch of pack %s at byte %"PRIuMAX"\n",
- sha1_to_hex(target->sha1), (uintmax_t)prev_posn);
+ hash_to_hex(target->hash),
+ (uintmax_t)prev_posn);
http_opt_request_remainder(preq->slot->curl, prev_posn);
}
@@ -2319,14 +2322,14 @@
BUG("curl_easy_getinfo for HTTP code failed: %s",
curl_easy_strerror(c));
if (slot->http_code >= 300)
- return size;
+ return nmemb;
}
do {
ssize_t retval = xwrite(freq->localfile,
(char *) ptr + posn, size - posn);
if (retval < 0)
- return posn;
+ return posn / eltsize;
posn += retval;
} while (posn < size);
@@ -2336,10 +2339,10 @@
freq->stream.next_out = expn;
freq->stream.avail_out = sizeof(expn);
freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH);
- git_SHA1_Update(&freq->c, expn,
- sizeof(expn) - freq->stream.avail_out);
+ the_hash_algo->update_fn(&freq->c, expn,
+ sizeof(expn) - freq->stream.avail_out);
} while (freq->stream.avail_in && freq->zret == Z_OK);
- return size;
+ return nmemb;
}
struct http_object_request *new_http_object_request(const char *base_url,
@@ -2395,7 +2398,7 @@
git_inflate_init(&freq->stream);
- git_SHA1_Init(&freq->c);
+ the_hash_algo->init_fn(&freq->c);
freq->url = get_remote_object_url(base_url, hex, 0);
@@ -2430,7 +2433,7 @@
if (prev_read == -1) {
memset(&freq->stream, 0, sizeof(freq->stream));
git_inflate_init(&freq->stream);
- git_SHA1_Init(&freq->c);
+ the_hash_algo->init_fn(&freq->c);
if (prev_posn>0) {
prev_posn = 0;
lseek(freq->localfile, 0, SEEK_SET);
@@ -2501,7 +2504,7 @@
}
git_inflate_end(&freq->stream);
- git_SHA1_Final(freq->real_oid.hash, &freq->c);
+ the_hash_algo->final_fn(freq->real_oid.hash, &freq->c);
if (freq->zret != Z_STREAM_END) {
unlink_or_warn(freq->tmpfile.buf);
return -1;
diff --git a/http.h b/http.h
index 4eb4e80..5e0ad72 100644
--- a/http.h
+++ b/http.h
@@ -25,8 +25,12 @@
#if LIBCURL_VERSION_NUM < 0x070704
#define curl_global_cleanup() do { /* nothing */ } while (0)
#endif
+
#if LIBCURL_VERSION_NUM < 0x070800
#define curl_global_init(a) do { /* nothing */ } while (0)
+#elif LIBCURL_VERSION_NUM >= 0x070c00
+#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
+ xrealloc, xstrdup, xcalloc)
#endif
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
@@ -75,18 +79,18 @@
};
/* Curl request read/write callbacks */
-extern size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-extern size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-extern size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
+size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
#ifndef NO_CURL_IOCTL
-extern curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
+curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
#endif
/* Slot lifecycle functions */
-extern struct active_request_slot *get_active_slot(void);
-extern int start_active_slot(struct active_request_slot *slot);
-extern void run_active_slot(struct active_request_slot *slot);
-extern void finish_all_active_slots(void);
+struct active_request_slot *get_active_slot(void);
+int start_active_slot(struct active_request_slot *slot);
+void run_active_slot(struct active_request_slot *slot);
+void finish_all_active_slots(void);
/*
* This will run one slot to completion in a blocking manner, similar to how
@@ -98,15 +102,15 @@
struct slot_results *results);
#ifdef USE_CURL_MULTI
-extern void fill_active_slots(void);
-extern void add_fill_function(void *data, int (*fill)(void *));
-extern void step_active_slots(void);
+void fill_active_slots(void);
+void add_fill_function(void *data, int (*fill)(void *));
+void step_active_slots(void);
#endif
-extern void http_init(struct remote *remote, const char *url,
- int proactive_auth);
-extern void http_cleanup(void);
-extern struct curl_slist *http_copy_default_headers(void);
+void http_init(struct remote *remote, const char *url,
+ int proactive_auth);
+void http_cleanup(void);
+struct curl_slist *http_copy_default_headers(void);
extern long int git_curl_ipresolve;
extern int active_requests;
@@ -136,12 +140,21 @@
#define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
+/*
+ * Normalize curl results to handle CURL_FAILONERROR (or lack thereof). Failing
+ * http codes have their "result" converted to CURLE_HTTP_RETURNED_ERROR, and
+ * an appropriate string placed in the errorstr buffer (pass curl_errorstr if
+ * you don't have a custom buffer).
+ */
+void normalize_curl_result(CURLcode *result, long http_code, char *errorstr,
+ size_t errorlen);
+
/* Helpers for modifying and creating URLs */
-extern void append_remote_object_url(struct strbuf *buf, const char *url,
- const char *hex,
- int only_two_digit_prefix);
-extern char *get_remote_object_url(const char *url, const char *hex,
- int only_two_digit_prefix);
+void append_remote_object_url(struct strbuf *buf, const char *url,
+ const char *hex,
+ int only_two_digit_prefix);
+char *get_remote_object_url(const char *url, const char *hex,
+ int only_two_digit_prefix);
/* Options for http_get_*() */
struct http_get_options {
@@ -195,11 +208,11 @@
*/
int http_get_strbuf(const char *url, struct strbuf *result, struct http_get_options *options);
-extern int http_fetch_ref(const char *base, struct ref *ref);
+int http_fetch_ref(const char *base, struct ref *ref);
/* Helpers for fetching packs */
-extern int http_get_info_packs(const char *base_url,
- struct packed_git **packs_head);
+int http_get_info_packs(const char *base_url,
+ struct packed_git **packs_head);
struct http_pack_request {
char *url;
@@ -210,10 +223,10 @@
struct active_request_slot *slot;
};
-extern struct http_pack_request *new_http_pack_request(
+struct http_pack_request *new_http_pack_request(
struct packed_git *target, const char *base_url);
-extern int finish_http_pack_request(struct http_pack_request *preq);
-extern void release_http_pack_request(struct http_pack_request *preq);
+int finish_http_pack_request(struct http_pack_request *preq);
+void release_http_pack_request(struct http_pack_request *preq);
/* Helpers for fetching object */
struct http_object_request {
@@ -225,19 +238,19 @@
long http_code;
struct object_id oid;
struct object_id real_oid;
- git_SHA_CTX c;
+ git_hash_ctx c;
git_zstream stream;
int zret;
int rename;
struct active_request_slot *slot;
};
-extern struct http_object_request *new_http_object_request(
+struct http_object_request *new_http_object_request(
const char *base_url, const struct object_id *oid);
-extern void process_http_object_request(struct http_object_request *freq);
-extern int finish_http_object_request(struct http_object_request *freq);
-extern void abort_http_object_request(struct http_object_request *freq);
-extern void release_http_object_request(struct http_object_request *freq);
+void process_http_object_request(struct http_object_request *freq);
+int finish_http_object_request(struct http_object_request *freq);
+void abort_http_object_request(struct http_object_request *freq);
+void release_http_object_request(struct http_object_request *freq);
/* setup routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */
void setup_curl_trace(CURL *handle);
diff --git a/ident.c b/ident.c
index 33bcf40..e666ee4 100644
--- a/ident.c
+++ b/ident.c
@@ -11,6 +11,10 @@
static struct strbuf git_default_name = STRBUF_INIT;
static struct strbuf git_default_email = STRBUF_INIT;
static struct strbuf git_default_date = STRBUF_INIT;
+static struct strbuf git_author_name = STRBUF_INIT;
+static struct strbuf git_author_email = STRBUF_INIT;
+static struct strbuf git_committer_name = STRBUF_INIT;
+static struct strbuf git_committer_email = STRBUF_INIT;
static int default_email_is_bogus;
static int default_name_is_bogus;
@@ -355,7 +359,7 @@
"\n");
const char *fmt_ident(const char *name, const char *email,
- const char *date_str, int flag)
+ enum want_ident whose_ident, const char *date_str, int flag)
{
static struct strbuf ident = STRBUF_INIT;
int strict = (flag & IDENT_STRICT);
@@ -363,6 +367,12 @@
int want_name = !(flag & IDENT_NO_NAME);
if (!email) {
+ if (whose_ident == WANT_AUTHOR_IDENT && git_author_email.len)
+ email = git_author_email.buf;
+ else if (whose_ident == WANT_COMMITTER_IDENT && git_committer_email.len)
+ email = git_committer_email.buf;
+ }
+ if (!email) {
if (strict && ident_use_config_only
&& !(ident_config_given & IDENT_MAIL_GIVEN)) {
fputs(_(env_hint), stderr);
@@ -378,6 +388,13 @@
if (want_name) {
int using_default = 0;
if (!name) {
+ if (whose_ident == WANT_AUTHOR_IDENT && git_author_name.len)
+ name = git_author_name.buf;
+ else if (whose_ident == WANT_COMMITTER_IDENT &&
+ git_committer_name.len)
+ name = git_committer_name.buf;
+ }
+ if (!name) {
if (strict && ident_use_config_only
&& !(ident_config_given & IDENT_NAME_GIVEN)) {
fputs(_(env_hint), stderr);
@@ -425,9 +442,25 @@
return ident.buf;
}
-const char *fmt_name(const char *name, const char *email)
+const char *fmt_name(enum want_ident whose_ident)
{
- return fmt_ident(name, email, NULL, IDENT_STRICT | IDENT_NO_DATE);
+ char *name = NULL;
+ char *email = NULL;
+
+ switch (whose_ident) {
+ case WANT_BLANK_IDENT:
+ break;
+ case WANT_AUTHOR_IDENT:
+ name = getenv("GIT_AUTHOR_NAME");
+ email = getenv("GIT_AUTHOR_EMAIL");
+ break;
+ case WANT_COMMITTER_IDENT:
+ name = getenv("GIT_COMMITTER_NAME");
+ email = getenv("GIT_COMMITTER_EMAIL");
+ break;
+ }
+ return fmt_ident(name, email, whose_ident, NULL,
+ IDENT_STRICT | IDENT_NO_DATE);
}
const char *git_author_info(int flag)
@@ -438,6 +471,7 @@
author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
return fmt_ident(getenv("GIT_AUTHOR_NAME"),
getenv("GIT_AUTHOR_EMAIL"),
+ WANT_AUTHOR_IDENT,
getenv("GIT_AUTHOR_DATE"),
flag);
}
@@ -450,6 +484,7 @@
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
return fmt_ident(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL"),
+ WANT_COMMITTER_IDENT,
getenv("GIT_COMMITTER_DATE"),
flag);
}
@@ -473,10 +508,45 @@
return ident_is_sufficient(author_ident_explicitly_given);
}
-int git_ident_config(const char *var, const char *value, void *data)
+static int set_ident(const char *var, const char *value)
{
- if (!strcmp(var, "user.useconfigonly")) {
- ident_use_config_only = git_config_bool(var, value);
+ if (!strcmp(var, "author.name")) {
+ if (!value)
+ return config_error_nonbool(var);
+ strbuf_reset(&git_author_name);
+ strbuf_addstr(&git_author_name, value);
+ author_ident_explicitly_given |= IDENT_NAME_GIVEN;
+ ident_config_given |= IDENT_NAME_GIVEN;
+ return 0;
+ }
+
+ if (!strcmp(var, "author.email")) {
+ if (!value)
+ return config_error_nonbool(var);
+ strbuf_reset(&git_author_email);
+ strbuf_addstr(&git_author_email, value);
+ author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+ ident_config_given |= IDENT_MAIL_GIVEN;
+ return 0;
+ }
+
+ if (!strcmp(var, "committer.name")) {
+ if (!value)
+ return config_error_nonbool(var);
+ strbuf_reset(&git_committer_name);
+ strbuf_addstr(&git_committer_name, value);
+ committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
+ ident_config_given |= IDENT_NAME_GIVEN;
+ return 0;
+ }
+
+ if (!strcmp(var, "committer.email")) {
+ if (!value)
+ return config_error_nonbool(var);
+ strbuf_reset(&git_committer_email);
+ strbuf_addstr(&git_committer_email, value);
+ committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+ ident_config_given |= IDENT_MAIL_GIVEN;
return 0;
}
@@ -505,6 +575,36 @@
return 0;
}
+int git_ident_config(const char *var, const char *value, void *data)
+{
+ if (!strcmp(var, "user.useconfigonly")) {
+ ident_use_config_only = git_config_bool(var, value);
+ return 0;
+ }
+
+ return set_ident(var, value);
+}
+
+static void set_env_if(const char *key, const char *value, int *given, int bit)
+{
+ if ((*given & bit) || getenv(key))
+ return; /* nothing to do */
+ setenv(key, value, 0);
+ *given |= bit;
+}
+
+void prepare_fallback_ident(const char *name, const char *email)
+{
+ set_env_if("GIT_AUTHOR_NAME", name,
+ &author_ident_explicitly_given, IDENT_NAME_GIVEN);
+ set_env_if("GIT_AUTHOR_EMAIL", email,
+ &author_ident_explicitly_given, IDENT_MAIL_GIVEN);
+ set_env_if("GIT_COMMITTER_NAME", name,
+ &committer_ident_explicitly_given, IDENT_NAME_GIVEN);
+ set_env_if("GIT_COMMITTER_EMAIL", email,
+ &committer_ident_explicitly_given, IDENT_MAIL_GIVEN);
+}
+
static int buf_cmp(const char *a_begin, const char *a_end,
const char *b_begin, const char *b_end)
{
diff --git a/imap-send.c b/imap-send.c
index 18ca6ba..6c54d8c 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1114,7 +1114,7 @@
if (!strcmp(srvc->auth_method, "CRAM-MD5")) {
if (!CAP(AUTH_CRAM_MD5)) {
- fprintf(stderr, "You specified"
+ fprintf(stderr, "You specified "
"CRAM-MD5 as authentication method, "
"but %s doesn't support it.\n", srvc->host);
goto bail;
diff --git a/khash.h b/khash.h
index 532109c..21c2095 100644
--- a/khash.h
+++ b/khash.h
@@ -69,14 +69,14 @@
khval_t *vals; \
} kh_##name##_t;
-#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \
- extern kh_##name##_t *kh_init_##name(void); \
- extern void kh_destroy_##name(kh_##name##_t *h); \
- extern void kh_clear_##name(kh_##name##_t *h); \
- extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
- extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
- extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
- extern void kh_del_##name(kh_##name##_t *h, khint_t x);
+#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \
+ kh_##name##_t *kh_init_##name(void); \
+ void kh_destroy_##name(kh_##name##_t *h); \
+ void kh_clear_##name(kh_##name##_t *h); \
+ khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
+ int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+ khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
+ void kh_del_##name(kh_##name##_t *h, khint_t x);
#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
SCOPE kh_##name##_t *kh_init_##name(void) { \
@@ -324,12 +324,20 @@
code; \
} }
-#define __kh_oid_cmp(a, b) (hashcmp(a, b) == 0)
+static inline unsigned int oidhash_by_value(struct object_id oid)
+{
+ return oidhash(&oid);
+}
-KHASH_INIT(sha1, const unsigned char *, void *, 1, sha1hash, __kh_oid_cmp)
-typedef kh_sha1_t khash_sha1;
+static inline int oideq_by_value(struct object_id a, struct object_id b)
+{
+ return oideq(&a, &b);
+}
-KHASH_INIT(sha1_pos, const unsigned char *, int, 1, sha1hash, __kh_oid_cmp)
-typedef kh_sha1_pos_t khash_sha1_pos;
+KHASH_INIT(oid_set, struct object_id, int, 0, oidhash_by_value, oideq_by_value)
+
+KHASH_INIT(oid_map, struct object_id, void *, 1, oidhash_by_value, oideq_by_value)
+
+KHASH_INIT(oid_pos, struct object_id, int, 1, oidhash_by_value, oideq_by_value)
#endif /* __AC_KHASH_H */
diff --git a/kwset.c b/kwset.c
index 4fb6455..fc439e0 100644
--- a/kwset.c
+++ b/kwset.c
@@ -38,7 +38,13 @@
#include "compat/obstack.h"
#define NCHAR (UCHAR_MAX + 1)
-#define obstack_chunk_alloc xmalloc
+/* adapter for `xmalloc()`, which takes `size_t`, not `long` */
+static void *obstack_chunk_alloc(long size)
+{
+ if (size < 0)
+ BUG("Cannot allocate a negative amount: %ld", size);
+ return xmalloc(size);
+}
#define obstack_chunk_free free
#define U(c) ((unsigned char) (c))
@@ -475,7 +481,7 @@
for (i = 0; i < NCHAR; ++i)
kwset->next[i] = next[U(trans[i])];
else
- memcpy(kwset->next, next, NCHAR * sizeof(struct trie *));
+ COPY_ARRAY(kwset->next, next, NCHAR);
}
/* Fix things up for any translation table. */
diff --git a/kwset.h b/kwset.h
index 583f626..df99a92 100644
--- a/kwset.h
+++ b/kwset.h
@@ -37,16 +37,16 @@
if enough memory cannot be obtained. The argument if non-NULL
specifies a table of character translations to be applied to all
pattern and search text. */
-extern kwset_t kwsalloc(unsigned char const *);
+kwset_t kwsalloc(unsigned char const *);
/* Incrementally extend the keyword set to include the given string.
Return NULL for success, or an error message. Remember an index
number for each keyword included in the set. */
-extern const char *kwsincr(kwset_t, char const *, size_t);
+const char *kwsincr(kwset_t, char const *, size_t);
/* When the keyword set has been completely built, prepare it for
use. Return NULL for success, or an error message. */
-extern const char *kwsprep(kwset_t);
+const char *kwsprep(kwset_t);
/* Search through the given buffer for a member of the keyword set.
Return a pointer to the leftmost longest match found, or NULL if
@@ -54,8 +54,8 @@
the matching substring in the integer it points to. Similarly,
if foundindex is non-NULL, store the index of the particular
keyword found therein. */
-extern size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
+size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
/* Deallocate the given keyword set and all its associated storage. */
-extern void kwsfree(kwset_t);
+void kwsfree(kwset_t);
diff --git a/line-log.c b/line-log.c
index 24e2173..9010e00 100644
--- a/line-log.c
+++ b/line-log.c
@@ -496,12 +496,13 @@
return (struct commit *) commit;
}
-static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
+static void fill_blob_sha1(struct repository *r, struct commit *commit,
+ struct diff_filespec *spec)
{
- unsigned mode;
+ unsigned short mode;
struct object_id oid;
- if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))
+ if (get_tree_entry(r, &commit->object.oid, spec->path, &oid, &mode))
die("There is no path %s in the commit", spec->path);
fill_filespec(spec, &oid, 1, mode);
@@ -585,7 +586,7 @@
name_part);
spec = alloc_filespec(full_name);
- fill_blob_sha1(commit, spec);
+ fill_blob_sha1(r, commit, spec);
fill_line_ends(r, spec, &lines, &ends);
cb_data.spec = spec;
cb_data.lines = lines;
@@ -736,6 +737,38 @@
return ret;
}
+static int same_paths_in_pathspec_and_range(struct pathspec *pathspec,
+ struct line_log_data *range)
+{
+ int i;
+ struct line_log_data *r;
+
+ for (i = 0, r = range; i < pathspec->nr && r; i++, r = r->next)
+ if (strcmp(pathspec->items[i].match, r->path))
+ return 0;
+ if (i < pathspec->nr || r)
+ /* different number of pathspec items and ranges */
+ return 0;
+
+ return 1;
+}
+
+static void parse_pathspec_from_ranges(struct pathspec *pathspec,
+ struct line_log_data *range)
+{
+ struct line_log_data *r;
+ struct argv_array array = ARGV_ARRAY_INIT;
+ const char **paths;
+
+ for (r = range; r; r = r->next)
+ argv_array_push(&array, r->path);
+ paths = argv_array_detach(&array);
+
+ parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
+ /* strings are now owned by pathspec */
+ free(paths);
+}
+
void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
{
struct commit *commit = NULL;
@@ -745,20 +778,7 @@
range = parse_lines(rev->diffopt.repo, commit, prefix, args);
add_line_range(rev, commit, range);
- if (!rev->diffopt.detect_rename) {
- struct line_log_data *r;
- struct argv_array array = ARGV_ARRAY_INIT;
- const char **paths;
-
- for (r = range; r; r = r->next)
- argv_array_push(&array, r->path);
- paths = argv_array_detach(&array);
-
- parse_pathspec(&rev->diffopt.pathspec, 0,
- PATHSPEC_PREFER_FULL, "", paths);
- /* strings are now owned by pathspec */
- free(paths);
- }
+ parse_pathspec_from_ranges(&rev->diffopt.pathspec, range);
}
static void move_diff_queue(struct diff_queue_struct *dst,
@@ -816,15 +836,29 @@
struct diff_queue_struct *queue,
struct commit *commit, struct commit *parent)
{
+ struct object_id *tree_oid, *parent_tree_oid;
+
assert(commit);
+ tree_oid = get_commit_tree_oid(commit);
+ parent_tree_oid = parent ? get_commit_tree_oid(parent) : NULL;
+
+ if (opt->detect_rename &&
+ !same_paths_in_pathspec_and_range(&opt->pathspec, range)) {
+ clear_pathspec(&opt->pathspec);
+ parse_pathspec_from_ranges(&opt->pathspec, range);
+ }
DIFF_QUEUE_CLEAR(&diff_queued_diff);
- diff_tree_oid(parent ? get_commit_tree_oid(parent) : NULL,
- get_commit_tree_oid(commit), "", opt);
- if (opt->detect_rename) {
+ diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+ if (opt->detect_rename && diff_might_be_rename()) {
+ /* must look at the full tree diff to detect renames */
+ clear_pathspec(&opt->pathspec);
+ DIFF_QUEUE_CLEAR(&diff_queued_diff);
+
+ diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+
filter_diffs_for_paths(range, 1);
- if (diff_might_be_rename())
- diffcore_std(opt);
+ diffcore_std(opt);
filter_diffs_for_paths(range, 0);
}
move_diff_queue(queue, &diff_queued_diff);
@@ -1103,10 +1137,12 @@
int line_log_print(struct rev_info *rev, struct commit *commit)
{
- struct line_log_data *range = lookup_line_range(rev, commit);
show_log(rev);
- dump_diff_hacky(rev, range);
+ if (!(rev->diffopt.output_format & DIFF_FORMAT_NO_OUTPUT)) {
+ struct line_log_data *range = lookup_line_range(rev, commit);
+ dump_diff_hacky(rev, range);
+ }
return 1;
}
diff --git a/line-log.h b/line-log.h
index e2a5ee7..8ee7a2b 100644
--- a/line-log.h
+++ b/line-log.h
@@ -25,17 +25,17 @@
struct range_set target;
};
-extern void range_set_init(struct range_set *, size_t prealloc);
-extern void range_set_release(struct range_set *);
+void range_set_init(struct range_set *, size_t prealloc);
+void range_set_release(struct range_set *);
/* Range includes start; excludes end */
-extern void range_set_append_unsafe(struct range_set *, long start, long end);
+void range_set_append_unsafe(struct range_set *, long start, long end);
/* New range must begin at or after end of last added range */
-extern void range_set_append(struct range_set *, long start, long end);
+void range_set_append(struct range_set *, long start, long end);
/*
* In-place pass of sorting and merging the ranges in the range set,
* to sort and make the ranges disjoint.
*/
-extern void sort_and_merge_range_set(struct range_set *);
+void sort_and_merge_range_set(struct range_set *);
/* Linked list of interesting files and their associated ranges. The
* list must be kept sorted by path.
@@ -54,10 +54,10 @@
struct diff_ranges diff;
};
-extern void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args);
+void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args);
-extern int line_log_filter(struct rev_info *rev);
+int line_log_filter(struct rev_info *rev);
-extern int line_log_print(struct rev_info *rev, struct commit *commit);
+int line_log_print(struct rev_info *rev, struct commit *commit);
#endif /* LINE_LOG_H */
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index b71bd1f..256bcfb 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -6,6 +6,14 @@
#include "list-objects.h"
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
+#include "promisor-remote.h"
+#include "trace.h"
+#include "url.h"
+
+static int parse_combine_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg,
+ struct strbuf *errbuf);
/*
* Parse value of the argument to the "filter" keyword.
@@ -29,16 +37,11 @@
{
const char *v0;
- if (filter_options->choice) {
- if (errbuf) {
- strbuf_addstr(
- errbuf,
- _("multiple filter-specs cannot be combined"));
- }
- return 1;
- }
+ if (!arg)
+ return 0;
- filter_options->filter_spec = strdup(arg);
+ if (filter_options->choice)
+ BUG("filter_options already populated");
if (!strcmp(arg, "blob:none")) {
filter_options->choice = LOFC_BLOB_NONE;
@@ -52,51 +55,207 @@
} else if (skip_prefix(arg, "tree:", &v0)) {
if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) {
- if (errbuf) {
- strbuf_addstr(
- errbuf,
- _("expected 'tree:<depth>'"));
- }
+ strbuf_addstr(errbuf, _("expected 'tree:<depth>'"));
return 1;
}
filter_options->choice = LOFC_TREE_DEPTH;
return 0;
} else if (skip_prefix(arg, "sparse:oid=", &v0)) {
- struct object_context oc;
- struct object_id sparse_oid;
-
- /*
- * Try to parse <oid-expression> into an OID for the current
- * command, but DO NOT complain if we don't have the blob or
- * ref locally.
- */
- if (!get_oid_with_context(the_repository, v0, GET_OID_BLOB,
- &sparse_oid, &oc))
- filter_options->sparse_oid_value = oiddup(&sparse_oid);
+ filter_options->sparse_oid_name = xstrdup(v0);
filter_options->choice = LOFC_SPARSE_OID;
return 0;
} else if (skip_prefix(arg, "sparse:path=", &v0)) {
- filter_options->choice = LOFC_SPARSE_PATH;
- filter_options->sparse_path_value = strdup(v0);
- return 0;
- }
+ if (errbuf) {
+ strbuf_addstr(
+ errbuf,
+ _("sparse:path filters support has been dropped"));
+ }
+ return 1;
- if (errbuf)
- strbuf_addf(errbuf, "invalid filter-spec '%s'", arg);
+ } else if (skip_prefix(arg, "combine:", &v0)) {
+ return parse_combine_filter(filter_options, v0, errbuf);
+
+ }
+ /*
+ * Please update _git_fetch() in git-completion.bash when you
+ * add new filters
+ */
+
+ strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);
memset(filter_options, 0, sizeof(*filter_options));
return 1;
}
-int parse_list_objects_filter(struct list_objects_filter_options *filter_options,
- const char *arg)
+static const char *RESERVED_NON_WS = "~`!@#$^&*()[]{}\\;'\",<>?";
+
+static int has_reserved_character(
+ struct strbuf *sub_spec, struct strbuf *errbuf)
+{
+ const char *c = sub_spec->buf;
+ while (*c) {
+ if (*c <= ' ' || strchr(RESERVED_NON_WS, *c)) {
+ strbuf_addf(
+ errbuf,
+ _("must escape char in sub-filter-spec: '%c'"),
+ *c);
+ return 1;
+ }
+ c++;
+ }
+
+ return 0;
+}
+
+static int parse_combine_subfilter(
+ struct list_objects_filter_options *filter_options,
+ struct strbuf *subspec,
+ struct strbuf *errbuf)
+{
+ size_t new_index = filter_options->sub_nr;
+ char *decoded;
+ int result;
+
+ ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+ filter_options->sub_alloc);
+
+ decoded = url_percent_decode(subspec->buf);
+
+ result = has_reserved_character(subspec, errbuf) ||
+ gently_parse_list_objects_filter(
+ &filter_options->sub[new_index], decoded, errbuf);
+
+ free(decoded);
+ return result;
+}
+
+static int parse_combine_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg,
+ struct strbuf *errbuf)
+{
+ struct strbuf **subspecs = strbuf_split_str(arg, '+', 0);
+ size_t sub;
+ int result = 0;
+
+ if (!subspecs[0]) {
+ strbuf_addstr(errbuf, _("expected something after combine:"));
+ result = 1;
+ goto cleanup;
+ }
+
+ for (sub = 0; subspecs[sub] && !result; sub++) {
+ if (subspecs[sub + 1]) {
+ /*
+ * This is not the last subspec. Remove trailing "+" so
+ * we can parse it.
+ */
+ size_t last = subspecs[sub]->len - 1;
+ assert(subspecs[sub]->buf[last] == '+');
+ strbuf_remove(subspecs[sub], last, 1);
+ }
+ result = parse_combine_subfilter(
+ filter_options, subspecs[sub], errbuf);
+ }
+
+ filter_options->choice = LOFC_COMBINE;
+
+cleanup:
+ strbuf_list_free(subspecs);
+ if (result) {
+ list_objects_filter_release(filter_options);
+ memset(filter_options, 0, sizeof(*filter_options));
+ }
+ return result;
+}
+
+static int allow_unencoded(char ch)
+{
+ if (ch <= ' ' || ch == '%' || ch == '+')
+ return 0;
+ return !strchr(RESERVED_NON_WS, ch);
+}
+
+static void filter_spec_append_urlencode(
+ struct list_objects_filter_options *filter, const char *raw)
{
struct strbuf buf = STRBUF_INIT;
- if (gently_parse_list_objects_filter(filter_options, arg, &buf))
- die("%s", buf.buf);
- return 0;
+ strbuf_addstr_urlencode(&buf, raw, allow_unencoded);
+ trace_printf("Add to combine filter-spec: %s\n", buf.buf);
+ string_list_append(&filter->filter_spec, strbuf_detach(&buf, NULL));
+}
+
+/*
+ * Changes filter_options into an equivalent LOFC_COMBINE filter options
+ * instance. Does not do anything if filter_options is already LOFC_COMBINE.
+ */
+static void transform_to_combine_type(
+ struct list_objects_filter_options *filter_options)
+{
+ assert(filter_options->choice);
+ if (filter_options->choice == LOFC_COMBINE)
+ return;
+ {
+ const int initial_sub_alloc = 2;
+ struct list_objects_filter_options *sub_array =
+ xcalloc(initial_sub_alloc, sizeof(*sub_array));
+ sub_array[0] = *filter_options;
+ memset(filter_options, 0, sizeof(*filter_options));
+ filter_options->sub = sub_array;
+ filter_options->sub_alloc = initial_sub_alloc;
+ }
+ filter_options->sub_nr = 1;
+ filter_options->choice = LOFC_COMBINE;
+ string_list_append(&filter_options->filter_spec, xstrdup("combine:"));
+ filter_spec_append_urlencode(
+ filter_options,
+ list_objects_filter_spec(&filter_options->sub[0]));
+ /*
+ * We don't need the filter_spec strings for subfilter specs, only the
+ * top level.
+ */
+ string_list_clear(&filter_options->sub[0].filter_spec, /*free_util=*/0);
+}
+
+void list_objects_filter_die_if_populated(
+ struct list_objects_filter_options *filter_options)
+{
+ if (filter_options->choice)
+ die(_("multiple filter-specs cannot be combined"));
+}
+
+void parse_list_objects_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg)
+{
+ struct strbuf errbuf = STRBUF_INIT;
+ int parse_error;
+
+ if (!filter_options->choice) {
+ string_list_append(&filter_options->filter_spec, xstrdup(arg));
+
+ parse_error = gently_parse_list_objects_filter(
+ filter_options, arg, &errbuf);
+ } else {
+ /*
+ * Make filter_options an LOFC_COMBINE spec so we can trivially
+ * add subspecs to it.
+ */
+ transform_to_combine_type(filter_options);
+
+ string_list_append(&filter_options->filter_spec, xstrdup("+"));
+ filter_spec_append_urlencode(filter_options, arg);
+ ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+ filter_options->sub_alloc);
+
+ parse_error = gently_parse_list_objects_filter(
+ &filter_options->sub[filter_options->sub_nr - 1], arg,
+ &errbuf);
+ }
+ if (parse_error)
+ die("%s", errbuf.buf);
}
int opt_parse_list_objects_filter(const struct option *opt,
@@ -104,77 +263,108 @@
{
struct list_objects_filter_options *filter_options = opt->value;
- if (unset || !arg) {
+ if (unset || !arg)
list_objects_filter_set_no_filter(filter_options);
- return 0;
- }
-
- return parse_list_objects_filter(filter_options, arg);
+ else
+ parse_list_objects_filter(filter_options, arg);
+ return 0;
}
-void expand_list_objects_filter_spec(
- const struct list_objects_filter_options *filter,
- struct strbuf *expanded_spec)
+const char *list_objects_filter_spec(struct list_objects_filter_options *filter)
{
- strbuf_init(expanded_spec, strlen(filter->filter_spec));
- if (filter->choice == LOFC_BLOB_LIMIT)
- strbuf_addf(expanded_spec, "blob:limit=%lu",
+ if (!filter->filter_spec.nr)
+ BUG("no filter_spec available for this filter");
+ if (filter->filter_spec.nr != 1) {
+ struct strbuf concatted = STRBUF_INIT;
+ strbuf_add_separated_string_list(
+ &concatted, "", &filter->filter_spec);
+ string_list_clear(&filter->filter_spec, /*free_util=*/0);
+ string_list_append(
+ &filter->filter_spec, strbuf_detach(&concatted, NULL));
+ }
+
+ return filter->filter_spec.items[0].string;
+}
+
+const char *expand_list_objects_filter_spec(
+ struct list_objects_filter_options *filter)
+{
+ if (filter->choice == LOFC_BLOB_LIMIT) {
+ struct strbuf expanded_spec = STRBUF_INIT;
+ strbuf_addf(&expanded_spec, "blob:limit=%lu",
filter->blob_limit_value);
- else if (filter->choice == LOFC_TREE_DEPTH)
- strbuf_addf(expanded_spec, "tree:%lu",
- filter->tree_exclude_depth);
- else
- strbuf_addstr(expanded_spec, filter->filter_spec);
+ string_list_clear(&filter->filter_spec, /*free_util=*/0);
+ string_list_append(
+ &filter->filter_spec,
+ strbuf_detach(&expanded_spec, NULL));
+ }
+
+ return list_objects_filter_spec(filter);
}
void list_objects_filter_release(
struct list_objects_filter_options *filter_options)
{
- free(filter_options->filter_spec);
- free(filter_options->sparse_oid_value);
- free(filter_options->sparse_path_value);
+ size_t sub;
+
+ if (!filter_options)
+ return;
+ string_list_clear(&filter_options->filter_spec, /*free_util=*/0);
+ free(filter_options->sparse_oid_name);
+ for (sub = 0; sub < filter_options->sub_nr; sub++)
+ list_objects_filter_release(&filter_options->sub[sub]);
+ free(filter_options->sub);
memset(filter_options, 0, sizeof(*filter_options));
}
void partial_clone_register(
const char *remote,
- const struct list_objects_filter_options *filter_options)
+ struct list_objects_filter_options *filter_options)
{
- /*
- * Record the name of the partial clone remote in the
- * config and in the global variable -- the latter is
- * used throughout to indicate that partial clone is
- * enabled and to expect missing objects.
- */
- if (repository_format_partial_clone &&
- *repository_format_partial_clone &&
- strcmp(remote, repository_format_partial_clone))
- die(_("cannot change partial clone promisor remote"));
+ char *cfg_name;
+ char *filter_name;
- git_config_set("core.repositoryformatversion", "1");
- git_config_set("extensions.partialclone", remote);
+ /* Check if it is already registered */
+ if (!promisor_remote_find(remote)) {
+ git_config_set("core.repositoryformatversion", "1");
- repository_format_partial_clone = xstrdup(remote);
+ /* Add promisor config for the remote */
+ cfg_name = xstrfmt("remote.%s.promisor", remote);
+ git_config_set(cfg_name, "true");
+ free(cfg_name);
+ }
/*
* Record the initial filter-spec in the config as
* the default for subsequent fetches from this remote.
*/
- core_partial_clone_filter_default =
- xstrdup(filter_options->filter_spec);
- git_config_set("core.partialclonefilter",
- core_partial_clone_filter_default);
+ filter_name = xstrfmt("remote.%s.partialclonefilter", remote);
+ /* NEEDSWORK: 'expand' result leaking??? */
+ git_config_set(filter_name,
+ expand_list_objects_filter_spec(filter_options));
+ free(filter_name);
+
+ /* Make sure the config info are reset */
+ promisor_remote_reinit();
}
void partial_clone_get_default_filter_spec(
- struct list_objects_filter_options *filter_options)
+ struct list_objects_filter_options *filter_options,
+ const char *remote)
{
+ struct promisor_remote *promisor = promisor_remote_find(remote);
+ struct strbuf errbuf = STRBUF_INIT;
+
/*
* Parse default value, but silently ignore it if it is invalid.
*/
- if (!core_partial_clone_filter_default)
+ if (!promisor)
return;
+
+ string_list_append(&filter_options->filter_spec,
+ promisor->partial_clone_filter);
gently_parse_list_objects_filter(filter_options,
- core_partial_clone_filter_default,
- NULL);
+ promisor->partial_clone_filter,
+ &errbuf);
+ strbuf_release(&errbuf);
}
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index e3adc78..2ffb392 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -2,7 +2,7 @@
#define LIST_OBJECTS_FILTER_OPTIONS_H
#include "parse-options.h"
-#include "strbuf.h"
+#include "string-list.h"
/*
* The list of defined filters for list-objects.
@@ -13,7 +13,7 @@
LOFC_BLOB_LIMIT,
LOFC_TREE_DEPTH,
LOFC_SPARSE_OID,
- LOFC_SPARSE_PATH,
+ LOFC_COMBINE,
LOFC__COUNT /* must be last */
};
@@ -24,8 +24,10 @@
* commands that launch filtering sub-processes, or for communication
* over the network, don't use this value; use the result of
* expand_list_objects_filter_spec() instead.
+ * To get the raw filter spec given by the user, use the result of
+ * list_objects_filter_spec().
*/
- char *filter_spec;
+ struct string_list filter_spec;
/*
* 'choice' is determined by parsing the filter-spec. This indicates
@@ -39,20 +41,40 @@
unsigned int no_filter : 1;
/*
- * Parsed values (fields) from within the filter-spec. These are
- * choice-specific; not all values will be defined for any given
- * choice.
+ * BEGIN choice-specific parsed values from within the filter-spec. Only
+ * some values will be defined for any given choice.
*/
- struct object_id *sparse_oid_value;
- char *sparse_path_value;
+
+ char *sparse_oid_name;
unsigned long blob_limit_value;
unsigned long tree_exclude_depth;
+
+ /* LOFC_COMBINE values */
+
+ /* This array contains all the subfilters which this filter combines. */
+ size_t sub_nr, sub_alloc;
+ struct list_objects_filter_options *sub;
+
+ /*
+ * END choice-specific parsed values.
+ */
};
/* Normalized command line arguments */
#define CL_ARG__FILTER "filter"
-int parse_list_objects_filter(
+void list_objects_filter_die_if_populated(
+ struct list_objects_filter_options *filter_options);
+
+/*
+ * Parses the filter spec string given by arg and either (1) simply places the
+ * result in filter_options if it is not yet populated or (2) combines it with
+ * the filter already in filter_options if it is already populated. In the case
+ * of (2), the filter specs are combined as if specified with 'combine:'.
+ *
+ * Dies and prints a user-facing message if an error occurs.
+ */
+void parse_list_objects_filter(
struct list_objects_filter_options *filter_options,
const char *arg);
@@ -67,13 +89,22 @@
/*
* Translates abbreviated numbers in the filter's filter_spec into their
* fully-expanded forms (e.g., "limit:blob=1k" becomes "limit:blob=1024").
+ * Returns a string owned by the list_objects_filter_options object.
*
- * This form should be used instead of the raw filter_spec field when
- * communicating with a remote process or subprocess.
+ * This form should be used instead of the raw list_objects_filter_spec()
+ * value when communicating with a remote process or subprocess.
*/
-void expand_list_objects_filter_spec(
- const struct list_objects_filter_options *filter,
- struct strbuf *expanded_spec);
+const char *expand_list_objects_filter_spec(
+ struct list_objects_filter_options *filter);
+
+/*
+ * Returns the filter spec string more or less in the form as the user
+ * entered it. This form of the filter_spec can be used in user-facing
+ * messages. Returns a string owned by the list_objects_filter_options
+ * object.
+ */
+const char *list_objects_filter_spec(
+ struct list_objects_filter_options *filter);
void list_objects_filter_release(
struct list_objects_filter_options *filter_options);
@@ -87,8 +118,9 @@
void partial_clone_register(
const char *remote,
- const struct list_objects_filter_options *filter_options);
-void partial_clone_get_default_filter_spec(
struct list_objects_filter_options *filter_options);
+void partial_clone_get_default_filter_spec(
+ struct list_objects_filter_options *filter_options,
+ const char *remote);
#endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
diff --git a/list-objects-filter.c b/list-objects-filter.c
index ee449de..1e8d4e7 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -26,11 +26,46 @@
*/
#define FILTER_SHOWN_BUT_REVISIT (1<<21)
-/*
- * A filter for list-objects to omit ALL blobs from the traversal.
- * And to OPTIONALLY collect a list of the omitted OIDs.
- */
-struct filter_blobs_none_data {
+struct subfilter {
+ struct filter *filter;
+ struct oidset seen;
+ struct oidset omits;
+ struct object_id skip_tree;
+ unsigned is_skipping_tree : 1;
+};
+
+struct filter {
+ enum list_objects_filter_result (*filter_object_fn)(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct oidset *omits,
+ void *filter_data);
+
+ /*
+ * Optional. If this function is supplied and the filter needs
+ * to collect omits, then this function is called once before
+ * free_fn is called.
+ *
+ * This is required because the following two conditions hold:
+ *
+ * a. A tree filter can add and remove objects as an object
+ * graph is traversed.
+ * b. A combine filter's omit set is the union of all its
+ * subfilters, which may include tree: filters.
+ *
+ * As such, the omits sets must be separate sets, and can only
+ * be unioned after the traversal is completed.
+ */
+ void (*finalize_omits_fn)(struct oidset *omits, void *filter_data);
+
+ void (*free_fn)(void *filter_data);
+
+ void *filter_data;
+
+ /* If non-NULL, the filter collects a list of the omitted OIDs here. */
struct oidset *omits;
};
@@ -40,10 +75,9 @@
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
- struct filter_blobs_none_data *filter_data = filter_data_;
-
switch (filter_situation) {
default:
BUG("unknown filter_situation: %d", filter_situation);
@@ -61,24 +95,18 @@
assert(obj->type == OBJ_BLOB);
assert((obj->flags & SEEN) == 0);
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
}
}
-static void *filter_blobs_none__init(
- struct oidset *omitted,
+static void filter_blobs_none__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
- struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
-
- *filter_fn = filter_blobs_none;
- *filter_free_fn = free;
- return d;
+ filter->filter_object_fn = filter_blobs_none;
+ filter->free_fn = free;
}
/*
@@ -86,8 +114,6 @@
* Can OPTIONALLY collect a list of the omitted OIDs.
*/
struct filter_trees_depth_data {
- struct oidset *omits;
-
/*
* Maps trees to the minimum depth at which they were seen. It is not
* necessary to re-traverse a tree at deeper or equal depths than it has
@@ -110,16 +136,16 @@
/* Returns 1 if the oid was in the omits set before it was invoked. */
static int filter_trees_update_omits(
struct object *obj,
- struct filter_trees_depth_data *filter_data,
+ struct oidset *omits,
int include_it)
{
- if (!filter_data->omits)
+ if (!omits)
return 0;
if (include_it)
- return oidset_remove(filter_data->omits, &obj->oid);
+ return oidset_remove(omits, &obj->oid);
else
- return oidset_insert(filter_data->omits, &obj->oid);
+ return oidset_insert(omits, &obj->oid);
}
static enum list_objects_filter_result filter_trees_depth(
@@ -128,6 +154,7 @@
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_trees_depth_data *filter_data = filter_data_;
@@ -152,7 +179,7 @@
return LOFR_ZERO;
case LOFS_BLOB:
- filter_trees_update_omits(obj, filter_data, include_it);
+ filter_trees_update_omits(obj, omits, include_it);
return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO;
case LOFS_BEGIN_TREE:
@@ -173,12 +200,12 @@
filter_res = LOFR_SKIP_TREE;
} else {
int been_omitted = filter_trees_update_omits(
- obj, filter_data, include_it);
+ obj, omits, include_it);
seen_info->depth = filter_data->current_depth;
if (include_it)
filter_res = LOFR_DO_SHOW;
- else if (filter_data->omits && !been_omitted)
+ else if (omits && !been_omitted)
/*
* Must update omit information of children
* recursively; they have not been omitted yet.
@@ -201,21 +228,18 @@
free(d);
}
-static void *filter_trees_depth__init(
- struct oidset *omitted,
+static void filter_trees_depth__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_trees_depth_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
oidmap_init(&d->seen_at_depth, 0);
d->exclude_depth = filter_options->tree_exclude_depth;
d->current_depth = 0;
- *filter_fn = filter_trees_depth;
- *filter_free_fn = filter_trees_free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_trees_depth;
+ filter->free_fn = filter_trees_free;
}
/*
@@ -223,7 +247,6 @@
* And to OPTIONALLY collect a list of the omitted OIDs.
*/
struct filter_blobs_limit_data {
- struct oidset *omits;
unsigned long max_bytes;
};
@@ -233,6 +256,7 @@
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_blobs_limit_data *filter_data = filter_data_;
@@ -270,30 +294,27 @@
if (object_length < filter_data->max_bytes)
goto include_it;
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
}
include_it:
- if (filter_data->omits)
- oidset_remove(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_remove(omits, &obj->oid);
return LOFR_MARK_SEEN | LOFR_DO_SHOW;
}
-static void *filter_blobs_limit__init(
- struct oidset *omitted,
+static void filter_blobs_limit__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
d->max_bytes = filter_options->blob_limit_value;
- *filter_fn = filter_blobs_limit;
- *filter_free_fn = free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_blobs_limit;
+ filter->free_fn = free;
}
/*
@@ -307,12 +328,12 @@
*/
struct frame {
/*
- * defval is the usual default include/exclude value that
+ * default_match is the usual default include/exclude value that
* should be inherited as we recurse into directories based
* upon pattern matching of the directory itself or of a
* containing directory.
*/
- int defval;
+ enum pattern_match_result default_match;
/*
* 1 if the directory (recursively) contains any provisionally
@@ -326,8 +347,7 @@
};
struct filter_sparse_data {
- struct oidset *omits;
- struct exclude_list el;
+ struct pattern_list pl;
size_t nr, alloc;
struct frame *array_frame;
@@ -339,11 +359,13 @@
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_sparse_data *filter_data = filter_data_;
- int val, dtype;
+ int dtype;
struct frame *frame;
+ enum pattern_match_result match;
switch (filter_situation) {
default:
@@ -352,17 +374,17 @@
case LOFS_BEGIN_TREE:
assert(obj->type == OBJ_TREE);
dtype = DT_DIR;
- val = is_excluded_from_list(pathname, strlen(pathname),
- filename, &dtype, &filter_data->el,
- r->index);
- if (val < 0)
- val = filter_data->array_frame[filter_data->nr].defval;
+ match = path_matches_pattern_list(pathname, strlen(pathname),
+ filename, &dtype, &filter_data->pl,
+ r->index);
+ if (match == UNDECIDED)
+ match = filter_data->array_frame[filter_data->nr - 1].default_match;
ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
filter_data->alloc);
- filter_data->nr++;
- filter_data->array_frame[filter_data->nr].defval = val;
+ filter_data->array_frame[filter_data->nr].default_match = match;
filter_data->array_frame[filter_data->nr].child_prov_omit = 0;
+ filter_data->nr++;
/*
* A directory with this tree OID may appear in multiple
@@ -387,16 +409,15 @@
case LOFS_END_TREE:
assert(obj->type == OBJ_TREE);
- assert(filter_data->nr > 0);
+ assert(filter_data->nr > 1);
- frame = &filter_data->array_frame[filter_data->nr];
- filter_data->nr--;
+ frame = &filter_data->array_frame[--filter_data->nr];
/*
* Tell our parent directory if any of our children were
* provisionally omitted.
*/
- filter_data->array_frame[filter_data->nr].child_prov_omit |=
+ filter_data->array_frame[filter_data->nr - 1].child_prov_omit |=
frame->child_prov_omit;
/*
@@ -412,17 +433,17 @@
assert(obj->type == OBJ_BLOB);
assert((obj->flags & SEEN) == 0);
- frame = &filter_data->array_frame[filter_data->nr];
+ frame = &filter_data->array_frame[filter_data->nr - 1];
dtype = DT_REG;
- val = is_excluded_from_list(pathname, strlen(pathname),
- filename, &dtype, &filter_data->el,
+ match = path_matches_pattern_list(pathname, strlen(pathname),
+ filename, &dtype, &filter_data->pl,
r->index);
- if (val < 0)
- val = frame->defval;
- if (val > 0) {
- if (filter_data->omits)
- oidset_remove(filter_data->omits, &obj->oid);
+ if (match == UNDECIDED)
+ match = frame->default_match;
+ if (match == MATCHED) {
+ if (omits)
+ oidset_remove(omits, &obj->oid);
return LOFR_MARK_SEEN | LOFR_DO_SHOW;
}
@@ -436,8 +457,8 @@
* Leave the LOFR_ bits unset so that if the blob appears
* again in the traversal, we will be asked again.
*/
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
/*
* Remember that at least 1 blob in this tree was
@@ -453,57 +474,173 @@
static void filter_sparse_free(void *filter_data)
{
struct filter_sparse_data *d = filter_data;
- /* TODO free contents of 'd' */
+ free(d->array_frame);
free(d);
}
-static void *filter_sparse_oid__init(
- struct oidset *omitted,
+static void filter_sparse_oid__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
- if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value,
- NULL, 0, &d->el) < 0)
- die("could not load filter specification");
+ struct object_context oc;
+ struct object_id sparse_oid;
+
+ if (get_oid_with_context(the_repository,
+ filter_options->sparse_oid_name,
+ GET_OID_BLOB, &sparse_oid, &oc))
+ die(_("unable to access sparse blob in '%s'"),
+ filter_options->sparse_oid_name);
+ if (add_patterns_from_blob_to_list(&sparse_oid, "", 0, &d->pl) < 0)
+ die(_("unable to parse sparse filter data in %s"),
+ oid_to_hex(&sparse_oid));
ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
- d->array_frame[d->nr].defval = 0; /* default to include */
+ d->array_frame[d->nr].default_match = 0; /* default to include */
d->array_frame[d->nr].child_prov_omit = 0;
+ d->nr++;
- *filter_fn = filter_sparse;
- *filter_free_fn = filter_sparse_free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_sparse;
+ filter->free_fn = filter_sparse_free;
}
-static void *filter_sparse_path__init(
- struct oidset *omitted,
- struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+/* A filter which only shows objects shown by all sub-filters. */
+struct combine_filter_data {
+ struct subfilter *sub;
+ size_t nr;
+};
+
+static enum list_objects_filter_result process_subfilter(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct subfilter *sub)
{
- struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
- if (add_excludes_from_file_to_list(filter_options->sparse_path_value,
- NULL, 0, &d->el, NULL) < 0)
- die("could not load filter specification");
+ enum list_objects_filter_result result;
- ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
- d->array_frame[d->nr].defval = 0; /* default to include */
- d->array_frame[d->nr].child_prov_omit = 0;
+ /*
+ * Check and update is_skipping_tree before oidset_contains so
+ * that is_skipping_tree gets unset even when the object is
+ * marked as seen. As of this writing, no filter uses
+ * LOFR_MARK_SEEN on trees that also uses LOFR_SKIP_TREE, so the
+ * ordering is only theoretically important. Be cautious if you
+ * change the order of the below checks and more filters have
+ * been added!
+ */
+ if (sub->is_skipping_tree) {
+ if (filter_situation == LOFS_END_TREE &&
+ oideq(&obj->oid, &sub->skip_tree))
+ sub->is_skipping_tree = 0;
+ else
+ return LOFR_ZERO;
+ }
+ if (oidset_contains(&sub->seen, &obj->oid))
+ return LOFR_ZERO;
- *filter_fn = filter_sparse;
- *filter_free_fn = filter_sparse_free;
- return d;
+ result = list_objects_filter__filter_object(
+ r, filter_situation, obj, pathname, filename, sub->filter);
+
+ if (result & LOFR_MARK_SEEN)
+ oidset_insert(&sub->seen, &obj->oid);
+
+ if (result & LOFR_SKIP_TREE) {
+ sub->is_skipping_tree = 1;
+ sub->skip_tree = obj->oid;
+ }
+
+ return result;
}
-typedef void *(*filter_init_fn)(
- struct oidset *omitted,
+static enum list_objects_filter_result filter_combine(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct oidset *omits,
+ void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ enum list_objects_filter_result combined_result =
+ LOFR_DO_SHOW | LOFR_MARK_SEEN | LOFR_SKIP_TREE;
+ size_t sub;
+
+ for (sub = 0; sub < d->nr; sub++) {
+ enum list_objects_filter_result sub_result = process_subfilter(
+ r, filter_situation, obj, pathname, filename,
+ &d->sub[sub]);
+ if (!(sub_result & LOFR_DO_SHOW))
+ combined_result &= ~LOFR_DO_SHOW;
+ if (!(sub_result & LOFR_MARK_SEEN))
+ combined_result &= ~LOFR_MARK_SEEN;
+ if (!d->sub[sub].is_skipping_tree)
+ combined_result &= ~LOFR_SKIP_TREE;
+ }
+
+ return combined_result;
+}
+
+static void filter_combine__free(void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ size_t sub;
+ for (sub = 0; sub < d->nr; sub++) {
+ list_objects_filter__free(d->sub[sub].filter);
+ oidset_clear(&d->sub[sub].seen);
+ if (d->sub[sub].omits.set.size)
+ BUG("expected oidset to be cleared already");
+ }
+ free(d->sub);
+}
+
+static void add_all(struct oidset *dest, struct oidset *src) {
+ struct oidset_iter iter;
+ struct object_id *src_oid;
+
+ oidset_iter_init(src, &iter);
+ while ((src_oid = oidset_iter_next(&iter)) != NULL)
+ oidset_insert(dest, src_oid);
+}
+
+static void filter_combine__finalize_omits(
+ struct oidset *omits,
+ void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ size_t sub;
+
+ for (sub = 0; sub < d->nr; sub++) {
+ add_all(omits, &d->sub[sub].omits);
+ oidset_clear(&d->sub[sub].omits);
+ }
+}
+
+static void filter_combine__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn);
+ struct filter* filter)
+{
+ struct combine_filter_data *d = xcalloc(1, sizeof(*d));
+ size_t sub;
+
+ d->nr = filter_options->sub_nr;
+ d->sub = xcalloc(d->nr, sizeof(*d->sub));
+ for (sub = 0; sub < d->nr; sub++)
+ d->sub[sub].filter = list_objects_filter__init(
+ filter->omits ? &d->sub[sub].omits : NULL,
+ &filter_options->sub[sub]);
+
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_combine;
+ filter->free_fn = filter_combine__free;
+ filter->finalize_omits_fn = filter_combine__finalize_omits;
+}
+
+typedef void (*filter_init_fn)(
+ struct list_objects_filter_options *filter_options,
+ struct filter *filter);
/*
* Must match "enum list_objects_filter_choice".
@@ -514,15 +651,14 @@
filter_blobs_limit__init,
filter_trees_depth__init,
filter_sparse_oid__init,
- filter_sparse_path__init,
+ filter_combine__init,
};
-void *list_objects_filter__init(
+struct filter *list_objects_filter__init(
struct oidset *omitted,
- struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct list_objects_filter_options *filter_options)
{
+ struct filter *filter;
filter_init_fn init_fn;
assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT);
@@ -532,10 +668,44 @@
filter_options->choice);
init_fn = s_filters[filter_options->choice];
- if (init_fn)
- return init_fn(omitted, filter_options,
- filter_fn, filter_free_fn);
- *filter_fn = NULL;
- *filter_free_fn = NULL;
- return NULL;
+ if (!init_fn)
+ return NULL;
+
+ filter = xcalloc(1, sizeof(*filter));
+ filter->omits = omitted;
+ init_fn(filter_options, filter);
+ return filter;
+}
+
+enum list_objects_filter_result list_objects_filter__filter_object(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct filter *filter)
+{
+ if (filter && (obj->flags & NOT_USER_GIVEN))
+ return filter->filter_object_fn(r, filter_situation, obj,
+ pathname, filename,
+ filter->omits,
+ filter->filter_data);
+ /*
+ * No filter is active or user gave object explicitly. In this case,
+ * always show the object (except when LOFS_END_TREE, since this tree
+ * had already been shown when LOFS_BEGIN_TREE).
+ */
+ if (filter_situation == LOFS_END_TREE)
+ return 0;
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+}
+
+void list_objects_filter__free(struct filter *filter)
+{
+ if (!filter)
+ return;
+ if (filter->finalize_omits_fn && filter->omits)
+ filter->finalize_omits_fn(filter->omits, filter->filter_data);
+ filter->free_fn(filter->filter_data);
+ free(filter);
}
diff --git a/list-objects-filter.h b/list-objects-filter.h
index 1d45a4a..cfd784e 100644
--- a/list-objects-filter.h
+++ b/list-objects-filter.h
@@ -60,30 +60,36 @@
LOFS_BLOB
};
-typedef enum list_objects_filter_result (*filter_object_fn)(
+struct filter;
+
+/*
+ * Constructor for the set of defined list-objects filters.
+ * The `omitted` set is optional. It is populated with objects that the
+ * filter excludes. This set should not be considered finalized until
+ * after list_objects_filter__free is called on the returned `struct
+ * filter *`.
+ */
+struct filter *list_objects_filter__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options);
+
+/*
+ * Lets `filter` decide how to handle the `obj`. If `filter` is NULL, this
+ * function behaves as expected if no filter is configured: all objects are
+ * included.
+ */
+enum list_objects_filter_result list_objects_filter__filter_object(
struct repository *r,
enum list_objects_filter_situation filter_situation,
struct object *obj,
const char *pathname,
const char *filename,
- void *filter_data);
-
-typedef void (*filter_free_fn)(void *filter_data);
+ struct filter *filter);
/*
- * Constructor for the set of defined list-objects filters.
- * Returns a generic "void *filter_data".
- *
- * The returned "filter_fn" will be used by traverse_commit_list()
- * to filter the results.
- *
- * The returned "filter_free_fn" is a destructor for the
- * filter_data.
+ * Destroys `filter` and finalizes the `omitted` set, if present. Does
+ * nothing if `filter` is null.
*/
-void *list_objects_filter__init(
- struct oidset *omitted,
- struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn);
+void list_objects_filter__free(struct filter *filter);
#endif /* LIST_OBJECTS_FILTER_H */
diff --git a/list-objects.c b/list-objects.c
index dc77361..e19589b 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -18,8 +18,7 @@
show_object_fn show_object;
show_commit_fn show_commit;
void *show_data;
- filter_object_fn filter_fn;
- void *filter_data;
+ struct filter *filter;
};
static void process_blob(struct traversal_context *ctx,
@@ -29,7 +28,7 @@
{
struct object *obj = &blob->object;
size_t pathlen;
- enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+ enum list_objects_filter_result r;
if (!ctx->revs->blob_objects)
return;
@@ -54,11 +53,10 @@
pathlen = path->len;
strbuf_addstr(path, name);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_BLOB, obj,
- path->buf, &path->buf[pathlen],
- ctx->filter_data);
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_BLOB, obj,
+ path->buf, &path->buf[pathlen],
+ ctx->filter);
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
@@ -125,6 +123,11 @@
if (S_ISDIR(entry.mode)) {
struct tree *t = lookup_tree(ctx->revs->repo, &entry.oid);
+ if (!t) {
+ die(_("entry '%s' in tree %s has tree mode, "
+ "but is not a tree"),
+ entry.path, oid_to_hex(&tree->object.oid));
+ }
t->object.flags |= NOT_USER_GIVEN;
process_tree(ctx, t, base, entry.path);
}
@@ -133,6 +136,11 @@
base, entry.path);
else {
struct blob *b = lookup_blob(ctx->revs->repo, &entry.oid);
+ if (!b) {
+ die(_("entry '%s' in tree %s has blob mode, "
+ "but is not a blob"),
+ entry.path, oid_to_hex(&tree->object.oid));
+ }
b->object.flags |= NOT_USER_GIVEN;
process_blob(ctx, b, base, entry.path);
}
@@ -147,7 +155,7 @@
struct object *obj = &tree->object;
struct rev_info *revs = ctx->revs;
int baselen = base->len;
- enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+ enum list_objects_filter_result r;
int failed_parse;
if (!revs->tree_objects)
@@ -176,11 +184,10 @@
}
strbuf_addstr(base, name);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_BEGIN_TREE, obj,
- base->buf, &base->buf[baselen],
- ctx->filter_data);
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_BEGIN_TREE, obj,
+ base->buf, &base->buf[baselen],
+ ctx->filter);
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
@@ -193,16 +200,14 @@
else if (!failed_parse)
process_tree_contents(ctx, tree, base);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) {
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_END_TREE, obj,
- base->buf, &base->buf[baselen],
- ctx->filter_data);
- if (r & LOFR_MARK_SEEN)
- obj->flags |= SEEN;
- if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data);
- }
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_END_TREE, obj,
+ base->buf, &base->buf[baselen],
+ ctx->filter);
+ if (r & LOFR_MARK_SEEN)
+ obj->flags |= SEEN;
+ if (r & LOFR_DO_SHOW)
+ ctx->show_object(obj, base->buf, ctx->show_data);
strbuf_setlen(base, baselen);
free_tree_buffer(tree);
@@ -360,10 +365,15 @@
* an uninteresting boundary commit may not have its tree
* parsed yet, but we are not going to show them anyway
*/
- if (get_commit_tree(commit)) {
+ if (!ctx->revs->tree_objects)
+ ; /* do not bother loading tree */
+ else if (get_commit_tree(commit)) {
struct tree *tree = get_commit_tree(commit);
tree->object.flags |= NOT_USER_GIVEN;
add_pending_tree(ctx->revs, tree);
+ } else if (commit->object.parsed) {
+ die(_("unable to load root tree for commit %s"),
+ oid_to_hex(&commit->object.oid));
}
ctx->show_commit(commit, ctx->show_data);
@@ -389,8 +399,7 @@
ctx.show_commit = show_commit;
ctx.show_object = show_object;
ctx.show_data = show_data;
- ctx.filter_fn = NULL;
- ctx.filter_data = NULL;
+ ctx.filter = NULL;
do_traverse(&ctx);
}
@@ -403,17 +412,12 @@
struct oidset *omitted)
{
struct traversal_context ctx;
- filter_free_fn filter_free_fn = NULL;
ctx.revs = revs;
ctx.show_object = show_object;
ctx.show_commit = show_commit;
ctx.show_data = show_data;
- ctx.filter_fn = NULL;
-
- ctx.filter_data = list_objects_filter__init(omitted, filter_options,
- &ctx.filter_fn, &filter_free_fn);
+ ctx.filter = list_objects_filter__init(omitted, filter_options);
do_traverse(&ctx);
- if (ctx.filter_data && filter_free_fn)
- filter_free_fn(ctx.filter_data);
+ list_objects_filter__free(ctx.filter);
}
diff --git a/ll-merge.c b/ll-merge.c
index 5b8d46a..d65a897 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -32,6 +32,20 @@
char *cmdline;
};
+static struct attr_check *merge_attributes;
+static struct attr_check *load_merge_attributes(void)
+{
+ if (!merge_attributes)
+ merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL);
+ return merge_attributes;
+}
+
+void reset_merge_attributes(void)
+{
+ attr_check_free(merge_attributes);
+ merge_attributes = NULL;
+}
+
/*
* Built-in low-levels
*/
@@ -354,7 +368,7 @@
struct index_state *istate,
const struct ll_merge_options *opts)
{
- static struct attr_check *check;
+ struct attr_check *check = load_merge_attributes();
static const struct ll_merge_options default_opts;
const char *ll_driver_name = NULL;
int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
@@ -369,9 +383,6 @@
normalize_file(theirs, path, istate);
}
- if (!check)
- check = attr_check_initl("merge", "conflict-marker-size", NULL);
-
git_check_attr(istate, path, check);
ll_driver_name = check->items[0].value;
if (check->items[1].value) {
diff --git a/ll-merge.h b/ll-merge.h
index b9e2af1..e78973d 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -26,5 +26,6 @@
const struct ll_merge_options *opts);
int ll_merge_marker_size(struct index_state *istate, const char *path);
+void reset_merge_attributes(void);
#endif
diff --git a/lockfile.h b/lockfile.h
index 35403cc..9843053 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -159,7 +159,7 @@
* timeout_ms is -1, retry indefinitely. The flags argument and error
* handling are described above.
*/
-extern int hold_lock_file_for_update_timeout(
+int hold_lock_file_for_update_timeout(
struct lock_file *lk, const char *path,
int flags, long timeout_ms);
@@ -188,8 +188,8 @@
* of `hold_lock_file_for_update()` to lock `path`. `err` should be the
* `errno` set by the failing call.
*/
-extern void unable_to_lock_message(const char *path, int err,
- struct strbuf *buf);
+void unable_to_lock_message(const char *path, int err,
+ struct strbuf *buf);
/*
* Emit an appropriate error message and `die()` following the failure
@@ -197,7 +197,7 @@
* `errno` set by the failing
* call.
*/
-extern NORETURN void unable_to_lock_die(const char *path, int err);
+NORETURN void unable_to_lock_die(const char *path, int err);
/*
* Associate a stdio stream with the lockfile (which must still be
@@ -234,7 +234,7 @@
* Return the path of the file that is locked by the specified
* lock_file object. The caller must free the memory.
*/
-extern char *get_locked_file_path(struct lock_file *lk);
+char *get_locked_file_path(struct lock_file *lk);
/*
* If the lockfile is still open, close it (and the file pointer if it
@@ -282,7 +282,7 @@
* call `commit_lock_file()` for a `lock_file` object that is not
* currently locked.
*/
-extern int commit_lock_file(struct lock_file *lk);
+int commit_lock_file(struct lock_file *lk);
/*
* Like `commit_lock_file()`, but rename the lockfile to the provided
diff --git a/log-tree.c b/log-tree.c
index 3cb1425..923a299 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -77,6 +77,7 @@
const struct name_decoration *get_name_decoration(const struct object *obj)
{
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
return lookup_decoration(&name_decoration, obj);
}
@@ -677,9 +678,7 @@
raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
format_display_notes(&commit->object.oid, ¬ebuf,
get_log_output_encoding(), raw);
- ctx.notes_message = notebuf.len
- ? strbuf_detach(¬ebuf, NULL)
- : xcalloc(1, 1);
+ ctx.notes_message = strbuf_detach(¬ebuf, NULL);
}
/*
@@ -687,8 +686,7 @@
*/
if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
ctx.need_8bit_cte =
- has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
- getenv("GIT_COMMITTER_EMAIL")));
+ has_non_ascii(fmt_name(WANT_COMMITTER_IDENT));
ctx.date_mode = opt->date_mode;
ctx.date_mode_explicit = opt->date_mode_explicit;
ctx.abbrev = opt->diffopt.abbrev;
diff --git a/ls-refs.c b/ls-refs.c
index 0a7dbc6..818aef7 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -57,7 +57,8 @@
if (!symref_target)
die("'%s' is a symref but it is not?", refname);
- strbuf_addf(&refline, " symref-target:%s", symref_target);
+ strbuf_addf(&refline, " symref-target:%s",
+ strip_namespace(symref_target));
}
if (data->peel) {
diff --git a/ls-refs.h b/ls-refs.h
index b62877e..7e5646f 100644
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -4,7 +4,7 @@
struct repository;
struct argv_array;
struct packet_reader;
-extern int ls_refs(struct repository *r, struct argv_array *keys,
- struct packet_reader *request);
+int ls_refs(struct repository *r, struct argv_array *keys,
+ struct packet_reader *request);
#endif /* LS_REFS_H */
diff --git a/mailinfo.h b/mailinfo.h
index 6830e1e..79b1d67 100644
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -39,8 +39,8 @@
int input_error;
};
-extern void setup_mailinfo(struct mailinfo *);
-extern int mailinfo(struct mailinfo *, const char *msg, const char *patch);
-extern void clear_mailinfo(struct mailinfo *);
+void setup_mailinfo(struct mailinfo *);
+int mailinfo(struct mailinfo *, const char *msg, const char *patch);
+void clear_mailinfo(struct mailinfo *);
#endif /* MAILINFO_H */
diff --git a/match-trees.c b/match-trees.c
index ddc4d39..f6c194c 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -140,7 +140,7 @@
while (one.size) {
const char *path;
const struct object_id *elem;
- unsigned mode;
+ unsigned short mode;
int score;
elem = tree_entry_extract(&one, &path, &mode);
@@ -196,7 +196,7 @@
rewrite_here = NULL;
while (desc.size) {
const char *name;
- unsigned mode;
+ unsigned short mode;
tree_entry_extract(&desc, &name, &mode);
if (strlen(name) == toplen &&
@@ -248,7 +248,8 @@
* other hand, it could cover tree one and we might need to pick a
* subtree of it.
*/
-void shift_tree(const struct object_id *hash1,
+void shift_tree(struct repository *r,
+ const struct object_id *hash1,
const struct object_id *hash2,
struct object_id *shifted,
int depth_limit)
@@ -285,12 +286,12 @@
if (add_score < del_score) {
/* We need to pick a subtree of two */
- unsigned mode;
+ unsigned short mode;
if (!*del_prefix)
return;
- if (get_tree_entry(hash2, del_prefix, shifted, &mode))
+ if (get_tree_entry(r, hash2, del_prefix, shifted, &mode))
die("cannot find path %s in tree %s",
del_prefix, oid_to_hex(hash2));
return;
@@ -307,22 +308,23 @@
* Unfortunately we cannot fundamentally tell which one to
* be prefixed, as recursive merge can work in either direction.
*/
-void shift_tree_by(const struct object_id *hash1,
+void shift_tree_by(struct repository *r,
+ const struct object_id *hash1,
const struct object_id *hash2,
struct object_id *shifted,
const char *shift_prefix)
{
struct object_id sub1, sub2;
- unsigned mode1, mode2;
+ unsigned short mode1, mode2;
unsigned candidate = 0;
/* Can hash2 be a tree at shift_prefix in tree hash1? */
- if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
+ if (!get_tree_entry(r, hash1, shift_prefix, &sub1, &mode1) &&
S_ISDIR(mode1))
candidate |= 1;
/* Can hash1 be a tree at shift_prefix in tree hash2? */
- if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
+ if (!get_tree_entry(r, hash2, shift_prefix, &sub2, &mode2) &&
S_ISDIR(mode2))
candidate |= 2;
diff --git a/merge-blobs.h b/merge-blobs.h
index cc31038..13cf966 100644
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -4,8 +4,8 @@
struct blob;
struct index_state;
-extern void *merge_blobs(struct index_state *, const char *,
- struct blob *, struct blob *,
- struct blob *, unsigned long *);
+void *merge_blobs(struct index_state *, const char *,
+ struct blob *, struct blob *,
+ struct blob *, unsigned long *);
#endif /* MERGE_BLOBS_H */
diff --git a/merge-recursive.c b/merge-recursive.c
index 4851825..6b812d6 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -115,32 +115,32 @@
hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
}
-static void flush_output(struct merge_options *o)
+static void flush_output(struct merge_options *opt)
{
- if (o->buffer_output < 2 && o->obuf.len) {
- fputs(o->obuf.buf, stdout);
- strbuf_reset(&o->obuf);
+ if (opt->buffer_output < 2 && opt->obuf.len) {
+ fputs(opt->obuf.buf, stdout);
+ strbuf_reset(&opt->obuf);
}
}
-static int err(struct merge_options *o, const char *err, ...)
+static int err(struct merge_options *opt, const char *err, ...)
{
va_list params;
- if (o->buffer_output < 2)
- flush_output(o);
+ if (opt->buffer_output < 2)
+ flush_output(opt);
else {
- strbuf_complete(&o->obuf, '\n');
- strbuf_addstr(&o->obuf, "error: ");
+ strbuf_complete(&opt->obuf, '\n');
+ strbuf_addstr(&opt->obuf, "error: ");
}
va_start(params, err);
- strbuf_vaddf(&o->obuf, err, params);
+ strbuf_vaddf(&opt->obuf, err, params);
va_end(params);
- if (o->buffer_output > 1)
- strbuf_addch(&o->obuf, '\n');
+ if (opt->buffer_output > 1)
+ strbuf_addch(&opt->obuf, '\n');
else {
- error("%s", o->obuf.buf);
- strbuf_reset(&o->obuf);
+ error("%s", opt->obuf.buf);
+ strbuf_reset(&opt->obuf);
}
return -1;
@@ -153,9 +153,9 @@
struct object_id shifted;
if (!*subtree_shift) {
- shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
+ shift_tree(repo, &one->object.oid, &two->object.oid, &shifted, 0);
} else {
- shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
+ shift_tree_by(repo, &one->object.oid, &two->object.oid, &shifted,
subtree_shift);
}
if (oideq(&two->object.oid, &shifted))
@@ -163,6 +163,11 @@
return lookup_tree(repo, &shifted);
}
+static inline void set_commit_tree(struct commit *c, struct tree *t)
+{
+ c->maybe_tree = t;
+}
+
static struct commit *make_virtual_commit(struct repository *repo,
struct tree *tree,
const char *comment)
@@ -170,7 +175,7 @@
struct commit *commit = alloc_commit_node(repo);
set_merge_remote_desc(commit, comment, (struct object *)commit);
- commit->maybe_tree = tree;
+ set_commit_tree(commit, tree);
commit->object.parsed = 1;
return commit;
}
@@ -196,163 +201,148 @@
RENAME_TWO_FILES_TO_ONE
};
-struct rename_conflict_info {
- enum rename_type rename_type;
- struct diff_filepair *pair1;
- struct diff_filepair *pair2;
- const char *branch1;
- const char *branch2;
- struct stage_data *dst_entry1;
- struct stage_data *dst_entry2;
- struct diff_filespec ren1_other;
- struct diff_filespec ren2_other;
-};
-
/*
* Since we want to write the index eventually, we cannot reuse the index
* for these (temporary) data.
*/
struct stage_data {
- struct {
- unsigned mode;
- struct object_id oid;
- } stages[4];
+ struct diff_filespec stages[4]; /* mostly for oid & mode; maybe path */
struct rename_conflict_info *rename_conflict_info;
unsigned processed:1;
};
+struct rename {
+ unsigned processed:1;
+ struct diff_filepair *pair;
+ const char *branch; /* branch that the rename occurred on */
+ /*
+ * If directory rename detection affected this rename, what was its
+ * original type ('A' or 'R') and it's original destination before
+ * the directory rename (otherwise, '\0' and NULL for these two vars).
+ */
+ char dir_rename_original_type;
+ char *dir_rename_original_dest;
+ /*
+ * Purpose of src_entry and dst_entry:
+ *
+ * If 'before' is renamed to 'after' then src_entry will contain
+ * the versions of 'before' from the merge_base, HEAD, and MERGE in
+ * stages 1, 2, and 3; dst_entry will contain the respective
+ * versions of 'after' in corresponding locations. Thus, we have a
+ * total of six modes and oids, though some will be null. (Stage 0
+ * is ignored; we're interested in handling conflicts.)
+ *
+ * Since we don't turn on break-rewrites by default, neither
+ * src_entry nor dst_entry can have all three of their stages have
+ * non-null oids, meaning at most four of the six will be non-null.
+ * Also, since this is a rename, both src_entry and dst_entry will
+ * have at least one non-null oid, meaning at least two will be
+ * non-null. Of the six oids, a typical rename will have three be
+ * non-null. Only two implies a rename/delete, and four implies a
+ * rename/add.
+ */
+ struct stage_data *src_entry;
+ struct stage_data *dst_entry;
+};
+
+struct rename_conflict_info {
+ enum rename_type rename_type;
+ struct rename *ren1;
+ struct rename *ren2;
+};
+
static inline void setup_rename_conflict_info(enum rename_type rename_type,
- struct diff_filepair *pair1,
- struct diff_filepair *pair2,
- const char *branch1,
- const char *branch2,
- struct stage_data *dst_entry1,
- struct stage_data *dst_entry2,
- struct merge_options *o,
- struct stage_data *src_entry1,
- struct stage_data *src_entry2)
+ struct merge_options *opt,
+ struct rename *ren1,
+ struct rename *ren2)
{
- int ostage1 = 0, ostage2;
struct rename_conflict_info *ci;
/*
* When we have two renames involved, it's easiest to get the
* correct things into stage 2 and 3, and to make sure that the
* content merge puts HEAD before the other branch if we just
- * ensure that branch1 == o->branch1. So, simply flip arguments
+ * ensure that branch1 == opt->branch1. So, simply flip arguments
* around if we don't have that.
*/
- if (dst_entry2 && branch1 != o->branch1) {
- setup_rename_conflict_info(rename_type,
- pair2, pair1,
- branch2, branch1,
- dst_entry2, dst_entry1,
- o,
- src_entry2, src_entry1);
+ if (ren2 && ren1->branch != opt->branch1) {
+ setup_rename_conflict_info(rename_type, opt, ren2, ren1);
return;
}
ci = xcalloc(1, sizeof(struct rename_conflict_info));
ci->rename_type = rename_type;
- ci->pair1 = pair1;
- ci->branch1 = branch1;
- ci->branch2 = branch2;
+ ci->ren1 = ren1;
+ ci->ren2 = ren2;
- ci->dst_entry1 = dst_entry1;
- dst_entry1->rename_conflict_info = ci;
- dst_entry1->processed = 0;
-
- assert(!pair2 == !dst_entry2);
- if (dst_entry2) {
- ci->dst_entry2 = dst_entry2;
- ci->pair2 = pair2;
- dst_entry2->rename_conflict_info = ci;
- }
-
- /*
- * For each rename, there could have been
- * modifications on the side of history where that
- * file was not renamed.
- */
- if (rename_type == RENAME_ADD ||
- rename_type == RENAME_TWO_FILES_TO_ONE) {
- ostage1 = o->branch1 == branch1 ? 3 : 2;
-
- ci->ren1_other.path = pair1->one->path;
- oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
- ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
- }
-
- if (rename_type == RENAME_TWO_FILES_TO_ONE) {
- ostage2 = ostage1 ^ 1;
-
- ci->ren2_other.path = pair2->one->path;
- oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
- ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
+ ci->ren1->dst_entry->processed = 0;
+ ci->ren1->dst_entry->rename_conflict_info = ci;
+ if (ren2) {
+ ci->ren2->dst_entry->rename_conflict_info = ci;
}
}
-static int show(struct merge_options *o, int v)
+static int show(struct merge_options *opt, int v)
{
- return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
+ return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5;
}
__attribute__((format (printf, 3, 4)))
-static void output(struct merge_options *o, int v, const char *fmt, ...)
+static void output(struct merge_options *opt, int v, const char *fmt, ...)
{
va_list ap;
- if (!show(o, v))
+ if (!show(opt, v))
return;
- strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
+ strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
va_start(ap, fmt);
- strbuf_vaddf(&o->obuf, fmt, ap);
+ strbuf_vaddf(&opt->obuf, fmt, ap);
va_end(ap);
- strbuf_addch(&o->obuf, '\n');
- if (!o->buffer_output)
- flush_output(o);
+ strbuf_addch(&opt->obuf, '\n');
+ if (!opt->buffer_output)
+ flush_output(opt);
}
-static void output_commit_title(struct merge_options *o, struct commit *commit)
+static void output_commit_title(struct merge_options *opt, struct commit *commit)
{
struct merge_remote_desc *desc;
- strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
+ strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2);
desc = merge_remote_util(commit);
if (desc)
- strbuf_addf(&o->obuf, "virtual %s\n", desc->name);
+ strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
else {
- strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
+ strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
DEFAULT_ABBREV);
- strbuf_addch(&o->obuf, ' ');
+ strbuf_addch(&opt->obuf, ' ');
if (parse_commit(commit) != 0)
- strbuf_addstr(&o->obuf, _("(bad commit)\n"));
+ strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
else {
const char *title;
const char *msg = get_commit_buffer(commit, NULL);
int len = find_commit_subject(msg, &title);
if (len)
- strbuf_addf(&o->obuf, "%.*s\n", len, title);
+ strbuf_addf(&opt->obuf, "%.*s\n", len, title);
unuse_commit_buffer(commit, msg);
}
}
- flush_output(o);
+ flush_output(opt);
}
-static int add_cacheinfo(struct merge_options *o,
- unsigned int mode, const struct object_id *oid,
+static int add_cacheinfo(struct merge_options *opt,
+ const struct diff_filespec *blob,
const char *path, int stage, int refresh, int options)
{
- struct index_state *istate = o->repo->index;
+ struct index_state *istate = opt->repo->index;
struct cache_entry *ce;
int ret;
- ce = make_cache_entry(istate, mode, oid ? oid : &null_oid, path, stage, 0);
+ ce = make_cache_entry(istate, blob->mode, &blob->oid, path, stage, 0);
if (!ce)
- return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
+ return err(opt, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
ret = add_index_entry(istate, ce, options);
if (refresh) {
@@ -361,7 +351,7 @@
nce = refresh_cache_entry(istate, ce,
CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
if (!nce)
- return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
+ return err(opt, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
if (nce != ce)
ret = add_index_entry(istate, nce, options);
}
@@ -374,7 +364,7 @@
init_tree_desc(desc, tree->buffer, tree->size);
}
-static int unpack_trees_start(struct merge_options *o,
+static int unpack_trees_start(struct merge_options *opt,
struct tree *common,
struct tree *head,
struct tree *merge)
@@ -383,49 +373,49 @@
struct tree_desc t[3];
struct index_state tmp_index = { NULL };
- memset(&o->unpack_opts, 0, sizeof(o->unpack_opts));
- if (o->call_depth)
- o->unpack_opts.index_only = 1;
+ memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts));
+ if (opt->call_depth)
+ opt->unpack_opts.index_only = 1;
else
- o->unpack_opts.update = 1;
- o->unpack_opts.merge = 1;
- o->unpack_opts.head_idx = 2;
- o->unpack_opts.fn = threeway_merge;
- o->unpack_opts.src_index = o->repo->index;
- o->unpack_opts.dst_index = &tmp_index;
- o->unpack_opts.aggressive = !merge_detect_rename(o);
- setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
+ opt->unpack_opts.update = 1;
+ opt->unpack_opts.merge = 1;
+ opt->unpack_opts.head_idx = 2;
+ opt->unpack_opts.fn = threeway_merge;
+ opt->unpack_opts.src_index = opt->repo->index;
+ opt->unpack_opts.dst_index = &tmp_index;
+ opt->unpack_opts.aggressive = !merge_detect_rename(opt);
+ setup_unpack_trees_porcelain(&opt->unpack_opts, "merge");
init_tree_desc_from_tree(t+0, common);
init_tree_desc_from_tree(t+1, head);
init_tree_desc_from_tree(t+2, merge);
- rc = unpack_trees(3, t, &o->unpack_opts);
- cache_tree_free(&o->repo->index->cache_tree);
+ rc = unpack_trees(3, t, &opt->unpack_opts);
+ cache_tree_free(&opt->repo->index->cache_tree);
/*
- * Update o->repo->index to match the new results, AFTER saving a copy
- * in o->orig_index. Update src_index to point to the saved copy.
+ * Update opt->repo->index to match the new results, AFTER saving a copy
+ * in opt->orig_index. Update src_index to point to the saved copy.
* (verify_uptodate() checks src_index, and the original index is
* the one that had the necessary modification timestamps.)
*/
- o->orig_index = *o->repo->index;
- *o->repo->index = tmp_index;
- o->unpack_opts.src_index = &o->orig_index;
+ opt->orig_index = *opt->repo->index;
+ *opt->repo->index = tmp_index;
+ opt->unpack_opts.src_index = &opt->orig_index;
return rc;
}
-static void unpack_trees_finish(struct merge_options *o)
+static void unpack_trees_finish(struct merge_options *opt)
{
- discard_index(&o->orig_index);
- clear_unpack_trees_porcelain(&o->unpack_opts);
+ discard_index(&opt->orig_index);
+ clear_unpack_trees_porcelain(&opt->unpack_opts);
}
-struct tree *write_tree_from_memory(struct merge_options *o)
+struct tree *write_tree_from_memory(struct merge_options *opt)
{
struct tree *result = NULL;
- struct index_state *istate = o->repo->index;
+ struct index_state *istate = opt->repo->index;
if (unmerged_index(istate)) {
int i;
@@ -444,11 +434,11 @@
if (!cache_tree_fully_valid(istate->cache_tree) &&
cache_tree_update(istate, 0) < 0) {
- err(o, _("error building trees"));
+ err(opt, _("error building trees"));
return NULL;
}
- result = lookup_tree(o->repo, &istate->cache_tree->oid);
+ result = lookup_tree(opt->repo, &istate->cache_tree->oid);
return result;
}
@@ -459,37 +449,37 @@
{
struct path_hashmap_entry *entry;
int baselen = base->len;
- struct merge_options *o = context;
+ struct merge_options *opt = context;
strbuf_addstr(base, path);
FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
hashmap_entry_init(entry, path_hash(entry->path));
- hashmap_add(&o->current_file_dir_set, entry);
+ hashmap_add(&opt->current_file_dir_set, entry);
strbuf_setlen(base, baselen);
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
}
-static void get_files_dirs(struct merge_options *o, struct tree *tree)
+static void get_files_dirs(struct merge_options *opt, struct tree *tree)
{
struct pathspec match_all;
memset(&match_all, 0, sizeof(match_all));
- read_tree_recursive(the_repository, tree, "", 0, 0,
- &match_all, save_files_dirs, o);
+ read_tree_recursive(opt->repo, tree, "", 0, 0,
+ &match_all, save_files_dirs, opt);
}
-static int get_tree_entry_if_blob(const struct object_id *tree,
+static int get_tree_entry_if_blob(struct repository *r,
+ const struct object_id *tree,
const char *path,
- struct object_id *hashy,
- unsigned int *mode_o)
+ struct diff_filespec *dfs)
{
int ret;
- ret = get_tree_entry(tree, path, hashy, mode_o);
- if (S_ISDIR(*mode_o)) {
- oidcpy(hashy, &null_oid);
- *mode_o = 0;
+ ret = get_tree_entry(r, tree, path, &dfs->oid, &dfs->mode);
+ if (S_ISDIR(dfs->mode)) {
+ oidcpy(&dfs->oid, &null_oid);
+ dfs->mode = 0;
}
return ret;
}
@@ -498,18 +488,16 @@
* Returns an index_entry instance which doesn't have to correspond to
* a real cache entry in Git's index.
*/
-static struct stage_data *insert_stage_data(const char *path,
+static struct stage_data *insert_stage_data(struct repository *r,
+ const char *path,
struct tree *o, struct tree *a, struct tree *b,
struct string_list *entries)
{
struct string_list_item *item;
struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
- get_tree_entry_if_blob(&o->object.oid, path,
- &e->stages[1].oid, &e->stages[1].mode);
- get_tree_entry_if_blob(&a->object.oid, path,
- &e->stages[2].oid, &e->stages[2].mode);
- get_tree_entry_if_blob(&b->object.oid, path,
- &e->stages[3].oid, &e->stages[3].mode);
+ get_tree_entry_if_blob(r, &o->object.oid, path, &e->stages[1]);
+ get_tree_entry_if_blob(r, &a->object.oid, path, &e->stages[2]);
+ get_tree_entry_if_blob(r, &b->object.oid, path, &e->stages[3]);
item = string_list_insert(entries, path);
item->util = e;
return e;
@@ -573,7 +561,7 @@
return onelen - twolen;
}
-static void record_df_conflict_files(struct merge_options *o,
+static void record_df_conflict_files(struct merge_options *opt,
struct string_list *entries)
{
/* If there is a D/F conflict and the file for such a conflict
@@ -598,7 +586,7 @@
* If we're merging merge-bases, we don't want to bother with
* any working directory changes.
*/
- if (o->call_depth)
+ if (opt->call_depth)
return;
/* Ensure D/F conflicts are adjacent in the entries list. */
@@ -610,7 +598,7 @@
df_sorted_entries.cmp = string_list_df_name_compare;
string_list_sort(&df_sorted_entries);
- string_list_clear(&o->df_conflict_file_set, 1);
+ string_list_clear(&opt->df_conflict_file_set, 1);
for (i = 0; i < df_sorted_entries.nr; i++) {
const char *path = df_sorted_entries.items[i].string;
int len = strlen(path);
@@ -626,7 +614,7 @@
len > last_len &&
memcmp(path, last_file, last_len) == 0 &&
path[last_len] == '/') {
- string_list_insert(&o->df_conflict_file_set, last_file);
+ string_list_insert(&opt->df_conflict_file_set, last_file);
}
/*
@@ -645,33 +633,6 @@
string_list_clear(&df_sorted_entries, 0);
}
-struct rename {
- struct diff_filepair *pair;
- /*
- * Purpose of src_entry and dst_entry:
- *
- * If 'before' is renamed to 'after' then src_entry will contain
- * the versions of 'before' from the merge_base, HEAD, and MERGE in
- * stages 1, 2, and 3; dst_entry will contain the respective
- * versions of 'after' in corresponding locations. Thus, we have a
- * total of six modes and oids, though some will be null. (Stage 0
- * is ignored; we're interested in handling conflicts.)
- *
- * Since we don't turn on break-rewrites by default, neither
- * src_entry nor dst_entry can have all three of their stages have
- * non-null oids, meaning at most four of the six will be non-null.
- * Also, since this is a rename, both src_entry and dst_entry will
- * have at least one non-null oid, meaning at least two will be
- * non-null. Of the six oids, a typical rename will have three be
- * non-null. Only two implies a rename/delete, and four implies a
- * rename/add.
- */
- struct stage_data *src_entry;
- struct stage_data *dst_entry;
- unsigned add_turned_into_rename:1;
- unsigned processed:1;
-};
-
static int update_stages(struct merge_options *opt, const char *path,
const struct diff_filespec *o,
const struct diff_filespec *a,
@@ -692,13 +653,13 @@
if (remove_file_from_index(opt->repo->index, path))
return -1;
if (o)
- if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
+ if (add_cacheinfo(opt, o, path, 1, 0, options))
return -1;
if (a)
- if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
+ if (add_cacheinfo(opt, a, path, 2, 0, options))
return -1;
if (b)
- if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
+ if (add_cacheinfo(opt, b, path, 3, 0, options))
return -1;
return 0;
}
@@ -717,20 +678,20 @@
oidcpy(&entry->stages[3].oid, &b->oid);
}
-static int remove_file(struct merge_options *o, int clean,
+static int remove_file(struct merge_options *opt, int clean,
const char *path, int no_wd)
{
- int update_cache = o->call_depth || clean;
- int update_working_directory = !o->call_depth && !no_wd;
+ int update_cache = opt->call_depth || clean;
+ int update_working_directory = !opt->call_depth && !no_wd;
if (update_cache) {
- if (remove_file_from_index(o->repo->index, path))
+ if (remove_file_from_index(opt->repo->index, path))
return -1;
}
if (update_working_directory) {
if (ignore_case) {
struct cache_entry *ce;
- ce = index_file_exists(o->repo->index, path, strlen(path),
+ ce = index_file_exists(opt->repo->index, path, strlen(path),
ignore_case);
if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
return 0;
@@ -751,7 +712,7 @@
out->buf[i] = '_';
}
-static char *unique_path(struct merge_options *o, const char *path, const char *branch)
+static char *unique_path(struct merge_options *opt, const char *path, const char *branch)
{
struct path_hashmap_entry *entry;
struct strbuf newpath = STRBUF_INIT;
@@ -762,16 +723,16 @@
add_flattened_path(&newpath, branch);
base_len = newpath.len;
- while (hashmap_get_from_hash(&o->current_file_dir_set,
+ while (hashmap_get_from_hash(&opt->current_file_dir_set,
path_hash(newpath.buf), newpath.buf) ||
- (!o->call_depth && file_exists(newpath.buf))) {
+ (!opt->call_depth && file_exists(newpath.buf))) {
strbuf_setlen(&newpath, base_len);
strbuf_addf(&newpath, "_%d", suffix++);
}
FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
hashmap_entry_init(entry, path_hash(entry->path));
- hashmap_add(&o->current_file_dir_set, entry);
+ hashmap_add(&opt->current_file_dir_set, entry);
return strbuf_detach(&newpath, NULL);
}
@@ -810,10 +771,10 @@
* Returns whether path was tracked in the index before the merge started,
* and its oid and mode match the specified values
*/
-static int was_tracked_and_matches(struct merge_options *o, const char *path,
- const struct object_id *oid, unsigned mode)
+static int was_tracked_and_matches(struct merge_options *opt, const char *path,
+ const struct diff_filespec *blob)
{
- int pos = index_name_pos(&o->orig_index, path, strlen(path));
+ int pos = index_name_pos(&opt->orig_index, path, strlen(path));
struct cache_entry *ce;
if (0 > pos)
@@ -821,16 +782,16 @@
return 0;
/* See if the file we were tracking before matches */
- ce = o->orig_index.cache[pos];
- return (oid_eq(&ce->oid, oid) && ce->ce_mode == mode);
+ ce = opt->orig_index.cache[pos];
+ return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
}
/*
* Returns whether path was tracked in the index before the merge started
*/
-static int was_tracked(struct merge_options *o, const char *path)
+static int was_tracked(struct merge_options *opt, const char *path)
{
- int pos = index_name_pos(&o->orig_index, path, strlen(path));
+ int pos = index_name_pos(&opt->orig_index, path, strlen(path));
if (0 <= pos)
/* we were tracking this path before the merge */
@@ -839,13 +800,13 @@
return 0;
}
-static int would_lose_untracked(struct merge_options *o, const char *path)
+static int would_lose_untracked(struct merge_options *opt, const char *path)
{
- struct index_state *istate = o->repo->index;
+ struct index_state *istate = opt->repo->index;
/*
* This may look like it can be simplified to:
- * return !was_tracked(o, path) && file_exists(path)
+ * return !was_tracked(opt, path) && file_exists(path)
* but it can't. This function needs to know whether path was in
* the working tree due to EITHER having been tracked in the index
* before the merge OR having been put into the working copy and
@@ -882,38 +843,38 @@
return file_exists(path);
}
-static int was_dirty(struct merge_options *o, const char *path)
+static int was_dirty(struct merge_options *opt, const char *path)
{
struct cache_entry *ce;
int dirty = 1;
- if (o->call_depth || !was_tracked(o, path))
+ if (opt->call_depth || !was_tracked(opt, path))
return !dirty;
- ce = index_file_exists(o->unpack_opts.src_index,
+ ce = index_file_exists(opt->unpack_opts.src_index,
path, strlen(path), ignore_case);
- dirty = verify_uptodate(ce, &o->unpack_opts) != 0;
+ dirty = verify_uptodate(ce, &opt->unpack_opts) != 0;
return dirty;
}
-static int make_room_for_path(struct merge_options *o, const char *path)
+static int make_room_for_path(struct merge_options *opt, const char *path)
{
int status, i;
const char *msg = _("failed to create path '%s'%s");
/* Unlink any D/F conflict files that are in the way */
- for (i = 0; i < o->df_conflict_file_set.nr; i++) {
- const char *df_path = o->df_conflict_file_set.items[i].string;
+ for (i = 0; i < opt->df_conflict_file_set.nr; i++) {
+ const char *df_path = opt->df_conflict_file_set.items[i].string;
size_t pathlen = strlen(path);
size_t df_pathlen = strlen(df_path);
if (df_pathlen < pathlen &&
path[df_pathlen] == '/' &&
strncmp(path, df_path, df_pathlen) == 0) {
- output(o, 3,
+ output(opt, 3,
_("Removing %s to make room for subdirectory\n"),
df_path);
unlink(df_path);
- unsorted_string_list_delete_item(&o->df_conflict_file_set,
+ unsorted_string_list_delete_item(&opt->df_conflict_file_set,
i, 0);
break;
}
@@ -924,16 +885,16 @@
if (status) {
if (status == SCLD_EXISTS)
/* something else exists */
- return err(o, msg, path, _(": perhaps a D/F conflict?"));
- return err(o, msg, path, "");
+ return err(opt, msg, path, _(": perhaps a D/F conflict?"));
+ return err(opt, msg, path, "");
}
/*
* Do not unlink a file in the work tree if we are not
* tracking it.
*/
- if (would_lose_untracked(o, path))
- return err(o, _("refusing to lose untracked file at '%s'"),
+ if (would_lose_untracked(opt, path))
+ return err(opt, _("refusing to lose untracked file at '%s'"),
path);
/* Successful unlink is good.. */
@@ -943,19 +904,18 @@
if (errno == ENOENT)
return 0;
/* .. but not some other error (who really cares what?) */
- return err(o, msg, path, _(": perhaps a D/F conflict?"));
+ return err(opt, msg, path, _(": perhaps a D/F conflict?"));
}
-static int update_file_flags(struct merge_options *o,
- const struct object_id *oid,
- unsigned mode,
+static int update_file_flags(struct merge_options *opt,
+ const struct diff_filespec *contents,
const char *path,
int update_cache,
int update_wd)
{
int ret = 0;
- if (o->call_depth)
+ if (opt->call_depth)
update_wd = 0;
if (update_wd) {
@@ -963,7 +923,7 @@
void *buf;
unsigned long size;
- if (S_ISGITLINK(mode)) {
+ if (S_ISGITLINK(contents->mode)) {
/*
* We may later decide to recursively descend into
* the submodule directory and update its index
@@ -973,84 +933,84 @@
goto update_index;
}
- buf = read_object_file(oid, &type, &size);
+ buf = read_object_file(&contents->oid, &type, &size);
if (!buf)
- return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
+ return err(opt, _("cannot read object %s '%s'"),
+ oid_to_hex(&contents->oid), path);
if (type != OBJ_BLOB) {
- ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
+ ret = err(opt, _("blob expected for %s '%s'"),
+ oid_to_hex(&contents->oid), path);
goto free_buf;
}
- if (S_ISREG(mode)) {
+ if (S_ISREG(contents->mode)) {
struct strbuf strbuf = STRBUF_INIT;
- if (convert_to_working_tree(o->repo->index, path, buf, size, &strbuf)) {
+ if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) {
free(buf);
size = strbuf.len;
buf = strbuf_detach(&strbuf, NULL);
}
}
- if (make_room_for_path(o, path) < 0) {
+ if (make_room_for_path(opt, path) < 0) {
update_wd = 0;
goto free_buf;
}
- if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
+ if (S_ISREG(contents->mode) ||
+ (!has_symlinks && S_ISLNK(contents->mode))) {
int fd;
- if (mode & 0100)
- mode = 0777;
- else
- mode = 0666;
+ int mode = (contents->mode & 0100 ? 0777 : 0666);
+
fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
if (fd < 0) {
- ret = err(o, _("failed to open '%s': %s"),
+ ret = err(opt, _("failed to open '%s': %s"),
path, strerror(errno));
goto free_buf;
}
write_in_full(fd, buf, size);
close(fd);
- } else if (S_ISLNK(mode)) {
+ } else if (S_ISLNK(contents->mode)) {
char *lnk = xmemdupz(buf, size);
safe_create_leading_directories_const(path);
unlink(path);
if (symlink(lnk, path))
- ret = err(o, _("failed to symlink '%s': %s"),
+ ret = err(opt, _("failed to symlink '%s': %s"),
path, strerror(errno));
free(lnk);
} else
- ret = err(o,
+ ret = err(opt,
_("do not know what to do with %06o %s '%s'"),
- mode, oid_to_hex(oid), path);
+ contents->mode, oid_to_hex(&contents->oid), path);
free_buf:
free(buf);
}
update_index:
if (!ret && update_cache)
- if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
+ if (add_cacheinfo(opt, contents, path, 0, update_wd,
ADD_CACHE_OK_TO_ADD))
return -1;
return ret;
}
-static int update_file(struct merge_options *o,
+static int update_file(struct merge_options *opt,
int clean,
- const struct object_id *oid,
- unsigned mode,
+ const struct diff_filespec *contents,
const char *path)
{
- return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
+ return update_file_flags(opt, contents, path,
+ opt->call_depth || clean, !opt->call_depth);
}
/* Low level file merging, update and removal */
struct merge_file_info {
- struct object_id oid;
- unsigned mode;
+ struct diff_filespec blob; /* mostly use oid & mode; sometimes path */
unsigned clean:1,
merge:1;
};
-static int merge_3way(struct merge_options *o,
+static int merge_3way(struct merge_options *opt,
mmbuffer_t *result_buf,
- const struct diff_filespec *one,
+ const struct diff_filespec *o,
const struct diff_filespec *a,
const struct diff_filespec *b,
const char *branch1,
@@ -1062,15 +1022,15 @@
char *base_name, *name1, *name2;
int merge_status;
- ll_opts.renormalize = o->renormalize;
+ ll_opts.renormalize = opt->renormalize;
ll_opts.extra_marker_size = extra_marker_size;
- ll_opts.xdl_opts = o->xdl_opts;
+ ll_opts.xdl_opts = opt->xdl_opts;
- if (o->call_depth) {
+ if (opt->call_depth) {
ll_opts.virtual_ancestor = 1;
ll_opts.variant = 0;
} else {
- switch (o->recursive_variant) {
+ switch (opt->recursive_variant) {
case MERGE_RECURSIVE_OURS:
ll_opts.variant = XDL_MERGE_FAVOR_OURS;
break;
@@ -1083,26 +1043,27 @@
}
}
+ assert(a->path && b->path);
if (strcmp(a->path, b->path) ||
- (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
- base_name = o->ancestor == NULL ? NULL :
- mkpathdup("%s:%s", o->ancestor, one->path);
+ (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) {
+ base_name = opt->ancestor == NULL ? NULL :
+ mkpathdup("%s:%s", opt->ancestor, o->path);
name1 = mkpathdup("%s:%s", branch1, a->path);
name2 = mkpathdup("%s:%s", branch2, b->path);
} else {
- base_name = o->ancestor == NULL ? NULL :
- mkpathdup("%s", o->ancestor);
+ base_name = opt->ancestor == NULL ? NULL :
+ mkpathdup("%s", opt->ancestor);
name1 = mkpathdup("%s", branch1);
name2 = mkpathdup("%s", branch2);
}
- read_mmblob(&orig, &one->oid);
+ read_mmblob(&orig, &o->oid);
read_mmblob(&src1, &a->oid);
read_mmblob(&src2, &b->oid);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2,
- o->repo->index, &ll_opts);
+ opt->repo->index, &ll_opts);
free(base_name);
free(name1);
@@ -1122,7 +1083,7 @@
struct commit *commit;
int contains_another;
- char merged_revision[42];
+ char merged_revision[GIT_MAX_HEXSZ + 2];
const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
"--all", merged_revision, NULL };
struct rev_info revs;
@@ -1184,7 +1145,12 @@
strbuf_release(&sb);
}
-static int merge_submodule(struct merge_options *o,
+static int is_valid(const struct diff_filespec *dfs)
+{
+ return dfs->mode != 0 && !is_null_oid(&dfs->oid);
+}
+
+static int merge_submodule(struct merge_options *opt,
struct object_id *result, const char *path,
const struct object_id *base, const struct object_id *a,
const struct object_id *b)
@@ -1194,7 +1160,7 @@
struct object_array merges;
int i;
- int search = !o->call_depth;
+ int search = !opt->call_depth;
/* store a in result in case we fail */
oidcpy(result, a);
@@ -1208,32 +1174,32 @@
return 0;
if (add_submodule_odb(path)) {
- output(o, 1, _("Failed to merge submodule %s (not checked out)"), path);
+ output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
return 0;
}
- if (!(commit_base = lookup_commit_reference(o->repo, base)) ||
- !(commit_a = lookup_commit_reference(o->repo, a)) ||
- !(commit_b = lookup_commit_reference(o->repo, b))) {
- output(o, 1, _("Failed to merge submodule %s (commits not present)"), path);
+ if (!(commit_base = lookup_commit_reference(opt->repo, base)) ||
+ !(commit_a = lookup_commit_reference(opt->repo, a)) ||
+ !(commit_b = lookup_commit_reference(opt->repo, b))) {
+ output(opt, 1, _("Failed to merge submodule %s (commits not present)"), path);
return 0;
}
/* check whether both changes are forward */
if (!in_merge_bases(commit_base, commit_a) ||
!in_merge_bases(commit_base, commit_b)) {
- output(o, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
+ output(opt, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
return 0;
}
/* Case #1: a is contained in b or vice versa */
if (in_merge_bases(commit_a, commit_b)) {
oidcpy(result, b);
- if (show(o, 3)) {
- output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(o, commit_b);
- } else if (show(o, 2))
- output(o, 2, _("Fast-forwarding submodule %s"), path);
+ if (show(opt, 3)) {
+ output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
+ output_commit_title(opt, commit_b);
+ } else if (show(opt, 2))
+ output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
; /* no output */
@@ -1241,11 +1207,11 @@
}
if (in_merge_bases(commit_b, commit_a)) {
oidcpy(result, a);
- if (show(o, 3)) {
- output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
- output_commit_title(o, commit_a);
- } else if (show(o, 2))
- output(o, 2, _("Fast-forwarding submodule %s"), path);
+ if (show(opt, 3)) {
+ output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
+ output_commit_title(opt, commit_a);
+ } else if (show(opt, 2))
+ output(opt, 2, _("Fast-forwarding submodule %s"), path);
else
; /* no output */
@@ -1264,18 +1230,18 @@
return 0;
/* find commit which merges them */
- parent_count = find_first_merges(o->repo, &merges, path,
+ parent_count = find_first_merges(opt->repo, &merges, path,
commit_a, commit_b);
switch (parent_count) {
case 0:
- output(o, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
+ output(opt, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
break;
case 1:
- output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
- output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
+ output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
+ output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
print_commit((struct commit *) merges.objects[0].item);
- output(o, 2, _(
+ output(opt, 2, _(
"If this is correct simply add it to the index "
"for example\n"
"by using:\n\n"
@@ -1285,7 +1251,7 @@
break;
default:
- output(o, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
+ output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
for (i = 0; i < merges.nr; i++)
print_commit((struct commit *) merges.objects[i].item);
}
@@ -1294,8 +1260,8 @@
return 0;
}
-static int merge_mode_and_contents(struct merge_options *o,
- const struct diff_filespec *one,
+static int merge_mode_and_contents(struct merge_options *opt,
+ const struct diff_filespec *o,
const struct diff_filespec *a,
const struct diff_filespec *b,
const char *filename,
@@ -1304,13 +1270,13 @@
const int extra_marker_size,
struct merge_file_info *result)
{
- if (o->branch1 != branch1) {
+ if (opt->branch1 != branch1) {
/*
* It's weird getting a reverse merge with HEAD on the bottom
* side of the conflict markers and the other branch on the
* top. Fix that.
*/
- return merge_mode_and_contents(o, one, b, a,
+ return merge_mode_and_contents(opt, o, b, a,
filename,
branch2, branch1,
extra_marker_size, result);
@@ -1322,48 +1288,48 @@
if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
result->clean = 0;
if (S_ISREG(a->mode)) {
- result->mode = a->mode;
- oidcpy(&result->oid, &a->oid);
+ result->blob.mode = a->mode;
+ oidcpy(&result->blob.oid, &a->oid);
} else {
- result->mode = b->mode;
- oidcpy(&result->oid, &b->oid);
+ result->blob.mode = b->mode;
+ oidcpy(&result->blob.oid, &b->oid);
}
} else {
- if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
+ if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid))
result->merge = 1;
/*
* Merge modes
*/
- if (a->mode == b->mode || a->mode == one->mode)
- result->mode = b->mode;
+ if (a->mode == b->mode || a->mode == o->mode)
+ result->blob.mode = b->mode;
else {
- result->mode = a->mode;
- if (b->mode != one->mode) {
+ result->blob.mode = a->mode;
+ if (b->mode != o->mode) {
result->clean = 0;
result->merge = 1;
}
}
- if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
- oidcpy(&result->oid, &b->oid);
- else if (oid_eq(&b->oid, &one->oid))
- oidcpy(&result->oid, &a->oid);
+ if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid))
+ oidcpy(&result->blob.oid, &b->oid);
+ else if (oid_eq(&b->oid, &o->oid))
+ oidcpy(&result->blob.oid, &a->oid);
else if (S_ISREG(a->mode)) {
mmbuffer_t result_buf;
int ret = 0, merge_status;
- merge_status = merge_3way(o, &result_buf, one, a, b,
+ merge_status = merge_3way(opt, &result_buf, o, a, b,
branch1, branch2,
extra_marker_size);
if ((merge_status < 0) || !result_buf.ptr)
- ret = err(o, _("Failed to execute internal merge"));
+ ret = err(opt, _("Failed to execute internal merge"));
if (!ret &&
write_object_file(result_buf.ptr, result_buf.size,
- blob_type, &result->oid))
- ret = err(o, _("Unable to add %s to database"),
+ blob_type, &result->blob.oid))
+ ret = err(opt, _("Unable to add %s to database"),
a->path);
free(result_buf.ptr);
@@ -1371,23 +1337,23 @@
return ret;
result->clean = (merge_status == 0);
} else if (S_ISGITLINK(a->mode)) {
- result->clean = merge_submodule(o, &result->oid,
- one->path,
- &one->oid,
+ result->clean = merge_submodule(opt, &result->blob.oid,
+ o->path,
+ &o->oid,
&a->oid,
&b->oid);
} else if (S_ISLNK(a->mode)) {
- switch (o->recursive_variant) {
+ switch (opt->recursive_variant) {
case MERGE_RECURSIVE_NORMAL:
- oidcpy(&result->oid, &a->oid);
+ oidcpy(&result->blob.oid, &a->oid);
if (!oid_eq(&a->oid, &b->oid))
result->clean = 0;
break;
case MERGE_RECURSIVE_OURS:
- oidcpy(&result->oid, &a->oid);
+ oidcpy(&result->blob.oid, &a->oid);
break;
case MERGE_RECURSIVE_THEIRS:
- oidcpy(&result->oid, &b->oid);
+ oidcpy(&result->blob.oid, &b->oid);
break;
}
} else
@@ -1395,15 +1361,13 @@
}
if (result->merge)
- output(o, 2, _("Auto-merging %s"), filename);
+ output(opt, 2, _("Auto-merging %s"), filename);
return 0;
}
-static int handle_rename_via_dir(struct merge_options *o,
- struct diff_filepair *pair,
- const char *rename_branch,
- const char *other_branch)
+static int handle_rename_via_dir(struct merge_options *opt,
+ struct rename_conflict_info *ci)
{
/*
* Handle file adds that need to be renamed due to directory rename
@@ -1411,38 +1375,47 @@
* there is no content merge to do; just move the file into the
* desired final location.
*/
- const struct diff_filespec *dest = pair->two;
+ const struct rename *ren = ci->ren1;
+ const struct diff_filespec *dest = ren->pair->two;
+ char *file_path = dest->path;
+ int mark_conflicted = (opt->detect_directory_renames == 1);
+ assert(ren->dir_rename_original_dest);
- if (!o->call_depth && would_lose_untracked(o, dest->path)) {
- char *alt_path = unique_path(o, dest->path, rename_branch);
-
- output(o, 1, _("Error: Refusing to lose untracked file at %s; "
- "writing to %s instead."),
- dest->path, alt_path);
- /*
- * Write the file in worktree at alt_path, but not in the
- * index. Instead, write to dest->path for the index but
- * only at the higher appropriate stage.
- */
- if (update_file(o, 0, &dest->oid, dest->mode, alt_path))
- return -1;
- free(alt_path);
- return update_stages(o, dest->path, NULL,
- rename_branch == o->branch1 ? dest : NULL,
- rename_branch == o->branch1 ? NULL : dest);
+ if (!opt->call_depth && would_lose_untracked(opt, dest->path)) {
+ mark_conflicted = 1;
+ file_path = unique_path(opt, dest->path, ren->branch);
+ output(opt, 1, _("Error: Refusing to lose untracked file at %s; "
+ "writing to %s instead."),
+ dest->path, file_path);
}
- /* Update dest->path both in index and in worktree */
- if (update_file(o, 1, &dest->oid, dest->mode, dest->path))
- return -1;
- return 0;
+ if (mark_conflicted) {
+ /*
+ * Write the file in worktree at file_path. In the index,
+ * only record the file at dest->path in the appropriate
+ * higher stage.
+ */
+ if (update_file(opt, 0, dest, file_path))
+ return -1;
+ if (file_path != dest->path)
+ free(file_path);
+ if (update_stages(opt, dest->path, NULL,
+ ren->branch == opt->branch1 ? dest : NULL,
+ ren->branch == opt->branch1 ? NULL : dest))
+ return -1;
+ return 0; /* not clean, but conflicted */
+ } else {
+ /* Update dest->path both in index and in worktree */
+ if (update_file(opt, 1, dest, dest->path))
+ return -1;
+ return 1; /* clean */
+ }
}
-static int handle_change_delete(struct merge_options *o,
+static int handle_change_delete(struct merge_options *opt,
const char *path, const char *old_path,
- const struct object_id *o_oid, int o_mode,
- const struct object_id *changed_oid,
- int changed_mode,
+ const struct diff_filespec *o,
+ const struct diff_filespec *changed,
const char *change_branch,
const char *delete_branch,
const char *change, const char *change_past)
@@ -1451,20 +1424,20 @@
const char *update_path = path;
int ret = 0;
- if (dir_in_way(o->repo->index, path, !o->call_depth, 0) ||
- (!o->call_depth && would_lose_untracked(o, path))) {
- update_path = alt_path = unique_path(o, path, change_branch);
+ if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0) ||
+ (!opt->call_depth && would_lose_untracked(opt, path))) {
+ update_path = alt_path = unique_path(opt, path, change_branch);
}
- if (o->call_depth) {
+ if (opt->call_depth) {
/*
* We cannot arbitrarily accept either a_sha or b_sha as
* correct; since there is no true "middle point" between
* them, simply reuse the base version for virtual merge base.
*/
- ret = remove_file_from_index(o->repo->index, path);
+ ret = remove_file_from_index(opt->repo->index, path);
if (!ret)
- ret = update_file(o, 0, o_oid, o_mode, update_path);
+ ret = update_file(opt, 0, o, update_path);
} else {
/*
* Despite the four nearly duplicate messages and argument
@@ -1483,24 +1456,24 @@
*/
if (!alt_path) {
if (!old_path) {
- output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
+ output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s in %s. Version %s of %s left in tree."),
change, path, delete_branch, change_past,
change_branch, change_branch, path);
} else {
- output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
+ output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s to %s in %s. Version %s of %s left in tree."),
change, old_path, delete_branch, change_past, path,
change_branch, change_branch, path);
}
} else {
if (!old_path) {
- output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
+ output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s in %s. Version %s of %s left in tree at %s."),
change, path, delete_branch, change_past,
change_branch, change_branch, path, alt_path);
} else {
- output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
+ output(opt, 1, _("CONFLICT (%s/delete): %s deleted in %s "
"and %s to %s in %s. Version %s of %s left in tree at %s."),
change, old_path, delete_branch, change_past, path,
change_branch, change_branch, path, alt_path);
@@ -1508,142 +1481,127 @@
}
/*
* No need to call update_file() on path when change_branch ==
- * o->branch1 && !alt_path, since that would needlessly touch
+ * opt->branch1 && !alt_path, since that would needlessly touch
* path. We could call update_file_flags() with update_cache=0
* and update_wd=0, but that's a no-op.
*/
- if (change_branch != o->branch1 || alt_path)
- ret = update_file(o, 0, changed_oid, changed_mode, update_path);
+ if (change_branch != opt->branch1 || alt_path)
+ ret = update_file(opt, 0, changed, update_path);
}
free(alt_path);
return ret;
}
-static int handle_rename_delete(struct merge_options *o,
- struct diff_filepair *pair,
- const char *rename_branch,
- const char *delete_branch)
+static int handle_rename_delete(struct merge_options *opt,
+ struct rename_conflict_info *ci)
{
- const struct diff_filespec *orig = pair->one;
- const struct diff_filespec *dest = pair->two;
+ const struct rename *ren = ci->ren1;
+ const struct diff_filespec *orig = ren->pair->one;
+ const struct diff_filespec *dest = ren->pair->two;
+ const char *rename_branch = ren->branch;
+ const char *delete_branch = (opt->branch1 == ren->branch ?
+ opt->branch2 : opt->branch1);
- if (handle_change_delete(o,
- o->call_depth ? orig->path : dest->path,
- o->call_depth ? NULL : orig->path,
- &orig->oid, orig->mode,
- &dest->oid, dest->mode,
+ if (handle_change_delete(opt,
+ opt->call_depth ? orig->path : dest->path,
+ opt->call_depth ? NULL : orig->path,
+ orig, dest,
rename_branch, delete_branch,
_("rename"), _("renamed")))
return -1;
- if (o->call_depth)
- return remove_file_from_index(o->repo->index, dest->path);
+ if (opt->call_depth)
+ return remove_file_from_index(opt->repo->index, dest->path);
else
- return update_stages(o, dest->path, NULL,
- rename_branch == o->branch1 ? dest : NULL,
- rename_branch == o->branch1 ? NULL : dest);
+ return update_stages(opt, dest->path, NULL,
+ rename_branch == opt->branch1 ? dest : NULL,
+ rename_branch == opt->branch1 ? NULL : dest);
}
-static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
- struct stage_data *entry,
- int stage)
-{
- struct object_id *oid = &entry->stages[stage].oid;
- unsigned mode = entry->stages[stage].mode;
- if (mode == 0 || is_null_oid(oid))
- return NULL;
- oidcpy(&target->oid, oid);
- target->mode = mode;
- return target;
-}
-
-static int handle_file_collision(struct merge_options *o,
+static int handle_file_collision(struct merge_options *opt,
const char *collide_path,
const char *prev_path1,
const char *prev_path2,
const char *branch1, const char *branch2,
- const struct object_id *a_oid,
- unsigned int a_mode,
- const struct object_id *b_oid,
- unsigned int b_mode)
+ struct diff_filespec *a,
+ struct diff_filespec *b)
{
struct merge_file_info mfi;
- struct diff_filespec null, a, b;
+ struct diff_filespec null;
char *alt_path = NULL;
const char *update_path = collide_path;
/*
* It's easiest to get the correct things into stage 2 and 3, and
* to make sure that the content merge puts HEAD before the other
- * branch if we just ensure that branch1 == o->branch1. So, simply
+ * branch if we just ensure that branch1 == opt->branch1. So, simply
* flip arguments around if we don't have that.
*/
- if (branch1 != o->branch1) {
- return handle_file_collision(o, collide_path,
+ if (branch1 != opt->branch1) {
+ return handle_file_collision(opt, collide_path,
prev_path2, prev_path1,
branch2, branch1,
- b_oid, b_mode,
- a_oid, a_mode);
+ b, a);
}
/*
* In the recursive case, we just opt to undo renames
*/
- if (o->call_depth && (prev_path1 || prev_path2)) {
- /* Put first file (a_oid, a_mode) in its original spot */
+ if (opt->call_depth && (prev_path1 || prev_path2)) {
+ /* Put first file (a->oid, a->mode) in its original spot */
if (prev_path1) {
- if (update_file(o, 1, a_oid, a_mode, prev_path1))
+ if (update_file(opt, 1, a, prev_path1))
return -1;
} else {
- if (update_file(o, 1, a_oid, a_mode, collide_path))
+ if (update_file(opt, 1, a, collide_path))
return -1;
}
- /* Put second file (b_oid, b_mode) in its original spot */
+ /* Put second file (b->oid, b->mode) in its original spot */
if (prev_path2) {
- if (update_file(o, 1, b_oid, b_mode, prev_path2))
+ if (update_file(opt, 1, b, prev_path2))
return -1;
} else {
- if (update_file(o, 1, b_oid, b_mode, collide_path))
+ if (update_file(opt, 1, b, collide_path))
return -1;
}
/* Don't leave something at collision path if unrenaming both */
if (prev_path1 && prev_path2)
- remove_file(o, 1, collide_path, 0);
+ remove_file(opt, 1, collide_path, 0);
return 0;
}
/* Remove rename sources if rename/add or rename/rename(2to1) */
if (prev_path1)
- remove_file(o, 1, prev_path1,
- o->call_depth || would_lose_untracked(o, prev_path1));
+ remove_file(opt, 1, prev_path1,
+ opt->call_depth || would_lose_untracked(opt, prev_path1));
if (prev_path2)
- remove_file(o, 1, prev_path2,
- o->call_depth || would_lose_untracked(o, prev_path2));
+ remove_file(opt, 1, prev_path2,
+ opt->call_depth || would_lose_untracked(opt, prev_path2));
/*
* Remove the collision path, if it wouldn't cause dirty contents
* or an untracked file to get lost. We'll either overwrite with
* merged contents, or just write out to differently named files.
*/
- if (was_dirty(o, collide_path)) {
- output(o, 1, _("Refusing to lose dirty file at %s"),
+ if (was_dirty(opt, collide_path)) {
+ output(opt, 1, _("Refusing to lose dirty file at %s"),
collide_path);
- update_path = alt_path = unique_path(o, collide_path, "merged");
- } else if (would_lose_untracked(o, collide_path)) {
+ update_path = alt_path = unique_path(opt, collide_path, "merged");
+ } else if (would_lose_untracked(opt, collide_path)) {
/*
* Only way we get here is if both renames were from
* a directory rename AND user had an untracked file
* at the location where both files end up after the
* two directory renames. See testcase 10d of t6043.
*/
- output(o, 1, _("Refusing to lose untracked file at "
+ output(opt, 1, _("Refusing to lose untracked file at "
"%s, even though it's in the way."),
collide_path);
- update_path = alt_path = unique_path(o, collide_path, "merged");
+ update_path = alt_path = unique_path(opt, collide_path, "merged");
} else {
/*
* FIXME: It's possible that the two files are identical
@@ -1655,30 +1613,22 @@
* merge-recursive interoperate anyway, so punting for
* now...
*/
- remove_file(o, 0, collide_path, 0);
+ remove_file(opt, 0, collide_path, 0);
}
/* Store things in diff_filespecs for functions that need it */
- memset(&a, 0, sizeof(struct diff_filespec));
- memset(&b, 0, sizeof(struct diff_filespec));
- null.path = a.path = b.path = (char *)collide_path;
+ null.path = (char *)collide_path;
oidcpy(&null.oid, &null_oid);
null.mode = 0;
- oidcpy(&a.oid, a_oid);
- a.mode = a_mode;
- a.oid_valid = 1;
- oidcpy(&b.oid, b_oid);
- b.mode = b_mode;
- b.oid_valid = 1;
- if (merge_mode_and_contents(o, &null, &a, &b, collide_path,
- branch1, branch2, o->call_depth * 2, &mfi))
+ if (merge_mode_and_contents(opt, &null, a, b, collide_path,
+ branch1, branch2, opt->call_depth * 2, &mfi))
return -1;
mfi.clean &= !alt_path;
- if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, update_path))
+ if (update_file(opt, mfi.clean, &mfi.blob, update_path))
return -1;
- if (!mfi.clean && !o->call_depth &&
- update_stages(o, collide_path, NULL, &a, &b))
+ if (!mfi.clean && !opt->call_depth &&
+ update_stages(opt, collide_path, NULL, a, b))
return -1;
free(alt_path);
/*
@@ -1691,52 +1641,58 @@
return mfi.clean;
}
-static int handle_rename_add(struct merge_options *o,
+static int handle_rename_add(struct merge_options *opt,
struct rename_conflict_info *ci)
{
/* a was renamed to c, and a separate c was added. */
- struct diff_filespec *a = ci->pair1->one;
- struct diff_filespec *c = ci->pair1->two;
+ struct diff_filespec *a = ci->ren1->pair->one;
+ struct diff_filespec *c = ci->ren1->pair->two;
char *path = c->path;
char *prev_path_desc;
struct merge_file_info mfi;
- int other_stage = (ci->branch1 == o->branch1 ? 3 : 2);
+ const char *rename_branch = ci->ren1->branch;
+ const char *add_branch = (opt->branch1 == rename_branch ?
+ opt->branch2 : opt->branch1);
+ int other_stage = (ci->ren1->branch == opt->branch1 ? 3 : 2);
- output(o, 1, _("CONFLICT (rename/add): "
+ output(opt, 1, _("CONFLICT (rename/add): "
"Rename %s->%s in %s. Added %s in %s"),
- a->path, c->path, ci->branch1,
- c->path, ci->branch2);
+ a->path, c->path, rename_branch,
+ c->path, add_branch);
prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
- if (merge_mode_and_contents(o, a, c, &ci->ren1_other, prev_path_desc,
- o->branch1, o->branch2,
- 1 + o->call_depth * 2, &mfi))
+ ci->ren1->src_entry->stages[other_stage].path = a->path;
+ if (merge_mode_and_contents(opt, a, c,
+ &ci->ren1->src_entry->stages[other_stage],
+ prev_path_desc,
+ opt->branch1, opt->branch2,
+ 1 + opt->call_depth * 2, &mfi))
return -1;
free(prev_path_desc);
- return handle_file_collision(o,
+ ci->ren1->dst_entry->stages[other_stage].path = mfi.blob.path = c->path;
+ return handle_file_collision(opt,
c->path, a->path, NULL,
- ci->branch1, ci->branch2,
- &mfi.oid, mfi.mode,
- &ci->dst_entry1->stages[other_stage].oid,
- ci->dst_entry1->stages[other_stage].mode);
+ rename_branch, add_branch,
+ &mfi.blob,
+ &ci->ren1->dst_entry->stages[other_stage]);
}
-static char *find_path_for_conflict(struct merge_options *o,
+static char *find_path_for_conflict(struct merge_options *opt,
const char *path,
const char *branch1,
const char *branch2)
{
char *new_path = NULL;
- if (dir_in_way(o->repo->index, path, !o->call_depth, 0)) {
- new_path = unique_path(o, path, branch1);
- output(o, 1, _("%s is a directory in %s adding "
+ if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0)) {
+ new_path = unique_path(opt, path, branch1);
+ output(opt, 1, _("%s is a directory in %s adding "
"as %s instead"),
path, branch2, new_path);
- } else if (would_lose_untracked(o, path)) {
- new_path = unique_path(o, path, branch1);
- output(o, 1, _("Refusing to lose untracked file"
+ } else if (would_lose_untracked(opt, path)) {
+ new_path = unique_path(opt, path, branch1);
+ output(opt, 1, _("Refusing to lose untracked file"
" at %s; adding as %s instead"),
path, new_path);
}
@@ -1744,41 +1700,40 @@
return new_path;
}
-static int handle_rename_rename_1to2(struct merge_options *o,
+static int handle_rename_rename_1to2(struct merge_options *opt,
struct rename_conflict_info *ci)
{
/* One file was renamed in both branches, but to different names. */
struct merge_file_info mfi;
- struct diff_filespec other;
struct diff_filespec *add;
- struct diff_filespec *one = ci->pair1->one;
- struct diff_filespec *a = ci->pair1->two;
- struct diff_filespec *b = ci->pair2->two;
+ struct diff_filespec *o = ci->ren1->pair->one;
+ struct diff_filespec *a = ci->ren1->pair->two;
+ struct diff_filespec *b = ci->ren2->pair->two;
char *path_desc;
- output(o, 1, _("CONFLICT (rename/rename): "
+ output(opt, 1, _("CONFLICT (rename/rename): "
"Rename \"%s\"->\"%s\" in branch \"%s\" "
"rename \"%s\"->\"%s\" in \"%s\"%s"),
- one->path, a->path, ci->branch1,
- one->path, b->path, ci->branch2,
- o->call_depth ? _(" (left unresolved)") : "");
+ o->path, a->path, ci->ren1->branch,
+ o->path, b->path, ci->ren2->branch,
+ opt->call_depth ? _(" (left unresolved)") : "");
path_desc = xstrfmt("%s and %s, both renamed from %s",
- a->path, b->path, one->path);
- if (merge_mode_and_contents(o, one, a, b, path_desc,
- ci->branch1, ci->branch2,
- o->call_depth * 2, &mfi))
+ a->path, b->path, o->path);
+ if (merge_mode_and_contents(opt, o, a, b, path_desc,
+ ci->ren1->branch, ci->ren2->branch,
+ opt->call_depth * 2, &mfi))
return -1;
free(path_desc);
- if (o->call_depth) {
+ if (opt->call_depth) {
/*
* FIXME: For rename/add-source conflicts (if we could detect
* such), this is wrong. We should instead find a unique
* pathname and then either rename the add-source file to that
* unique path, or use that unique path instead of src here.
*/
- if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
+ if (update_file(opt, 0, &mfi.blob, o->path))
return -1;
/*
@@ -1789,61 +1744,65 @@
* such cases, we should keep the added file around,
* resolving the conflict at that path in its favor.
*/
- add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
- if (add) {
- if (update_file(o, 0, &add->oid, add->mode, a->path))
+ add = &ci->ren1->dst_entry->stages[2 ^ 1];
+ if (is_valid(add)) {
+ if (update_file(opt, 0, add, a->path))
return -1;
}
else
- remove_file_from_index(o->repo->index, a->path);
- add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
- if (add) {
- if (update_file(o, 0, &add->oid, add->mode, b->path))
+ remove_file_from_index(opt->repo->index, a->path);
+ add = &ci->ren2->dst_entry->stages[3 ^ 1];
+ if (is_valid(add)) {
+ if (update_file(opt, 0, add, b->path))
return -1;
}
else
- remove_file_from_index(o->repo->index, b->path);
+ remove_file_from_index(opt->repo->index, b->path);
} else {
/*
* For each destination path, we need to see if there is a
* rename/add collision. If not, we can write the file out
* to the specified location.
*/
- add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
- if (add) {
- if (handle_file_collision(o, a->path,
+ add = &ci->ren1->dst_entry->stages[2 ^ 1];
+ if (is_valid(add)) {
+ add->path = mfi.blob.path = a->path;
+ if (handle_file_collision(opt, a->path,
NULL, NULL,
- ci->branch1, ci->branch2,
- &mfi.oid, mfi.mode,
- &add->oid, add->mode) < 0)
+ ci->ren1->branch,
+ ci->ren2->branch,
+ &mfi.blob, add) < 0)
return -1;
} else {
- char *new_path = find_path_for_conflict(o, a->path,
- ci->branch1,
- ci->branch2);
- if (update_file(o, 0, &mfi.oid, mfi.mode, new_path ? new_path : a->path))
+ char *new_path = find_path_for_conflict(opt, a->path,
+ ci->ren1->branch,
+ ci->ren2->branch);
+ if (update_file(opt, 0, &mfi.blob,
+ new_path ? new_path : a->path))
return -1;
free(new_path);
- if (update_stages(o, a->path, NULL, a, NULL))
+ if (update_stages(opt, a->path, NULL, a, NULL))
return -1;
}
- add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
- if (add) {
- if (handle_file_collision(o, b->path,
+ add = &ci->ren2->dst_entry->stages[3 ^ 1];
+ if (is_valid(add)) {
+ add->path = mfi.blob.path = b->path;
+ if (handle_file_collision(opt, b->path,
NULL, NULL,
- ci->branch1, ci->branch2,
- &add->oid, add->mode,
- &mfi.oid, mfi.mode) < 0)
+ ci->ren1->branch,
+ ci->ren2->branch,
+ add, &mfi.blob) < 0)
return -1;
} else {
- char *new_path = find_path_for_conflict(o, b->path,
- ci->branch2,
- ci->branch1);
- if (update_file(o, 0, &mfi.oid, mfi.mode, new_path ? new_path : b->path))
+ char *new_path = find_path_for_conflict(opt, b->path,
+ ci->ren2->branch,
+ ci->ren1->branch);
+ if (update_file(opt, 0, &mfi.blob,
+ new_path ? new_path : b->path))
return -1;
free(new_path);
- if (update_stages(o, b->path, NULL, NULL, b))
+ if (update_stages(opt, b->path, NULL, NULL, b))
return -1;
}
}
@@ -1851,58 +1810,68 @@
return 0;
}
-static int handle_rename_rename_2to1(struct merge_options *o,
+static int handle_rename_rename_2to1(struct merge_options *opt,
struct rename_conflict_info *ci)
{
/* Two files, a & b, were renamed to the same thing, c. */
- struct diff_filespec *a = ci->pair1->one;
- struct diff_filespec *b = ci->pair2->one;
- struct diff_filespec *c1 = ci->pair1->two;
- struct diff_filespec *c2 = ci->pair2->two;
+ struct diff_filespec *a = ci->ren1->pair->one;
+ struct diff_filespec *b = ci->ren2->pair->one;
+ struct diff_filespec *c1 = ci->ren1->pair->two;
+ struct diff_filespec *c2 = ci->ren2->pair->two;
char *path = c1->path; /* == c2->path */
char *path_side_1_desc;
char *path_side_2_desc;
struct merge_file_info mfi_c1;
struct merge_file_info mfi_c2;
+ int ostage1, ostage2;
- output(o, 1, _("CONFLICT (rename/rename): "
+ output(opt, 1, _("CONFLICT (rename/rename): "
"Rename %s->%s in %s. "
"Rename %s->%s in %s"),
- a->path, c1->path, ci->branch1,
- b->path, c2->path, ci->branch2);
+ a->path, c1->path, ci->ren1->branch,
+ b->path, c2->path, ci->ren2->branch);
path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
- if (merge_mode_and_contents(o, a, c1, &ci->ren1_other, path_side_1_desc,
- o->branch1, o->branch2,
- 1 + o->call_depth * 2, &mfi_c1) ||
- merge_mode_and_contents(o, b, &ci->ren2_other, c2, path_side_2_desc,
- o->branch1, o->branch2,
- 1 + o->call_depth * 2, &mfi_c2))
+ ostage1 = ci->ren1->branch == opt->branch1 ? 3 : 2;
+ ostage2 = ostage1 ^ 1;
+ ci->ren1->src_entry->stages[ostage1].path = a->path;
+ ci->ren2->src_entry->stages[ostage2].path = b->path;
+ if (merge_mode_and_contents(opt, a, c1,
+ &ci->ren1->src_entry->stages[ostage1],
+ path_side_1_desc,
+ opt->branch1, opt->branch2,
+ 1 + opt->call_depth * 2, &mfi_c1) ||
+ merge_mode_and_contents(opt, b,
+ &ci->ren2->src_entry->stages[ostage2],
+ c2, path_side_2_desc,
+ opt->branch1, opt->branch2,
+ 1 + opt->call_depth * 2, &mfi_c2))
return -1;
free(path_side_1_desc);
free(path_side_2_desc);
+ mfi_c1.blob.path = path;
+ mfi_c2.blob.path = path;
- return handle_file_collision(o, path, a->path, b->path,
- ci->branch1, ci->branch2,
- &mfi_c1.oid, mfi_c1.mode,
- &mfi_c2.oid, mfi_c2.mode);
+ return handle_file_collision(opt, path, a->path, b->path,
+ ci->ren1->branch, ci->ren2->branch,
+ &mfi_c1.blob, &mfi_c2.blob);
}
/*
* Get the diff_filepairs changed between o_tree and tree.
*/
-static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
+static struct diff_queue_struct *get_diffpairs(struct merge_options *opt,
struct tree *o_tree,
struct tree *tree)
{
struct diff_queue_struct *ret;
struct diff_options opts;
- repo_diff_setup(o->repo, &opts);
+ repo_diff_setup(opt->repo, &opts);
opts.flags.recursive = 1;
opts.flags.rename_empty = 0;
- opts.detect_rename = merge_detect_rename(o);
+ opts.detect_rename = merge_detect_rename(opt);
/*
* We do not have logic to handle the detection of copies. In
* fact, it may not even make sense to add such logic: would we
@@ -1911,17 +1880,17 @@
*/
if (opts.detect_rename > DIFF_DETECT_RENAME)
opts.detect_rename = DIFF_DETECT_RENAME;
- opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
- o->diff_rename_limit >= 0 ? o->diff_rename_limit :
+ opts.rename_limit = opt->merge_rename_limit >= 0 ? opt->merge_rename_limit :
+ opt->diff_rename_limit >= 0 ? opt->diff_rename_limit :
1000;
- opts.rename_score = o->rename_score;
- opts.show_rename_progress = o->show_rename_progress;
+ opts.rename_score = opt->rename_score;
+ opts.show_rename_progress = opt->show_rename_progress;
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup_done(&opts);
diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
diffcore_std(&opts);
- if (opts.needed_rename_limit > o->needed_rename_limit)
- o->needed_rename_limit = opts.needed_rename_limit;
+ if (opts.needed_rename_limit > opt->needed_rename_limit)
+ opt->needed_rename_limit = opts.needed_rename_limit;
ret = xmalloc(sizeof(*ret));
*ret = diff_queued_diff;
@@ -1933,12 +1902,14 @@
return ret;
}
-static int tree_has_path(struct tree *tree, const char *path)
+static int tree_has_path(struct repository *r, struct tree *tree,
+ const char *path)
{
struct object_id hashy;
- unsigned int mode_o;
+ unsigned short mode_o;
- return !get_tree_entry(&tree->object.oid, path,
+ return !get_tree_entry(r,
+ &tree->object.oid, path,
&hashy, &mode_o);
}
@@ -2040,7 +2011,7 @@
* level conflicts for the renamed location. If there is a rename and
* there are no conflicts, return the new name. Otherwise, return NULL.
*/
-static char *handle_path_level_conflicts(struct merge_options *o,
+static char *handle_path_level_conflicts(struct merge_options *opt,
const char *path,
struct dir_rename_entry *entry,
struct hashmap *collisions,
@@ -2061,7 +2032,7 @@
/* This should only happen when entry->non_unique_new_dir set */
if (!entry->non_unique_new_dir)
BUG("entry->non_unqiue_dir not set and !new_path");
- output(o, 1, _("CONFLICT (directory rename split): "
+ output(opt, 1, _("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 "
@@ -2089,11 +2060,11 @@
*/
if (collision_ent->reported_already) {
clean = 0;
- } else if (tree_has_path(tree, new_path)) {
+ } else if (tree_has_path(opt->repo, tree, new_path)) {
collision_ent->reported_already = 1;
strbuf_add_separated_string_list(&collision_paths, ", ",
&collision_ent->source_files);
- output(o, 1, _("CONFLICT (implicit dir rename): Existing "
+ output(opt, 1, _("CONFLICT (implicit dir rename): Existing "
"file/dir at %s in the way of implicit "
"directory rename(s) putting the following "
"path(s) there: %s."),
@@ -2103,7 +2074,7 @@
collision_ent->reported_already = 1;
strbuf_add_separated_string_list(&collision_paths, ", ",
&collision_ent->source_files);
- output(o, 1, _("CONFLICT (implicit dir rename): Cannot map "
+ output(opt, 1, _("CONFLICT (implicit dir rename): Cannot map "
"more than one path to %s; implicit directory "
"renames tried to put these paths there: %s"),
new_path, collision_paths.buf);
@@ -2140,7 +2111,7 @@
* causes conflicts for files within those merged directories, then
* that should be detected at the individual path level.
*/
-static void handle_directory_level_conflicts(struct merge_options *o,
+static void handle_directory_level_conflicts(struct merge_options *opt,
struct hashmap *dir_re_head,
struct tree *head,
struct hashmap *dir_re_merge,
@@ -2167,7 +2138,7 @@
string_list_append(&remove_from_merge,
merge_ent->dir)->util = merge_ent;
strbuf_release(&merge_ent->new_dir);
- } else if (tree_has_path(head, head_ent->dir)) {
+ } else if (tree_has_path(opt->repo, head, head_ent->dir)) {
/* 2. This wasn't a directory rename after all */
string_list_append(&remove_from_head,
head_ent->dir)->util = head_ent;
@@ -2181,7 +2152,7 @@
hashmap_iter_init(dir_re_merge, &iter);
while ((merge_ent = hashmap_iter_next(&iter))) {
head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
- if (tree_has_path(merge, merge_ent->dir)) {
+ if (tree_has_path(opt->repo, merge, merge_ent->dir)) {
/* 2. This wasn't a directory rename after all */
string_list_append(&remove_from_merge,
merge_ent->dir)->util = merge_ent;
@@ -2195,11 +2166,11 @@
* know that head_ent->new_dir and merge_ent->new_dir
* are different strings.
*/
- output(o, 1, _("CONFLICT (rename/rename): "
+ output(opt, 1, _("CONFLICT (rename/rename): "
"Rename directory %s->%s in %s. "
"Rename directory %s->%s in %s"),
- head_ent->dir, head_ent->new_dir.buf, o->branch1,
- head_ent->dir, merge_ent->new_dir.buf, o->branch2);
+ head_ent->dir, head_ent->new_dir.buf, opt->branch1,
+ head_ent->dir, merge_ent->new_dir.buf, opt->branch2);
string_list_append(&remove_from_head,
head_ent->dir)->util = head_ent;
strbuf_release(&head_ent->new_dir);
@@ -2213,8 +2184,7 @@
remove_hashmap_entries(dir_re_merge, &remove_from_merge);
}
-static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
- struct tree *tree)
+static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
{
struct hashmap *dir_renames;
struct hashmap_iter iter;
@@ -2399,7 +2369,7 @@
}
}
-static char *check_for_directory_rename(struct merge_options *o,
+static char *check_for_directory_rename(struct merge_options *opt,
const char *path,
struct tree *tree,
struct hashmap *dir_renames,
@@ -2440,11 +2410,11 @@
*/
oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
if (oentry) {
- output(o, 1, _("WARNING: Avoiding applying %s -> %s rename "
+ output(opt, 1, _("WARNING: Avoiding applying %s -> %s rename "
"to %s, because %s itself was renamed."),
entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
} else {
- new_path = handle_path_level_conflicts(o, path, entry,
+ new_path = handle_path_level_conflicts(opt, path, entry,
collisions, tree);
*clean_merge &= (new_path != NULL);
}
@@ -2452,7 +2422,7 @@
return new_path;
}
-static void apply_directory_rename_modifications(struct merge_options *o,
+static void apply_directory_rename_modifications(struct merge_options *opt,
struct diff_filepair *pair,
char *new_path,
struct rename *re,
@@ -2460,8 +2430,7 @@
struct tree *o_tree,
struct tree *a_tree,
struct tree *b_tree,
- struct string_list *entries,
- int *clean)
+ struct string_list *entries)
{
struct string_list_item *item;
int stage = (tree == a_tree ? 2 : 3);
@@ -2476,11 +2445,11 @@
* saying the file would have been overwritten), but it might
* be dirty, though.
*/
- update_wd = !was_dirty(o, pair->two->path);
+ update_wd = !was_dirty(opt, pair->two->path);
if (!update_wd)
- output(o, 1, _("Refusing to lose dirty file at %s"),
+ output(opt, 1, _("Refusing to lose dirty file at %s"),
pair->two->path);
- remove_file(o, 1, pair->two->path, !update_wd);
+ remove_file(opt, 1, pair->two->path, !update_wd);
/* Find or create a new re->dst_entry */
item = string_list_lookup(entries, new_path);
@@ -2512,7 +2481,7 @@
if (pair->status == 'R')
re->dst_entry->processed = 1;
- re->dst_entry = insert_stage_data(new_path,
+ re->dst_entry = insert_stage_data(opt->repo, new_path,
o_tree, a_tree, b_tree,
entries);
item = string_list_insert(entries, new_path);
@@ -2535,21 +2504,24 @@
* the various handle_rename_*() functions update the index
* explicitly rather than relying on unpack_trees() to have done it.
*/
- get_tree_entry(&tree->object.oid,
+ get_tree_entry(opt->repo,
+ &tree->object.oid,
pair->two->path,
&re->dst_entry->stages[stage].oid,
&re->dst_entry->stages[stage].mode);
- /* Update pair status */
- if (pair->status == 'A') {
- /*
- * Recording rename information for this add makes it look
- * like a rename/delete conflict. Make sure we can
- * correctly handle this as an add that was moved to a new
- * directory instead of reporting a rename/delete conflict.
- */
- re->add_turned_into_rename = 1;
- }
+ /*
+ * Record the original change status (or 'type' of change). If it
+ * was originally an add ('A'), this lets us differentiate later
+ * between a RENAME_DELETE conflict and RENAME_VIA_DIR (they
+ * otherwise look the same). If it was originally a rename ('R'),
+ * this lets us remember and report accurately about the transitive
+ * renaming that occurred via the directory rename detection. Also,
+ * record the original destination name.
+ */
+ re->dir_rename_original_type = pair->status;
+ re->dir_rename_original_dest = pair->two->path;
+
/*
* We don't actually look at pair->status again, but it seems
* pedagogically correct to adjust it.
@@ -2569,7 +2541,8 @@
* to be able to associate the correct cache entries with the rename
* information; tree is always equal to either a_tree or b_tree.
*/
-static struct string_list *get_renames(struct merge_options *o,
+static struct string_list *get_renames(struct merge_options *opt,
+ const char *branch,
struct diff_queue_struct *pairs,
struct hashmap *dir_renames,
struct hashmap *dir_rename_exclusions,
@@ -2599,7 +2572,7 @@
diff_free_filepair(pair);
continue;
}
- new_path = check_for_directory_rename(o, pair->two->path, tree,
+ new_path = check_for_directory_rename(opt, pair->two->path, tree,
dir_renames,
dir_rename_exclusions,
&collisions,
@@ -2611,29 +2584,32 @@
re = xmalloc(sizeof(*re));
re->processed = 0;
- re->add_turned_into_rename = 0;
re->pair = pair;
+ re->branch = branch;
+ re->dir_rename_original_type = '\0';
+ re->dir_rename_original_dest = NULL;
item = string_list_lookup(entries, re->pair->one->path);
if (!item)
- re->src_entry = insert_stage_data(re->pair->one->path,
+ re->src_entry = insert_stage_data(opt->repo,
+ re->pair->one->path,
o_tree, a_tree, b_tree, entries);
else
re->src_entry = item->util;
item = string_list_lookup(entries, re->pair->two->path);
if (!item)
- re->dst_entry = insert_stage_data(re->pair->two->path,
+ re->dst_entry = insert_stage_data(opt->repo,
+ re->pair->two->path,
o_tree, a_tree, b_tree, entries);
else
re->dst_entry = item->util;
item = string_list_insert(renames, pair->one->path);
item->util = re;
if (new_path)
- apply_directory_rename_modifications(o, pair, new_path,
+ apply_directory_rename_modifications(opt, pair, new_path,
re, tree, o_tree,
a_tree, b_tree,
- entries,
- clean_merge);
+ entries);
}
hashmap_iter_init(&collisions, &iter);
@@ -2645,7 +2621,7 @@
return renames;
}
-static int process_renames(struct merge_options *o,
+static int process_renames(struct merge_options *opt,
struct string_list *a_renames,
struct string_list *b_renames)
{
@@ -2668,7 +2644,6 @@
for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
struct string_list *renames1, *renames2Dst;
struct rename *ren1 = NULL, *ren2 = NULL;
- const char *branch1, *branch2;
const char *ren1_src, *ren1_dst;
struct string_list_item *lookup;
@@ -2689,13 +2664,9 @@
if (ren1) {
renames1 = a_renames;
renames2Dst = &b_by_dst;
- branch1 = o->branch1;
- branch2 = o->branch2;
} else {
renames1 = b_renames;
renames2Dst = &a_by_dst;
- branch1 = o->branch2;
- branch2 = o->branch1;
SWAP(ren2, ren1);
}
@@ -2729,22 +2700,13 @@
* the base stage (think of rename +
* add-source cases).
*/
- remove_file(o, 1, ren1_src, 1);
+ remove_file(opt, 1, ren1_src, 1);
update_entry(ren1->dst_entry,
ren1->pair->one,
ren1->pair->two,
ren2->pair->two);
}
- setup_rename_conflict_info(rename_type,
- ren1->pair,
- ren2->pair,
- branch1,
- branch2,
- ren1->dst_entry,
- ren2->dst_entry,
- o,
- NULL,
- NULL);
+ setup_rename_conflict_info(rename_type, opt, ren1, ren2);
} else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
/* Two different files renamed to the same thing */
char *ren2_dst;
@@ -2763,16 +2725,7 @@
ren2->src_entry->processed = 1;
setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
- ren1->pair,
- ren2->pair,
- branch1,
- branch2,
- ren1->dst_entry,
- ren2->dst_entry,
- o,
- ren1->src_entry,
- ren2->src_entry);
-
+ opt, ren1, ren2);
} else {
/* Renamed in 1, maybe changed in 2 */
/* we only use sha1 and mode of these */
@@ -2792,8 +2745,8 @@
* stage and in other_stage (think of rename +
* add-source case).
*/
- remove_file(o, 1, ren1_src,
- renamed_stage == 2 || !was_tracked(o, ren1_src));
+ remove_file(opt, 1, ren1_src,
+ renamed_stage == 2 || !was_tracked(opt, ren1_src));
oidcpy(&src_other.oid,
&ren1->src_entry->stages[other_stage].oid);
@@ -2804,28 +2757,12 @@
try_merge = 0;
if (oid_eq(&src_other.oid, &null_oid) &&
- ren1->add_turned_into_rename) {
+ ren1->dir_rename_original_type == 'A') {
setup_rename_conflict_info(RENAME_VIA_DIR,
- ren1->pair,
- NULL,
- branch1,
- branch2,
- ren1->dst_entry,
- NULL,
- o,
- NULL,
- NULL);
+ opt, ren1, NULL);
} else if (oid_eq(&src_other.oid, &null_oid)) {
setup_rename_conflict_info(RENAME_DELETE,
- ren1->pair,
- NULL,
- branch1,
- branch2,
- ren1->dst_entry,
- NULL,
- o,
- NULL,
- NULL);
+ opt, ren1, NULL);
} else if ((dst_other.mode == ren1->pair->two->mode) &&
oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
/*
@@ -2836,9 +2773,8 @@
* update_file_flags() instead of
* update_file().
*/
- if (update_file_flags(o,
- &ren1->pair->two->oid,
- ren1->pair->two->mode,
+ if (update_file_flags(opt,
+ ren1->pair->two,
ren1_dst,
1, /* update_cache */
0 /* update_wd */))
@@ -2852,25 +2788,17 @@
* file, then the merge will be clean.
*/
setup_rename_conflict_info(RENAME_ADD,
- ren1->pair,
- NULL,
- branch1,
- branch2,
- ren1->dst_entry,
- NULL,
- o,
- ren1->src_entry,
- NULL);
+ opt, ren1, NULL);
} else
try_merge = 1;
if (clean_merge < 0)
goto cleanup_and_return;
if (try_merge) {
- struct diff_filespec *one, *a, *b;
+ struct diff_filespec *o, *a, *b;
src_other.path = (char *)ren1_src;
- one = ren1->pair->one;
+ o = ren1->pair->one;
if (a_renames == renames1) {
a = ren1->pair->two;
b = &src_other;
@@ -2878,17 +2806,9 @@
b = ren1->pair->two;
a = &src_other;
}
- update_entry(ren1->dst_entry, one, a, b);
+ update_entry(ren1->dst_entry, o, a, b);
setup_rename_conflict_info(RENAME_NORMAL,
- ren1->pair,
- NULL,
- branch1,
- NULL,
- ren1->dst_entry,
- NULL,
- o,
- NULL,
- NULL);
+ opt, ren1, NULL);
}
}
}
@@ -2923,7 +2843,7 @@
free(pairs);
}
-static int detect_and_process_renames(struct merge_options *o,
+static int detect_and_process_renames(struct merge_options *opt,
struct tree *common,
struct tree *head,
struct tree *merge,
@@ -2937,17 +2857,18 @@
ri->head_renames = NULL;
ri->merge_renames = NULL;
- if (!merge_detect_rename(o))
+ if (!merge_detect_rename(opt))
return 1;
- head_pairs = get_diffpairs(o, common, head);
- merge_pairs = get_diffpairs(o, common, merge);
+ head_pairs = get_diffpairs(opt, common, head);
+ merge_pairs = get_diffpairs(opt, common, merge);
- if (o->detect_directory_renames) {
- dir_re_head = get_directory_renames(head_pairs, head);
- dir_re_merge = get_directory_renames(merge_pairs, merge);
+ if ((opt->detect_directory_renames == 2) ||
+ (opt->detect_directory_renames == 1 && !opt->call_depth)) {
+ dir_re_head = get_directory_renames(head_pairs);
+ dir_re_merge = get_directory_renames(merge_pairs);
- handle_directory_level_conflicts(o,
+ handle_directory_level_conflicts(opt,
dir_re_head, head,
dir_re_merge, merge);
} else {
@@ -2957,19 +2878,19 @@
dir_rename_init(dir_re_merge);
}
- ri->head_renames = get_renames(o, head_pairs,
+ ri->head_renames = get_renames(opt, opt->branch1, head_pairs,
dir_re_merge, dir_re_head, head,
common, head, merge, entries,
&clean);
if (clean < 0)
goto cleanup;
- ri->merge_renames = get_renames(o, merge_pairs,
+ ri->merge_renames = get_renames(opt, opt->branch2, merge_pairs,
dir_re_head, dir_re_merge, merge,
common, head, merge, entries,
&clean);
if (clean < 0)
goto cleanup;
- clean &= process_renames(o, ri->head_renames, ri->merge_renames);
+ clean &= process_renames(opt, ri->head_renames, ri->merge_renames);
cleanup:
/*
@@ -3005,12 +2926,7 @@
final_cleanup_rename(re_info->merge_renames);
}
-static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
-{
- return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
-}
-
-static int read_oid_strbuf(struct merge_options *o,
+static int read_oid_strbuf(struct merge_options *opt,
const struct object_id *oid,
struct strbuf *dst)
{
@@ -3019,130 +2935,99 @@
unsigned long size;
buf = read_object_file(oid, &type, &size);
if (!buf)
- return err(o, _("cannot read object %s"), oid_to_hex(oid));
+ return err(opt, _("cannot read object %s"), oid_to_hex(oid));
if (type != OBJ_BLOB) {
free(buf);
- return err(o, _("object %s is not a blob"), oid_to_hex(oid));
+ return err(opt, _("object %s is not a blob"), oid_to_hex(oid));
}
strbuf_attach(dst, buf, size, size + 1);
return 0;
}
static int blob_unchanged(struct merge_options *opt,
- const struct object_id *o_oid,
- unsigned o_mode,
- const struct object_id *a_oid,
- unsigned a_mode,
+ const struct diff_filespec *o,
+ const struct diff_filespec *a,
int renormalize, const char *path)
{
- struct strbuf o = STRBUF_INIT;
- struct strbuf a = STRBUF_INIT;
+ struct strbuf obuf = STRBUF_INIT;
+ struct strbuf abuf = STRBUF_INIT;
int ret = 0; /* assume changed for safety */
+ const struct index_state *idx = opt->repo->index;
- if (a_mode != o_mode)
+ if (a->mode != o->mode)
return 0;
- if (oid_eq(o_oid, a_oid))
+ if (oid_eq(&o->oid, &a->oid))
return 1;
if (!renormalize)
return 0;
- assert(o_oid && a_oid);
- if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
+ if (read_oid_strbuf(opt, &o->oid, &obuf) ||
+ read_oid_strbuf(opt, &a->oid, &abuf))
goto error_return;
/*
* Note: binary | is used so that both renormalizations are
* performed. Comparison can be skipped if both files are
* unchanged since their sha1s have already been compared.
*/
- if (renormalize_buffer(opt->repo->index, path, o.buf, o.len, &o) |
- renormalize_buffer(opt->repo->index, path, a.buf, a.len, &a))
- ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
+ if (renormalize_buffer(idx, path, obuf.buf, obuf.len, &obuf) |
+ renormalize_buffer(idx, path, abuf.buf, abuf.len, &abuf))
+ ret = (obuf.len == abuf.len && !memcmp(obuf.buf, abuf.buf, obuf.len));
error_return:
- strbuf_release(&o);
- strbuf_release(&a);
+ strbuf_release(&obuf);
+ strbuf_release(&abuf);
return ret;
}
-static int handle_modify_delete(struct merge_options *o,
+static int handle_modify_delete(struct merge_options *opt,
const char *path,
- struct object_id *o_oid, int o_mode,
- struct object_id *a_oid, int a_mode,
- struct object_id *b_oid, int b_mode)
+ const struct diff_filespec *o,
+ const struct diff_filespec *a,
+ const struct diff_filespec *b)
{
const char *modify_branch, *delete_branch;
- struct object_id *changed_oid;
- int changed_mode;
+ const struct diff_filespec *changed;
- if (a_oid) {
- modify_branch = o->branch1;
- delete_branch = o->branch2;
- changed_oid = a_oid;
- changed_mode = a_mode;
+ if (is_valid(a)) {
+ modify_branch = opt->branch1;
+ delete_branch = opt->branch2;
+ changed = a;
} else {
- modify_branch = o->branch2;
- delete_branch = o->branch1;
- changed_oid = b_oid;
- changed_mode = b_mode;
+ modify_branch = opt->branch2;
+ delete_branch = opt->branch1;
+ changed = b;
}
- return handle_change_delete(o,
+ return handle_change_delete(opt,
path, NULL,
- o_oid, o_mode,
- changed_oid, changed_mode,
+ o, changed,
modify_branch, delete_branch,
_("modify"), _("modified"));
}
-static int handle_content_merge(struct merge_options *o,
+static int handle_content_merge(struct merge_file_info *mfi,
+ struct merge_options *opt,
const char *path,
int is_dirty,
- struct object_id *o_oid, int o_mode,
- struct object_id *a_oid, int a_mode,
- struct object_id *b_oid, int b_mode,
- struct rename_conflict_info *rename_conflict_info)
+ const struct diff_filespec *o,
+ const struct diff_filespec *a,
+ const struct diff_filespec *b,
+ struct rename_conflict_info *ci)
{
const char *reason = _("content");
- const char *path1 = NULL, *path2 = NULL;
- struct merge_file_info mfi;
- struct diff_filespec one, a, b;
unsigned df_conflict_remains = 0;
- if (!o_oid) {
+ if (!is_valid(o))
reason = _("add/add");
- o_oid = (struct object_id *)&null_oid;
- }
- one.path = a.path = b.path = (char *)path;
- oidcpy(&one.oid, o_oid);
- one.mode = o_mode;
- oidcpy(&a.oid, a_oid);
- a.mode = a_mode;
- oidcpy(&b.oid, b_oid);
- b.mode = b_mode;
- if (rename_conflict_info) {
- struct diff_filepair *pair1 = rename_conflict_info->pair1;
+ assert(o->path && a->path && b->path);
+ if (ci && dir_in_way(opt->repo->index, path, !opt->call_depth,
+ S_ISGITLINK(ci->ren1->pair->two->mode)))
+ df_conflict_remains = 1;
- path1 = (o->branch1 == rename_conflict_info->branch1) ?
- pair1->two->path : pair1->one->path;
- /* If rename_conflict_info->pair2 != NULL, we are in
- * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
- * normal rename.
- */
- path2 = (rename_conflict_info->pair2 ||
- o->branch2 == rename_conflict_info->branch1) ?
- pair1->two->path : pair1->one->path;
- one.path = pair1->one->path;
- a.path = (char *)path1;
- b.path = (char *)path2;
-
- if (dir_in_way(o->repo->index, path, !o->call_depth,
- S_ISGITLINK(pair1->two->mode)))
- df_conflict_remains = 1;
- }
- if (merge_mode_and_contents(o, &one, &a, &b, path,
- o->branch1, o->branch2,
- o->call_depth * 2, &mfi))
+ if (merge_mode_and_contents(opt, o, a, b, path,
+ opt->branch1, opt->branch2,
+ opt->call_depth * 2, mfi))
return -1;
/*
@@ -3151,15 +3036,14 @@
* b) The merge matches what was in HEAD (content, mode, pathname)
* c) The target path is usable (i.e. not involved in D/F conflict)
*/
- if (mfi.clean &&
- was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) &&
+ if (mfi->clean && was_tracked_and_matches(opt, path, &mfi->blob) &&
!df_conflict_remains) {
int pos;
struct cache_entry *ce;
- output(o, 3, _("Skipped %s (merged same as existing)"), path);
- if (add_cacheinfo(o, mfi.mode, &mfi.oid, path,
- 0, (!o->call_depth && !is_dirty), 0))
+ output(opt, 3, _("Skipped %s (merged same as existing)"), path);
+ if (add_cacheinfo(opt, &mfi->blob, path,
+ 0, (!opt->call_depth && !is_dirty), 0))
return -1;
/*
* However, add_cacheinfo() will delete the old cache entry
@@ -3167,110 +3051,196 @@
* flag to avoid making the file appear as if it were
* deleted by the user.
*/
- pos = index_name_pos(&o->orig_index, path, strlen(path));
- ce = o->orig_index.cache[pos];
+ pos = index_name_pos(&opt->orig_index, path, strlen(path));
+ ce = opt->orig_index.cache[pos];
if (ce_skip_worktree(ce)) {
- pos = index_name_pos(o->repo->index, path, strlen(path));
- ce = o->repo->index->cache[pos];
+ pos = index_name_pos(opt->repo->index, path, strlen(path));
+ ce = opt->repo->index->cache[pos];
ce->ce_flags |= CE_SKIP_WORKTREE;
}
- return mfi.clean;
+ return mfi->clean;
}
- if (!mfi.clean) {
- if (S_ISGITLINK(mfi.mode))
+ if (!mfi->clean) {
+ if (S_ISGITLINK(mfi->blob.mode))
reason = _("submodule");
- output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
+ output(opt, 1, _("CONFLICT (%s): Merge conflict in %s"),
reason, path);
- if (rename_conflict_info && !df_conflict_remains)
- if (update_stages(o, path, &one, &a, &b))
+ if (ci && !df_conflict_remains)
+ if (update_stages(opt, path, o, a, b))
return -1;
}
if (df_conflict_remains || is_dirty) {
char *new_path;
- if (o->call_depth) {
- remove_file_from_index(o->repo->index, path);
+ if (opt->call_depth) {
+ remove_file_from_index(opt->repo->index, path);
} else {
- if (!mfi.clean) {
- if (update_stages(o, path, &one, &a, &b))
+ if (!mfi->clean) {
+ if (update_stages(opt, path, o, a, b))
return -1;
} else {
- int file_from_stage2 = was_tracked(o, path);
- struct diff_filespec merged;
- oidcpy(&merged.oid, &mfi.oid);
- merged.mode = mfi.mode;
+ int file_from_stage2 = was_tracked(opt, path);
- if (update_stages(o, path, NULL,
- file_from_stage2 ? &merged : NULL,
- file_from_stage2 ? NULL : &merged))
+ if (update_stages(opt, path, NULL,
+ file_from_stage2 ? &mfi->blob : NULL,
+ file_from_stage2 ? NULL : &mfi->blob))
return -1;
}
}
- new_path = unique_path(o, path, rename_conflict_info->branch1);
+ new_path = unique_path(opt, path, ci->ren1->branch);
if (is_dirty) {
- output(o, 1, _("Refusing to lose dirty file at %s"),
+ output(opt, 1, _("Refusing to lose dirty file at %s"),
path);
}
- output(o, 1, _("Adding as %s instead"), new_path);
- if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
+ output(opt, 1, _("Adding as %s instead"), new_path);
+ if (update_file(opt, 0, &mfi->blob, new_path)) {
free(new_path);
return -1;
}
free(new_path);
- mfi.clean = 0;
- } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
+ mfi->clean = 0;
+ } else if (update_file(opt, mfi->clean, &mfi->blob, path))
return -1;
- return !is_dirty && mfi.clean;
+ return !is_dirty && mfi->clean;
}
-static int handle_rename_normal(struct merge_options *o,
+static int handle_rename_normal(struct merge_options *opt,
const char *path,
- struct object_id *o_oid, unsigned int o_mode,
- struct object_id *a_oid, unsigned int a_mode,
- struct object_id *b_oid, unsigned int b_mode,
+ const struct diff_filespec *o,
+ const struct diff_filespec *a,
+ const struct diff_filespec *b,
struct rename_conflict_info *ci)
{
+ struct rename *ren = ci->ren1;
+ struct merge_file_info mfi;
+ int clean;
+ int side = (ren->branch == opt->branch1 ? 2 : 3);
+
/* Merge the content and write it out */
- return handle_content_merge(o, path, was_dirty(o, path),
- o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
- ci);
+ clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
+ o, a, b, ci);
+
+ if (clean && opt->detect_directory_renames == 1 &&
+ ren->dir_rename_original_dest) {
+ if (update_stages(opt, path,
+ NULL,
+ side == 2 ? &mfi.blob : NULL,
+ side == 2 ? NULL : &mfi.blob))
+ return -1;
+ clean = 0; /* not clean, but conflicted */
+ }
+ return clean;
+}
+
+static void dir_rename_warning(const char *msg,
+ int is_add,
+ int clean,
+ struct merge_options *opt,
+ struct rename *ren)
+{
+ const char *other_branch;
+ other_branch = (ren->branch == opt->branch1 ?
+ opt->branch2 : opt->branch1);
+ if (is_add) {
+ output(opt, clean ? 2 : 1, msg,
+ ren->pair->one->path, ren->branch,
+ other_branch, ren->pair->two->path);
+ return;
+ }
+ output(opt, clean ? 2 : 1, msg,
+ ren->pair->one->path, ren->dir_rename_original_dest, ren->branch,
+ other_branch, ren->pair->two->path);
+}
+static int warn_about_dir_renamed_entries(struct merge_options *opt,
+ struct rename *ren)
+{
+ const char *msg;
+ int clean = 1, is_add;
+
+ if (!ren)
+ return clean;
+
+ /* Return early if ren was not affected/created by a directory rename */
+ if (!ren->dir_rename_original_dest)
+ return clean;
+
+ /* Sanity checks */
+ assert(opt->detect_directory_renames > 0);
+ assert(ren->dir_rename_original_type == 'A' ||
+ ren->dir_rename_original_type == 'R');
+
+ /* Check whether to treat directory renames as a conflict */
+ clean = (opt->detect_directory_renames == 2);
+
+ is_add = (ren->dir_rename_original_type == 'A');
+ if (ren->dir_rename_original_type == 'A' && clean) {
+ msg = _("Path updated: %s added in %s inside a "
+ "directory that was renamed in %s; moving it to %s.");
+ } else if (ren->dir_rename_original_type == 'A' && !clean) {
+ msg = _("CONFLICT (file location): %s added in %s "
+ "inside a directory that was renamed in %s, "
+ "suggesting it should perhaps be moved to %s.");
+ } else if (ren->dir_rename_original_type == 'R' && clean) {
+ msg = _("Path updated: %s renamed to %s in %s, inside a "
+ "directory that was renamed in %s; moving it to %s.");
+ } else if (ren->dir_rename_original_type == 'R' && !clean) {
+ msg = _("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.");
+ } else {
+ BUG("Impossible dir_rename_original_type/clean combination");
+ }
+ dir_rename_warning(msg, is_add, clean, opt, ren);
+
+ return clean;
}
/* Per entry merge function */
-static int process_entry(struct merge_options *o,
+static int process_entry(struct merge_options *opt,
const char *path, struct stage_data *entry)
{
int clean_merge = 1;
- int normalize = o->renormalize;
- unsigned o_mode = entry->stages[1].mode;
- unsigned a_mode = entry->stages[2].mode;
- unsigned b_mode = entry->stages[3].mode;
- struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
- struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
- struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
+ int normalize = opt->renormalize;
+
+ struct diff_filespec *o = &entry->stages[1];
+ struct diff_filespec *a = &entry->stages[2];
+ struct diff_filespec *b = &entry->stages[3];
+ int o_valid = is_valid(o);
+ int a_valid = is_valid(a);
+ int b_valid = is_valid(b);
+ o->path = a->path = b->path = (char*)path;
entry->processed = 1;
if (entry->rename_conflict_info) {
- struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
- switch (conflict_info->rename_type) {
+ struct rename_conflict_info *ci = entry->rename_conflict_info;
+ struct diff_filespec *temp;
+ int path_clean;
+
+ path_clean = warn_about_dir_renamed_entries(opt, ci->ren1);
+ path_clean &= warn_about_dir_renamed_entries(opt, ci->ren2);
+
+ /*
+ * For cases with a single rename, {o,a,b}->path have all been
+ * set to the rename target path; we need to set two of these
+ * back to the rename source.
+ * For rename/rename conflicts, we'll manually fix paths below.
+ */
+ temp = (opt->branch1 == ci->ren1->branch) ? b : a;
+ o->path = temp->path = ci->ren1->pair->one->path;
+ if (ci->ren2) {
+ assert(opt->branch1 == ci->ren1->branch);
+ }
+
+ switch (ci->rename_type) {
case RENAME_NORMAL:
case RENAME_ONE_FILE_TO_ONE:
- clean_merge = handle_rename_normal(o,
- path,
- o_oid, o_mode,
- a_oid, a_mode,
- b_oid, b_mode,
- conflict_info);
+ clean_merge = handle_rename_normal(opt, path, o, a, b,
+ ci);
break;
case RENAME_VIA_DIR:
- clean_merge = 1;
- if (handle_rename_via_dir(o,
- conflict_info->pair1,
- conflict_info->branch1,
- conflict_info->branch2))
- clean_merge = -1;
+ clean_merge = handle_rename_via_dir(opt, ci);
break;
case RENAME_ADD:
/*
@@ -3279,165 +3249,172 @@
* two-way merged cleanly with the added file, I
* guess it's a clean merge?
*/
- clean_merge = handle_rename_add(o, conflict_info);
+ clean_merge = handle_rename_add(opt, ci);
break;
case RENAME_DELETE:
clean_merge = 0;
- if (handle_rename_delete(o,
- conflict_info->pair1,
- conflict_info->branch1,
- conflict_info->branch2))
+ if (handle_rename_delete(opt, ci))
clean_merge = -1;
break;
case RENAME_ONE_FILE_TO_TWO:
+ /*
+ * Manually fix up paths; note:
+ * ren[12]->pair->one->path are equal.
+ */
+ o->path = ci->ren1->pair->one->path;
+ a->path = ci->ren1->pair->two->path;
+ b->path = ci->ren2->pair->two->path;
+
clean_merge = 0;
- if (handle_rename_rename_1to2(o, conflict_info))
+ if (handle_rename_rename_1to2(opt, ci))
clean_merge = -1;
break;
case RENAME_TWO_FILES_TO_ONE:
/*
+ * Manually fix up paths; note,
+ * ren[12]->pair->two->path are actually equal.
+ */
+ o->path = NULL;
+ a->path = ci->ren1->pair->two->path;
+ b->path = ci->ren2->pair->two->path;
+
+ /*
* Probably unclean merge, but if the two renamed
* files merge cleanly and the two resulting files
* can then be two-way merged cleanly, I guess it's
* a clean merge?
*/
- clean_merge = handle_rename_rename_2to1(o,
- conflict_info);
+ clean_merge = handle_rename_rename_2to1(opt, ci);
break;
default:
entry->processed = 0;
break;
}
- } else if (o_oid && (!a_oid || !b_oid)) {
+ if (path_clean < clean_merge)
+ clean_merge = path_clean;
+ } else if (o_valid && (!a_valid || !b_valid)) {
/* Case A: Deleted in one */
- if ((!a_oid && !b_oid) ||
- (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
- (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
+ if ((!a_valid && !b_valid) ||
+ (!b_valid && blob_unchanged(opt, o, a, normalize, path)) ||
+ (!a_valid && blob_unchanged(opt, o, b, normalize, path))) {
/* Deleted in both or deleted in one and
* unchanged in the other */
- if (a_oid)
- output(o, 2, _("Removing %s"), path);
+ if (a_valid)
+ output(opt, 2, _("Removing %s"), path);
/* do not touch working file if it did not exist */
- remove_file(o, 1, path, !a_oid);
+ remove_file(opt, 1, path, !a_valid);
} else {
/* Modify/delete; deleted side may have put a directory in the way */
clean_merge = 0;
- if (handle_modify_delete(o, path, o_oid, o_mode,
- a_oid, a_mode, b_oid, b_mode))
+ if (handle_modify_delete(opt, path, o, a, b))
clean_merge = -1;
}
- } else if ((!o_oid && a_oid && !b_oid) ||
- (!o_oid && !a_oid && b_oid)) {
+ } else if ((!o_valid && a_valid && !b_valid) ||
+ (!o_valid && !a_valid && b_valid)) {
/* Case B: Added in one. */
/* [nothing|directory] -> ([nothing|directory], file) */
const char *add_branch;
const char *other_branch;
- unsigned mode;
- const struct object_id *oid;
const char *conf;
+ const struct diff_filespec *contents;
- if (a_oid) {
- add_branch = o->branch1;
- other_branch = o->branch2;
- mode = a_mode;
- oid = a_oid;
+ if (a_valid) {
+ add_branch = opt->branch1;
+ other_branch = opt->branch2;
+ contents = a;
conf = _("file/directory");
} else {
- add_branch = o->branch2;
- other_branch = o->branch1;
- mode = b_mode;
- oid = b_oid;
+ add_branch = opt->branch2;
+ other_branch = opt->branch1;
+ contents = b;
conf = _("directory/file");
}
- if (dir_in_way(o->repo->index, path,
- !o->call_depth && !S_ISGITLINK(a_mode),
+ if (dir_in_way(opt->repo->index, path,
+ !opt->call_depth && !S_ISGITLINK(a->mode),
0)) {
- char *new_path = unique_path(o, path, add_branch);
+ char *new_path = unique_path(opt, path, add_branch);
clean_merge = 0;
- output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
+ output(opt, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s"),
conf, path, other_branch, path, new_path);
- if (update_file(o, 0, oid, mode, new_path))
+ if (update_file(opt, 0, contents, new_path))
clean_merge = -1;
- else if (o->call_depth)
- remove_file_from_index(o->repo->index, path);
+ else if (opt->call_depth)
+ remove_file_from_index(opt->repo->index, path);
free(new_path);
} else {
- output(o, 2, _("Adding %s"), path);
+ output(opt, 2, _("Adding %s"), path);
/* do not overwrite file if already present */
- if (update_file_flags(o, oid, mode, path, 1, !a_oid))
+ if (update_file_flags(opt, contents, path, 1, !a_valid))
clean_merge = -1;
}
- } else if (a_oid && b_oid) {
- if (!o_oid) {
+ } else if (a_valid && b_valid) {
+ if (!o_valid) {
/* Case C: Added in both (check for same permissions) */
- output(o, 1,
+ output(opt, 1,
_("CONFLICT (add/add): Merge conflict in %s"),
path);
- clean_merge = handle_file_collision(o,
+ clean_merge = handle_file_collision(opt,
path, NULL, NULL,
- o->branch1,
- o->branch2,
- a_oid, a_mode,
- b_oid, b_mode);
+ opt->branch1,
+ opt->branch2,
+ a, b);
} else {
/* case D: Modified in both, but differently. */
+ struct merge_file_info mfi;
int is_dirty = 0; /* unpack_trees would have bailed if dirty */
- clean_merge = handle_content_merge(o, path,
+ clean_merge = handle_content_merge(&mfi, opt, path,
is_dirty,
- o_oid, o_mode,
- a_oid, a_mode,
- b_oid, b_mode,
- NULL);
+ o, a, b, NULL);
}
- } else if (!o_oid && !a_oid && !b_oid) {
+ } else if (!o_valid && !a_valid && !b_valid) {
/*
* this entry was deleted altogether. a_mode == 0 means
* we had that path and want to actively remove it.
*/
- remove_file(o, 1, path, !a_mode);
+ remove_file(opt, 1, path, !a->mode);
} else
BUG("fatal merge failure, shouldn't happen.");
return clean_merge;
}
-int merge_trees(struct merge_options *o,
+int merge_trees(struct merge_options *opt,
struct tree *head,
struct tree *merge,
struct tree *common,
struct tree **result)
{
- struct index_state *istate = o->repo->index;
+ struct index_state *istate = opt->repo->index;
int code, clean;
struct strbuf sb = STRBUF_INIT;
- if (!o->call_depth && repo_index_has_changes(o->repo, head, &sb)) {
- err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"),
+ if (!opt->call_depth && repo_index_has_changes(opt->repo, head, &sb)) {
+ err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"),
sb.buf);
return -1;
}
- if (o->subtree_shift) {
- merge = shift_tree_object(o->repo, head, merge, o->subtree_shift);
- common = shift_tree_object(o->repo, head, common, o->subtree_shift);
+ if (opt->subtree_shift) {
+ merge = shift_tree_object(opt->repo, head, merge, opt->subtree_shift);
+ common = shift_tree_object(opt->repo, head, common, opt->subtree_shift);
}
if (oid_eq(&common->object.oid, &merge->object.oid)) {
- output(o, 0, _("Already up to date!"));
+ output(opt, 0, _("Already up to date!"));
*result = head;
return 1;
}
- code = unpack_trees_start(o, common, head, merge);
+ code = unpack_trees_start(opt, common, head, merge);
if (code != 0) {
- if (show(o, 4) || o->call_depth)
- err(o, _("merging of trees %s and %s failed"),
+ if (show(opt, 4) || opt->call_depth)
+ err(opt, _("merging of trees %s and %s failed"),
oid_to_hex(&head->object.oid),
oid_to_hex(&merge->object.oid));
- unpack_trees_finish(o);
+ unpack_trees_finish(opt);
return -1;
}
@@ -3452,21 +3429,21 @@
* opposed to decaring a local hashmap is for convenience
* so that we don't have to pass it to around.
*/
- hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
- get_files_dirs(o, head);
- get_files_dirs(o, merge);
+ hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512);
+ get_files_dirs(opt, head);
+ get_files_dirs(opt, merge);
- entries = get_unmerged(o->repo->index);
- clean = detect_and_process_renames(o, common, head, merge,
+ entries = get_unmerged(opt->repo->index);
+ clean = detect_and_process_renames(opt, common, head, merge,
entries, &re_info);
- record_df_conflict_files(o, entries);
+ record_df_conflict_files(opt, entries);
if (clean < 0)
goto cleanup;
for (i = entries->nr-1; 0 <= i; i--) {
const char *path = entries->items[i].string;
struct stage_data *e = entries->items[i].util;
if (!e->processed) {
- int ret = process_entry(o, path, e);
+ int ret = process_entry(opt, path, e);
if (!ret)
clean = 0;
else if (ret < 0) {
@@ -3488,19 +3465,19 @@
string_list_clear(entries, 1);
free(entries);
- hashmap_free(&o->current_file_dir_set, 1);
+ hashmap_free(&opt->current_file_dir_set, 1);
if (clean < 0) {
- unpack_trees_finish(o);
+ unpack_trees_finish(opt);
return clean;
}
}
else
clean = 1;
- unpack_trees_finish(o);
+ unpack_trees_finish(opt);
- if (o->call_depth && !(*result = write_tree_from_memory(o)))
+ if (opt->call_depth && !(*result = write_tree_from_memory(opt)))
return -1;
return clean;
@@ -3521,7 +3498,7 @@
* Merge the commits h1 and h2, return the resulting virtual
* commit object and a flag indicating the cleanness of the merge.
*/
-int merge_recursive(struct merge_options *o,
+int merge_recursive(struct merge_options *opt,
struct commit *h1,
struct commit *h2,
struct commit_list *ca,
@@ -3532,10 +3509,10 @@
struct tree *mrtree;
int clean;
- if (show(o, 4)) {
- output(o, 4, _("Merging:"));
- output_commit_title(o, h1);
- output_commit_title(o, h2);
+ if (show(opt, 4)) {
+ output(opt, 4, _("Merging:"));
+ output_commit_title(opt, h1);
+ output_commit_title(opt, h2);
}
if (!ca) {
@@ -3543,13 +3520,13 @@
ca = reverse_commit_list(ca);
}
- if (show(o, 5)) {
+ if (show(opt, 5)) {
unsigned cnt = commit_list_count(ca);
- output(o, 5, Q_("found %u common ancestor:",
+ output(opt, 5, Q_("found %u common ancestor:",
"found %u common ancestors:", cnt), cnt);
for (iter = ca; iter; iter = iter->next)
- output_commit_title(o, iter->item);
+ output_commit_title(opt, iter->item);
}
merged_common_ancestors = pop_commit(&ca);
@@ -3557,13 +3534,13 @@
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
- tree = lookup_tree(o->repo, o->repo->hash_algo->empty_tree);
- merged_common_ancestors = make_virtual_commit(o->repo, tree, "ancestor");
+ tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
+ merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor");
}
for (iter = ca; iter; iter = iter->next) {
const char *saved_b1, *saved_b2;
- o->call_depth++;
+ opt->call_depth++;
/*
* When the merge fails, the result contains files
* with conflict markers. The cleanness flag is
@@ -3572,46 +3549,46 @@
* overwritten it: the committed "conflicts" were
* already resolved.
*/
- discard_index(o->repo->index);
- saved_b1 = o->branch1;
- saved_b2 = o->branch2;
- o->branch1 = "Temporary merge branch 1";
- o->branch2 = "Temporary merge branch 2";
- if (merge_recursive(o, merged_common_ancestors, iter->item,
+ discard_index(opt->repo->index);
+ saved_b1 = opt->branch1;
+ saved_b2 = opt->branch2;
+ opt->branch1 = "Temporary merge branch 1";
+ opt->branch2 = "Temporary merge branch 2";
+ if (merge_recursive(opt, merged_common_ancestors, iter->item,
NULL, &merged_common_ancestors) < 0)
return -1;
- o->branch1 = saved_b1;
- o->branch2 = saved_b2;
- o->call_depth--;
+ opt->branch1 = saved_b1;
+ opt->branch2 = saved_b2;
+ opt->call_depth--;
if (!merged_common_ancestors)
- return err(o, _("merge returned no commit"));
+ return err(opt, _("merge returned no commit"));
}
- discard_index(o->repo->index);
- if (!o->call_depth)
- repo_read_index(o->repo);
+ discard_index(opt->repo->index);
+ if (!opt->call_depth)
+ repo_read_index(opt->repo);
- o->ancestor = "merged common ancestors";
- clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2),
+ opt->ancestor = "merged common ancestors";
+ clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
get_commit_tree(merged_common_ancestors),
&mrtree);
if (clean < 0) {
- flush_output(o);
+ flush_output(opt);
return clean;
}
- if (o->call_depth) {
- *result = make_virtual_commit(o->repo, mrtree, "merged tree");
+ if (opt->call_depth) {
+ *result = make_virtual_commit(opt->repo, mrtree, "merged tree");
commit_list_insert(h1, &(*result)->parents);
commit_list_insert(h2, &(*result)->parents->next);
}
- flush_output(o);
- if (!o->call_depth && o->buffer_output < 2)
- strbuf_release(&o->obuf);
- if (show(o, 2))
+ flush_output(opt);
+ if (!opt->call_depth && opt->buffer_output < 2)
+ strbuf_release(&opt->obuf);
+ if (show(opt, 2))
diff_warn_rename_limit("merge.renamelimit",
- o->needed_rename_limit, 0);
+ opt->needed_rename_limit, 0);
return clean;
}
@@ -3633,7 +3610,7 @@
return (struct commit *)object;
}
-int merge_recursive_generic(struct merge_options *o,
+int merge_recursive_generic(struct merge_options *opt,
const struct object_id *head,
const struct object_id *merge,
int num_base_list,
@@ -3642,128 +3619,141 @@
{
int clean;
struct lock_file lock = LOCK_INIT;
- struct commit *head_commit = get_ref(o->repo, head, o->branch1);
- struct commit *next_commit = get_ref(o->repo, merge, o->branch2);
+ struct commit *head_commit = get_ref(opt->repo, head, opt->branch1);
+ struct commit *next_commit = get_ref(opt->repo, merge, opt->branch2);
struct commit_list *ca = NULL;
if (base_list) {
int i;
for (i = 0; i < num_base_list; ++i) {
struct commit *base;
- if (!(base = get_ref(o->repo, base_list[i], oid_to_hex(base_list[i]))))
- return err(o, _("Could not parse object '%s'"),
+ if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i]))))
+ return err(opt, _("Could not parse object '%s'"),
oid_to_hex(base_list[i]));
commit_list_insert(base, &ca);
}
}
- repo_hold_locked_index(o->repo, &lock, LOCK_DIE_ON_ERROR);
- clean = merge_recursive(o, head_commit, next_commit, ca,
+ repo_hold_locked_index(opt->repo, &lock, LOCK_DIE_ON_ERROR);
+ clean = merge_recursive(opt, head_commit, next_commit, ca,
result);
if (clean < 0) {
rollback_lock_file(&lock);
return clean;
}
- if (write_locked_index(o->repo->index, &lock,
+ if (write_locked_index(opt->repo->index, &lock,
COMMIT_LOCK | SKIP_IF_UNCHANGED))
- return err(o, _("Unable to write index."));
+ return err(opt, _("Unable to write index."));
return clean ? 0 : 1;
}
-static void merge_recursive_config(struct merge_options *o)
+static void merge_recursive_config(struct merge_options *opt)
{
char *value = NULL;
- git_config_get_int("merge.verbosity", &o->verbosity);
- git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
- git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
+ git_config_get_int("merge.verbosity", &opt->verbosity);
+ git_config_get_int("diff.renamelimit", &opt->diff_rename_limit);
+ git_config_get_int("merge.renamelimit", &opt->merge_rename_limit);
if (!git_config_get_string("diff.renames", &value)) {
- o->diff_detect_rename = git_config_rename("diff.renames", value);
+ opt->diff_detect_rename = git_config_rename("diff.renames", value);
free(value);
}
if (!git_config_get_string("merge.renames", &value)) {
- o->merge_detect_rename = git_config_rename("merge.renames", value);
+ opt->merge_detect_rename = git_config_rename("merge.renames", value);
+ free(value);
+ }
+ if (!git_config_get_string("merge.directoryrenames", &value)) {
+ int boolval = git_parse_maybe_bool(value);
+ if (0 <= boolval) {
+ opt->detect_directory_renames = boolval ? 2 : 0;
+ } else if (!strcasecmp(value, "conflict")) {
+ opt->detect_directory_renames = 1;
+ } /* avoid erroring on values from future versions of git */
free(value);
}
git_config(git_xmerge_config, NULL);
}
-void init_merge_options(struct merge_options *o,
+void init_merge_options(struct merge_options *opt,
struct repository *repo)
{
const char *merge_verbosity;
- memset(o, 0, sizeof(struct merge_options));
- o->repo = repo;
- o->verbosity = 2;
- o->buffer_output = 1;
- o->diff_rename_limit = -1;
- o->merge_rename_limit = -1;
- o->renormalize = 0;
- o->diff_detect_rename = -1;
- o->merge_detect_rename = -1;
- o->detect_directory_renames = 1;
- merge_recursive_config(o);
+ memset(opt, 0, sizeof(struct merge_options));
+ opt->repo = repo;
+ opt->verbosity = 2;
+ opt->buffer_output = 1;
+ opt->diff_rename_limit = -1;
+ opt->merge_rename_limit = -1;
+ opt->renormalize = 0;
+ opt->diff_detect_rename = -1;
+ opt->merge_detect_rename = -1;
+ opt->detect_directory_renames = 1;
+ merge_recursive_config(opt);
merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
if (merge_verbosity)
- o->verbosity = strtol(merge_verbosity, NULL, 10);
- if (o->verbosity >= 5)
- o->buffer_output = 0;
- strbuf_init(&o->obuf, 0);
- string_list_init(&o->df_conflict_file_set, 1);
+ opt->verbosity = strtol(merge_verbosity, NULL, 10);
+ if (opt->verbosity >= 5)
+ opt->buffer_output = 0;
+ strbuf_init(&opt->obuf, 0);
+ string_list_init(&opt->df_conflict_file_set, 1);
}
-int parse_merge_opt(struct merge_options *o, const char *s)
+int parse_merge_opt(struct merge_options *opt, const char *s)
{
const char *arg;
if (!s || !*s)
return -1;
if (!strcmp(s, "ours"))
- o->recursive_variant = MERGE_RECURSIVE_OURS;
+ opt->recursive_variant = MERGE_RECURSIVE_OURS;
else if (!strcmp(s, "theirs"))
- o->recursive_variant = MERGE_RECURSIVE_THEIRS;
+ opt->recursive_variant = MERGE_RECURSIVE_THEIRS;
else if (!strcmp(s, "subtree"))
- o->subtree_shift = "";
+ opt->subtree_shift = "";
else if (skip_prefix(s, "subtree=", &arg))
- o->subtree_shift = arg;
+ opt->subtree_shift = arg;
else if (!strcmp(s, "patience"))
- o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
+ opt->xdl_opts = DIFF_WITH_ALG(opt, PATIENCE_DIFF);
else if (!strcmp(s, "histogram"))
- o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
+ opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF);
else if (skip_prefix(s, "diff-algorithm=", &arg)) {
long value = parse_algorithm_value(arg);
if (value < 0)
return -1;
/* clear out previous settings */
- DIFF_XDL_CLR(o, NEED_MINIMAL);
- o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
- o->xdl_opts |= value;
+ DIFF_XDL_CLR(opt, NEED_MINIMAL);
+ opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
+ opt->xdl_opts |= value;
}
else if (!strcmp(s, "ignore-space-change"))
- DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
+ DIFF_XDL_SET(opt, IGNORE_WHITESPACE_CHANGE);
else if (!strcmp(s, "ignore-all-space"))
- DIFF_XDL_SET(o, IGNORE_WHITESPACE);
+ DIFF_XDL_SET(opt, IGNORE_WHITESPACE);
else if (!strcmp(s, "ignore-space-at-eol"))
- DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
+ DIFF_XDL_SET(opt, IGNORE_WHITESPACE_AT_EOL);
else if (!strcmp(s, "ignore-cr-at-eol"))
- DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);
+ DIFF_XDL_SET(opt, IGNORE_CR_AT_EOL);
else if (!strcmp(s, "renormalize"))
- o->renormalize = 1;
+ opt->renormalize = 1;
else if (!strcmp(s, "no-renormalize"))
- o->renormalize = 0;
+ opt->renormalize = 0;
else if (!strcmp(s, "no-renames"))
- o->merge_detect_rename = 0;
+ opt->merge_detect_rename = 0;
else if (!strcmp(s, "find-renames")) {
- o->merge_detect_rename = 1;
- o->rename_score = 0;
+ opt->merge_detect_rename = 1;
+ opt->rename_score = 0;
}
else if (skip_prefix(s, "find-renames=", &arg) ||
skip_prefix(s, "rename-threshold=", &arg)) {
- if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
+ if ((opt->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
return -1;
- o->merge_detect_rename = 1;
+ opt->merge_detect_rename = 1;
}
+ /*
+ * Please update $__git_merge_strategy_options in
+ * git-completion.bash when you add new options
+ */
else
return -1;
return 0;
diff --git a/mergetools/smerge b/mergetools/smerge
new file mode 100644
index 0000000..9c2e6f6
--- /dev/null
+++ b/mergetools/smerge
@@ -0,0 +1,12 @@
+diff_cmd () {
+ "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
+ else
+ "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
+ fi
+}
diff --git a/midx.c b/midx.c
index 8a505fd..d649644 100644
--- a/midx.c
+++ b/midx.c
@@ -8,6 +8,8 @@
#include "sha1-lookup.h"
#include "midx.h"
#include "progress.h"
+#include "trace2.h"
+#include "run-command.h"
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1
@@ -33,6 +35,8 @@
#define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t))
#define MIDX_LARGE_OFFSET_NEEDED 0x80000000
+#define PACK_EXPIRED UINT_MAX
+
static char *get_midx_filename(const char *object_dir)
{
return xstrfmt("%s/pack/multi-pack-index", object_dir);
@@ -70,7 +74,7 @@
midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
- FLEX_ALLOC_MEM(m, object_dir, object_dir, strlen(object_dir));
+ FLEX_ALLOC_STR(m, object_dir, object_dir);
m->fd = fd;
m->data = midx_map;
m->data_len = midx_size;
@@ -164,6 +168,9 @@
m->pack_names[i]);
}
+ trace2_data_intmax("midx", the_repository, "load/num_packs", m->num_packs);
+ trace2_data_intmax("midx", the_repository, "load/num_objects", m->num_objects);
+
return m;
cleanup_fail:
@@ -188,18 +195,17 @@
m->fd = -1;
for (i = 0; i < m->num_packs; i++) {
- if (m->packs[i]) {
- close_pack(m->packs[i]);
- free(m->packs[i]);
- }
+ if (m->packs[i])
+ m->packs[i]->multi_pack_index = 0;
}
FREE_AND_NULL(m->packs);
FREE_AND_NULL(m->pack_names);
}
-int prepare_midx_pack(struct multi_pack_index *m, uint32_t pack_int_id)
+int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id)
{
struct strbuf pack_name = STRBUF_INIT;
+ struct packed_git *p;
if (pack_int_id >= m->num_packs)
die(_("bad pack-int-id: %u (%u total packs)"),
@@ -211,9 +217,18 @@
strbuf_addf(&pack_name, "%s/pack/%s", m->object_dir,
m->pack_names[pack_int_id]);
- m->packs[pack_int_id] = add_packed_git(pack_name.buf, pack_name.len, m->local);
+ p = add_packed_git(pack_name.buf, pack_name.len, m->local);
strbuf_release(&pack_name);
- return !m->packs[pack_int_id];
+
+ if (!p)
+ return 1;
+
+ p->multi_pack_index = 1;
+ m->packs[pack_int_id] = p;
+ install_packed_git(r, p);
+ list_add_tail(&p->mru, &r->objects->packed_git_mru);
+
+ return 0;
}
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result)
@@ -257,7 +272,10 @@
return get_be32(m->chunk_object_offsets + pos * MIDX_CHUNK_OFFSET_WIDTH);
}
-static int nth_midxed_pack_entry(struct multi_pack_index *m, struct pack_entry *e, uint32_t pos)
+static int nth_midxed_pack_entry(struct repository *r,
+ struct multi_pack_index *m,
+ struct pack_entry *e,
+ uint32_t pos)
{
uint32_t pack_int_id;
struct packed_git *p;
@@ -267,7 +285,7 @@
pack_int_id = nth_midxed_pack_int_id(m, pos);
- if (prepare_midx_pack(m, pack_int_id))
+ if (prepare_midx_pack(r, m, pack_int_id))
die(_("error preparing packfile from multi-pack-index"));
p = m->packs[pack_int_id];
@@ -297,17 +315,52 @@
return 1;
}
-int fill_midx_entry(const struct object_id *oid, struct pack_entry *e, struct multi_pack_index *m)
+int fill_midx_entry(struct repository * r,
+ const struct object_id *oid,
+ struct pack_entry *e,
+ struct multi_pack_index *m)
{
uint32_t pos;
if (!bsearch_midx(oid, m, &pos))
return 0;
- return nth_midxed_pack_entry(m, e, pos);
+ return nth_midxed_pack_entry(r, m, e, pos);
}
-int midx_contains_pack(struct multi_pack_index *m, const char *idx_name)
+/* Match "foo.idx" against either "foo.pack" _or_ "foo.idx". */
+static int cmp_idx_or_pack_name(const char *idx_or_pack_name,
+ const char *idx_name)
+{
+ /* Skip past any initial matching prefix. */
+ while (*idx_name && *idx_name == *idx_or_pack_name) {
+ idx_name++;
+ idx_or_pack_name++;
+ }
+
+ /*
+ * If we didn't match completely, we may have matched "pack-1234." and
+ * be left with "idx" and "pack" respectively, which is also OK. We do
+ * not have to check for "idx" and "idx", because that would have been
+ * a complete match (and in that case these strcmps will be false, but
+ * we'll correctly return 0 from the final strcmp() below.
+ *
+ * Technically this matches "fooidx" and "foopack", but we'd never have
+ * such names in the first place.
+ */
+ if (!strcmp(idx_name, "idx") && !strcmp(idx_or_pack_name, "pack"))
+ return 0;
+
+ /*
+ * This not only checks for a complete match, but also orders based on
+ * the first non-identical character, which means our ordering will
+ * match a raw strcmp(). That makes it OK to use this to binary search
+ * a naively-sorted list.
+ */
+ return strcmp(idx_or_pack_name, idx_name);
+}
+
+int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name)
{
uint32_t first = 0, last = m->num_packs;
@@ -317,7 +370,7 @@
int cmp;
current = m->pack_names[mid];
- cmp = strcmp(idx_name, current);
+ cmp = cmp_idx_or_pack_name(idx_or_pack_name, current);
if (!cmp)
return 1;
if (cmp > 0) {
@@ -377,13 +430,24 @@
return MIDX_HEADER_SIZE;
}
+struct pack_info {
+ uint32_t orig_pack_int_id;
+ char *pack_name;
+ struct packed_git *p;
+ unsigned expired : 1;
+};
+
+static int pack_info_compare(const void *_a, const void *_b)
+{
+ struct pack_info *a = (struct pack_info *)_a;
+ struct pack_info *b = (struct pack_info *)_b;
+ return strcmp(a->pack_name, b->pack_name);
+}
+
struct pack_list {
- struct packed_git **list;
- char **names;
+ struct pack_info *info;
uint32_t nr;
- uint32_t alloc_list;
- uint32_t alloc_names;
- size_t pack_name_concat_len;
+ uint32_t alloc;
struct multi_pack_index *m;
};
@@ -396,67 +460,33 @@
if (packs->m && midx_contains_pack(packs->m, file_name))
return;
- ALLOC_GROW(packs->list, packs->nr + 1, packs->alloc_list);
- ALLOC_GROW(packs->names, packs->nr + 1, packs->alloc_names);
+ ALLOC_GROW(packs->info, packs->nr + 1, packs->alloc);
- packs->list[packs->nr] = add_packed_git(full_path,
- full_path_len,
- 0);
+ packs->info[packs->nr].p = add_packed_git(full_path,
+ full_path_len,
+ 0);
- if (!packs->list[packs->nr]) {
+ if (!packs->info[packs->nr].p) {
warning(_("failed to add packfile '%s'"),
full_path);
return;
}
- if (open_pack_index(packs->list[packs->nr])) {
+ if (open_pack_index(packs->info[packs->nr].p)) {
warning(_("failed to open pack-index '%s'"),
full_path);
- close_pack(packs->list[packs->nr]);
- FREE_AND_NULL(packs->list[packs->nr]);
+ close_pack(packs->info[packs->nr].p);
+ FREE_AND_NULL(packs->info[packs->nr].p);
return;
}
- packs->names[packs->nr] = xstrdup(file_name);
- packs->pack_name_concat_len += strlen(file_name) + 1;
+ packs->info[packs->nr].pack_name = xstrdup(file_name);
+ packs->info[packs->nr].orig_pack_int_id = packs->nr;
+ packs->info[packs->nr].expired = 0;
packs->nr++;
}
}
-struct pack_pair {
- uint32_t pack_int_id;
- char *pack_name;
-};
-
-static int pack_pair_compare(const void *_a, const void *_b)
-{
- struct pack_pair *a = (struct pack_pair *)_a;
- struct pack_pair *b = (struct pack_pair *)_b;
- return strcmp(a->pack_name, b->pack_name);
-}
-
-static void sort_packs_by_name(char **pack_names, uint32_t nr_packs, uint32_t *perm)
-{
- uint32_t i;
- struct pack_pair *pairs;
-
- ALLOC_ARRAY(pairs, nr_packs);
-
- for (i = 0; i < nr_packs; i++) {
- pairs[i].pack_int_id = i;
- pairs[i].pack_name = pack_names[i];
- }
-
- QSORT(pairs, nr_packs, pack_pair_compare);
-
- for (i = 0; i < nr_packs; i++) {
- pack_names[i] = pairs[i].pack_name;
- perm[pairs[i].pack_int_id] = i;
- }
-
- free(pairs);
-}
-
struct pack_midx_entry {
struct object_id oid;
uint32_t pack_int_id;
@@ -482,7 +512,6 @@
}
static int nth_midxed_pack_midx_entry(struct multi_pack_index *m,
- uint32_t *pack_perm,
struct pack_midx_entry *e,
uint32_t pos)
{
@@ -490,7 +519,7 @@
return 1;
nth_midxed_object_oid(&e->oid, m, pos);
- e->pack_int_id = pack_perm[nth_midxed_pack_int_id(m, pos)];
+ e->pack_int_id = nth_midxed_pack_int_id(m, pos);
e->offset = nth_midxed_offset(m, pos);
/* consider objects in midx to be from "old" packs */
@@ -524,8 +553,7 @@
* of a packfile containing the object).
*/
static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
- struct packed_git **p,
- uint32_t *perm,
+ struct pack_info *info,
uint32_t nr_packs,
uint32_t *nr_objects)
{
@@ -536,7 +564,7 @@
uint32_t start_pack = m ? m->num_packs : 0;
for (cur_pack = start_pack; cur_pack < nr_packs; cur_pack++)
- total_objects += p[cur_pack]->num_objects;
+ total_objects += info[cur_pack].p->num_objects;
/*
* As we de-duplicate by fanout value, we expect the fanout
@@ -561,7 +589,7 @@
for (cur_object = start; cur_object < end; cur_object++) {
ALLOC_GROW(entries_by_fanout, nr_fanout + 1, alloc_fanout);
- nth_midxed_pack_midx_entry(m, perm,
+ nth_midxed_pack_midx_entry(m,
&entries_by_fanout[nr_fanout],
cur_object);
nr_fanout++;
@@ -572,12 +600,12 @@
uint32_t start = 0, end;
if (cur_fanout)
- start = get_pack_fanout(p[cur_pack], cur_fanout - 1);
- end = get_pack_fanout(p[cur_pack], cur_fanout);
+ start = get_pack_fanout(info[cur_pack].p, cur_fanout - 1);
+ end = get_pack_fanout(info[cur_pack].p, cur_fanout);
for (cur_object = start; cur_object < end; cur_object++) {
ALLOC_GROW(entries_by_fanout, nr_fanout + 1, alloc_fanout);
- fill_pack_entry(perm[cur_pack], p[cur_pack], cur_object, &entries_by_fanout[nr_fanout]);
+ fill_pack_entry(cur_pack, info[cur_pack].p, cur_object, &entries_by_fanout[nr_fanout]);
nr_fanout++;
}
}
@@ -606,7 +634,7 @@
}
static size_t write_midx_pack_names(struct hashfile *f,
- char **pack_names,
+ struct pack_info *info,
uint32_t num_packs)
{
uint32_t i;
@@ -614,14 +642,18 @@
size_t written = 0;
for (i = 0; i < num_packs; i++) {
- size_t writelen = strlen(pack_names[i]) + 1;
+ size_t writelen;
- if (i && strcmp(pack_names[i], pack_names[i - 1]) <= 0)
+ if (info[i].expired)
+ continue;
+
+ if (i && strcmp(info[i].pack_name, info[i - 1].pack_name) <= 0)
BUG("incorrect pack-file order: %s before %s",
- pack_names[i - 1],
- pack_names[i]);
+ info[i - 1].pack_name,
+ info[i].pack_name);
- hashwrite(f, pack_names[i], writelen);
+ writelen = strlen(info[i].pack_name) + 1;
+ hashwrite(f, info[i].pack_name, writelen);
written += writelen;
}
@@ -692,6 +724,7 @@
}
static size_t write_midx_object_offsets(struct hashfile *f, int large_offset_needed,
+ uint32_t *perm,
struct pack_midx_entry *objects, uint32_t nr_objects)
{
struct pack_midx_entry *list = objects;
@@ -701,7 +734,12 @@
for (i = 0; i < nr_objects; i++) {
struct pack_midx_entry *obj = list++;
- hashwrite_be32(f, obj->pack_int_id);
+ if (perm[obj->pack_int_id] == PACK_EXPIRED)
+ BUG("object %s is in an expired pack with int-id %d",
+ oid_to_hex(&obj->oid),
+ obj->pack_int_id);
+
+ hashwrite_be32(f, perm[obj->pack_int_id]);
if (large_offset_needed && obj->offset >> 31)
hashwrite_be32(f, MIDX_LARGE_OFFSET_NEEDED | nr_large_offset++);
@@ -747,7 +785,8 @@
return written;
}
-int write_midx_file(const char *object_dir)
+static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
+ struct string_list *packs_to_drop)
{
unsigned char cur_chunk, num_chunks = 0;
char *midx_name;
@@ -762,6 +801,9 @@
uint32_t nr_entries, num_large_offsets = 0;
struct pack_midx_entry *entries = NULL;
int large_offsets_needed = 0;
+ int pack_name_concat_len = 0;
+ int dropped_packs = 0;
+ int result = 0;
midx_name = get_midx_filename(object_dir);
if (safe_create_leading_directories(midx_name)) {
@@ -770,42 +812,34 @@
midx_name);
}
- packs.m = load_multi_pack_index(object_dir, 1);
+ if (m)
+ packs.m = m;
+ else
+ packs.m = load_multi_pack_index(object_dir, 1);
packs.nr = 0;
- packs.alloc_list = packs.m ? packs.m->num_packs : 16;
- packs.alloc_names = packs.alloc_list;
- packs.list = NULL;
- packs.names = NULL;
- packs.pack_name_concat_len = 0;
- ALLOC_ARRAY(packs.list, packs.alloc_list);
- ALLOC_ARRAY(packs.names, packs.alloc_names);
+ packs.alloc = packs.m ? packs.m->num_packs : 16;
+ packs.info = NULL;
+ ALLOC_ARRAY(packs.info, packs.alloc);
if (packs.m) {
for (i = 0; i < packs.m->num_packs; i++) {
- ALLOC_GROW(packs.list, packs.nr + 1, packs.alloc_list);
- ALLOC_GROW(packs.names, packs.nr + 1, packs.alloc_names);
+ ALLOC_GROW(packs.info, packs.nr + 1, packs.alloc);
- packs.list[packs.nr] = NULL;
- packs.names[packs.nr] = xstrdup(packs.m->pack_names[i]);
- packs.pack_name_concat_len += strlen(packs.names[packs.nr]) + 1;
+ packs.info[packs.nr].orig_pack_int_id = i;
+ packs.info[packs.nr].pack_name = xstrdup(packs.m->pack_names[i]);
+ packs.info[packs.nr].p = NULL;
+ packs.info[packs.nr].expired = 0;
packs.nr++;
}
}
for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
- if (packs.m && packs.nr == packs.m->num_packs)
+ if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
goto cleanup;
- if (packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
- packs.pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
- (packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
-
- ALLOC_ARRAY(pack_perm, packs.nr);
- sort_packs_by_name(packs.names, packs.nr, pack_perm);
-
- entries = get_sorted_entries(packs.m, packs.list, pack_perm, packs.nr, &nr_entries);
+ entries = get_sorted_entries(packs.m, packs.info, packs.nr, &nr_entries);
for (i = 0; i < nr_entries; i++) {
if (entries[i].offset > 0x7fffffff)
@@ -814,6 +848,61 @@
large_offsets_needed = 1;
}
+ QSORT(packs.info, packs.nr, pack_info_compare);
+
+ if (packs_to_drop && packs_to_drop->nr) {
+ int drop_index = 0;
+ int missing_drops = 0;
+
+ for (i = 0; i < packs.nr && drop_index < packs_to_drop->nr; i++) {
+ int cmp = strcmp(packs.info[i].pack_name,
+ packs_to_drop->items[drop_index].string);
+
+ if (!cmp) {
+ drop_index++;
+ packs.info[i].expired = 1;
+ } else if (cmp > 0) {
+ error(_("did not see pack-file %s to drop"),
+ packs_to_drop->items[drop_index].string);
+ drop_index++;
+ missing_drops++;
+ i--;
+ } else {
+ packs.info[i].expired = 0;
+ }
+ }
+
+ if (missing_drops) {
+ result = 1;
+ goto cleanup;
+ }
+ }
+
+ /*
+ * pack_perm stores a permutation between pack-int-ids from the
+ * previous multi-pack-index to the new one we are writing:
+ *
+ * pack_perm[old_id] = new_id
+ */
+ ALLOC_ARRAY(pack_perm, packs.nr);
+ for (i = 0; i < packs.nr; i++) {
+ if (packs.info[i].expired) {
+ dropped_packs++;
+ pack_perm[packs.info[i].orig_pack_int_id] = PACK_EXPIRED;
+ } else {
+ pack_perm[packs.info[i].orig_pack_int_id] = i - dropped_packs;
+ }
+ }
+
+ for (i = 0; i < packs.nr; i++) {
+ if (!packs.info[i].expired)
+ pack_name_concat_len += strlen(packs.info[i].pack_name) + 1;
+ }
+
+ if (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
+ pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
+ (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
+
hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
FREE_AND_NULL(midx_name);
@@ -824,14 +913,14 @@
cur_chunk = 0;
num_chunks = large_offsets_needed ? 5 : 4;
- written = write_midx_header(f, num_chunks, packs.nr);
+ written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
chunk_offsets[cur_chunk] = written + (num_chunks + 1) * MIDX_CHUNKLOOKUP_WIDTH;
cur_chunk++;
chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDFANOUT;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + packs.pack_name_concat_len;
+ chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + pack_name_concat_len;
cur_chunk++;
chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDLOOKUP;
@@ -879,7 +968,7 @@
switch (chunk_ids[i]) {
case MIDX_CHUNKID_PACKNAMES:
- written += write_midx_pack_names(f, packs.names, packs.nr);
+ written += write_midx_pack_names(f, packs.info, packs.nr);
break;
case MIDX_CHUNKID_OIDFANOUT:
@@ -891,7 +980,7 @@
break;
case MIDX_CHUNKID_OBJECTOFFSETS:
- written += write_midx_object_offsets(f, large_offsets_needed, entries, nr_entries);
+ written += write_midx_object_offsets(f, large_offsets_needed, pack_perm, entries, nr_entries);
break;
case MIDX_CHUNKID_LARGEOFFSETS:
@@ -914,19 +1003,23 @@
cleanup:
for (i = 0; i < packs.nr; i++) {
- if (packs.list[i]) {
- close_pack(packs.list[i]);
- free(packs.list[i]);
+ if (packs.info[i].p) {
+ close_pack(packs.info[i].p);
+ free(packs.info[i].p);
}
- free(packs.names[i]);
+ free(packs.info[i].pack_name);
}
- free(packs.list);
- free(packs.names);
+ free(packs.info);
free(entries);
free(pack_perm);
free(midx_name);
- return 0;
+ return result;
+}
+
+int write_midx_file(const char *object_dir)
+{
+ return write_midx_internal(object_dir, NULL, NULL);
}
void clear_midx_file(struct repository *r)
@@ -958,8 +1051,35 @@
va_end(ap);
}
-int verify_midx_file(const char *object_dir)
+struct pair_pos_vs_id
{
+ uint32_t pos;
+ uint32_t pack_int_id;
+};
+
+static int compare_pair_pos_vs_id(const void *_a, const void *_b)
+{
+ struct pair_pos_vs_id *a = (struct pair_pos_vs_id *)_a;
+ struct pair_pos_vs_id *b = (struct pair_pos_vs_id *)_b;
+
+ return b->pack_int_id - a->pack_int_id;
+}
+
+/*
+ * Limit calls to display_progress() for performance reasons.
+ * The interval here was arbitrarily chosen.
+ */
+#define SPARSE_PROGRESS_INTERVAL (1 << 12)
+#define midx_display_sparse_progress(progress, n) \
+ do { \
+ uint64_t _n = (n); \
+ if ((_n & (SPARSE_PROGRESS_INTERVAL - 1)) == 0) \
+ display_progress(progress, _n); \
+ } while (0)
+
+int verify_midx_file(struct repository *r, const char *object_dir)
+{
+ struct pair_pos_vs_id *pairs = NULL;
uint32_t i;
struct progress *progress;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
@@ -968,10 +1088,15 @@
if (!m)
return 0;
+ progress = start_progress(_("Looking for referenced packfiles"),
+ m->num_packs);
for (i = 0; i < m->num_packs; i++) {
- if (prepare_midx_pack(m, i))
+ if (prepare_midx_pack(r, m, i))
midx_report("failed to load pack in position %d", i);
+
+ display_progress(progress, i + 1);
}
+ stop_progress(&progress);
for (i = 0; i < 255; i++) {
uint32_t oid_fanout1 = ntohl(m->chunk_oid_fanout[i]);
@@ -982,6 +1107,8 @@
i, oid_fanout1, oid_fanout2, i + 1);
}
+ progress = start_sparse_progress(_("Verifying OID order in MIDX"),
+ m->num_objects - 1);
for (i = 0; i < m->num_objects - 1; i++) {
struct object_id oid1, oid2;
@@ -991,18 +1118,47 @@
if (oidcmp(&oid1, &oid2) >= 0)
midx_report(_("oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"),
i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1);
+
+ midx_display_sparse_progress(progress, i + 1);
+ }
+ stop_progress(&progress);
+
+ /*
+ * Create an array mapping each object to its packfile id. Sort it
+ * to group the objects by packfile. Use this permutation to visit
+ * each of the objects and only require 1 packfile to be open at a
+ * time.
+ */
+ ALLOC_ARRAY(pairs, m->num_objects);
+ for (i = 0; i < m->num_objects; i++) {
+ pairs[i].pos = i;
+ pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i);
}
- progress = start_progress(_("Verifying object offsets"), m->num_objects);
+ progress = start_sparse_progress(_("Sorting objects by packfile"),
+ m->num_objects);
+ display_progress(progress, 0); /* TODO: Measure QSORT() progress */
+ QSORT(pairs, m->num_objects, compare_pair_pos_vs_id);
+ stop_progress(&progress);
+
+ progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
for (i = 0; i < m->num_objects; i++) {
struct object_id oid;
struct pack_entry e;
off_t m_offset, p_offset;
- nth_midxed_object_oid(&oid, m, i);
- if (!fill_midx_entry(&oid, &e, m)) {
+ if (i > 0 && pairs[i-1].pack_int_id != pairs[i].pack_int_id &&
+ m->packs[pairs[i-1].pack_int_id])
+ {
+ close_pack_fd(m->packs[pairs[i-1].pack_int_id]);
+ close_pack_index(m->packs[pairs[i-1].pack_int_id]);
+ }
+
+ nth_midxed_object_oid(&oid, m, pairs[i].pos);
+
+ if (!fill_midx_entry(r, &oid, &e, m)) {
midx_report(_("failed to load pack entry for oid[%d] = %s"),
- i, oid_to_hex(&oid));
+ pairs[i].pos, oid_to_hex(&oid));
continue;
}
@@ -1017,11 +1173,210 @@
if (m_offset != p_offset)
midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64),
- i, oid_to_hex(&oid), m_offset, p_offset);
+ pairs[i].pos, oid_to_hex(&oid), m_offset, p_offset);
- display_progress(progress, i + 1);
+ midx_display_sparse_progress(progress, i + 1);
}
stop_progress(&progress);
+ free(pairs);
+
return verify_midx_error;
}
+
+int expire_midx_packs(struct repository *r, const char *object_dir)
+{
+ uint32_t i, *count, result = 0;
+ struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
+ struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+
+ if (!m)
+ return 0;
+
+ count = xcalloc(m->num_packs, sizeof(uint32_t));
+ for (i = 0; i < m->num_objects; i++) {
+ int pack_int_id = nth_midxed_pack_int_id(m, i);
+ count[pack_int_id]++;
+ }
+
+ for (i = 0; i < m->num_packs; i++) {
+ char *pack_name;
+
+ if (count[i])
+ continue;
+
+ if (prepare_midx_pack(r, m, i))
+ continue;
+
+ if (m->packs[i]->pack_keep)
+ continue;
+
+ pack_name = xstrdup(m->packs[i]->pack_name);
+ close_pack(m->packs[i]);
+
+ string_list_insert(&packs_to_drop, m->pack_names[i]);
+ unlink_pack_path(pack_name, 0);
+ free(pack_name);
+ }
+
+ free(count);
+
+ if (packs_to_drop.nr)
+ result = write_midx_internal(object_dir, m, &packs_to_drop);
+
+ string_list_clear(&packs_to_drop, 0);
+ return result;
+}
+
+struct repack_info {
+ timestamp_t mtime;
+ uint32_t referenced_objects;
+ uint32_t pack_int_id;
+};
+
+static int compare_by_mtime(const void *a_, const void *b_)
+{
+ const struct repack_info *a, *b;
+
+ a = (const struct repack_info *)a_;
+ b = (const struct repack_info *)b_;
+
+ if (a->mtime < b->mtime)
+ return -1;
+ if (a->mtime > b->mtime)
+ return 1;
+ return 0;
+}
+
+static int fill_included_packs_all(struct multi_pack_index *m,
+ unsigned char *include_pack)
+{
+ uint32_t i;
+
+ for (i = 0; i < m->num_packs; i++)
+ include_pack[i] = 1;
+
+ return m->num_packs < 2;
+}
+
+static int fill_included_packs_batch(struct repository *r,
+ struct multi_pack_index *m,
+ unsigned char *include_pack,
+ size_t batch_size)
+{
+ uint32_t i, packs_to_repack;
+ size_t total_size;
+ struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info));
+
+ for (i = 0; i < m->num_packs; i++) {
+ pack_info[i].pack_int_id = i;
+
+ if (prepare_midx_pack(r, m, i))
+ continue;
+
+ pack_info[i].mtime = m->packs[i]->mtime;
+ }
+
+ for (i = 0; batch_size && i < m->num_objects; i++) {
+ uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
+ pack_info[pack_int_id].referenced_objects++;
+ }
+
+ QSORT(pack_info, m->num_packs, compare_by_mtime);
+
+ total_size = 0;
+ packs_to_repack = 0;
+ for (i = 0; total_size < batch_size && i < m->num_packs; i++) {
+ int pack_int_id = pack_info[i].pack_int_id;
+ struct packed_git *p = m->packs[pack_int_id];
+ size_t expected_size;
+
+ if (!p)
+ continue;
+ if (open_pack_index(p) || !p->num_objects)
+ continue;
+
+ expected_size = (size_t)(p->pack_size
+ * pack_info[i].referenced_objects);
+ expected_size /= p->num_objects;
+
+ if (expected_size >= batch_size)
+ continue;
+
+ packs_to_repack++;
+ total_size += expected_size;
+ include_pack[pack_int_id] = 1;
+ }
+
+ free(pack_info);
+
+ if (total_size < batch_size || packs_to_repack < 2)
+ return 1;
+
+ return 0;
+}
+
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
+{
+ int result = 0;
+ uint32_t i;
+ unsigned char *include_pack;
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct strbuf base_name = STRBUF_INIT;
+ struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+
+ if (!m)
+ return 0;
+
+ include_pack = xcalloc(m->num_packs, sizeof(unsigned char));
+
+ if (batch_size) {
+ if (fill_included_packs_batch(r, m, include_pack, batch_size))
+ goto cleanup;
+ } else if (fill_included_packs_all(m, include_pack))
+ goto cleanup;
+
+ argv_array_push(&cmd.args, "pack-objects");
+
+ strbuf_addstr(&base_name, object_dir);
+ strbuf_addstr(&base_name, "/pack/pack");
+ argv_array_push(&cmd.args, base_name.buf);
+ strbuf_release(&base_name);
+
+ cmd.git_cmd = 1;
+ cmd.in = cmd.out = -1;
+
+ if (start_command(&cmd)) {
+ error(_("could not start pack-objects"));
+ result = 1;
+ goto cleanup;
+ }
+
+ for (i = 0; i < m->num_objects; i++) {
+ struct object_id oid;
+ uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
+
+ if (!include_pack[pack_int_id])
+ continue;
+
+ nth_midxed_object_oid(&oid, m, i);
+ xwrite(cmd.in, oid_to_hex(&oid), the_hash_algo->hexsz);
+ xwrite(cmd.in, "\n", 1);
+ }
+ close(cmd.in);
+
+ if (finish_command(&cmd)) {
+ error(_("could not finish pack-objects"));
+ result = 1;
+ goto cleanup;
+ }
+
+ result = write_midx_internal(object_dir, m, NULL);
+ m = NULL;
+
+cleanup:
+ if (m)
+ close_midx(m);
+ free(include_pack);
+ return result;
+}
diff --git a/midx.h b/midx.h
index 774f652..f0ae656 100644
--- a/midx.h
+++ b/midx.h
@@ -5,6 +5,7 @@
struct object_id;
struct pack_entry;
+struct repository;
#define GIT_TEST_MULTI_PACK_INDEX "GIT_TEST_MULTI_PACK_INDEX"
@@ -37,18 +38,20 @@
};
struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
-int prepare_midx_pack(struct multi_pack_index *m, uint32_t pack_int_id);
+int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result);
struct object_id *nth_midxed_object_oid(struct object_id *oid,
struct multi_pack_index *m,
uint32_t n);
-int fill_midx_entry(const struct object_id *oid, struct pack_entry *e, struct multi_pack_index *m);
-int midx_contains_pack(struct multi_pack_index *m, const char *idx_name);
+int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e, struct multi_pack_index *m);
+int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
int write_midx_file(const char *object_dir);
void clear_midx_file(struct repository *r);
-int verify_midx_file(const char *object_dir);
+int verify_midx_file(struct repository *r, const char *object_dir);
+int expire_midx_packs(struct repository *r, const char *object_dir);
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size);
void close_midx(struct multi_pack_index *m);
diff --git a/name-hash.c b/name-hash.c
index b4861bc..6959086 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -345,8 +345,9 @@
else {
int begin = k_start;
int end = k_end;
+ assert(begin >= 0);
while (begin < end) {
- int mid = (begin + end) >> 1;
+ int mid = begin + ((end - begin) >> 1);
int cmp = strncmp(istate->cache[mid]->name, prefix->buf, prefix->len);
if (cmp == 0) /* mid has same prefix; look in second part */
begin = mid + 1;
diff --git a/notes-merge.c b/notes-merge.c
index 280aa8e..2fe724f 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -29,14 +29,14 @@
static int path_to_oid(const char *path, struct object_id *oid)
{
- char hex_oid[GIT_SHA1_HEXSZ];
+ char hex_oid[GIT_MAX_HEXSZ];
int i = 0;
- while (*path && i < GIT_SHA1_HEXSZ) {
+ while (*path && i < the_hash_algo->hexsz) {
if (*path != '/')
hex_oid[i++] = *path;
path++;
}
- if (*path || i != GIT_SHA1_HEXSZ)
+ if (*path || i != the_hash_algo->hexsz)
return -1;
return get_oid_hex(hex_oid, oid);
}
diff --git a/notes.c b/notes.c
index 7f7cc4d..03e7d0c 100644
--- a/notes.c
+++ b/notes.c
@@ -67,8 +67,9 @@
#define GET_NIBBLE(n, sha1) ((((sha1)[(n) >> 1]) >> ((~(n) & 0x01) << 2)) & 0x0f)
-#define KEY_INDEX (GIT_SHA1_RAWSZ - 1)
-#define FANOUT_PATH_SEPARATORS ((GIT_SHA1_HEXSZ / 2) - 1)
+#define KEY_INDEX (the_hash_algo->rawsz - 1)
+#define FANOUT_PATH_SEPARATORS (the_hash_algo->rawsz - 1)
+#define FANOUT_PATH_SEPARATORS_MAX ((GIT_MAX_HEXSZ / 2) - 1)
#define SUBTREE_SHA1_PREFIXCMP(key_sha1, subtree_sha1) \
(memcmp(key_sha1, subtree_sha1, subtree_sha1[KEY_INDEX]))
@@ -198,7 +199,7 @@
struct leaf_node *entry)
{
struct leaf_node *l;
- struct int_node *parent_stack[GIT_SHA1_RAWSZ];
+ struct int_node *parent_stack[GIT_MAX_RAWSZ];
unsigned char i, j;
void **p = note_tree_search(t, &tree, &n, entry->key_oid.hash);
@@ -268,8 +269,10 @@
case PTR_TYPE_NOTE:
if (oideq(&l->key_oid, &entry->key_oid)) {
/* skip concatenation if l == entry */
- if (oideq(&l->val_oid, &entry->val_oid))
+ if (oideq(&l->val_oid, &entry->val_oid)) {
+ free(entry);
return 0;
+ }
ret = combine_notes(&l->val_oid,
&entry->val_oid);
@@ -394,14 +397,15 @@
void *buf;
struct tree_desc desc;
struct name_entry entry;
+ const unsigned hashsz = the_hash_algo->rawsz;
- buf = fill_tree_descriptor(&desc, &subtree->val_oid);
+ buf = fill_tree_descriptor(the_repository, &desc, &subtree->val_oid);
if (!buf)
die("Could not read %s for notes-index",
oid_to_hex(&subtree->val_oid));
prefix_len = subtree->key_oid.hash[KEY_INDEX];
- if (prefix_len >= GIT_SHA1_RAWSZ)
+ if (prefix_len >= hashsz)
BUG("prefix_len (%"PRIuMAX") is out of range", (uintmax_t)prefix_len);
if (prefix_len * 2 < n)
BUG("prefix_len (%"PRIuMAX") is too small", (uintmax_t)prefix_len);
@@ -411,7 +415,7 @@
struct leaf_node *l;
size_t path_len = strlen(entry.path);
- if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) {
+ if (path_len == 2 * (hashsz - prefix_len)) {
/* This is potentially the remainder of the SHA-1 */
if (!S_ISREG(entry.mode))
@@ -419,7 +423,7 @@
goto handle_non_note;
if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
- GIT_SHA1_RAWSZ - prefix_len))
+ hashsz - prefix_len))
goto handle_non_note; /* entry.path is not a SHA1 */
type = PTR_TYPE_NOTE;
@@ -439,7 +443,7 @@
* except for the last byte, where we write
* the length:
*/
- memset(object_oid.hash + len, 0, GIT_SHA1_RAWSZ - len - 1);
+ memset(object_oid.hash + len, 0, hashsz - len - 1);
object_oid.hash[KEY_INDEX] = (unsigned char)len;
type = PTR_TYPE_SUBTREE;
@@ -456,7 +460,7 @@
die("Failed to load %s %s into notes tree "
"from %s",
type == PTR_TYPE_NOTE ? "note" : "subtree",
- oid_to_hex(&l->key_oid), t->ref);
+ oid_to_hex(&object_oid), t->ref);
continue;
@@ -527,22 +531,22 @@
return fanout + 1;
}
-/* hex SHA1 + 19 * '/' + NUL */
-#define FANOUT_PATH_MAX GIT_SHA1_HEXSZ + FANOUT_PATH_SEPARATORS + 1
+/* hex oid + '/' between each pair of hex digits + NUL */
+#define FANOUT_PATH_MAX GIT_MAX_HEXSZ + FANOUT_PATH_SEPARATORS_MAX + 1
-static void construct_path_with_fanout(const unsigned char *sha1,
+static void construct_path_with_fanout(const unsigned char *hash,
unsigned char fanout, char *path)
{
unsigned int i = 0, j = 0;
- const char *hex_sha1 = sha1_to_hex(sha1);
- assert(fanout < GIT_SHA1_RAWSZ);
+ const char *hex_hash = hash_to_hex(hash);
+ assert(fanout < the_hash_algo->rawsz);
while (fanout) {
- path[i++] = hex_sha1[j++];
- path[i++] = hex_sha1[j++];
+ path[i++] = hex_hash[j++];
+ path[i++] = hex_hash[j++];
path[i++] = '/';
fanout--;
}
- xsnprintf(path + i, FANOUT_PATH_MAX - i, "%s", hex_sha1 + j);
+ xsnprintf(path + i, FANOUT_PATH_MAX - i, "%s", hex_hash + j);
}
static int for_each_note_helper(struct notes_tree *t, struct int_node *tree,
@@ -637,10 +641,10 @@
static void write_tree_entry(struct strbuf *buf, unsigned int mode,
const char *path, unsigned int path_len, const
- unsigned char *sha1)
+ unsigned char *hash)
{
strbuf_addf(buf, "%o %.*s%c", mode, path_len, path, '\0');
- strbuf_add(buf, sha1, GIT_SHA1_RAWSZ);
+ strbuf_add(buf, hash, the_hash_algo->rawsz);
}
static void tree_write_stack_init_subtree(struct tree_write_stack *tws,
@@ -652,7 +656,7 @@
n = (struct tree_write_stack *)
xmalloc(sizeof(struct tree_write_stack));
n->next = NULL;
- strbuf_init(&n->buf, 256 * (32 + GIT_SHA1_HEXSZ)); /* assume 256 entries per tree */
+ strbuf_init(&n->buf, 256 * (32 + the_hash_algo->hexsz)); /* assume 256 entries per tree */
n->path[0] = n->path[1] = '\0';
tws->next = n;
tws->path[0] = path[0];
@@ -757,7 +761,7 @@
note_path[note_path_len] = '\0';
mode = 040000;
}
- assert(note_path_len <= GIT_SHA1_HEXSZ + FANOUT_PATH_SEPARATORS);
+ assert(note_path_len <= GIT_MAX_HEXSZ + FANOUT_PATH_SEPARATORS);
/* Weave non-note entries into note entries */
return write_each_non_note_until(note_path, d) ||
@@ -986,7 +990,7 @@
combine_notes_fn combine_notes, int flags)
{
struct object_id oid, object_oid;
- unsigned mode;
+ unsigned short mode;
struct leaf_node root_tree;
if (!t)
@@ -1013,7 +1017,7 @@
return;
if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
die("Cannot use notes ref %s", notes_ref);
- if (get_tree_entry(&object_oid, "", &oid, &mode))
+ if (get_tree_entry(the_repository, &object_oid, "", &oid, &mode))
die("Failed to read notes tree referenced by %s (%s)",
notes_ref, oid_to_hex(&object_oid));
@@ -1137,7 +1141,7 @@
/* Prepare for traversal of current notes tree */
root.next = NULL; /* last forward entry in list is grounded */
- strbuf_init(&root.buf, 256 * (32 + GIT_SHA1_HEXSZ)); /* assume 256 entries */
+ strbuf_init(&root.buf, 256 * (32 + the_hash_algo->hexsz)); /* assume 256 entries */
root.path[0] = root.path[1] = '\0';
cb_data.root = &root;
cb_data.next_non_note = t->first_non_note;
@@ -1165,7 +1169,7 @@
while (l) {
if (flags & NOTES_PRUNE_VERBOSE)
- printf("%s\n", sha1_to_hex(l->sha1));
+ printf("%s\n", hash_to_hex(l->sha1));
if (!(flags & NOTES_PRUNE_DRYRUN))
remove_note(t, l->sha1);
l = l->next;
diff --git a/notes.h b/notes.h
index 414bc68..76337f2 100644
--- a/notes.h
+++ b/notes.h
@@ -276,12 +276,10 @@
/*
* Append notes for the given 'object_sha1' from all trees set up by
- * init_display_notes() to 'sb'. The 'flags' are a bitwise
- * combination of
+ * init_display_notes() to 'sb'.
*
- * - NOTES_SHOW_HEADER: add a 'Notes (refname):' header
- *
- * - NOTES_INDENT: indent the notes by 4 places
+ * If 'raw' is false the note will be indented by 4 places and
+ * a 'Notes (refname):' header added.
*
* You *must* call init_display_notes() before using this function.
*/
diff --git a/object-store.h b/object-store.h
index 14fc935..7f7b3cd 100644
--- a/object-store.h
+++ b/object-store.h
@@ -33,6 +33,8 @@
char *compute_alternate_path(const char *path, struct strbuf *err);
typedef int alt_odb_fn(struct object_directory *, void *);
int foreach_alt_odb(alt_odb_fn, void*);
+typedef void alternate_ref_fn(const struct object_id *oid, void *);
+void for_each_alternate_ref(alternate_ref_fn, void *);
/*
* Add the directory to the on-disk alternates file; the new entry will also
@@ -76,8 +78,9 @@
pack_keep_in_core:1,
freshened:1,
do_not_close:1,
- pack_promisor:1;
- unsigned char sha1[20];
+ pack_promisor:1,
+ multi_pack_index:1;
+ unsigned char hash[GIT_MAX_RAWSZ];
struct revindex_entry *revindex;
/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
@@ -129,12 +132,6 @@
struct list_head packed_git_mru;
/*
- * A linked list containing all packfiles, starting with those
- * contained in the multi_pack_index.
- */
- struct packed_git *all_packs;
-
- /*
* A fast, rough count of the number of objects in the repository.
* These two fields are not meant for direct access. Use
* approximate_object_count() instead.
@@ -162,10 +159,10 @@
void *map_loose_object(struct repository *r, const struct object_id *oid,
unsigned long *size);
-extern void *read_object_file_extended(struct repository *r,
- const struct object_id *oid,
- enum object_type *type,
- unsigned long *size, int lookup_replace);
+void *read_object_file_extended(struct repository *r,
+ const struct object_id *oid,
+ enum object_type *type,
+ unsigned long *size, int lookup_replace);
static inline void *repo_read_object_file(struct repository *r,
const struct object_id *oid,
enum object_type *type,
@@ -180,20 +177,20 @@
/* Read and unpack an object file into memory, write memory to an object file */
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
-extern int hash_object_file(const void *buf, unsigned long len,
- const char *type, struct object_id *oid);
+int hash_object_file(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid);
-extern int write_object_file(const void *buf, unsigned long len,
- const char *type, struct object_id *oid);
+int write_object_file(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid);
-extern int hash_object_file_literally(const void *buf, unsigned long len,
- const char *type, struct object_id *oid,
- unsigned flags);
+int hash_object_file_literally(const void *buf, unsigned long len,
+ const char *type, struct object_id *oid,
+ unsigned flags);
-extern int pretend_object_file(void *, unsigned long, enum object_type,
- struct object_id *oid);
+int pretend_object_file(void *, unsigned long, enum object_type,
+ struct object_id *oid);
-extern int force_object_loose(const struct object_id *oid, time_t mtime);
+int force_object_loose(const struct object_id *oid, time_t mtime);
/*
* Open the loose object at path, check its hash, and return the contents,
@@ -227,9 +224,9 @@
* with the specified name. This function does not respect replace
* references.
*/
-extern int has_loose_object_nonlocal(const struct object_id *);
+int has_loose_object_nonlocal(const struct object_id *);
-extern void assert_oid_type(const struct object_id *oid, enum object_type expect);
+void assert_oid_type(const struct object_id *oid, enum object_type expect);
struct object_info {
/* Request */
@@ -280,6 +277,16 @@
#define OBJECT_INFO_QUICK 8
/* Do not check loose object */
#define OBJECT_INFO_IGNORE_LOOSE 16
+/*
+ * Do not attempt to fetch the object if missing (even if fetch_is_missing is
+ * nonzero).
+ */
+#define OBJECT_INFO_SKIP_FETCH_OBJECT 32
+/*
+ * This is meant for bulk prefetching of missing blobs in a partial
+ * clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK
+ */
+#define OBJECT_INFO_FOR_PREFETCH (OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK)
int oid_object_info_extended(struct repository *r,
const struct object_id *,
diff --git a/object.c b/object.c
index 59ea24c..07bdd5b 100644
--- a/object.c
+++ b/object.c
@@ -59,9 +59,9 @@
* the specified sha1. n must be a power of 2. Please note that the
* return value is *not* consistent across computer architectures.
*/
-static unsigned int hash_obj(const unsigned char *sha1, unsigned int n)
+static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
{
- return sha1hash(sha1) & (n - 1);
+ return oidhash(oid) & (n - 1);
}
/*
@@ -71,7 +71,7 @@
*/
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
- unsigned int j = hash_obj(obj->oid.hash, size);
+ unsigned int j = hash_obj(&obj->oid, size);
while (hash[j]) {
j++;
@@ -85,7 +85,7 @@
* Look up the record for the given sha1 in the hash map stored in
* obj_hash. Return NULL if it was not found.
*/
-struct object *lookup_object(struct repository *r, const unsigned char *sha1)
+struct object *lookup_object(struct repository *r, const struct object_id *oid)
{
unsigned int i, first;
struct object *obj;
@@ -93,9 +93,9 @@
if (!r->parsed_objects->obj_hash)
return NULL;
- first = i = hash_obj(sha1, r->parsed_objects->obj_hash_size);
+ first = i = hash_obj(oid, r->parsed_objects->obj_hash_size);
while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {
- if (hasheq(sha1, obj->oid.hash))
+ if (oideq(oid, &obj->oid))
break;
i++;
if (i == r->parsed_objects->obj_hash_size)
@@ -141,13 +141,13 @@
r->parsed_objects->obj_hash_size = new_hash_size;
}
-void *create_object(struct repository *r, const unsigned char *sha1, void *o)
+void *create_object(struct repository *r, const struct object_id *oid, void *o)
{
struct object *obj = o;
obj->parsed = 0;
obj->flags = 0;
- hashcpy(obj->oid.hash, sha1);
+ oidcpy(&obj->oid, oid);
if (r->parsed_objects->obj_hash_size - 1 <= r->parsed_objects->nr_objs * 2)
grow_object_hash(r);
@@ -178,11 +178,11 @@
}
}
-struct object *lookup_unknown_object(const unsigned char *sha1)
+struct object *lookup_unknown_object(const struct object_id *oid)
{
- struct object *obj = lookup_object(the_repository, sha1);
+ struct object *obj = lookup_object(the_repository, oid);
if (!obj)
- obj = create_object(the_repository, sha1,
+ obj = create_object(the_repository, oid,
alloc_object_node(the_repository));
return obj;
}
@@ -256,7 +256,7 @@
void *buffer;
struct object *obj;
- obj = lookup_object(r, oid->hash);
+ obj = lookup_object(r, oid);
if (obj && obj->parsed)
return obj;
@@ -268,7 +268,7 @@
return NULL;
}
parse_blob_buffer(lookup_blob(r, oid), NULL, 0);
- return lookup_object(r, oid->hash);
+ return lookup_object(r, oid);
}
buffer = repo_read_object_file(r, oid, &type, &size);
@@ -517,7 +517,7 @@
o->loaded_alternates = 0;
INIT_LIST_HEAD(&o->packed_git_mru);
- close_all_packs(o);
+ close_object_store(o);
o->packed_git = NULL;
}
@@ -557,9 +557,11 @@
clear_alloc_state(o->commit_state);
clear_alloc_state(o->tag_state);
clear_alloc_state(o->object_state);
+ stat_validity_clear(o->shallow_stat);
FREE_AND_NULL(o->blob_state);
FREE_AND_NULL(o->tree_state);
FREE_AND_NULL(o->commit_state);
FREE_AND_NULL(o->tag_state);
FREE_AND_NULL(o->object_state);
+ FREE_AND_NULL(o->shallow_stat);
}
diff --git a/object.h b/object.h
index 796792c..0120892 100644
--- a/object.h
+++ b/object.h
@@ -90,19 +90,19 @@
struct object_id oid;
};
-extern const char *type_name(unsigned int type);
-extern int type_from_string_gently(const char *str, ssize_t, int gentle);
+const char *type_name(unsigned int type);
+int type_from_string_gently(const char *str, ssize_t, int gentle);
#define type_from_string(str) type_from_string_gently(str, -1, 0)
/*
* Return the current number of buckets in the object hashmap.
*/
-extern unsigned int get_max_object_index(void);
+unsigned int get_max_object_index(void);
/*
* Return the object from the specified bucket in the object hashmap.
*/
-extern struct object *get_indexed_object(unsigned int);
+struct object *get_indexed_object(unsigned int);
/*
* This can be used to see if we have heard of the object before, but
@@ -116,9 +116,9 @@
* half-initialised objects, the caller is expected to initialize them
* by calling parse_object() on them.
*/
-struct object *lookup_object(struct repository *r, const unsigned char *sha1);
+struct object *lookup_object(struct repository *r, const struct object_id *oid);
-extern void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
+void *create_object(struct repository *r, const struct object_id *oid, void *obj);
void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
@@ -143,7 +143,7 @@
struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
/** Returns the object, with potentially excess memory allocated. **/
-struct object *lookup_unknown_object(const unsigned char *sha1);
+struct object *lookup_unknown_object(const struct object_id *oid);
struct object_list *object_list_insert(struct object *item,
struct object_list **list_p);
@@ -189,6 +189,6 @@
/*
* Clear the specified object flags from all in-core commit objects.
*/
-extern void clear_commit_marks_all(unsigned int flags);
+void clear_commit_marks_all(unsigned int flags);
#endif /* OBJECT_H */
diff --git a/oidmap.c b/oidmap.c
index b0841a0..6d6e840 100644
--- a/oidmap.c
+++ b/oidmap.c
@@ -12,13 +12,6 @@
&((const struct oidmap_entry *) entry_or_key)->oid);
}
-static int hash(const struct object_id *oid)
-{
- int hash;
- memcpy(&hash, oid->hash, sizeof(hash));
- return hash;
-}
-
void oidmap_init(struct oidmap *map, size_t initial_size)
{
hashmap_init(&map->map, oidmap_neq, NULL, initial_size);
@@ -36,7 +29,7 @@
if (!map->map.cmpfn)
return NULL;
- return hashmap_get_from_hash(&map->map, hash(key), key);
+ return hashmap_get_from_hash(&map->map, oidhash(key), key);
}
void *oidmap_remove(struct oidmap *map, const struct object_id *key)
@@ -46,7 +39,7 @@
if (!map->map.cmpfn)
oidmap_init(map, 0);
- hashmap_entry_init(&entry, hash(key));
+ hashmap_entry_init(&entry, oidhash(key));
return hashmap_remove(&map->map, &entry, key);
}
@@ -57,6 +50,6 @@
if (!map->map.cmpfn)
oidmap_init(map, 0);
- hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
+ hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
return hashmap_put(&map->map, to_put);
}
diff --git a/oidmap.h b/oidmap.h
index 72430b6..7a93946 100644
--- a/oidmap.h
+++ b/oidmap.h
@@ -33,7 +33,7 @@
* parameter may be used to preallocate a sufficiently large table and thus
* prevent expensive resizing. If 0, the table is dynamically resized.
*/
-extern void oidmap_init(struct oidmap *map, size_t initial_size);
+void oidmap_init(struct oidmap *map, size_t initial_size);
/*
* Frees an oidmap structure and allocated memory.
@@ -41,13 +41,13 @@
* If `free_entries` is true, each oidmap_entry in the map is freed as well
* using stdlibs free().
*/
-extern void oidmap_free(struct oidmap *map, int free_entries);
+void oidmap_free(struct oidmap *map, int free_entries);
/*
* Returns the oidmap entry for the specified oid, or NULL if not found.
*/
-extern void *oidmap_get(const struct oidmap *map,
- const struct object_id *key);
+void *oidmap_get(const struct oidmap *map,
+ const struct object_id *key);
/*
* Adds or replaces an oidmap entry.
@@ -57,14 +57,14 @@
*
* Returns the replaced entry, or NULL if not found (i.e. the entry was added).
*/
-extern void *oidmap_put(struct oidmap *map, void *entry);
+void *oidmap_put(struct oidmap *map, void *entry);
/*
* Removes an oidmap entry matching the specified oid.
*
* Returns the removed entry, or NULL if not found.
*/
-extern void *oidmap_remove(struct oidmap *map, const struct object_id *key);
+void *oidmap_remove(struct oidmap *map, const struct object_id *key);
struct oidmap_iter {
diff --git a/oidset.c b/oidset.c
index fe4eb92..f63ce81 100644
--- a/oidset.c
+++ b/oidset.c
@@ -5,33 +5,68 @@
{
memset(&set->set, 0, sizeof(set->set));
if (initial_size)
- kh_resize_oid(&set->set, initial_size);
+ kh_resize_oid_set(&set->set, initial_size);
}
int oidset_contains(const struct oidset *set, const struct object_id *oid)
{
- khiter_t pos = kh_get_oid(&set->set, *oid);
+ khiter_t pos = kh_get_oid_set(&set->set, *oid);
return pos != kh_end(&set->set);
}
int oidset_insert(struct oidset *set, const struct object_id *oid)
{
int added;
- kh_put_oid(&set->set, *oid, &added);
+ kh_put_oid_set(&set->set, *oid, &added);
return !added;
}
int oidset_remove(struct oidset *set, const struct object_id *oid)
{
- khiter_t pos = kh_get_oid(&set->set, *oid);
+ khiter_t pos = kh_get_oid_set(&set->set, *oid);
if (pos == kh_end(&set->set))
return 0;
- kh_del_oid(&set->set, pos);
+ kh_del_oid_set(&set->set, pos);
return 1;
}
void oidset_clear(struct oidset *set)
{
- kh_release_oid(&set->set);
+ kh_release_oid_set(&set->set);
oidset_init(set, 0);
}
+
+void oidset_parse_file(struct oidset *set, const char *path)
+{
+ FILE *fp;
+ struct strbuf sb = STRBUF_INIT;
+ struct object_id oid;
+
+ fp = fopen(path, "r");
+ if (!fp)
+ die("could not open object name list: %s", path);
+ while (!strbuf_getline(&sb, fp)) {
+ const char *p;
+ const char *name;
+
+ /*
+ * Allow trailing comments, leading whitespace
+ * (including before commits), and empty or whitespace
+ * only lines.
+ */
+ name = strchr(sb.buf, '#');
+ if (name)
+ strbuf_setlen(&sb, name - sb.buf);
+ strbuf_trim(&sb);
+ if (!sb.len)
+ continue;
+
+ if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
+ die("invalid object name: %s", sb.buf);
+ oidset_insert(set, &oid);
+ }
+ if (ferror(fp))
+ die_errno("Could not read '%s'", path);
+ fclose(fp);
+ strbuf_release(&sb);
+}
diff --git a/oidset.h b/oidset.h
index c9d0f6d..5346563 100644
--- a/oidset.h
+++ b/oidset.h
@@ -16,23 +16,11 @@
* table overhead.
*/
-static inline unsigned int oid_hash(struct object_id oid)
-{
- return sha1hash(oid.hash);
-}
-
-static inline int oid_equal(struct object_id a, struct object_id b)
-{
- return oideq(&a, &b);
-}
-
-KHASH_INIT(oid, struct object_id, int, 0, oid_hash, oid_equal)
-
/**
* A single oidset; should be zero-initialized (or use OIDSET_INIT).
*/
struct oidset {
- kh_oid_t set;
+ kh_oid_set_t set;
};
#define OIDSET_INIT { { 0 } }
@@ -73,8 +61,16 @@
*/
void oidset_clear(struct oidset *set);
+/**
+ * Add the contents of the file 'path' to an initialized oidset. Each line is
+ * an unabbreviated object name. Comments begin with '#', and trailing comments
+ * are allowed. Leading whitespace and empty or white-space only lines are
+ * ignored.
+ */
+void oidset_parse_file(struct oidset *set, const char *path);
+
struct oidset_iter {
- kh_oid_t *set;
+ kh_oid_set_t *set;
khiter_t iter;
};
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 5566e94..a7a4964 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -28,8 +28,8 @@
struct ewah_bitmap *blobs;
struct ewah_bitmap *tags;
- khash_sha1 *bitmaps;
- khash_sha1 *reused;
+ kh_oid_map_t *bitmaps;
+ kh_oid_map_t *reused;
struct packing_data *to_pack;
struct bitmapped_commit *selected;
@@ -142,13 +142,13 @@
seen_objects_nr = 0;
}
-static uint32_t find_object_pos(const unsigned char *sha1)
+static uint32_t find_object_pos(const struct object_id *oid)
{
- struct object_entry *entry = packlist_find(writer.to_pack, sha1, NULL);
+ struct object_entry *entry = packlist_find(writer.to_pack, oid);
if (!entry) {
die("Failed to write bitmap index. Packfile doesn't have full closure "
- "(object %s is missing)", sha1_to_hex(sha1));
+ "(object %s is missing)", oid_to_hex(oid));
}
return oe_in_pack_pos(writer.to_pack, entry);
@@ -157,7 +157,7 @@
static void show_object(struct object *object, const char *name, void *data)
{
struct bitmap *base = data;
- bitmap_set(base, find_object_pos(object->oid.hash));
+ bitmap_set(base, find_object_pos(&object->oid));
mark_as_seen(object);
}
@@ -170,12 +170,12 @@
add_to_include_set(struct bitmap *base, struct commit *commit)
{
khiter_t hash_pos;
- uint32_t bitmap_pos = find_object_pos(commit->object.oid.hash);
+ uint32_t bitmap_pos = find_object_pos(&commit->object.oid);
if (bitmap_get(base, bitmap_pos))
return 0;
- hash_pos = kh_get_sha1(writer.bitmaps, commit->object.oid.hash);
+ hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);
if (hash_pos < kh_end(writer.bitmaps)) {
struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
bitmap_or_ewah(base, bc->bitmap);
@@ -256,7 +256,7 @@
struct bitmap *base = bitmap_new();
struct rev_info revs;
- writer.bitmaps = kh_init_sha1();
+ writer.bitmaps = kh_init_oid_map();
writer.to_pack = to_pack;
if (writer.show_progress)
@@ -311,7 +311,7 @@
if (i >= reuse_after)
stored->flags |= BITMAP_FLAG_REUSE;
- hash_pos = kh_put_sha1(writer.bitmaps, object->oid.hash, &hash_ret);
+ hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);
if (hash_ret == 0)
die("Duplicate entry when writing index: %s",
oid_to_hex(&object->oid));
@@ -366,7 +366,7 @@
if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
return;
- writer.reused = kh_init_sha1();
+ writer.reused = kh_init_oid_map();
rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
writer.show_progress);
/*
@@ -375,14 +375,14 @@
*/
}
-static struct ewah_bitmap *find_reused_bitmap(const unsigned char *sha1)
+static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
{
khiter_t hash_pos;
if (!writer.reused)
return NULL;
- hash_pos = kh_get_sha1(writer.reused, sha1);
+ hash_pos = kh_get_oid_map(writer.reused, *oid);
if (hash_pos >= kh_end(writer.reused))
return NULL;
@@ -422,14 +422,14 @@
if (next == 0) {
chosen = indexed_commits[i];
- reused_bitmap = find_reused_bitmap(chosen->object.oid.hash);
+ reused_bitmap = find_reused_bitmap(&chosen->object.oid);
} else {
chosen = indexed_commits[i + next];
for (j = 0; j <= next; ++j) {
struct commit *cm = indexed_commits[i + j];
- reused_bitmap = find_reused_bitmap(cm->object.oid.hash);
+ reused_bitmap = find_reused_bitmap(&cm->object.oid);
if (reused_bitmap || (cm->object.flags & NEEDS_BITMAP) != 0) {
chosen = cm;
break;
@@ -535,7 +535,7 @@
header.entry_count = htonl(writer.selected_nr);
hashcpy(header.checksum, writer.pack_checksum);
- hashwrite(f, &header, sizeof(header));
+ hashwrite(f, &header, sizeof(header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz);
dump_bitmap(f, writer.commits);
dump_bitmap(f, writer.trees);
dump_bitmap(f, writer.blobs);
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 4695aaf..e07c798 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -18,7 +18,7 @@
* commit.
*/
struct stored_bitmap {
- unsigned char sha1[20];
+ struct object_id oid;
struct ewah_bitmap *root;
struct stored_bitmap *xor;
int flags;
@@ -60,8 +60,8 @@
struct ewah_bitmap *blobs;
struct ewah_bitmap *tags;
- /* Map from SHA1 -> `stored_bitmap` for all the bitmapped commits */
- khash_sha1 *bitmaps;
+ /* Map from object ID -> `stored_bitmap` for all the bitmapped commits */
+ kh_oid_map_t *bitmaps;
/* Number of bitmapped commits */
uint32_t entry_count;
@@ -80,7 +80,7 @@
struct object **objects;
uint32_t *hashes;
uint32_t count, alloc;
- khash_sha1_pos *positions;
+ kh_oid_pos_t *positions;
} ext_index;
/* Bitmap result of the last performed walk */
@@ -138,7 +138,7 @@
{
struct bitmap_disk_header *header = (void *)index->map;
- if (index->map_size < sizeof(*header) + 20)
+ if (index->map_size < sizeof(*header) + the_hash_algo->rawsz)
return error("Corrupted bitmap index (missing header data)");
if (memcmp(header->magic, BITMAP_IDX_SIGNATURE, sizeof(BITMAP_IDX_SIGNATURE)) != 0)
@@ -157,19 +157,19 @@
"(Git requires BITMAP_OPT_FULL_DAG)");
if (flags & BITMAP_OPT_HASH_CACHE) {
- unsigned char *end = index->map + index->map_size - 20;
+ unsigned char *end = index->map + index->map_size - the_hash_algo->rawsz;
index->hashes = ((uint32_t *)end) - index->pack->num_objects;
}
}
index->entry_count = ntohl(header->entry_count);
- index->map_pos += sizeof(*header);
+ index->map_pos += sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz;
return 0;
}
static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
struct ewah_bitmap *root,
- const unsigned char *sha1,
+ const unsigned char *hash,
struct stored_bitmap *xor_with,
int flags)
{
@@ -181,15 +181,15 @@
stored->root = root;
stored->xor = xor_with;
stored->flags = flags;
- hashcpy(stored->sha1, sha1);
+ oidread(&stored->oid, hash);
- hash_pos = kh_put_sha1(index->bitmaps, stored->sha1, &ret);
+ hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret);
/* a 0 return code means the insertion succeeded with no changes,
* because the SHA1 already existed on the map. this is bad, there
* shouldn't be duplicated commits in the index */
if (ret == 0) {
- error("Duplicate entry in bitmap index: %s", sha1_to_hex(sha1));
+ error("Duplicate entry in bitmap index: %s", hash_to_hex(hash));
return NULL;
}
@@ -306,9 +306,10 @@
{
assert(bitmap_git->map);
- bitmap_git->bitmaps = kh_init_sha1();
- bitmap_git->ext_index.positions = kh_init_sha1_pos();
- load_pack_revindex(bitmap_git->pack);
+ bitmap_git->bitmaps = kh_init_oid_map();
+ bitmap_git->ext_index.positions = kh_init_oid_pos();
+ if (load_pack_revindex(bitmap_git->pack))
+ goto failed;
if (!(bitmap_git->commits = read_bitmap_1(bitmap_git)) ||
!(bitmap_git->trees = read_bitmap_1(bitmap_git)) ||
@@ -362,10 +363,10 @@
};
static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
- khash_sha1_pos *positions = bitmap_git->ext_index.positions;
- khiter_t pos = kh_get_sha1_pos(positions, sha1);
+ kh_oid_pos_t *positions = bitmap_git->ext_index.positions;
+ khiter_t pos = kh_get_oid_pos(positions, *oid);
if (pos < kh_end(positions)) {
int bitmap_pos = kh_value(positions, pos);
@@ -376,9 +377,9 @@
}
static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
- off_t offset = find_pack_entry_one(sha1, bitmap_git->pack);
+ off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack);
if (!offset)
return -1;
@@ -386,10 +387,10 @@
}
static int bitmap_position(struct bitmap_index *bitmap_git,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
- int pos = bitmap_position_packfile(bitmap_git, sha1);
- return (pos >= 0) ? pos : bitmap_position_extended(bitmap_git, sha1);
+ int pos = bitmap_position_packfile(bitmap_git, oid);
+ return (pos >= 0) ? pos : bitmap_position_extended(bitmap_git, oid);
}
static int ext_index_add_object(struct bitmap_index *bitmap_git,
@@ -401,7 +402,7 @@
int hash_ret;
int bitmap_pos;
- hash_pos = kh_put_sha1_pos(eindex->positions, object->oid.hash, &hash_ret);
+ hash_pos = kh_put_oid_pos(eindex->positions, object->oid, &hash_ret);
if (hash_ret > 0) {
if (eindex->count >= eindex->alloc) {
eindex->alloc = (eindex->alloc + 16) * 3 / 2;
@@ -431,7 +432,7 @@
struct bitmap_show_data *data = data_;
int bitmap_pos;
- bitmap_pos = bitmap_position(data->bitmap_git, object->oid.hash);
+ bitmap_pos = bitmap_position(data->bitmap_git, &object->oid);
if (bitmap_pos < 0)
bitmap_pos = ext_index_add_object(data->bitmap_git, object,
@@ -446,7 +447,7 @@
static int add_to_include_set(struct bitmap_index *bitmap_git,
struct include_data *data,
- const unsigned char *sha1,
+ const struct object_id *oid,
int bitmap_pos)
{
khiter_t hash_pos;
@@ -457,7 +458,7 @@
if (bitmap_get(data->base, bitmap_pos))
return 0;
- hash_pos = kh_get_sha1(bitmap_git->bitmaps, sha1);
+ hash_pos = kh_get_oid_map(bitmap_git->bitmaps, *oid);
if (hash_pos < kh_end(bitmap_git->bitmaps)) {
struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, hash_pos);
bitmap_or_ewah(data->base, lookup_stored_bitmap(st));
@@ -473,13 +474,13 @@
struct include_data *data = _data;
int bitmap_pos;
- bitmap_pos = bitmap_position(data->bitmap_git, commit->object.oid.hash);
+ bitmap_pos = bitmap_position(data->bitmap_git, &commit->object.oid);
if (bitmap_pos < 0)
bitmap_pos = ext_index_add_object(data->bitmap_git,
(struct object *)commit,
NULL);
- if (!add_to_include_set(data->bitmap_git, data, commit->object.oid.hash,
+ if (!add_to_include_set(data->bitmap_git, data, &commit->object.oid,
bitmap_pos)) {
struct commit_list *parent = commit->parents;
@@ -517,7 +518,7 @@
roots = roots->next;
if (object->type == OBJ_COMMIT) {
- khiter_t pos = kh_get_sha1(bitmap_git->bitmaps, object->oid.hash);
+ khiter_t pos = kh_get_oid_map(bitmap_git->bitmaps, object->oid);
if (pos < kh_end(bitmap_git->bitmaps)) {
struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
@@ -559,7 +560,7 @@
int pos;
roots = roots->next;
- pos = bitmap_position(bitmap_git, object->oid.hash);
+ pos = bitmap_position(bitmap_git, &object->oid);
if (pos < 0 || base == NULL || !bitmap_get(base, pos)) {
object->flags &= ~UNINTERESTING;
@@ -708,9 +709,7 @@
else
object_list_insert(object, &wants);
- if (!tag->tagged)
- die("bad tag");
- object = parse_object_or_die(&tag->tagged->oid, NULL);
+ object = parse_object_or_die(get_tagged_oid(tag), NULL);
}
if (object->flags & UNINTERESTING)
@@ -805,7 +804,7 @@
fprintf(stderr, "Failed to reuse at %d (%016llx)\n",
reuse_objects, result->words[i]);
- fprintf(stderr, " %s\n", sha1_to_hex(sha1));
+ fprintf(stderr, " %s\n", hash_to_hex(sha1));
}
#endif
@@ -925,7 +924,7 @@
struct bitmap_test_data *tdata = data;
int bitmap_pos;
- bitmap_pos = bitmap_position(tdata->bitmap_git, object->oid.hash);
+ bitmap_pos = bitmap_position(tdata->bitmap_git, &object->oid);
if (bitmap_pos < 0)
die("Object not in bitmap: %s\n", oid_to_hex(&object->oid));
@@ -939,7 +938,7 @@
int bitmap_pos;
bitmap_pos = bitmap_position(tdata->bitmap_git,
- commit->object.oid.hash);
+ &commit->object.oid);
if (bitmap_pos < 0)
die("Object not in bitmap: %s\n", oid_to_hex(&commit->object.oid));
@@ -966,7 +965,7 @@
bitmap_git->version, bitmap_git->entry_count);
root = revs->pending.objects[0].item;
- pos = kh_get_sha1(bitmap_git->bitmaps, root->oid.hash);
+ pos = kh_get_oid_map(bitmap_git->bitmaps, root->oid);
if (pos < kh_end(bitmap_git->bitmaps)) {
struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
@@ -1040,7 +1039,7 @@
int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
struct packing_data *mapping,
- khash_sha1 *reused_bitmaps,
+ kh_oid_map_t *reused_bitmaps,
int show_progress)
{
uint32_t i, num_objects;
@@ -1056,13 +1055,13 @@
reposition = xcalloc(num_objects, sizeof(uint32_t));
for (i = 0; i < num_objects; ++i) {
- const unsigned char *sha1;
+ struct object_id oid;
struct revindex_entry *entry;
struct object_entry *oe;
entry = &bitmap_git->pack->revindex[i];
- sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr);
- oe = packlist_find(mapping, sha1, NULL);
+ nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
+ oe = packlist_find(mapping, &oid);
if (oe)
reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
@@ -1079,9 +1078,9 @@
if (!rebuild_bitmap(reposition,
lookup_stored_bitmap(stored),
rebuild)) {
- hash_pos = kh_put_sha1(reused_bitmaps,
- stored->sha1,
- &hash_ret);
+ hash_pos = kh_put_oid_map(reused_bitmaps,
+ stored->oid,
+ &hash_ret);
kh_value(reused_bitmaps, hash_pos) =
bitmap_to_ewah(rebuild);
}
@@ -1108,7 +1107,7 @@
ewah_pool_free(b->trees);
ewah_pool_free(b->blobs);
ewah_pool_free(b->tags);
- kh_destroy_sha1(b->bitmaps);
+ kh_destroy_oid_map(b->bitmaps);
free(b->ext_index.objects);
free(b->ext_index.hashes);
bitmap_free(b->result);
@@ -1116,8 +1115,8 @@
free(b);
}
-int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git,
- const unsigned char *sha1)
+int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git,
+ const struct object_id *oid)
{
int pos;
@@ -1126,7 +1125,7 @@
if (!bitmap_git->haves)
return 0; /* walk had no "haves" */
- pos = bitmap_position_packfile(bitmap_git, sha1);
+ pos = bitmap_position_packfile(bitmap_git, oid);
if (pos < 0)
return 0;
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 8418ba8..00de3ec 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -14,7 +14,7 @@
uint16_t version;
uint16_t options;
uint32_t entry_count;
- unsigned char checksum[20];
+ unsigned char checksum[GIT_MAX_RAWSZ];
};
static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
@@ -51,7 +51,7 @@
struct packed_git **packfile,
uint32_t *entries, off_t *up_to);
int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
- khash_sha1 *reused_bitmaps, int show_progress);
+ kh_oid_map_t *reused_bitmaps, int show_progress);
void free_bitmap_index(struct bitmap_index *);
/*
@@ -59,7 +59,7 @@
* queried to see if a particular object was reachable from any of the
* objects flagged as UNINTERESTING.
*/
-int bitmap_has_sha1_in_uninteresting(struct bitmap_index *, const unsigned char *sha1);
+int bitmap_has_oid_in_uninteresting(struct bitmap_index *, const struct object_id *oid);
void bitmap_writer_show_progress(int show);
void bitmap_writer_set_checksum(unsigned char *sha1);
diff --git a/pack-objects.c b/pack-objects.c
index e7cd337..c6250d7 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -6,17 +6,17 @@
#include "config.h"
static uint32_t locate_object_entry_hash(struct packing_data *pdata,
- const unsigned char *sha1,
+ const struct object_id *oid,
int *found)
{
uint32_t i, mask = (pdata->index_size - 1);
- i = sha1hash(sha1) & mask;
+ i = oidhash(oid) & mask;
while (pdata->index[i] > 0) {
uint32_t pos = pdata->index[i] - 1;
- if (hasheq(sha1, pdata->objects[pos].idx.oid.hash)) {
+ if (oideq(oid, &pdata->objects[pos].idx.oid)) {
*found = 1;
return i;
}
@@ -56,7 +56,7 @@
for (i = 0; i < pdata->nr_objects; i++) {
int found;
uint32_t ix = locate_object_entry_hash(pdata,
- entry->idx.oid.hash,
+ &entry->idx.oid,
&found);
if (found)
@@ -68,8 +68,7 @@
}
struct object_entry *packlist_find(struct packing_data *pdata,
- const unsigned char *sha1,
- uint32_t *index_pos)
+ const struct object_id *oid)
{
uint32_t i;
int found;
@@ -77,10 +76,7 @@
if (!pdata->index_size)
return NULL;
- i = locate_object_entry_hash(pdata, sha1, &found);
-
- if (index_pos)
- *index_pos = i;
+ i = locate_object_entry_hash(pdata, oid, &found);
if (!found)
return NULL;
@@ -119,8 +115,7 @@
* this fall back code, just stay simple and fall back to using
* in_pack[] array.
*/
-void oe_map_new_pack(struct packing_data *pack,
- struct packed_git *p)
+void oe_map_new_pack(struct packing_data *pack)
{
uint32_t i;
@@ -154,8 +149,7 @@
}
struct object_entry *packlist_alloc(struct packing_data *pdata,
- const unsigned char *sha1,
- uint32_t index_pos)
+ const struct object_id *oid)
{
struct object_entry *new_entry;
@@ -178,12 +172,19 @@
new_entry = pdata->objects + pdata->nr_objects++;
memset(new_entry, 0, sizeof(*new_entry));
- hashcpy(new_entry->idx.oid.hash, sha1);
+ oidcpy(&new_entry->idx.oid, oid);
if (pdata->index_size * 3 <= pdata->nr_objects * 4)
rehash_objects(pdata);
- else
- pdata->index[index_pos] = pdata->nr_objects;
+ else {
+ int found;
+ uint32_t pos = locate_object_entry_hash(pdata,
+ &new_entry->idx.oid,
+ &found);
+ if (found)
+ BUG("duplicate object inserted into hash");
+ pdata->index[pos] = pdata->nr_objects;
+ }
if (pdata->in_pack)
pdata->in_pack[pdata->nr_objects - 1] = NULL;
diff --git a/pack-objects.h b/pack-objects.h
index 6bfacc7..6fe6ae5 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -183,12 +183,10 @@
}
struct object_entry *packlist_alloc(struct packing_data *pdata,
- const unsigned char *sha1,
- uint32_t index_pos);
+ const struct object_id *oid);
struct object_entry *packlist_find(struct packing_data *pdata,
- const unsigned char *sha1,
- uint32_t *index_pos);
+ const struct object_id *oid);
static inline uint32_t pack_name_hash(const char *name)
{
@@ -247,14 +245,14 @@
return pack->in_pack[e - pack->objects];
}
-void oe_map_new_pack(struct packing_data *pack,
- struct packed_git *p);
+void oe_map_new_pack(struct packing_data *pack);
+
static inline void oe_set_in_pack(struct packing_data *pack,
struct object_entry *e,
struct packed_git *p)
{
if (!p->index)
- oe_map_new_pack(pack, p);
+ oe_map_new_pack(pack);
if (pack->in_pack_by_idx)
e->in_pack_idx = p->index;
else
diff --git a/pack-revindex.c b/pack-revindex.c
index 50891f7..d28a7e4 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "pack-revindex.h"
#include "object-store.h"
+#include "packfile.h"
/*
* Pack index for existing packs give us easy access to the offsets into
@@ -158,10 +159,14 @@
sort_revindex(p->revindex, num_ent, p->pack_size);
}
-void load_pack_revindex(struct packed_git *p)
+int load_pack_revindex(struct packed_git *p)
{
- if (!p->revindex)
+ if (!p->revindex) {
+ if (open_pack_index(p))
+ return -1;
create_pack_revindex(p);
+ }
+ return 0;
}
int find_revindex_position(struct packed_git *p, off_t ofs)
@@ -188,7 +193,9 @@
{
int pos;
- load_pack_revindex(p);
+ if (load_pack_revindex(p))
+ return NULL;
+
pos = find_revindex_position(p, ofs);
if (pos < 0)
diff --git a/pack-revindex.h b/pack-revindex.h
index e262f3e..848331d 100644
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -8,7 +8,7 @@
unsigned int nr;
};
-void load_pack_revindex(struct packed_git *p);
+int load_pack_revindex(struct packed_git *p);
int find_revindex_position(struct packed_git *p, off_t ofs);
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
diff --git a/pack.h b/pack.h
index da99fdd..9fc0945 100644
--- a/pack.h
+++ b/pack.h
@@ -55,7 +55,7 @@
uint32_t *anomaly;
};
-extern void reset_pack_idx_option(struct pack_idx_option *);
+void reset_pack_idx_option(struct pack_idx_option *);
/*
* Packed object index header
@@ -79,28 +79,28 @@
/* Note, the data argument could be NULL if object type is blob */
typedef int (*verify_fn)(const struct object_id *, enum object_type, unsigned long, void*, int*);
-extern const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, const struct pack_idx_option *, const unsigned char *sha1);
-extern int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
-extern int verify_pack_index(struct packed_git *);
-extern int verify_pack(struct repository *, struct packed_git *, verify_fn fn, struct progress *, uint32_t);
-extern off_t write_pack_header(struct hashfile *f, uint32_t);
-extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
-extern char *index_pack_lockfile(int fd);
+const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, const struct pack_idx_option *, const unsigned char *sha1);
+int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
+int verify_pack_index(struct packed_git *);
+int verify_pack(struct repository *, struct packed_git *, verify_fn fn, struct progress *, uint32_t);
+off_t write_pack_header(struct hashfile *f, uint32_t);
+void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
+char *index_pack_lockfile(int fd);
/*
* The "hdr" output buffer should be at least this big, which will handle sizes
* up to 2^67.
*/
#define MAX_PACK_OBJECT_HEADER 10
-extern int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
- enum object_type, uintmax_t);
+int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
+ enum object_type, uintmax_t);
#define PH_ERROR_EOF (-1)
#define PH_ERROR_PACK_SIGNATURE (-2)
#define PH_ERROR_PROTOCOL (-3)
-extern int read_pack_header(int fd, struct pack_header *);
+int read_pack_header(int fd, struct pack_header *);
-extern struct hashfile *create_tmp_packfile(char **pack_tmp_name);
-extern void finish_tmp_packfile(struct strbuf *name_buffer, const char *pack_tmp_name, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, unsigned char sha1[]);
+struct hashfile *create_tmp_packfile(char **pack_tmp_name);
+void finish_tmp_packfile(struct strbuf *name_buffer, const char *pack_tmp_name, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, unsigned char sha1[]);
#endif
diff --git a/packfile.c b/packfile.c
index 16bcb75..f3f962a 100644
--- a/packfile.c
+++ b/packfile.c
@@ -16,6 +16,8 @@
#include "tree.h"
#include "object-store.h"
#include "midx.h"
+#include "commit-graph.h"
+#include "promisor-remote.h"
char *odb_pack_name(struct strbuf *buf,
const unsigned char *sha1,
@@ -235,7 +237,7 @@
struct packed_git *p = alloc_packed_git(alloc);
memcpy(p->pack_name, path, alloc); /* includes NUL */
- hashcpy(p->sha1, sha1);
+ hashcpy(p->hash, sha1);
if (check_packed_git_idx(idx_path, p)) {
free(p);
return NULL;
@@ -286,13 +288,6 @@
return 0;
}
-void release_pack_memory(size_t need)
-{
- size_t cur = pack_mapped;
- while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
- ; /* nothing */
-}
-
void close_pack_windows(struct packed_git *p)
{
while (p->windows) {
@@ -309,7 +304,7 @@
}
}
-static int close_pack_fd(struct packed_git *p)
+int close_pack_fd(struct packed_git *p)
{
if (p->pack_fd < 0)
return 0;
@@ -336,7 +331,7 @@
close_pack_index(p);
}
-void close_all_packs(struct raw_object_store *o)
+void close_object_store(struct raw_object_store *o)
{
struct packed_git *p;
@@ -350,6 +345,36 @@
close_midx(o->multi_pack_index);
o->multi_pack_index = NULL;
}
+
+ close_commit_graph(o);
+}
+
+void unlink_pack_path(const char *pack_name, int force_delete)
+{
+ static const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
+ int i;
+ struct strbuf buf = STRBUF_INIT;
+ size_t plen;
+
+ strbuf_addstr(&buf, pack_name);
+ strip_suffix_mem(buf.buf, &buf.len, ".pack");
+ plen = buf.len;
+
+ if (!force_delete) {
+ strbuf_addstr(&buf, ".keep");
+ if (!access(buf.buf, F_OK)) {
+ strbuf_release(&buf);
+ return;
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(exts); i++) {
+ strbuf_setlen(&buf, plen);
+ strbuf_addstr(&buf, exts[i]);
+ unlink(buf.buf);
+ }
+
+ strbuf_release(&buf);
}
/*
@@ -466,6 +491,16 @@
#endif
}
+const char *pack_basename(struct packed_git *p)
+{
+ const char *ret = strrchr(p->pack_name, '/');
+ if (ret)
+ ret = ret + 1; /* skip past slash */
+ else
+ ret = p->pack_name; /* we only have a base */
+ return ret;
+}
+
/*
* Do not call this directly as this leaks p->pack_fd on error return;
* call open_packed_git() instead.
@@ -482,7 +517,7 @@
if (!p->index_data) {
struct multi_pack_index *m;
- const char *pack_name = strrchr(p->pack_name, '/');
+ const char *pack_name = pack_basename(p);
for (m = the_repository->objects->multi_pack_index;
m; m = m->next) {
@@ -630,7 +665,7 @@
while (packed_git_limit < pack_mapped
&& unuse_one_window(p))
; /* nothing */
- win->base = xmmap(NULL, win->len,
+ win->base = xmmap_gently(NULL, win->len,
PROT_READ, MAP_PRIVATE,
p->pack_fd, win->offset);
if (win->base == MAP_FAILED)
@@ -669,23 +704,12 @@
}
}
-static void try_to_free_pack_memory(size_t size)
-{
- release_pack_memory(size);
-}
-
struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
{
- static int have_set_try_to_free_routine;
struct stat st;
size_t alloc;
struct packed_git *p;
- if (!have_set_try_to_free_routine) {
- have_set_try_to_free_routine = 1;
- set_try_to_free_routine(try_to_free_pack_memory);
- }
-
/*
* Make sure a corresponding .pack file exists and that
* the index looks sane.
@@ -722,8 +746,8 @@
p->pack_local = local;
p->mtime = st.st_mtime;
if (path_len < the_hash_algo->hexsz ||
- get_sha1_hex(path + path_len - the_hash_algo->hexsz, p->sha1))
- hashclr(p->sha1);
+ get_sha1_hex(path + path_len - the_hash_algo->hexsz, p->hash))
+ hashclr(p->hash);
return p;
}
@@ -893,25 +917,25 @@
* all unreachable objects about to be pruned, in which case they're not really
* interesting as a measure of repo size in the first place.
*/
-unsigned long approximate_object_count(void)
+unsigned long repo_approximate_object_count(struct repository *r)
{
- if (!the_repository->objects->approximate_object_count_valid) {
+ if (!r->objects->approximate_object_count_valid) {
unsigned long count;
struct multi_pack_index *m;
struct packed_git *p;
- prepare_packed_git(the_repository);
+ prepare_packed_git(r);
count = 0;
- for (m = get_multi_pack_index(the_repository); m; m = m->next)
+ for (m = get_multi_pack_index(r); m; m = m->next)
count += m->num_objects;
- for (p = the_repository->objects->packed_git; p; p = p->next) {
+ for (p = r->objects->packed_git; p; p = p->next) {
if (open_pack_index(p))
continue;
count += p->num_objects;
}
- the_repository->objects->approximate_object_count = count;
+ r->objects->approximate_object_count = count;
}
- return the_repository->objects->approximate_object_count;
+ return r->objects->approximate_object_count;
}
static void *get_next_packed_git(const void *p)
@@ -984,8 +1008,6 @@
}
rearrange_packed_git(r);
- r->objects->all_packs = NULL;
-
prepare_packed_git_mru(r);
r->objects->packed_git_initialized = 1;
}
@@ -1016,26 +1038,16 @@
struct packed_git *get_all_packs(struct repository *r)
{
+ struct multi_pack_index *m;
+
prepare_packed_git(r);
-
- if (!r->objects->all_packs) {
- struct packed_git *p = r->objects->packed_git;
- struct multi_pack_index *m;
-
- for (m = r->objects->multi_pack_index; m; m = m->next) {
- uint32_t i;
- for (i = 0; i < m->num_packs; i++) {
- if (!prepare_midx_pack(m, i)) {
- m->packs[i]->next = p;
- p = m->packs[i];
- }
- }
- }
-
- r->objects->all_packs = p;
+ for (m = r->objects->multi_pack_index; m; m = m->next) {
+ uint32_t i;
+ for (i = 0; i < m->num_packs; i++)
+ prepare_midx_pack(r, m, i);
}
- return r->objects->all_packs;
+ return r->objects->packed_git;
}
struct list_head *get_packed_git_mru(struct repository *r)
@@ -1271,7 +1283,7 @@
if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
poi_stack_alloc = alloc_nr(poi_stack_nr);
ALLOC_ARRAY(poi_stack, poi_stack_alloc);
- memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr);
+ COPY_ARRAY(poi_stack, small_poi_stack, poi_stack_nr);
} else {
ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc);
}
@@ -1681,8 +1693,8 @@
&& delta_stack == small_delta_stack) {
delta_stack_alloc = alloc_nr(delta_stack_nr);
ALLOC_ARRAY(delta_stack, delta_stack_alloc);
- memcpy(delta_stack, small_delta_stack,
- sizeof(*delta_stack)*delta_stack_nr);
+ COPY_ARRAY(delta_stack, small_delta_stack,
+ delta_stack_nr);
} else {
ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
}
@@ -1988,13 +2000,13 @@
return 0;
for (m = r->objects->multi_pack_index; m; m = m->next) {
- if (fill_midx_entry(oid, e, m))
+ if (fill_midx_entry(r, oid, e, m))
return 1;
}
list_for_each(pos, &r->objects->packed_git_mru) {
struct packed_git *p = list_entry(pos, struct packed_git, mru);
- if (fill_pack_entry(oid, e, p)) {
+ if (!p->multi_pack_index && fill_pack_entry(oid, e, p)) {
list_move(&p->mru, &r->objects->packed_git_mru);
return 1;
}
@@ -2023,8 +2035,10 @@
uint32_t i;
int r = 0;
- if (flags & FOR_EACH_OBJECT_PACK_ORDER)
- load_pack_revindex(p);
+ if (flags & FOR_EACH_OBJECT_PACK_ORDER) {
+ if (load_pack_revindex(p))
+ return -1;
+ }
for (i = 0; i < p->num_objects; i++) {
uint32_t pos;
@@ -2108,7 +2122,7 @@
oidset_insert(set, &parents->item->object.oid);
} else if (obj->type == OBJ_TAG) {
struct tag *tag = (struct tag *) obj;
- oidset_insert(set, &tag->tagged->oid);
+ oidset_insert(set, get_tagged_oid(tag));
}
return 0;
}
@@ -2119,7 +2133,7 @@
static int promisor_objects_prepared;
if (!promisor_objects_prepared) {
- if (repository_format_partial_clone) {
+ if (has_promisor_remote()) {
for_each_packed_object(add_promisor_object,
&promisor_objects,
FOR_EACH_OBJECT_PROMISOR_ONLY);
diff --git a/packfile.h b/packfile.h
index d70c6d9..fc7904e 100644
--- a/packfile.h
+++ b/packfile.h
@@ -15,23 +15,29 @@
*
* Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
*/
-extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
+char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
/*
* Return the name of the (local) packfile with the specified sha1 in
* its name. The return value is a pointer to memory that is
* overwritten each time this function is called.
*/
-extern char *sha1_pack_name(const unsigned char *sha1);
+char *sha1_pack_name(const unsigned char *sha1);
/*
* Return the name of the (local) pack index file with the specified
* sha1 in its name. The return value is a pointer to memory that is
* overwritten each time this function is called.
*/
-extern char *sha1_pack_index_name(const unsigned char *sha1);
+char *sha1_pack_index_name(const unsigned char *sha1);
-extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
+/*
+ * Return the basename of the packfile, omitting any containing directory
+ * (e.g., "pack-1234abcd[...].pack").
+ */
+const char *pack_basename(struct packed_git *p);
+
+struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
typedef void each_file_in_pack_dir_fn(const char *full_path, size_t full_path_len,
const char *file_pach, void *data);
@@ -45,8 +51,8 @@
#define PACKDIR_FILE_GARBAGE 4
extern void (*report_garbage)(unsigned seen_bits, const char *path);
-extern void reprepare_packed_git(struct repository *r);
-extern void install_packed_git(struct repository *r, struct packed_git *pack);
+void reprepare_packed_git(struct repository *r);
+void install_packed_git(struct repository *r, struct packed_git *pack);
struct packed_git *get_packed_git(struct repository *r);
struct list_head *get_packed_git_mru(struct repository *r);
@@ -57,34 +63,44 @@
* Give a rough count of objects in the repository. This sacrifices accuracy
* for speed.
*/
-unsigned long approximate_object_count(void);
+unsigned long repo_approximate_object_count(struct repository *r);
+#define approximate_object_count() repo_approximate_object_count(the_repository)
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
- struct packed_git *packs);
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
+ struct packed_git *packs);
-extern void pack_report(void);
+void pack_report(void);
/*
* mmap the index file for the specified packfile (if it is not
* already mmapped). Return 0 on success.
*/
-extern int open_pack_index(struct packed_git *);
+int open_pack_index(struct packed_git *);
/*
* munmap the index file for the specified packfile (if it is
* currently mmapped).
*/
-extern void close_pack_index(struct packed_git *);
+void close_pack_index(struct packed_git *);
-extern uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
+int close_pack_fd(struct packed_git *p);
-extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
-extern void close_pack_windows(struct packed_git *);
-extern void close_pack(struct packed_git *);
-extern void close_all_packs(struct raw_object_store *o);
-extern void unuse_pack(struct pack_window **);
-extern void clear_delta_base_cache(void);
-extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
+
+unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
+void close_pack_windows(struct packed_git *);
+void close_pack(struct packed_git *);
+void close_object_store(struct raw_object_store *o);
+void unuse_pack(struct pack_window **);
+void clear_delta_base_cache(void);
+struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+
+/*
+ * Unlink the .pack and associated extension files.
+ * Does not unlink if 'force_delete' is false and the pack-file is
+ * marked as ".keep".
+ */
+void unlink_pack_path(const char *pack_name, int force_delete);
/*
* Make sure that a pointer access into an mmap'd index file is within bounds,
@@ -94,7 +110,7 @@
* (like the 64-bit extended offset table), as we compare the size to the
* fixed-length parts when we open the file.
*/
-extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
+void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
/*
* Perform binary search on a pack-index for a given oid. Packfile is expected to
@@ -110,59 +126,59 @@
* at the SHA-1 within the mmapped index. Return NULL if there is an
* error.
*/
-extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
+const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
/*
* Like nth_packed_object_sha1, but write the data into the object specified by
* the the first argument. Returns the first argument on success, and NULL on
* error.
*/
-extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
+const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
/*
* Return the offset of the nth object within the specified packfile.
* The index must already be opened.
*/
-extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
+off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
/*
* If the object named sha1 is present in the specified packfile,
* return its offset within the packfile; otherwise, return 0.
*/
-extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
+off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
-extern int is_pack_valid(struct packed_git *);
-extern void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *);
-extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
-extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
-extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+int is_pack_valid(struct packed_git *);
+void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *);
+unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
+unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
+int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
-extern void release_pack_memory(size_t);
+void release_pack_memory(size_t);
/* global flag to enable extra checks when accessing packed objects */
extern int do_check_packed_object_crc;
-extern int packed_object_info(struct repository *r,
- struct packed_git *pack,
- off_t offset, struct object_info *);
+int packed_object_info(struct repository *r,
+ struct packed_git *pack,
+ off_t offset, struct object_info *);
-extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
-extern const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
+void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
+const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
/*
* Iff a pack file in the given repository contains the object named by sha1,
* return true and store its location to e.
*/
-extern int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
+int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
-extern int has_object_pack(const struct object_id *oid);
+int has_object_pack(const struct object_id *oid);
-extern int has_pack_index(const unsigned char *sha1);
+int has_pack_index(const unsigned char *sha1);
/*
* Return 1 if an object in a promisor packfile is or refers to the given
* object, 0 otherwise.
*/
-extern int is_promisor_object(const struct object_id *oid);
+int is_promisor_object(const struct object_id *oid);
/*
* Expose a function for fuzz testing.
@@ -174,7 +190,7 @@
* have a convenient entry-point for fuzz testing. For real uses, you should
* probably use open_pack_index() or parse_pack_index() instead.
*/
-extern int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
- size_t idx_size, struct packed_git *p);
+int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
+ size_t idx_size, struct packed_git *p);
#endif
diff --git a/pager.c b/pager.c
index a768797..41446d4 100644
--- a/pager.c
+++ b/pager.c
@@ -100,6 +100,7 @@
argv_array_push(&pager_process->args, pager);
pager_process->use_shell = 1;
setup_pager_env(&pager_process->env_array);
+ pager_process->trace2_child_class = "pager";
}
void setup_pager(void)
@@ -177,6 +178,26 @@
}
/*
+ * Clear the entire line, leave cursor in first column.
+ */
+void term_clear_line(void)
+{
+ if (is_terminal_dumb())
+ /*
+ * Fall back to print a terminal width worth of space
+ * characters (hoping that the terminal is still as wide
+ * as it was upon the first call to term_columns()).
+ */
+ fprintf(stderr, "\r%*s\r", term_columns(), "");
+ else
+ /*
+ * On non-dumb terminals use an escape sequence to clear
+ * the whole line, no matter how wide the terminal.
+ */
+ fputs("\r\033[K", stderr);
+}
+
+/*
* How many columns do we need to show this number in decimal?
*/
int decimal_width(uintmax_t number)
diff --git a/parse-options-cb.c b/parse-options-cb.c
index e2f3eae..1240a85 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -16,14 +16,17 @@
if (!arg) {
v = unset ? 0 : DEFAULT_ABBREV;
} else {
+ if (!*arg)
+ return error(_("option `%s' expects a numerical value"),
+ opt->long_name);
v = strtol(arg, (char **)&arg, 10);
if (*arg)
return error(_("option `%s' expects a numerical value"),
opt->long_name);
if (v && v < MINIMUM_ABBREV)
v = MINIMUM_ABBREV;
- else if (v > 40)
- v = 40;
+ else if (v > the_hash_algo->hexsz)
+ v = the_hash_algo->hexsz;
}
*(int *)(opt->value) = v;
return 0;
@@ -96,6 +99,23 @@
return 0;
}
+int parse_opt_commit(const struct option *opt, const char *arg, int unset)
+{
+ struct object_id oid;
+ struct commit *commit;
+ struct commit **target = opt->value;
+
+ if (!arg)
+ return -1;
+ if (get_oid(arg, &oid))
+ return error("malformed object name %s", arg);
+ commit = lookup_commit_reference(the_repository, &oid);
+ if (!commit)
+ return error("no such commit %s", arg);
+ *target = commit;
+ return 0;
+}
+
int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
{
struct object_id oid;
@@ -112,6 +132,23 @@
return 0;
}
+int parse_opt_object_id(const struct option *opt, const char *arg, int unset)
+{
+ struct object_id oid;
+ struct object_id *target = opt->value;
+
+ if (unset) {
+ *target = null_oid;
+ return 0;
+ }
+ if (!arg)
+ return -1;
+ if (get_oid(arg, &oid))
+ return error(_("malformed object name '%s'"), arg);
+ *target = oid;
+ return 0;
+}
+
int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
{
int *target = opt->value;
@@ -122,6 +159,23 @@
return 0;
}
+struct option *parse_options_dup(const struct option *o)
+{
+ struct option *opts;
+ int nr = 0;
+
+ while (o && o->type != OPTION_END) {
+ nr++;
+ o++;
+ }
+
+ ALLOC_ARRAY(opts, nr + 1);
+ memcpy(opts, o - nr, sizeof(*o) * nr);
+ memset(opts + nr, 0, sizeof(*opts));
+ opts[nr].type = OPTION_END;
+ return opts;
+}
+
struct option *parse_options_concat(struct option *a, struct option *b)
{
struct option *ret;
@@ -170,9 +224,12 @@
* "-h" output even if it's not being handled directly by
* parse_options().
*/
-int parse_opt_unknown_cb(const struct option *opt, const char *arg, int unset)
+enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
+ const struct option *opt,
+ const char *arg, int unset)
{
- return -2;
+ BUG_ON_OPT_ARG(arg);
+ return PARSE_OPT_UNKNOWN;
}
/**
diff --git a/parse-options.c b/parse-options.c
index 9f84bac..b42f54d 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -6,6 +6,8 @@
#include "color.h"
#include "utf8.h"
+static int disallow_abbreviated_options;
+
#define OPT_SHORT 1
#define OPT_UNSET 2
@@ -20,8 +22,9 @@
return error("BUG: switch '%c' %s", opt->short_name, reason);
}
-static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
- int flags, const char **arg)
+static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
+ const struct option *opt,
+ int flags, const char **arg)
{
if (p->opt) {
*arg = p->opt;
@@ -44,9 +47,10 @@
*file = prefix_filename(prefix, *file);
}
-static int opt_command_mode_error(const struct option *opt,
- const struct option *all_opts,
- int flags)
+static enum parse_opt_result opt_command_mode_error(
+ const struct option *opt,
+ const struct option *all_opts,
+ int flags)
{
const struct option *that;
struct strbuf that_name = STRBUF_INIT;
@@ -69,16 +73,16 @@
error(_("%s is incompatible with %s"),
optname(opt, flags), that_name.buf);
strbuf_release(&that_name);
- return -1;
+ return PARSE_OPT_ERROR;
}
return error(_("%s : incompatible with something else"),
optname(opt, flags));
}
-static int get_value(struct parse_opt_ctx_t *p,
- const struct option *opt,
- const struct option *all_opts,
- int flags)
+static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
+ const struct option *opt,
+ const struct option *all_opts,
+ int flags)
{
const char *s, *arg;
const int unset = flags & OPT_UNSET;
@@ -93,7 +97,7 @@
switch (opt->type) {
case OPTION_LOWLEVEL_CALLBACK:
- return (*(parse_opt_ll_cb *)opt->callback)(p, opt, unset);
+ return opt->ll_callback(p, opt, NULL, unset);
case OPTION_BIT:
if (unset)
@@ -109,6 +113,13 @@
*(int *)opt->value &= ~opt->defval;
return 0;
+ case OPTION_BITOP:
+ if (unset)
+ BUG("BITOP can't have unset form");
+ *(int *)opt->value &= ~opt->extra;
+ *(int *)opt->value |= opt->defval;
+ return 0;
+
case OPTION_COUNTUP:
if (*(int *)opt->value < 0)
*(int *)opt->value = 0;
@@ -152,16 +163,27 @@
return err;
case OPTION_CALLBACK:
- if (unset)
- return (*opt->callback)(opt, NULL, 1) ? (-1) : 0;
- if (opt->flags & PARSE_OPT_NOARG)
- return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
- if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
- return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
- if (get_arg(p, opt, flags, &arg))
- return -1;
- return (*opt->callback)(opt, arg, 0) ? (-1) : 0;
+ {
+ const char *p_arg = NULL;
+ int p_unset;
+ if (unset)
+ p_unset = 1;
+ else if (opt->flags & PARSE_OPT_NOARG)
+ p_unset = 0;
+ else if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
+ p_unset = 0;
+ else if (get_arg(p, opt, flags, &arg))
+ return -1;
+ else {
+ p_unset = 0;
+ p_arg = arg;
+ }
+ if (opt->callback)
+ return (*opt->callback)(opt, p_arg, p_unset) ? (-1) : 0;
+ else
+ return (*opt->ll_callback)(p, opt, p_arg, p_unset);
+ }
case OPTION_INTEGER:
if (unset) {
*(int *)opt->value = 0;
@@ -173,6 +195,9 @@
}
if (get_arg(p, opt, flags, &arg))
return -1;
+ if (!*arg)
+ return error(_("%s expects a numerical value"),
+ optname(opt, flags));
*(int *)opt->value = strtol(arg, (char **)&s, 10);
if (*s)
return error(_("%s expects a numerical value"),
@@ -201,7 +226,8 @@
}
}
-static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)
+static enum parse_opt_result parse_short_opt(struct parse_opt_ctx_t *p,
+ const struct option *options)
{
const struct option *all_opts = options;
const struct option *numopt = NULL;
@@ -228,15 +254,48 @@
len++;
arg = xmemdupz(p->opt, len);
p->opt = p->opt[len] ? p->opt + len : NULL;
- rc = (*numopt->callback)(numopt, arg, 0) ? (-1) : 0;
+ if (numopt->callback)
+ rc = (*numopt->callback)(numopt, arg, 0) ? (-1) : 0;
+ else
+ rc = (*numopt->ll_callback)(p, numopt, arg, 0);
free(arg);
return rc;
}
- return -2;
+ return PARSE_OPT_UNKNOWN;
}
-static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
- const struct option *options)
+static int has_string(const char *it, const char **array)
+{
+ while (*array)
+ if (!strcmp(it, *(array++)))
+ return 1;
+ return 0;
+}
+
+static int is_alias(struct parse_opt_ctx_t *ctx,
+ const struct option *one_opt,
+ const struct option *another_opt)
+{
+ const char **group;
+
+ if (!ctx->alias_groups)
+ return 0;
+
+ if (!one_opt->long_name || !another_opt->long_name)
+ return 0;
+
+ for (group = ctx->alias_groups; *group; group += 3) {
+ /* it and other are from the same family? */
+ if (has_string(one_opt->long_name, group) &&
+ has_string(another_opt->long_name, group))
+ return 1;
+ }
+ return 0;
+}
+
+static enum parse_opt_result parse_long_opt(
+ struct parse_opt_ctx_t *p, const char *arg,
+ const struct option *options)
{
const struct option *all_opts = options;
const char *arg_end = strchrnul(arg, '=');
@@ -261,14 +320,18 @@
optname(options, flags));
if (*rest)
continue;
+ if (options->value)
+ *(int *)options->value = options->defval;
p->out[p->cpidx++] = arg - 2;
- return 0;
+ return PARSE_OPT_DONE;
}
if (!rest) {
/* abbreviated? */
- if (!strncmp(long_name, arg, arg_end - arg)) {
+ if (!(p->flags & PARSE_OPT_KEEP_UNKNOWN) &&
+ !strncmp(long_name, arg, arg_end - arg)) {
is_abbreviated:
- if (abbrev_option) {
+ if (abbrev_option &&
+ !is_alias(p, abbrev_option, options)) {
/*
* If this is abbreviated, it is
* ambiguous. So when there is no
@@ -318,6 +381,10 @@
return get_value(p, options, all_opts, flags ^ opt_flags);
}
+ if (disallow_abbreviated_options && (ambiguous_option || abbrev_option))
+ die("disallowed abbreviated or ambiguous option '%.*s'",
+ (int)(arg_end - arg), arg);
+
if (ambiguous_option) {
error(_("ambiguous option: %s "
"(could be --%s%s or --%s%s)"),
@@ -326,11 +393,11 @@
ambiguous_option->long_name,
(abbrev_flags & OPT_UNSET) ? "no-" : "",
abbrev_option->long_name);
- return -3;
+ return PARSE_OPT_HELP;
}
if (abbrev_option)
return get_value(p, abbrev_option, all_opts, abbrev_flags);
- return -2;
+ return PARSE_OPT_UNKNOWN;
}
static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
@@ -400,6 +467,23 @@
if ((opts->flags & PARSE_OPT_OPTARG) ||
!(opts->flags & PARSE_OPT_NOARG))
err |= optbug(opts, "should not accept an argument");
+ break;
+ case OPTION_CALLBACK:
+ if (!opts->callback && !opts->ll_callback)
+ BUG("OPTION_CALLBACK needs one callback");
+ if (opts->callback && opts->ll_callback)
+ BUG("OPTION_CALLBACK can't have two callbacks");
+ break;
+ case OPTION_LOWLEVEL_CALLBACK:
+ if (!opts->ll_callback)
+ BUG("OPTION_LOWLEVEL_CALLBACK needs a callback");
+ if (opts->callback)
+ BUG("OPTION_LOWLEVEL_CALLBACK needs no high level callback");
+ break;
+ case OPTION_ALIAS:
+ BUG("OPT_ALIAS() should not remain at this point. "
+ "Are you using parse_options_step() directly?\n"
+ "That case is not supported yet.");
default:
; /* ok. (usually accepts an argument) */
}
@@ -411,21 +495,37 @@
exit(128);
}
+static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
+ int argc, const char **argv, const char *prefix,
+ const struct option *options, int flags)
+{
+ ctx->argc = argc;
+ ctx->argv = argv;
+ if (!(flags & PARSE_OPT_ONE_SHOT)) {
+ ctx->argc--;
+ ctx->argv++;
+ }
+ ctx->total = ctx->argc;
+ ctx->out = argv;
+ ctx->prefix = prefix;
+ ctx->cpidx = ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
+ ctx->flags = flags;
+ if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
+ (flags & PARSE_OPT_STOP_AT_NON_OPTION) &&
+ !(flags & PARSE_OPT_ONE_SHOT))
+ BUG("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
+ if ((flags & PARSE_OPT_ONE_SHOT) &&
+ (flags & PARSE_OPT_KEEP_ARGV0))
+ BUG("Can't keep argv0 if you don't have it");
+ parse_options_check(options);
+}
+
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, const char *prefix,
const struct option *options, int flags)
{
memset(ctx, 0, sizeof(*ctx));
- ctx->argc = ctx->total = argc - 1;
- ctx->argv = argv + 1;
- ctx->out = argv;
- ctx->prefix = prefix;
- ctx->cpidx = ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
- ctx->flags = flags;
- if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
- (flags & PARSE_OPT_STOP_AT_NON_OPTION))
- BUG("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
- parse_options_check(options);
+ parse_options_start_1(ctx, argc, argv, prefix, options, flags);
}
static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
@@ -475,8 +575,7 @@
}
}
-static int show_gitcomp(struct parse_opt_ctx_t *ctx,
- const struct option *opts)
+static int show_gitcomp(const struct option *opts)
{
const struct option *original_opts = opts;
int nr_noopts = 0;
@@ -520,6 +619,83 @@
return PARSE_OPT_COMPLETE;
}
+/*
+ * Scan and may produce a new option[] array, which should be used
+ * instead of the original 'options'.
+ *
+ * Right now this is only used to preprocess and substitue
+ * OPTION_ALIAS.
+ */
+static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
+ const struct option *options)
+{
+ struct option *newopt;
+ int i, nr, alias;
+ int nr_aliases = 0;
+
+ for (nr = 0; options[nr].type != OPTION_END; nr++) {
+ if (options[nr].type == OPTION_ALIAS)
+ nr_aliases++;
+ }
+
+ if (!nr_aliases)
+ return NULL;
+
+ ALLOC_ARRAY(newopt, nr + 1);
+ COPY_ARRAY(newopt, options, nr + 1);
+
+ /* each alias has two string pointers and NULL */
+ CALLOC_ARRAY(ctx->alias_groups, 3 * (nr_aliases + 1));
+
+ for (alias = 0, i = 0; i < nr; i++) {
+ int short_name;
+ const char *long_name;
+ const char *source;
+ int j;
+
+ if (newopt[i].type != OPTION_ALIAS)
+ continue;
+
+ short_name = newopt[i].short_name;
+ long_name = newopt[i].long_name;
+ source = newopt[i].value;
+
+ if (!long_name)
+ BUG("An alias must have long option name");
+
+ for (j = 0; j < nr; j++) {
+ const char *name = options[j].long_name;
+
+ if (!name || strcmp(name, source))
+ continue;
+
+ if (options[j].type == OPTION_ALIAS)
+ BUG("No please. Nested aliases are not supported.");
+
+ /*
+ * NEEDSWORK: this is a bit inconsistent because
+ * usage_with_options() on the original options[] will print
+ * help string as "alias of %s" but "git cmd -h" will
+ * print the original help string.
+ */
+ memcpy(newopt + i, options + j, sizeof(*newopt));
+ newopt[i].short_name = short_name;
+ newopt[i].long_name = long_name;
+ break;
+ }
+
+ if (j == nr)
+ BUG("could not find source option '%s' of alias '%s'",
+ source, newopt[i].long_name);
+ ctx->alias_groups[alias * 3 + 0] = newopt[i].long_name;
+ ctx->alias_groups[alias * 3 + 1] = options[j].long_name;
+ ctx->alias_groups[alias * 3 + 2] = NULL;
+ alias++;
+ }
+
+ return newopt;
+}
+
static int usage_with_options_internal(struct parse_opt_ctx_t *,
const char * const *,
const struct option *, int, int);
@@ -536,6 +712,10 @@
for (; ctx->argc; ctx->argc--, ctx->argv++) {
const char *arg = ctx->argv[0];
+ if (ctx->flags & PARSE_OPT_ONE_SHOT &&
+ ctx->argc != ctx->total)
+ break;
+
if (*arg != '-' || !arg[1]) {
if (parse_nodash_opt(ctx, arg, options) == 0)
continue;
@@ -551,27 +731,33 @@
/* lone --git-completion-helper is asked by git-completion.bash */
if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))
- return show_gitcomp(ctx, options);
+ return show_gitcomp(options);
if (arg[1] != '-') {
ctx->opt = arg + 1;
switch (parse_short_opt(ctx, options)) {
- case -1:
+ case PARSE_OPT_ERROR:
return PARSE_OPT_ERROR;
- case -2:
+ case PARSE_OPT_UNKNOWN:
if (ctx->opt)
check_typos(arg + 1, options);
if (internal_help && *ctx->opt == 'h')
goto show_usage;
goto unknown;
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_HELP:
+ case PARSE_OPT_COMPLETE:
+ BUG("parse_short_opt() cannot return these");
+ case PARSE_OPT_DONE:
+ break;
}
if (ctx->opt)
check_typos(arg + 1, options);
while (ctx->opt) {
switch (parse_short_opt(ctx, options)) {
- case -1:
+ case PARSE_OPT_ERROR:
return PARSE_OPT_ERROR;
- case -2:
+ case PARSE_OPT_UNKNOWN:
if (internal_help && *ctx->opt == 'h')
goto show_usage;
@@ -583,12 +769,19 @@
ctx->argv[0] = xstrdup(ctx->opt - 1);
*(char *)ctx->argv[0] = '-';
goto unknown;
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_COMPLETE:
+ case PARSE_OPT_HELP:
+ BUG("parse_short_opt() cannot return these");
+ case PARSE_OPT_DONE:
+ break;
}
}
continue;
}
- if (!arg[2]) { /* "--" */
+ if (!arg[2] /* "--" */ ||
+ !strcmp(arg + 2, "end-of-options")) {
if (!(ctx->flags & PARSE_OPT_KEEP_DASHDASH)) {
ctx->argc--;
ctx->argv++;
@@ -601,15 +794,22 @@
if (internal_help && !strcmp(arg + 2, "help"))
goto show_usage;
switch (parse_long_opt(ctx, arg + 2, options)) {
- case -1:
+ case PARSE_OPT_ERROR:
return PARSE_OPT_ERROR;
- case -2:
+ case PARSE_OPT_UNKNOWN:
goto unknown;
- case -3:
+ case PARSE_OPT_HELP:
goto show_usage;
+ case PARSE_OPT_NON_OPTION:
+ case PARSE_OPT_COMPLETE:
+ BUG("parse_long_opt() cannot return these");
+ case PARSE_OPT_DONE:
+ break;
}
continue;
unknown:
+ if (ctx->flags & PARSE_OPT_ONE_SHOT)
+ break;
if (!(ctx->flags & PARSE_OPT_KEEP_UNKNOWN))
return PARSE_OPT_UNKNOWN;
ctx->out[ctx->cpidx++] = ctx->argv[0];
@@ -623,6 +823,9 @@
int parse_options_end(struct parse_opt_ctx_t *ctx)
{
+ if (ctx->flags & PARSE_OPT_ONE_SHOT)
+ return ctx->total - ctx->argc;
+
MOVE_ARRAY(ctx->out + ctx->cpidx, ctx->argv, ctx->argc);
ctx->out[ctx->cpidx + ctx->argc] = NULL;
return ctx->cpidx + ctx->argc;
@@ -633,8 +836,16 @@
int flags)
{
struct parse_opt_ctx_t ctx;
+ struct option *real_options;
- parse_options_start(&ctx, argc, argv, prefix, options, flags);
+ disallow_abbreviated_options =
+ git_env_bool("GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS", 0);
+
+ memset(&ctx, 0, sizeof(ctx));
+ real_options = preprocess_options(&ctx, options);
+ if (real_options)
+ options = real_options;
+ parse_options_start_1(&ctx, argc, argv, prefix, options, flags);
switch (parse_options_step(&ctx, options, usagestr)) {
case PARSE_OPT_HELP:
case PARSE_OPT_ERROR:
@@ -657,6 +868,8 @@
}
precompose_argv(argc, argv);
+ free(real_options);
+ free(ctx.alias_groups);
return parse_options_end(&ctx);
}
@@ -751,6 +964,12 @@
fputc('\n', outfile);
pad = USAGE_OPTS_WIDTH;
}
+ if (opts->type == OPTION_ALIAS) {
+ fprintf(outfile, "%*s", pad + USAGE_GAP, "");
+ fprintf_ln(outfile, _("alias of --%s"),
+ (const char *)opts->value);
+ continue;
+ }
fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "", _(opts->help));
}
fputc('\n', outfile);
diff --git a/parse-options.h b/parse-options.h
index 14fe324..38a33a0 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -7,9 +7,11 @@
OPTION_ARGUMENT,
OPTION_GROUP,
OPTION_NUMBER,
+ OPTION_ALIAS,
/* options with no arguments */
OPTION_BIT,
OPTION_NEGBIT,
+ OPTION_BITOP,
OPTION_COUNTUP,
OPTION_SET_INT,
OPTION_CMDMODE,
@@ -27,7 +29,8 @@
PARSE_OPT_STOP_AT_NON_OPTION = 2,
PARSE_OPT_KEEP_ARGV0 = 4,
PARSE_OPT_KEEP_UNKNOWN = 8,
- PARSE_OPT_NO_INTERNAL_HELP = 16
+ PARSE_OPT_NO_INTERNAL_HELP = 16,
+ PARSE_OPT_ONE_SHOT = 32
};
enum parse_opt_option_flags {
@@ -43,12 +46,22 @@
PARSE_OPT_COMP_ARG = 1024
};
+enum parse_opt_result {
+ PARSE_OPT_COMPLETE = -3,
+ PARSE_OPT_HELP = -2,
+ PARSE_OPT_ERROR = -1, /* must be the same as error() */
+ PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */
+ PARSE_OPT_NON_OPTION,
+ PARSE_OPT_UNKNOWN
+};
+
struct option;
typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
struct parse_opt_ctx_t;
-typedef int parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
- const struct option *opt, int unset);
+typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
+ const struct option *opt,
+ const char *arg, int unset);
/*
* `type`::
@@ -98,13 +111,16 @@
* the option takes optional argument.
*
* `callback`::
- * pointer to the callback to use for OPTION_CALLBACK or
- * OPTION_LOWLEVEL_CALLBACK.
+ * pointer to the callback to use for OPTION_CALLBACK
*
* `defval`::
* default value to fill (*->value) with for PARSE_OPT_OPTARG.
* OPTION_{BIT,SET_INT} store the {mask,integer} to put in the value when met.
* CALLBACKS can use it like they want.
+ *
+ * `ll_callback`::
+ * pointer to the callback to use for OPTION_LOWLEVEL_CALLBACK
+ *
*/
struct option {
enum parse_opt_type type;
@@ -117,6 +133,8 @@
int flags;
parse_opt_cb *callback;
intptr_t defval;
+ parse_opt_ll_cb *ll_callback;
+ intptr_t extra;
};
#define OPT_BIT_F(s, l, v, h, b, f) { OPTION_BIT, (s), (l), (v), NULL, (h), \
@@ -126,12 +144,19 @@
#define OPT_SET_INT_F(s, l, v, h, i, f) { OPTION_SET_INT, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG | (f), NULL, (i) }
#define OPT_BOOL_F(s, l, v, h, f) OPT_SET_INT_F(s, l, v, h, 1, f)
+#define OPT_CALLBACK_F(s, l, v, a, h, f, cb) \
+ { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), (cb) }
+#define OPT_STRING_F(s, l, v, a, h, f) { OPTION_STRING, (s), (l), (v), (a), (h), (f) }
+#define OPT_INTEGER_F(s, l, v, h, f) { OPTION_INTEGER, (s), (l), (v), N_("n"), (h), (f) }
#define OPT_END() { OPTION_END }
-#define OPT_ARGUMENT(l, h) { OPTION_ARGUMENT, 0, (l), NULL, NULL, \
- (h), PARSE_OPT_NOARG}
+#define OPT_ARGUMENT(l, v, h) { OPTION_ARGUMENT, 0, (l), (v), NULL, \
+ (h), PARSE_OPT_NOARG, NULL, 1 }
#define OPT_GROUP(h) { OPTION_GROUP, 0, NULL, NULL, NULL, (h) }
#define OPT_BIT(s, l, v, h, b) OPT_BIT_F(s, l, v, h, b, 0)
+#define OPT_BITOP(s, l, v, h, set, clear) { OPTION_BITOP, (s), (l), (v), NULL, (h), \
+ PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, \
+ (set), NULL, (clear) }
#define OPT_NEGBIT(s, l, v, h, b) { OPTION_NEGBIT, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG, NULL, (b) }
#define OPT_COUNTUP(s, l, v, h) OPT_COUNTUP_F(s, l, v, h, 0)
@@ -141,10 +166,10 @@
(h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
#define OPT_CMDMODE(s, l, v, h, i) { OPTION_CMDMODE, (s), (l), (v), NULL, \
(h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
-#define OPT_INTEGER(s, l, v, h) { OPTION_INTEGER, (s), (l), (v), N_("n"), (h) }
+#define OPT_INTEGER(s, l, v, h) OPT_INTEGER_F(s, l, v, h, 0)
#define OPT_MAGNITUDE(s, l, v, h) { OPTION_MAGNITUDE, (s), (l), (v), \
N_("n"), (h), PARSE_OPT_NONEG }
-#define OPT_STRING(s, l, v, a, h) { OPTION_STRING, (s), (l), (v), (a), (h) }
+#define OPT_STRING(s, l, v, a, h) OPT_STRING_F(s, l, v, a, h, 0)
#define OPT_STRING_LIST(s, l, v, a, h) \
{ OPTION_CALLBACK, (s), (l), (v), (a), \
(h), 0, &parse_opt_string_list }
@@ -153,8 +178,7 @@
#define OPT_EXPIRY_DATE(s, l, v, h) \
{ OPTION_CALLBACK, (s), (l), (v), N_("expiry-date"),(h), 0, \
parse_opt_expiry_date_cb }
-#define OPT_CALLBACK(s, l, v, a, h, f) \
- { OPTION_CALLBACK, (s), (l), (v), (a), (h), 0, (f) }
+#define OPT_CALLBACK(s, l, v, a, h, f) OPT_CALLBACK_F(s, l, v, a, h, 0, f)
#define OPT_NUMBER_CALLBACK(v, h, f) \
{ OPTION_NUMBER, 0, NULL, (v), NULL, (h), \
PARSE_OPT_NOARG | PARSE_OPT_NONEG, (f) }
@@ -169,23 +193,34 @@
N_("no-op (backward compatibility)"), \
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, parse_opt_noop_cb }
-/* parse_options() will filter out the processed options and leave the
- * non-option arguments in argv[]. usagestr strings should be marked
- * for translation with N_().
+#define OPT_ALIAS(s, l, source_long_name) \
+ { OPTION_ALIAS, (s), (l), (source_long_name) }
+
+/*
+ * parse_options() will filter out the processed options and leave the
+ * non-option arguments in argv[]. argv0 is assumed program name and
+ * skipped.
+ *
+ * usagestr strings should be marked for translation with N_().
+ *
* Returns the number of arguments left in argv[].
+ *
+ * In one-shot mode, argv0 is not a program name, argv[] is left
+ * untouched and parse_options() returns the number of options
+ * processed.
*/
-extern int parse_options(int argc, const char **argv, const char *prefix,
- const struct option *options,
- const char * const usagestr[], int flags);
+int parse_options(int argc, const char **argv, const char *prefix,
+ const struct option *options,
+ const char * const usagestr[], int flags);
-extern NORETURN void usage_with_options(const char * const *usagestr,
- const struct option *options);
+NORETURN void usage_with_options(const char * const *usagestr,
+ const struct option *options);
-extern NORETURN void usage_msg_opt(const char *msg,
- const char * const *usagestr,
- const struct option *options);
+NORETURN void usage_msg_opt(const char *msg,
+ const char * const *usagestr,
+ const struct option *options);
-extern int optbug(const struct option *opt, const char *reason);
+int optbug(const struct option *opt, const char *reason);
const char *optname(const struct option *opt, int flags);
/*
@@ -202,16 +237,18 @@
BUG("option callback does not expect an argument"); \
} while (0)
-/*----- incremental advanced APIs -----*/
+/*
+ * Similar to the assertions above, but checks that "arg" is always non-NULL.
+ * This assertion also implies BUG_ON_OPT_NEG(), letting you declare both
+ * assertions in a single line.
+ */
+#define BUG_ON_OPT_NEG_NOARG(unset, arg) do { \
+ BUG_ON_OPT_NEG(unset); \
+ if(!(arg)) \
+ BUG("option callback expects an argument"); \
+} while(0)
-enum {
- PARSE_OPT_COMPLETE = -2,
- PARSE_OPT_HELP = -1,
- PARSE_OPT_DONE,
- PARSE_OPT_NON_OPTION,
- PARSE_OPT_ERROR,
- PARSE_OPT_UNKNOWN
-};
+/*----- incremental advanced APIs -----*/
/*
* It's okay for the caller to consume argv/argc in the usual way.
@@ -225,33 +262,42 @@
const char *opt;
int flags;
const char *prefix;
+ const char **alias_groups; /* must be in groups of 3 elements! */
+ struct option *updated_options;
};
-extern void parse_options_start(struct parse_opt_ctx_t *ctx,
- int argc, const char **argv, const char *prefix,
- const struct option *options, int flags);
+void parse_options_start(struct parse_opt_ctx_t *ctx,
+ int argc, const char **argv, const char *prefix,
+ const struct option *options, int flags);
-extern int parse_options_step(struct parse_opt_ctx_t *ctx,
- const struct option *options,
- const char * const usagestr[]);
+int parse_options_step(struct parse_opt_ctx_t *ctx,
+ const struct option *options,
+ const char * const usagestr[]);
-extern int parse_options_end(struct parse_opt_ctx_t *ctx);
+int parse_options_end(struct parse_opt_ctx_t *ctx);
-extern struct option *parse_options_concat(struct option *a, struct option *b);
+struct option *parse_options_dup(const struct option *a);
+struct option *parse_options_concat(struct option *a, struct option *b);
/*----- some often used options -----*/
-extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
-extern int parse_opt_expiry_date_cb(const struct option *, const char *, int);
-extern int parse_opt_color_flag_cb(const struct option *, const char *, int);
-extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
-extern int parse_opt_object_name(const struct option *, const char *, int);
-extern int parse_opt_commits(const struct option *, const char *, int);
-extern int parse_opt_tertiary(const struct option *, const char *, int);
-extern int parse_opt_string_list(const struct option *, const char *, int);
-extern int parse_opt_noop_cb(const struct option *, const char *, int);
-extern int parse_opt_unknown_cb(const struct option *, const char *, int);
-extern int parse_opt_passthru(const struct option *, const char *, int);
-extern int parse_opt_passthru_argv(const struct option *, const char *, int);
+int parse_opt_abbrev_cb(const struct option *, const char *, int);
+int parse_opt_expiry_date_cb(const struct option *, const char *, int);
+int parse_opt_color_flag_cb(const struct option *, const char *, int);
+int parse_opt_verbosity_cb(const struct option *, const char *, int);
+/* value is struct oid_array* */
+int parse_opt_object_name(const struct option *, const char *, int);
+/* value is struct object_id* */
+int parse_opt_object_id(const struct option *, const char *, int);
+int parse_opt_commits(const struct option *, const char *, int);
+int parse_opt_commit(const struct option *, const char *, int);
+int parse_opt_tertiary(const struct option *, const char *, int);
+int parse_opt_string_list(const struct option *, const char *, int);
+int parse_opt_noop_cb(const struct option *, const char *, int);
+enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
+ const struct option *,
+ const char *, int);
+int parse_opt_passthru(const struct option *, const char *, int);
+int parse_opt_passthru_argv(const struct option *, const char *, int);
#define OPT__VERBOSE(var, h) OPT_COUNTUP('v', "verbose", (var), (h))
#define OPT__QUIET(var, h) OPT_COUNTUP('q', "quiet", (var), (h))
@@ -283,5 +329,6 @@
#define OPT_NO_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("no-contains", v, h, PARSE_OPT_NONEG)
#define OPT_WITH(v, h) _OPT_CONTAINS_OR_WITH("with", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
#define OPT_WITHOUT(v, h) _OPT_CONTAINS_OR_WITH("without", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
+#define OPT_CLEANUP(v) OPT_STRING(0, "cleanup", v, N_("mode"), N_("how to strip spaces and #comments from message"))
#endif
diff --git a/patch-ids.c b/patch-ids.c
index c262e1b..e8c150d 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -11,7 +11,7 @@
}
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int diff_header_only)
+ struct object_id *oid, int diff_header_only, int stable)
{
if (!patch_id_defined(commit))
return -1;
@@ -22,7 +22,7 @@
else
diff_root_tree_oid(&commit->object.oid, "", options);
diffcore_std(options);
- return diff_flush_patch_id(options, oid, diff_header_only);
+ return diff_flush_patch_id(options, oid, diff_header_only, stable);
}
/*
@@ -46,11 +46,11 @@
struct patch_id *b = (void *)entry_or_key;
if (is_null_oid(&a->patch_id) &&
- commit_patch_id(a->commit, opt, &a->patch_id, 0))
+ commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&a->commit->object.oid));
if (is_null_oid(&b->patch_id) &&
- commit_patch_id(b->commit, opt, &b->patch_id, 0))
+ commit_patch_id(b->commit, opt, &b->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&b->commit->object.oid));
return !oideq(&a->patch_id, &b->patch_id);
@@ -80,10 +80,10 @@
struct object_id header_only_patch_id;
patch->commit = commit;
- if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
+ if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
return -1;
- hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
+ hashmap_entry_init(patch, oidhash(&header_only_patch_id));
return 0;
}
diff --git a/patch-ids.h b/patch-ids.h
index 82a12b6..03bb04e 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -20,7 +20,7 @@
};
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int);
+ struct object_id *oid, int, int);
int init_patch_ids(struct repository *, struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
diff --git a/path.c b/path.c
index 03ab712..e3da1f3 100644
--- a/path.c
+++ b/path.c
@@ -115,10 +115,13 @@
{ 1, 1, 0, "logs" },
{ 1, 1, 1, "logs/HEAD" },
{ 0, 1, 1, "logs/refs/bisect" },
+ { 0, 1, 1, "logs/refs/rewritten" },
+ { 0, 1, 1, "logs/refs/worktree" },
{ 0, 1, 0, "lost-found" },
{ 0, 1, 0, "objects" },
{ 0, 1, 0, "refs" },
{ 0, 1, 1, "refs/bisect" },
+ { 0, 1, 1, "refs/rewritten" },
{ 0, 1, 1, "refs/worktree" },
{ 0, 1, 0, "remotes" },
{ 0, 1, 0, "worktrees" },
@@ -1218,31 +1221,52 @@
}
/*
+ * If path ends with suffix (complete path components), returns the offset of
+ * the last character in the path before the suffix (sans trailing directory
+ * separators), and -1 otherwise.
+ */
+static ssize_t stripped_path_suffix_offset(const char *path, const char *suffix)
+{
+ int path_len = strlen(path), suffix_len = strlen(suffix);
+
+ while (suffix_len) {
+ if (!path_len)
+ return -1;
+
+ if (is_dir_sep(path[path_len - 1])) {
+ if (!is_dir_sep(suffix[suffix_len - 1]))
+ return -1;
+ path_len = chomp_trailing_dir_sep(path, path_len);
+ suffix_len = chomp_trailing_dir_sep(suffix, suffix_len);
+ }
+ else if (path[--path_len] != suffix[--suffix_len])
+ return -1;
+ }
+
+ if (path_len && !is_dir_sep(path[path_len - 1]))
+ return -1;
+ return chomp_trailing_dir_sep(path, path_len);
+}
+
+/*
+ * Returns true if the path ends with components, considering only complete path
+ * components, and false otherwise.
+ */
+int ends_with_path_components(const char *path, const char *components)
+{
+ return stripped_path_suffix_offset(path, components) != -1;
+}
+
+/*
* If path ends with suffix (complete path components), returns the
* part before suffix (sans trailing directory separators).
* Otherwise returns NULL.
*/
char *strip_path_suffix(const char *path, const char *suffix)
{
- int path_len = strlen(path), suffix_len = strlen(suffix);
+ ssize_t offset = stripped_path_suffix_offset(path, suffix);
- while (suffix_len) {
- if (!path_len)
- return NULL;
-
- if (is_dir_sep(path[path_len - 1])) {
- if (!is_dir_sep(suffix[suffix_len - 1]))
- return NULL;
- path_len = chomp_trailing_dir_sep(path, path_len);
- suffix_len = chomp_trailing_dir_sep(suffix, suffix_len);
- }
- else if (path[--path_len] != suffix[--suffix_len])
- return NULL;
- }
-
- if (path_len && !is_dir_sep(path[path_len - 1]))
- return NULL;
- return xstrndup(path, chomp_trailing_dir_sep(path, path_len));
+ return offset == -1 ? NULL : xstrndup(path, offset);
}
int daemon_avoid_alias(const char *p)
diff --git a/path.h b/path.h
index 651e615..14d6dca 100644
--- a/path.h
+++ b/path.h
@@ -13,19 +13,19 @@
/*
* Return a statically allocated path.
*/
-extern const char *mkpath(const char *fmt, ...)
+const char *mkpath(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
/*
* Return a path.
*/
-extern char *mkpathdup(const char *fmt, ...)
+char *mkpathdup(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
/*
* Construct a path and place the result in the provided buffer `buf`.
*/
-extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)
+char *mksnpath(char *buf, size_t n, const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
/*
@@ -37,16 +37,16 @@
* Constructs a path into the common git directory of repository `repo` and
* append it in the provided buffer `sb`.
*/
-extern void strbuf_git_common_path(struct strbuf *sb,
- const struct repository *repo,
- const char *fmt, ...)
+void strbuf_git_common_path(struct strbuf *sb,
+ const struct repository *repo,
+ const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
/*
* Return a statically allocated path into the main repository's
* (the_repository) common git directory.
*/
-extern const char *git_common_path(const char *fmt, ...)
+const char *git_common_path(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
@@ -66,30 +66,30 @@
/*
* Return a path into the git directory of repository `repo`.
*/
-extern char *repo_git_path(const struct repository *repo,
- const char *fmt, ...)
+char *repo_git_path(const struct repository *repo,
+ const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
/*
* Construct a path into the git directory of repository `repo` and append it
* to the provided buffer `sb`.
*/
-extern void strbuf_repo_git_path(struct strbuf *sb,
- const struct repository *repo,
- const char *fmt, ...)
+void strbuf_repo_git_path(struct strbuf *sb,
+ const struct repository *repo,
+ const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
/*
* Return a statically allocated path into the main repository's
* (the_repository) git directory.
*/
-extern const char *git_path(const char *fmt, ...)
+const char *git_path(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
/*
* Return a path into the main repository's (the_repository) git directory.
*/
-extern char *git_pathdup(const char *fmt, ...)
+char *git_pathdup(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
/*
@@ -97,14 +97,14 @@
* and place it in the provided buffer `buf`, the contents of the buffer will
* be overridden.
*/
-extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
+char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
/*
* Construct a path into the main repository's (the_repository) git directory
* and append it to the provided buffer `sb`.
*/
-extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
+void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
/*
@@ -112,7 +112,7 @@
*
* If the repository doesn't have a worktree NULL is returned.
*/
-extern char *repo_worktree_path(const struct repository *repo,
+char *repo_worktree_path(const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
@@ -122,7 +122,7 @@
*
* If the repository doesn't have a worktree nothing will be appended to `sb`.
*/
-extern void strbuf_repo_worktree_path(struct strbuf *sb,
+void strbuf_repo_worktree_path(struct strbuf *sb,
const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
@@ -131,7 +131,7 @@
* Return a path into a submodule's git directory located at `path`. `path`
* must only reference a submodule of the main repository (the_repository).
*/
-extern char *git_pathdup_submodule(const char *path, const char *fmt, ...)
+char *git_pathdup_submodule(const char *path, const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
/*
@@ -139,11 +139,11 @@
* append it to the provided buffer `sb`. `path` must only reference a
* submodule of the main repository (the_repository).
*/
-extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
+int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
-extern void report_linked_checkout_garbage(void);
+void report_linked_checkout_garbage(void);
/*
* You can define a static memoized git path like:
@@ -193,4 +193,7 @@
const char *git_path_fetch_head(struct repository *r);
const char *git_path_shallow(struct repository *r);
+
+int ends_with_path_components(const char *path, const char *components);
+
#endif /* PATH_H */
diff --git a/perl/Git.pm b/perl/Git.pm
index d856930..62c472e 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -980,7 +980,7 @@
return -1;
}
- if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
+ if ($description !~ /^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})? \S+ (\d+)$/) {
carp "Unexpected result returned from git cat-file";
return -1;
}
diff --git a/pkt-line.c b/pkt-line.c
index d4b71d3..a0e87b1 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -88,13 +88,15 @@
void packet_flush(int fd)
{
packet_trace("0000", 4, 1);
- write_or_die(fd, "0000", 4);
+ if (write_in_full(fd, "0000", 4) < 0)
+ die_errno(_("unable to write flush packet"));
}
void packet_delim(int fd)
{
packet_trace("0001", 4, 1);
- write_or_die(fd, "0001", 4);
+ if (write_in_full(fd, "0001", 4) < 0)
+ die_errno(_("unable to write delim packet"));
}
int packet_flush_gently(int fd)
@@ -117,7 +119,7 @@
strbuf_add(buf, "0001", 4);
}
-static void set_packet_header(char *buf, const int size)
+void set_packet_header(char *buf, int size)
{
static char hexchar[] = "0123456789abcdef";
@@ -348,16 +350,17 @@
return PACKET_READ_EOF;
}
- if ((options & PACKET_READ_DIE_ON_ERR_PACKET) &&
- starts_with(buffer, "ERR "))
- die(_("remote error: %s"), buffer + 4);
-
if ((options & PACKET_READ_CHOMP_NEWLINE) &&
len && buffer[len-1] == '\n')
len--;
buffer[len] = 0;
packet_trace(buffer, len, 0);
+
+ if ((options & PACKET_READ_DIE_ON_ERR_PACKET) &&
+ starts_with(buffer, "ERR "))
+ die(_("remote error: %s"), buffer + 4);
+
*pktlen = len;
return PACKET_READ_NORMAL;
}
diff --git a/pkt-line.h b/pkt-line.h
index ad9a4a2..5c62015 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -25,6 +25,7 @@
void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
void packet_buf_flush(struct strbuf *buf);
void packet_buf_delim(struct strbuf *buf);
+void set_packet_header(char *buf, int size);
void packet_write(int fd_out, const char *buf, size_t size);
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len);
@@ -171,9 +172,9 @@
* Initialize a 'struct packet_reader' object which is an
* abstraction around the 'packet_read_with_status()' function.
*/
-extern void packet_reader_init(struct packet_reader *reader, int fd,
- char *src_buffer, size_t src_len,
- int options);
+void packet_reader_init(struct packet_reader *reader, int fd,
+ char *src_buffer, size_t src_len,
+ int options);
/*
* Perform a packet read and return the status of the read.
@@ -185,7 +186,7 @@
* 'line' is set to point at the read line
* PACKET_READ_FLUSH: 'pktlen' is set to '0' and 'line' is set to NULL
*/
-extern enum packet_read_status packet_reader_read(struct packet_reader *reader);
+enum packet_read_status packet_reader_read(struct packet_reader *reader);
/*
* Peek the next packet line without consuming it and return the status.
@@ -195,7 +196,7 @@
* Peeking multiple times without calling 'packet_reader_read()' will return
* the same result.
*/
-extern enum packet_read_status packet_reader_peek(struct packet_reader *reader);
+enum packet_read_status packet_reader_peek(struct packet_reader *reader);
#define DEFAULT_PACKET_MAX 1000
#define LARGE_PACKET_MAX 65520
diff --git a/po/README b/po/README
index aa704ff..07595d3 100644
--- a/po/README
+++ b/po/README
@@ -293,7 +293,7 @@
emits gibberish on every call to gettext. To use it run the test suite
with it, e.g.:
- cd t && GIT_TEST_GETTEXT_POISON=YesPlease prove -j 9 ./t[0-9]*.sh
+ cd t && GIT_TEST_GETTEXT_POISON=true prove -j 9 ./t[0-9]*.sh
If tests break with it you should inspect them manually and see if
what you're translating is sane, i.e. that you're not translating
diff --git a/po/TEAMS b/po/TEAMS
index d8f7a2b..00472a4 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -11,11 +11,15 @@
Members: Alex Henrie <alexhenrie24@gmail.com>
Language: de (German)
-Repository: https://github.com/ralfth/git-po-de
-Leader: Ralf Thielow <ralf.thielow@gmail.com>
-Members: Matthias Rüster <matthias.ruester@gmail.com>
+Repository: https://github.com/ruester/git-po-de
+Leader: Matthias Rüster <matthias.ruester@gmail.com>
+Members: Ralf Thielow <ralf.thielow@gmail.com>
Phillip Szelat <phillip.szelat@gmail.com>
+Language: el (Greek)
+Repository: https://github.com/vyruss/git-po-el
+Leader: Jimmy Angelakos <vyruss@hellug.gr>
+
Language: es (Spanish)
Repository: https://github.com/ChrisADR/git-po
Leader: Christopher Díaz <christopher.diaz.riv@gmail.com>
@@ -29,9 +33,8 @@
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Language: it (Italian)
-Repository: https://github.com/quizzlo/git-po-it/
-Leader: Marco Paolone <marcopaolone AT gmail.com>
-Members: Stefano Lattarini <stefano.lattarini AT gmail.com>
+Repository: https://github.com/AlessandroMenti/git-po
+Leader: Alessandro Menti <alessandro.menti@alessandromenti.it>
Language: ko (Korean)
Repository: https://github.com/git-l10n-ko/git-l10n-ko/
@@ -63,4 +66,4 @@
Leader: Jiang Xin <worldhello.net AT gmail.com>
Members: Ray Chen <oldsharp AT gmail.com>
依云 <lilydjwg AT gmail.com>
- Fangyi Zhou <fangyi.zhou AT yuriko.moe>
+ Fangyi Zhou <me AT fangyi.io>
diff --git a/po/bg.po b/po/bg.po
index 814d40a..e1d10db 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
# Bulgarian translation of git po-file.
-# Copyright (C) 2014, 2015, 2016, 2017, 2018 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019 Alexander Shopov <ash@kambanaria.org>.
# This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019.
#
# ========================
# DICTIONARY TO MERGE IN GIT GUI
@@ -79,7 +79,9 @@
# packfile пакет
# promisory гарантиращ, гарант promisory packfile гарантиращ пакет, promisory remote хранилище-гарант
# delta - разлика, делта, обект-разлика
-# peeled tag - проследен етикет - когато етикет сочи към друг етикет, а не подаване и проследяваме подобно на символна връзка
+# ??
+# peeled tag - проследяване на етикет - когато етикет сочи към друг етикет, а не подаване и проследяваме подобно на символна връзка
+# nested tag - непряк етикет
# strip - премахвам (за компонент при филтриране)
# unrelated histories - независими истории
# inexact rename detection търсене на преименувания на обекти съчетани с промени
@@ -127,6 +129,16 @@
# ssl backend реализация на SSL
# delta island група разлики
# island marks граници на групите
+# reflog журнал на указателите
+# hash контролна сума, изчисляване на контролна сума
+# fanout откъс (разперване???)
+# idx - index of pack file, 1 index per 1 packfile
+# midx - multi-pack index, for objects across multiple packfiles
+# overlay mode - припокриващ режим (при изтеглянe)
+# incremental file нарастващ файл
+# split (commit-graphr) раздробен (граф с подавания)
+# clobber (a tag) презаписвам (етикет)
+# blame извеждане на авторство
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -143,10 +155,10 @@
# for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
msgid ""
msgstr ""
-"Project-Id-Version: git 2.20\n"
+"Project-Id-Version: git 2.22\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-02 13:41+0100\n"
+"POT-Creation-Date: 2019-08-10 12:25+0300\n"
+"PO-Revision-Date: 2019-08-10 12:33+0300\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -155,37 +167,37 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:170
+#: advice.c:180
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."
@@ -193,38 +205,45 @@
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Бележка: изтегляне на „%s“.\n"
+"Бележка: преминаване към „%s“.\n"
"\n"
"Указателят „HEAD“ не е свързан. Може да разглеждате, да правите произволни\n"
"промени и да ги подавате. Ако изтеглите нещо друго, всички промени ще "
@@ -232,106 +251,121 @@
"забравени и никой клон няма да се промени.\n"
"\n"
"Ако искате да създадете нов клон, за да запазите подаванията си, можете да\n"
-"направите това като зададете име на клон към опцията „-b“ на командата\n"
-"„commit“. Например:\n"
+"направите това като зададете име на клон към опцията „-c“ на командата\n"
+"„switch“. Например:\n"
"\n"
-" git checkout -b ИМЕ_НА_НОВ_КЛОН\n"
+" git switch -c ИМЕ_НА_НОВ_КЛОН\n"
"\n"
+"Може да отмените това действие с командата:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Може да спрете това съобщение със задаване на настройката „advice."
+"detachedHead“\n"
+"да е „false“.\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "командният ред завършва с „/“"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "кавичка без еш"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "непозната опция за знаците за интервали „%s“"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "опциите „--reject“ и „--3way“ са несъвместими"
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "опциите „--cached“ и „--3way“ са несъвместими"
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Липсва име на файл на ред %d от кръпката"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на стар файл"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/"
"null“"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "грешен режим на ред №%d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "несъвместими заглавни части на редове №%d и №%d"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "част от кръпка без заглавна част на ред %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -346,71 +380,71 @@
"След съкращаването на първите %d части от компонентите на пътя, в заглавната "
"част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "новият файл зависи от старото съдържание на файла"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "изтритият файл не е празен"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "новият файл „%s“ зависи от старото съдържание на файла"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритият файл „%s“ не е празен"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -419,13 +453,13 @@
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -434,316 +468,317 @@
"при търсене за:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"в хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Преминаване към тройно сливане…\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Неуспешно преминаване към тройно сливане…\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…"
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -752,145 +787,144 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "път"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "БРОЙ"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "действие"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "повече подробности"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
@@ -913,99 +947,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "такъв указател няма: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "неправилно име на обект: „%s“"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "не е обект-дърво: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "текущата работна директория не е следена"
+
+#: archive.c:457
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "само съхранение без компресиране"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "бързо компресиране"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "добро компресиране"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "хранилище"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "команда"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Опцията „--exec“ изисква „--remote“"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
@@ -1025,16 +1078,16 @@
msgid "cannot read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "филтърът „%s“ не може да бъде стартиран"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "дескрипторът не може да бъде пренасочен"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "филтърът „%s“ върна грешка"
@@ -1049,7 +1102,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "грешка при декомпресиране с „deflate“ (%d)"
@@ -1059,12 +1112,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "„%.*s“ е неправилно име за атрибут"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s: командата не е позволена: „%s:%d“"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1077,17 +1135,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1096,7 +1154,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1105,7 +1163,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1114,7 +1172,7 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1125,7 +1183,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1136,22 +1194,22 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -1191,46 +1249,46 @@
msgstr[0] "Двоично търсене: остава %d версия след тази %s\n"
msgstr[1] "Двоично търсене: остават %d версии след тази %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "Опциите „--contents“ и „--reverse“ са несъвместими"
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на диапазон по веригата на първите наследници"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "няма път на име „%s“ в „%s“"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1243,88 +1301,88 @@
"информацията за следения клон чрез:\n"
"git branch --set-upstream-to=%s%s%s"
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
"Клонът „%s“ не може да служи като източник за собствената си синхронизация."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“ чрез "
"пребазиране."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Клонът „%s“ ще следи локалния клон „%s“ чрез пребазиране."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Клонът „%s“ ще следи локалния клон „%s“."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Клонът „%s“ ще следи отдалечения указател „%s“."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Клонът „%s“ ще следи локалния указател „%s“ чрез пребазиране."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Клонът „%s“ ще следи локалния указател „%s“."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Настройките за следения клон не могат да бъдат записани"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "„%s“ не е позволено име за клон."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Вече съществува клон с име „%s“."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Текущият клон не може да бъде принудително обновен."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заявеният отдалечен клон „%s“ не съществува"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1343,27 +1401,27 @@
"може да използвате „git push -u“, за да настроите към кой клон да се "
"изтласква."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Неправилно име на обект: „%s“"
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Името на обект не е еднозначно: „%s“"
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Неправилно място за начало на клон: „%s“"
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
@@ -1378,71 +1436,75 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "В хранилището липсват следните необходими подавания:"
-#: bundle.c:192
+#: 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] "Пратката съдържа следните %d указатели:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Пратката съдържа пълна история."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изисква следния указател:"
msgstr[1] "Пратката изисква следните %d указатели:"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши успешно"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде създаден"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно"
@@ -1451,9 +1513,8 @@
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
@@ -1463,7 +1524,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1486,29 +1547,29 @@
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1518,95 +1579,271 @@
"Може да поправите подаването заедно със съобщението или може да\n"
"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "файлът с гра̀фа на подаванията „%s“ е твърде малък"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "файлът с гра̀фа на подаванията е твърде малък"
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
+msgid "commit-graph signature %X does not match signature %X"
msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
+msgid "commit-graph version %X does not match version %X"
msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "версията на отпечатъка на гра̀фа с подаванията %X не съвпада с %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr "неправилно отместване на откъс: %08x%08x"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
+msgid "commit-graph chunk id %08x appears multiple times"
msgstr "откъсът %08x се явява многократно"
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "базовият откъс липсва в гра̀фа с подаванията"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "веригата на гра̀фа с подаванията не съвпада"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "подаването „%s“ не може да бъде открито"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да бъде определен"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Анотиране на подаванията в гра̀фа"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "Разширяване на достижимите подавания в гра̀фа"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Откриване на подаванията в гра̀фа"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл"
+msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "грешка при добавяне на пакетен файл „%s“"
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "грешка при отваряне на индекса на „%s“"
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Откриване на подаванията в гра̀фа измежду %d указател"
+msgstr[1] "Откриване на подаванията в гра̀фа измежду %d указатели"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "прекалено много подавания за записване на гра̀фа"
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Преброяване на различните подавания в гра̀фа"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Откриване на още върхове в гра̀фа с подаванията"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "правилният брой на базовите идентификатори не може да се запише"
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Запазване на гра̀фа с подаванията в %d пас"
+msgstr[1] "Запазване на гра̀фа с подаванията в %d паса"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Търсене на подаванията със сливания"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "неочакван, повтарящ се идентификатор на подаване: %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Сливане на гра̀фа с подаванията"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "прекалено много подавания за записване на гра̀фа"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
+"е преди „%s“, а не трябва"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
+"трябва да е %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Проверка на подаванията в гра̀фа"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
+"анализира"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
+"подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
+"не е"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
+"другаде е"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а "
+"другаде е %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
+"%<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1621,162 +1858,162 @@
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
@@ -1784,139 +2021,139 @@
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва "
"стандартната стойност „keep“ (запазване)"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
@@ -1970,50 +2207,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "отсрещното хранилище не може да е плитко"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "отдалечена грешка: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "неправилен пакет"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "протоколна грешка: неочаквано „%s“"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "неправилен отговор на „ls-refs“: „%s“"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "очакваше се изчистване на буферите след изброяването на указателите"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "протокол „%s“ не се поддържа"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "Търсене на „%s“… "
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "„%s“ (порт %s) не може да се открие („%s“)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -2022,7 +2254,7 @@
"готово.\n"
"Свързване към „%s“ (порт %s)…"
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2032,56 +2264,56 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "действието завърши."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "„%s“ не може да се открие (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "непознат порт „%s“"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "необичайното име на хост „%s“ е блокирано"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "необичайният порт „%s“ е блокиран"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "посредникът „%s“ не може да се стартира"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"не е указан път. Проверете синтаксиса с командата:\n"
"\n"
" git help pull"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "необичайният път „%s“ е блокиран"
@@ -2090,33 +2322,33 @@
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
-msgstr "Проверка на връзката"
+msgstr "Проверка на свързаността"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "неправилно действие за край на ред: %d"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“."
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -2126,13 +2358,13 @@
"Файлът ще остане с първоначалните знаци за край на ред в работната ви "
"директория."
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
"Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“."
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -2143,14 +2375,14 @@
"Файлът ще остане с първоначалните знаци за край на ред в работната ви "
"директория."
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
"„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при "
"кодиране „%s“"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -2159,14 +2391,14 @@
"Файлът „%s“ съдържа маркер за поредността на байтовете (BOM). Използвайте "
"„UTF-%s“ като кодиране за работното дърво."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
"„%s“ трябва да съдържа маркер за поредността на байтовете (BOM) при кодиране "
"„%s“"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2176,37 +2408,37 @@
"на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от "
"поредността на байтовете)."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "неуспешно създаване на процес за външен филтър „%s“"
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "входът не може да бъде подаден на външния филтър „%s“"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "неуспешно изпълнение на външния филтър „%s“: %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "неуспешно четене от външния филтър „%s“"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "неуспешно изпълнение на външния филтър „%s“"
@@ -2242,53 +2474,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "в бъдещето"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "преди %<PRIuMAX> секунда"
msgstr[1] "преди %<PRIuMAX> секунди"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "преди %<PRIuMAX> минута"
msgstr[1] "преди %<PRIuMAX> минути"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "преди %<PRIuMAX> час"
msgstr[1] "преди %<PRIuMAX> часа"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "преди %<PRIuMAX> ден"
msgstr[1] "преди %<PRIuMAX> дена"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "преди %<PRIuMAX> седмица"
msgstr[1] "преди %<PRIuMAX> седмици"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "преди %<PRIuMAX> месец"
msgstr[1] "преди %<PRIuMAX> месеца"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2296,42 +2528,42 @@
msgstr[1] "%<PRIuMAX> години"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "преди %s и %<PRIuMAX> месец"
msgstr[1] "преди %s и %<PRIuMAX> месеца"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "преди %<PRIuMAX> година"
msgstr[1] "преди %<PRIuMAX> години"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Разпространяване на границите на групите"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "неправилен обект-дърво: %s"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "регулярният израз на групата за „%s“, не може да бъде зареден: „%s“"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"регулярният израз на групата в конфигурационния файл съдържа повече от "
"максимално поддържаните (%d) прихващащи групи"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Отбелязани са %d групи, работата приключи.\n"
@@ -2345,24 +2577,31 @@
msgid "Performing inexact rename detection"
msgstr "Търсене на преименувания на обекти съчетани с промени"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "опцията „%s“ изисква стойност"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Не е хранилище на git. Ползвайте опцията „--no-index“, за да сравните "
+"пътища извън работно дърво"
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
"директории\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2371,25 +2610,33 @@
"„default“ (стандартно), „blocks“ (парчета), „zebra“ (райе), "
"„dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "непознатата стойност „%s“ на настройката „color-moved-ws“ се прескача"
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-"color-moved-ws: „allow-indentation-change“ е несъвместима с другите режими "
-"за знаците за интервали"
+"неподдържан режим за настройката „color-moved-ws mode“ — „%s“, възможните "
+"стойности са „ignore-space-change“ (пренебрегване на промените на празните "
+"знаци), „ignore-space-at-eol“ (пренебрегване на промените на празните знаци "
+"в края на реда), „ignore-all-space“ (пренебрегване на всички празни знаци), "
+"„allow-indentation-change“ (позволяване на промените в празните знаци за "
+"форматиране)"
-#: diff.c:394
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"„color-moved-ws“: „allow-indentation-change“ е несъвместима с другите режими "
+"за празни знаци"
+
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2398,27 +2645,38 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "неправилна стойност за „--stat“: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "опцията „%s“ очаква число за аргумент"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2427,63 +2685,563 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Неразпознат параметър към опцията „--submodule“: „%s“"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "непозната стойност след „ws-error-highlight=%.*s“"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "„%s“ не може да се открие"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
+"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "опцията „%s“ изисква знак, а не: „%s“"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "неправилен аргумент за „--color-moved“: „%s“"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"опцията приема следните варианти за алгоритъм за разлики: „myers“ (по "
+"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
+"„histogram“ (хистограмен)"
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "неправилен аргумент към „%s“"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "неправилен аргумент към „--word-diff“: „%s“"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Формат на изхода за разликите"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "създаване на кръпки"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "без извеждане на разликите"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "БРОЙ"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "файловете с разлики да са в суров формат"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "псевдоним на „-p --stat“"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "псевдоним на „-p --stat“"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "„--stat“ във формат за четене от програма"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "извеждане само на последния ред на „--stat“"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "извеждане на разпределението на промените за всяка поддиректория"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "псевдоним на „--dirstat=cumulative“"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
+"празните знаци"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"съкратено резюме на създадените, преименуваните и файловете с промяна на "
+"режима на достъп"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "извеждане само на имената на променените файлове"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "извеждане само на имената и статистиката за променените файлове"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "извеждане на статистика за промените"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "ШИРОЧИНА"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "статистика с такава ШИРОЧИНА за промените"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "статистика за промените с такава ШИРОЧИНА на имената"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "БРОЙ"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "ограничаване на БРОя на редовете в статистиката за промените"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "кратко резюме в статистиката за промените"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "извеждане на двоична разлика във вид за прилагане"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"показване на пълните имена на обекти в редовете за индекса при вариантите "
+"преди и след промяната"
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "разлики в цвят"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "ВИД"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"грешките в празните знаци да се указват в редовете за контекста, вариантите "
+"преди и след разликата,"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
+"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "ПРЕФИКС"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "префикс вместо „a/“ за източник"
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "префикс вместо „b/“ за цел"
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "без префикс за източника и целта"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"извеждане на контекст между последователните парчета с разлики от указания "
+"БРОЙ редове"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "ЗНАК"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "знак вместо „+“ за нов вариант на ред"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "знак вместо „-“ за стар вариант на ред"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "знак вместо „ “ за контекст"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Настройки за разлики с преименуване"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"заместване на пълните промени с последователност от изтриване и създаване"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "засичане на преименуванията"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "без предварителен вариант при изтриване"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "засичане на копиранията"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "търсене на копирано и от непроменените файлове"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "без търсене на преименувания"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "празни обекти като източник при преименувания"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"продължаване на извеждането на историята — без отрязването при преименувания "
+"на файл"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Опции към алгоритъма за разлики"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "търсене на възможно най-малка разлика"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "без промени в празните знаци при сравняване на редове"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "без промени в празните знаци"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "без промени в празните знаци в края на редовете"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "без промени в знаците за край на ред"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "без промени в редовете, които са изцяло от празни знаци"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"евристика за преместване на границите на парчетата за улесняване на четенето"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "разлика чрез алгоритъм за подредба като пасианс"
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "разлика по хистограмния алгоритъм"
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "АЛГОРИТЪМ"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "избор на АЛГОРИТЪМа за разлики"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "ТЕКСТ"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "разлика чрез алгоритъма със закотвяне"
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "РЕЖИМ"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "различен цвят за извеждане на преместените редове"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+"режим за прескачането на празните знаци при задаването на „--color-moved“"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Други опции за разлики"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
+"се ползват относителни пътища"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "обработка на всички файлове като текстови"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "размяна на двата входа — обръщане на разликата"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+"завършване с код за състояние 1 при наличието на разлики, а в противен "
+"случай — с 0"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "без всякакъв изход от програмата"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "позволяване на изпълнение на външна помощна програма за разлики"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"изпълнение на външни програми-филтри при сравнението на двоични файлове"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "КОГА"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "игнориране на промените в подмодулите при извеждането на разликите"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "ФОРМАТ"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "начин за извеждане на промените в подмодулите"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "без включване в индекса на записите, добавени с „git add -N“"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "включване в индекса на записите, добавени с „git add -N“"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "НИЗ"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "търсене на разлики, които променят броя на поява на указаните низове"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"търсене на разлики, които променят броя на поява на низовете, които напасват "
+"на регулярния израз"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "извеждане на всички промени с „-G“/„-S“"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "управление на подредбата на файловете в изхода"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "търсене на разлики, които променят броя на поява на указания обект"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "избор на файловете по вид разлика"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "ФАЙЛ"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Изход към указания файл"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
-"установени са точните копия на променените пътища поради многото файлове."
+"установени са само точните копия на променените пътища поради многото "
+"файлове."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "пътят „%s“ не съвпада с никой файл в git"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
@@ -2497,7 +3255,7 @@
msgid "Filtering content"
msgstr "Филтриране на съдържанието"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
@@ -2512,7 +3270,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "GIT_DIR не може да се зададе да е „%s“"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
@@ -2525,252 +3283,240 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "невъзможно писане към отдалечено хранилище"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Сървърът не поддържа плитки клиенти"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Сървърът поддържа „multi_ack_detailed“"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "Сървърът поддържа „no-done“"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Сървърът поддържа „multi_ack“"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Сървърът поддържа „side-band-64k“"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Сървърът поддържа „side-band“"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Сървърът поддържа „ofs-delta“"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "Сървърът поддържа филтри"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Сървърът поддържа „%s“"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Сървърът не поддържа плитки клиенти"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Сървърът поддържа филтри"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "невъзможно писане към отдалечено хранилище"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
-msgstr "Сървърът не позволява заявка за необявен „%s“"
+msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подписа данните."
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
@@ -2780,18 +3526,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
@@ -2848,41 +3594,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Команди от ниско ниво/Допълнителни инструменти"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "налични команди на git от „%s“"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "команди на git от други директории от „$PATH“"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Това са най-често използваните команди на Git:"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "неподдържан списък от команди „%s“"
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Популярните въведения в Git са:"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "За повече информация за КОМАНДА изпълнете „git help КОМАНДА“"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Външни команди"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Псевдоними на командите"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2891,36 +3637,36 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
"не съществува."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
"имате предвид „%s“."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2934,16 +3680,16 @@
"\n"
"Най-близките команди са"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2957,7 +3703,7 @@
"\n"
"Команди с подобно име са:"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2976,58 +3722,82 @@
"\n"
"Изпълнете:\n"
"\n"
-" git config --global user.email \"ИМЕ@example.com\"\n"
-" git config --global user.name \"ВАШЕТО ИМЕ\"\n"
+" git config --global user.email \"ИМЕ@example.com\"\n"
+" git config --global user.name \"ВАШЕТО ИМЕ\"\n"
"\n"
"и въведете данни за себе си.\n"
"Ако пропуснете опцията „--global“, самоличността е само за текущото "
"хранилище.\n"
"\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "липсва адрес за е-поща, а автоматичното отгатване е изключено"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
"адресът за е-поща не може да бъде отгатнат (най-доброто предположение бе "
"„%s“)"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "липсва име, а автоматичното отгатване е изключено"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "името не може да бъде отгатнато (най-доброто предположение бе „%s“)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "не може да се ползва празно име като идентификатор (за <%s>)"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "не може да комбинирате множество филтри"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "поддържа се единствено „tree:0“"
+msgid "expected 'tree:<depth>'"
+msgstr "очаква се „tree:ДЪЛБОЧИНА“"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "поддръжката на филтри със „sparse:path“ е премахната"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "неправилен филтър: „%s“"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "не може да промените хранилището-гарант на непълно хранилище"
@@ -3059,12 +3829,13 @@
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
@@ -3075,109 +3846,109 @@
"неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е "
"преустановено."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. "
"Сливането е преустановено."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
"подаванията)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Превъртане на подмодула „%s“ до следното подаване:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Превъртане на подмодула „%s“"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
"от подаванията)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
"Открито е сливане, което може да решава проблема със сливането на "
"подмодула:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3193,31 +3964,31 @@
"\n"
"Това приема предложеното.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3226,7 +3997,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3235,7 +4006,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3244,7 +4015,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3253,33 +4024,45 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото: %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
+"„%s“ е добавен в „%s“"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Преустановяване на действието, за да не се изгуби неследеният файл „%s“. "
"Вместо него се добавя „%s“"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3288,29 +4071,18 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3321,7 +4093,7 @@
"постави „%s“, защото няколко нови директории поделят съдържанието на "
"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3330,7 +4102,7 @@
"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3340,7 +4112,7 @@
"съответства на „%s“. Косвено преименуване на директория води до поставянето "
"на тези пътища там: %s."
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3349,7 +4121,7 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3358,38 +4130,21 @@
"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
"„%s“ също е с променено име."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
-"„%s“ е добавен в „%s“"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Добавяне на слетия „%s“"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавяне като „%s“"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "променен"
@@ -3397,50 +4152,96 @@
msgid "content"
msgstr "съдържание"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Добавяне като „%s“"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
+"„%s“. Обектът се мести в „%s“."
+
+#: merge-recursive.c:3182
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
+"преименувана в „%s“. Предложението е да преместите обекта в „%s“."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
+"преименувана в „%s“. Обектът се мести в „%s“."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
+"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ "
"като „%s“"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3449,131 +4250,140 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "версията на отпечатъка %u не съвпада"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "неправилно (прекалено голямо) отместване на откъс"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"идентификаторът за краен откъс на индекс за множество пакети се явява по-"
"рано от очакваното"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
"грешка при създаването на пакетен файл на базата на индекс за множество "
"пакети"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетният файл за триене „%s“ не може да се открие"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Търсене на указаните пакетни файлове"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -3581,31 +4391,49 @@
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr ""
+"Проверка на подредбата на идентификатори на обекти в MIDX (файл с индекс към "
+"множество пакетни файлове)"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Подредба на обектите по пакетни файлове"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "командата „pack-objects“ не може да бъде стартирана"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "командата „pack-objects“ не може да бъде завършена"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3621,7 +4449,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "не може да се изчака нишка за имена: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3638,23 +4466,23 @@
"\n"
" git notes merge --abort"
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
"Не сте завършили сливането на бележките. (Указателят „%s“ съществува)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"Неинициализирано или нереферирано дърво за бележки не може да бъде подадено"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Неправилна стойност за „notes.rewriteMode“: „%s“"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
@@ -3664,7 +4492,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
@@ -3674,50 +4502,106 @@
msgid "invalid object type \"%s\""
msgstr "неправилен вид обект: „%s“"
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "обектът „%s“ е %s, а не %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "обектът „%s“ е непознат вид: %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "разлика в SHA1: „%s“"
+msgid "hash mismatch %s"
+msgstr "разлика в контролната сума: „%s“"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "опцията „%s“ изисква аргумент"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "опциите „%s“ и „%s“ са несъвместими"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "опцията „%s“ е несъвместима с нещо"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "опцията „%s“ не приема аргументи"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "опцията „%s“ не е налична"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "непозната опция: „%s“"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "непознат флаг „%c“"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "непозната стойност извън „ascii“ в низа: „%s“"
+
+#: parse-options.c:887
msgid "..."
msgstr "…"
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -3725,58 +4609,75 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-ЧИСЛО"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "псевдоним на „--%s“"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "опцията „%s“ очаква число за аргумент"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "неправилна дата на срок: „%s“"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
+"„auto“ (автоматично) или „never“ (никога)"
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Екраниращият знак „\\“не може да е последен знак в стойността на атрибут"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Позволено е само едно указване на „attr:“."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "„attr:“ трябва да указва стойност"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "неправилно име на атрибут: „%s“"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3784,131 +4685,191 @@
"глобалната настройка за дословни пътища „literal“ е несъвместима с всички "
"други глобални настройки за пътища"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправилен параметър за опцията за магически пътища „prefix“"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Магическите пътища „%c“ са без реализация за „%s“"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: „%s“ е извън хранилището"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "„%s“ (клавиш: „%c“)"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pkt-line.c:104
+#: 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:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "протоколна грешка: прекалено дълъг ред"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "неуспешен запис на пакет с формат"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"неуспешен запис на пакетен файл — данните надвишават максималният размер на "
"пакет"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "неуспешен запис на пакет"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "грешка при четене"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "отдалеченото хранилище неочаквано прекъсна връзката"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "протоколна грешка: неправилна дължина на ред: %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "отдалечена грешка: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Обновяване на индекса"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "заглавната част на git „%.*s“ не може да се анализира"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"няма да бъде добавен псевдоним за файл „%s“ („%s“ вече съществува в индекса)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "в базата от данни за обектите не може да се създаде празен обект-BLOB"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: може да добавяте само обикновени файлове, символни връзки и директории "
+"на git"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "не е изтеглено подаване в „%s“"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "файлът „%s“ не може да бъде индексиран"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "„%s“ не може да се добави в индекса"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "„stat“ не може да се изпълни върху „%s“"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "„%s“ съществува и като файл, и като директория"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Обновяване на индекса"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3917,7 +4878,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3927,62 +4888,154 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "неправилен подпис: „0x%08x“"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "неправилна версия на индекса %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "игнориране на разширението „%.4s“"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "непознат формат на запис в индекса: „0x%08x“"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
-msgstr "неправилно име на поле в индекса, близо до пътя „%s“"
+msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "неподредени записи в индекса"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "множество записи за слетия файл „%s“"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "неподредени записи за „%s“"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: неуспешно отваряне на файла на индекса"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: файлът на индекса е по-малък от очакваното"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: неуспешно заделяне на съответстваща памет чрез „mmap“ на индекса"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "споделеният индекс „%s“ не може да се обнови"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "правата за достъп до „%s“ не могат да бъдат поправени"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: не може да се премине към етап №0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. "
+"Настройката се прескача."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -4029,7 +5082,14 @@
"Може да променяте последователността на редовете — те се изпълняват\n"
"последователно отгоре-надолу.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
+msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4038,7 +5098,7 @@
"Не изтривайте редове. Подаванията могат да се прескачат с командата "
"„drop“.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4046,7 +5106,7 @@
"\n"
"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4061,7 +5121,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -4071,125 +5131,155 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Празните подавания са коментирани"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да се чете."
+msgid "could not write '%s'"
+msgstr "„%s“ не може да се запише"
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "„%s“ не може да се копира като „%s“."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Предупреждение: някои подавания може да са пропуснати.\n"
+"Пропуснати подавания (новите са най-отгоре):\n"
+
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
+"\n"
+"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
+"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
+"предупреждение)\n"
+"или „error“ (считане за грешка).\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "„%s“ не сочи към позволен обект!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "игнориране на указател на обект извън клон „%s“"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "„%s“ не може да бъде отворен за запис: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "указателят „%s“ не може да се прочете"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "указателят „%s“ вече съществува"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "неочакван идентификатор на обект при записването на „%s“"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "неочакван идентификатор на обект при изтриването на „%s“"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "журналът с подаванията за указателя „%s“ е празен"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "указател не може да се обнови с грешно име „%s“"
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "неуспешно обновяване на указателя „%s“: %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
@@ -4199,350 +5289,486 @@
msgid "invalid refspec '%s'"
msgstr "неправилен указател: „%s“"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "изтрит"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "напред с %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "назад с %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) не приема аргументи"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "непознат аргумент за %%(objectsize): %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) не приема аргументи"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) не приема аргументи"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "очаква се положителна стойност за „objectname:short=%s“"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "непознат аргумент за %%(objectname): %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "непознат аргумент за „%%(if)“: %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(извън клон, пребазиране на „%s“)"
+msgid "no branch, rebasing %s"
+msgstr "извън клон, пребазиране на „%s“"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(извън клон, двоично търсене от „%s“)"
+msgid "no branch, bisect started on %s"
+msgstr "извън клон, двоично търсене от „%s“"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "извън клон"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(извън клон)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "опциите „%s“ и „--merged“ са несъвместими"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "опциите „%s“ и „--no-merged“ са несъвместими"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "опцията „%s“ не сочи към подаване"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"съкращението за отдалечено хранилище не може за започва със знака „/“: %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Вътрешна грешка"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "ключ „%s“ на шаблона не съдържа „*“"
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "стойност „%s“ на шаблона не съдържа „*“"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Зададената цел не е пълен указател (не започва с „refs/“).\n"
+"Бяха пробвани следните варианти:\n"
+"\n"
+" ⁃ указател от отдалеченото хранилище, който да съответства на „%s“;\n"
+" ⁃ дали изтласкваният ИЗТОЧНИК („%s“) е указател в „refs/{heads,tags}/“.\n"
+" При съвпадение се добавя съответен префикс „refs/{heads,tags}/“ за\n"
+" отдалеченото хранилище.\n"
+"\n"
+"Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n"
+"указателя."
+
+#: remote.c:1040
+#, 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 ""
+"ИЗТОЧНИКът е обект-подаване. Не целите ли всъщност да създадете нов клон "
+"като\n"
+"изтласкате към „%s:refs/heads/%s“?"
+
+#: remote.c:1045
+#, 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 ""
+"ИЗТОЧНИКът е обект-етикет. Не целите ли всъщност да създадете нов клон "
+"като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#: remote.c:1050
+#, 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 ""
+"ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#: remote.c:1055
+#, 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 ""
+"ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n"
+"изтласкате към „%s:refs/tags/%s“?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "не е открит клон съответстващ на „%s“"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
+"източник"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "отдалеченият указател „%s“ не може да бъде открит"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "• прескачане на неочаквания локален указател „%s“"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (за повече информация ползвайте „%s“)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4550,11 +5776,11 @@
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4569,10 +5795,15 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4596,11 +5827,6 @@
msgid "unable to write rerere record"
msgstr "приложеното коригиране на конфликт не може да бъде записано"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "„%s“ не може да се запише"
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4654,8 +5880,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
@@ -4689,29 +5915,35 @@
msgid "unable to open rr-cache directory"
msgstr "директорията „rr-cache“ не може да се отвори"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
+"p“ и „-s“"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "неуспешно отваряне на „/dev/null“"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "не може да се създаде асинхронна нишка: %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4721,32 +5953,32 @@
"За да изключите това предупреждение, изпълнете:\n"
" git config advice.ignoredHook false"
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"неочакван изчистващ пакет „flush“ при изчитане на състоянието от "
"отдалеченото разпакетиране"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "неуспешно отдалечено разпакетиране: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4754,42 +5986,47 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "„%s“ не може да бъде изтрит"
+
+#: sequencer.c:321
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4797,7 +6034,7 @@
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4807,110 +6044,115 @@
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Несъществуващ режим на изчистване „%s“"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "неправилен формат на дата „%s“ в „%s“"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4939,17 +6181,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "запазване на начално подаване"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4978,7 +6220,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -5004,311 +6246,362 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "указано е базово подаване, но подаването „%s“ не е сливане."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "неуспешно извличане на съобщението за подаване на „%s“"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "„%.*s“ не може да се анализира"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да се чете."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "преустановяване на извършваното в момента отбиране на подавания"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "преустановяване на извършваното в момента отмяна на подаване"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr ""
-"в момента вече се извършва отбиране на подавания или пребазиране на клона"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "в момента вече се извършва отбиране на подавания"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "директорията за секвенсора „%s“ не може да бъде създадена"
+msgstr ""
+"директорията за определянето на последователността „%s“ не може да бъде "
+"създадена"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "в момента не тече пребазиране"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "в момента не се извършва отбиране на подавания"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "неуспешно прескачане на подаването"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "няма какво да се прескочи"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"подали ли сте вече? Пробвайте с:\n"
+"\n"
+" git %s --continue"
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5327,27 +6620,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5362,11 +6655,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
-msgstr "и промени индекса и/или работното дърво\n"
+msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5383,76 +6676,76 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "дървото, сочено от „%s“, не може да бъде открито"
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "индексът не може да бъде записан"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5463,31 +6756,31 @@
"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "„%s“ е неправилен идентификатор на обект"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5510,48 +6803,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5561,82 +6854,42 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "промените в индекса не могат да бъдат подадени."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. "
-"Настройката се прескача."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Предупреждение: някои подавания може да са пропуснати.\n"
-"Пропуснати подавания (новите са най-отгоре):\n"
-
-#: sequencer.c:4697
-#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
-"\n"
-"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
-"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
-"предупреждение)\n"
-"или „error“ (считане за грешка).\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5646,31 +6899,15 @@
"continue“ след това.\n"
"Може и да преустановите пребазирането с командата „git rebase --abort“.\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
-msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "„%s“ не може да се копира като „%s“."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "файлът с командите не може да се обработи"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
@@ -5679,7 +6916,7 @@
msgid "'%s' is outside repository"
msgstr "„%s“ е извън хранилището"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5690,7 +6927,7 @@
"\n"
" git КОМАНДА -- ПЪТ…"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5703,12 +6940,12 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5720,94 +6957,94 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
"не може да се зададе текуща работна директория при неправилни настройки"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "тази команда трябва да се изпълни в работно дърво"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "открити са непознати разширения в хранилището:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "„%s“ не може да се отвори"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "прекалено голям файл „.git“: „%s“"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "грешка при прочитане на „%s“"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправилен формат на gitfile: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "липсва път в gitfile: „%s“"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "не е хранилище на Git: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "„%s“ е прекалено голям"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "не е хранилище на git: „%s“"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "процесът не може да се върне към предишната работна директория"
-#: setup.c:837
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
+
+#: setup.c:1083
+msgid "Unable to read current working directory"
+msgstr "Текущата работна директория не може да бъде прочетена"
+
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "не може да се влезе в директорията „%s“"
+
+#: setup.c:1103
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:848
-#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-
-#: setup.c:1078
-msgid "Unable to read current working directory"
-msgstr "Текущата работна директория не може да бъде прочетена"
-
-#: setup.c:1090 setup.c:1096
-#, c-format
-msgid "cannot change to '%s'"
-msgstr "не може да се влезе в директорията „%s“"
-
#: setup.c:1109
#, c-format
msgid ""
@@ -5819,7 +7056,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5829,292 +7066,297 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
"alternates“"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
"дълбоко влагане"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "файлът с алтернативите не може да бъде прочетен"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "неуспешно изпълнение на „mmap“"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "неправилен вид обект"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
"type“"
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "грешка при записа на файла със сумите по SHA1 „%s“"
+msgid "unable to write file %s"
+msgstr "файлът „%s“ не може да бъде записан"
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не могат да бъдат зададени"
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "грешка при запис на файл"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "грешка при затварянето на файла със сумите по SHA1"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "грешка при затварянето на файла с непакетиран обект"
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "не може да се пише във файла със сумите по SHA1"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "грешка при записа на файла с непакетиран обект"
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "файлът със сумите по SHA1 на „%s“ не може да бъде прочетен"
+msgid "cannot read object for %s"
+msgstr "обектът за „%s“ не може да се прочете"
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "повредено подаване"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "повреден етикет"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "неправилна сума по SHA1 за „%s“ (трябва да е %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "късият SHA1 „%s“ не е еднозначен"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Възможностите са:"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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"
@@ -6124,79 +7366,142 @@
"шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
"Възможно е такива указатели да са създадени случайно. Например:\n"
"\n"
-" git checkout -b $BRANCH $(git rev-parse…)\n"
+" git switch -c $BRANCH $(git rev-parse …)\n"
"\n"
"където стойността на променливата на средата BRANCH е празна, при което се\n"
-"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете "
+"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Може "
"да\n"
"спрете това съобщение като изпълните командата:\n"
-"„git config advice.objectNameWarning false“"
+"\n"
+" git config advice.objectNameWarning false"
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u байт/сек."
+msgstr[1] "%u байта/сек."
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо "
"коригирайте конфликтите"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в неподготвения подмодул „%s“"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "Подмодулът „%s“ не може да бъде достъпен"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "„%s“ не е хранилище на git"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "индексът на подмодула „%s“ не е чист"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Подмодулът „%s“ не може да се обнови."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -6204,12 +7509,12 @@
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -6220,16 +7525,16 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
@@ -6239,23 +7544,23 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "игнориране на подозрително име на подмодул: „%s“"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"„%s“ се прескача, защото е възможно да се тълкува като опция за командния "
"ред: %s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "Неправилна стойност за „%s“"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
@@ -6290,7 +7595,7 @@
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "Не може да се получи информация чрез „stat“ за „%s“"
@@ -6329,29 +7634,38 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+"За повече информация вижте раздела „protocol.version“ в „git help config“"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "опциите на сървъра изискват поне версия 2 на протокола"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "протокол версия 2 все още не се поддържа"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "непозната стойност за настройката „%s“: „%s“"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "преносът по „%s“ не е позволен"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "командата „git-over-rsync“ вече не се поддържа"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6360,7 +7674,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6385,39 +7699,34 @@
" git push\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "неуспешен пълен запис към насрещната помощна програма"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "насрещната помощна програма за „%s“ не може да бъде открита"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
"файловият дескриптор от насрещната помощна програма не може да се дублира с "
"„dup“"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6426,106 +7735,106 @@
"непозната задължителна способност „%s“. Насрещната помощна програма "
"вероятно изисква нова версия на Git"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
"насрещната помощна програма трябва да поддържа способност за изброяване на "
"указатели"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "„%s“ неочаквано върна: „%s“"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "„%s“ заключи и „%s“"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "неуспешно изпълнение на бързо внасяне"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "грешка при изпълнението на бързо внасяне"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "указателят „%s“ не може да се прочете"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "неочакван отговор при свързване: „%s“"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "протоколът не поддържа задаването на път на отдалечената услуга"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "неправилен път на отдалечената услуга"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "неуспешно свързване към подуслугата „%s“"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"насрещната помощна програма не поддържа изтласкване. Необходимо е "
"изброяване на указателите"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "не може да се извърши бързо изнасяне"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "грешка при изпълнението на командата за бързо изнасяне"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6534,47 +7843,47 @@
"Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n"
"направено. Пробвайте да укажете клон, напр. “master“.\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "неправилен отговор в списъка с указатели: „%s“"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "неуспешно четене на „%s“"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "неуспешен запис в „%s“"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "неуспешно изпълнение на нишката „%s“"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "неуспешно изпълнение на „%s“"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "неуспешно стартиране на нишка за копиране на данните"
@@ -6590,11 +7899,11 @@
msgid "empty filename in tree entry"
msgstr "празно име на файл в запис в дърво"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6603,7 +7912,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да преминете към нов клон."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6612,7 +7921,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6621,7 +7930,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6630,7 +7939,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6639,7 +7948,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6648,7 +7957,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6657,7 +7966,7 @@
"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6666,7 +7975,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6675,7 +7984,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6684,7 +7993,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6693,7 +8002,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6702,7 +8011,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6711,7 +8020,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6721,7 +8030,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6731,7 +8040,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6740,7 +8049,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6749,7 +8058,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6758,7 +8067,7 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6767,12 +8076,12 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6782,7 +8091,7 @@
"актуални:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6793,7 +8102,7 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6804,7 +8113,7 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6813,16 +8122,16 @@
"Подмодулът не може да бъде обновен:\n"
"„%s“"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Преустановяване на действието\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Изтегляне на файлове"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Обновяване на файлове"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6861,33 +8170,33 @@
msgid "invalid '..' path segment"
msgstr "неправилна част от пътя „..“"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
@@ -6906,161 +8215,168 @@
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Неслети пътища:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (използвайте „git restore --staged ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (използвайте „git restore --source=%s --staged ФАЙЛ…“, за да извадите "
+"ФАЙЛа от индекса)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за "
"конфликта)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в "
-"работното дърво)"
+" (използвайте „git restore ФАЙЛ…“, за да отхвърлите промените в работната "
+"директория)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (подайте или отхвърлете неследеното или промененото съдържание в "
"подмодулите)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "изтрити в двата случая:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "добавени от вас:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "изтрити от тях:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "добавени от тях:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "изтрити от вас:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "добавени и в двата случая:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "променени и в двата случая:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "нов файл:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "копиран:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "изтрит:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "променен:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "преименуван:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "смяна на вида:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "непозната промяна:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "неслят:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "нови подавания, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "променено съдържание, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Има %d скатаване."
msgstr[1] "Има %d скатавания."
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -7068,241 +8384,260 @@
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
+"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Последна изпълнена команда (изпълнена е общо %d команда):"
-msgstr[1] "Последна изпълнена команда (изпълнени са общо %d команди):"
+msgstr[0] "Последно изпълнена команда (изпълнена е общо %d команда):"
+msgstr[1] "Последно изпълнени команди (изпълнени са общо %d команди):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
-msgstr " повече информация има във файла „%s“)"
+msgstr " (повече информация има във файла „%s“)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1284
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Следваща команда за изпълнение (остава още %d команда):"
-msgstr[1] "Следваща команда за изпълнение (остават още %d команди):"
+msgstr[1] "Следващи команди за изпълнение (остават още %d команди):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "В момента се извършва отбиране на подавания."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (за да продължите, изпълнете „git cherry-pick --continue“)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "В момента тече отмяна на подаване."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (за да продължите, изпълнете „git revert --continue“)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "Указателят „HEAD“ не е свързан и е при "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7311,35 +8646,35 @@
msgstr ""
"Бяха необходими %.2f секунди за изброяването на неследените файлове.\n"
"Добавянето на опцията „-uno“ към командата „git status“, ще ускори\n"
-"изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n"
+"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"към индекса за подаване не са добавени промени (използвайте „git add“ и/или "
"„git commit -a“)\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7348,196 +8683,201 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "различен"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: builtin/add.c:24
+#: compat/precompose_utf8.c:58 builtin/clone.c:453
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "неуспешно изтриване на „%s“"
+
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Файлът „%s“ не може да бъде отворен за запис."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr ""
"прескачане на файловете, които не могат да бъдат добавени поради грешки"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7568,12 +8908,12 @@
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n"
@@ -7582,137 +8922,137 @@
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "опциите „-A“ и „-u“ са несъвместими"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Вероятно искахте да използвате „git add .“?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Кръпките не могат да бъдат разделени."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "След коригирането на този проблем изпълнете „%s --continue“."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на "
"редовете може да се загубят."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Кръпката е празна."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "грешен ред с идентичност: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7720,30 +9060,24 @@
"Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"За интерактивно изпълнение е необходимо стандартният\n"
-"вход да е свързан с терминал, а в момента не е."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -7751,39 +9085,40 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте опцията „git am --show-"
"current-patch“ to see the failed patch"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7793,7 +9128,7 @@
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7804,17 +9139,17 @@
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7825,149 +9160,149 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“."
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "показване на прилаганата кръпка."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7975,18 +9310,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7995,10 +9330,14 @@
"Открита е излишна директория „%s“.\n"
"Можете да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "интерактивният режим изисква кръпки на командния ред"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
@@ -8016,242 +9355,474 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Липсва адрес за отдалеченото хранилище"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
"git archive: очакваше се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: получен е „NACK“ — %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: протоколна грешка"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms ЛОШО ДОБРО"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] СЪСТОЯНИЕ ВЕРСИЯ ДОБРО ЛОШО"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr "git bisect--helper --bisect-check-and-set-terms КОМАНДА ДОБРО"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check ЛОШО ДОБРО УПРАВЛЯВАЩА_ДУМА"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "не може да смените значението на управляващата дума „%s“"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "използвайте две различни управляващи думи"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "файлът „BISECT_TERMS“ не може да се отвори"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "В момента не се извършва двоично търсене.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "„%s“ не е подаване"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n"
+"изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "файлът „%s“ не може да бъде отворен"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s."
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
+"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
+
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Трябва да започнете двоичното търсене чрез командата „git bisect start“.\n"
+"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
+"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "двоично търсене само по „%s“ подаване."
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "не са указани управляващи думи"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Текущите управляващи думи са: %s за старото състояние\n"
+"и %s за новото състояние.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
+"Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "непозната опция: %s"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "„%s“ не изглежда като указател към версия"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "Неправилен указател „HEAD“"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start "
+"СЪЩЕСТВУВАЩ_КЛОН“."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+"не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
+"„cogito“"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "неправилен указател: „%s“"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "извършване на „git bisect next“"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "проверка за очакваните версии"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "изчистване на състоянието на двоичното търсене"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr ""
+"проверка и задаване на управляващи думи към състоянието на двоичното търсене"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "извеждане на управляващите думи"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "начало на двоично търсене"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване"
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
-msgstr "опцията „--write-terms“ изисква точно два аргумента"
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "липсва запис за „BISECT_WRITE“"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:669
+msgid "--write-terms requires two arguments"
+msgstr "опцията „--write-terms“ изисква точно 2 аргумента"
+
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "опцията „--bisect-clean-state“ не приема аргументи"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "трябва да е цвят: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "трябва да завършва с цвят"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "неправилна стойност за „blame.coloring“"
-#: builtin/blame.c:793
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Извеждане на анотациите с намирането им, последователно"
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "версията за прескачане „%s“ не може да бъде открита"
-#: builtin/blame.c:794
+#: builtin/blame.c:845
+msgid "Show blame entries as we find them, incrementally"
+msgstr "Извеждане на авторството с намирането му, последователно"
+
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията "
"е изключена)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Извеждане на статистика за извършените действия"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Принудително извеждане на напредъка"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
-msgstr "Извеждане на допълнителна информация за определянето на анотациите"
+msgstr "Извеждане на допълнителна информация за определянето на авторството"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr ""
"Извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr ""
"Извеждане на първоначалният номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "ВЕРС"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Прескачане на ВЕРСията при извеждане на авторството"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
"оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "оцветяване на редовете по възраст"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Подобряване на разликите чрез експериментална евристика"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr ""
"Търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr ""
"Търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Информация само за редовете в диапазона от n до m включително. Броенето "
"започва от 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -8265,20 +9836,20 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
-msgstr "Анотирани редове"
+msgstr "Редове с авторство"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
@@ -8308,7 +9879,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8317,7 +9888,7 @@
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8326,12 +9897,12 @@
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8340,113 +9911,122 @@
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на следящия клон „%s“"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8457,189 +10037,183 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените "
-"клони"
+"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
+"отдалечените клони"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "без клон-източник"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "извеждане на името на текущия клон"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "КЛЮЧ"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "име на полето, по което да е подредбата"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: 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:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -8647,35 +10221,39 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон"
+#: 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 ""
+"Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
+"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8696,7 +10274,7 @@
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8704,7 +10282,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8712,140 +10290,140 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "може да укажете само една пакетна опция"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта-BLOB"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "обект-BLOB"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "без подреждане на изхода от „--batch-all-objects“"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | АТРИБУТ…] [--] ПЪТ…"
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | АТРИБУТ…]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "извеждане на всички атрибути, зададени върху файл"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "използване на файла „.gitattributes“ само от индекса"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: 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:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "извеждане на несъвпадащите пътища"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "прескачане на индекса при проверката"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "опцията „--stdin“ е несъвместима с имена на пътища"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "опцията „-z“ изисква „--stdin“"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "не е зададен път"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "опцията „--quiet“ изисква да е подаден точно един път"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "опциите „--quiet“ и „--verbose“ са несъвместими"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "опцията „--non-matching“ изисква „--verbose“"
@@ -8866,54 +10444,54 @@
msgid "no contacts specified"
msgstr "не са указани контакти"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "изтегляне на всички файлове в индекса"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "презаписване на файловете, дори и да съществуват"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr "без предупреждения при липсващи файлове и файлове не в индекса"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "без изтегляне на нови файлове"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "изчитане на пътищата от стандартния вход"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "записване на съдържанието във временни файлове"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "НИЗ"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "при създаването на нови файлове да се добавя префикса НИЗ"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това състояние на сливане"
@@ -8925,106 +10503,165 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [ОПЦИЯ…] КЛОН"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Пресъздаден е %d конфликт при сливане"
+msgstr[1] "Пресъздадени са %d конфликта при сливане"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Обновен е %d път от „%s“"
+msgstr[1] "Обновени са %d пътя от „%s“"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Обновен е %d път от индекса"
+msgstr[1] "Обновени са %d пътя от индекса"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "Опцията „%s“ е несъвместима с обновяването на пътища"
+msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "Опцията „%s“ е несъвместима с „%s“"
+msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "не е указано нито „%s“, нито „%s“"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"не може да се продължи с промени в следните файлове, които са добавени в "
+"индекса:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr "локалните промени в тези файлове ще се презапишат: %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -9046,7 +10683,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -9064,173 +10701,249 @@
"Ако все пак искате да запазите тази промяна чрез създаване на клон,\n"
"сега е най-подходящият за това чрез командата:\n"
"\n"
-" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
+" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
msgstr[1] ""
"Ако все пак искате да запазите тези промени чрез създаване на клон,\n"
"сега е най-подходящият за това чрез командата:\n"
"\n"
-" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
+" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
-msgstr "В момента сте на клон, който предстои да бъде създаден"
+msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "очаква се само един указател"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
-msgstr "очакваше се един указател, а сте подали %d."
+msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
+"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "очаква се клон, а не етикет — „%s“"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "очаква се локален, а не отдалечен клон — „%s“"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "очаква се клон, а не „%s“"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "очаква се клон, а не подаване — „%s“"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на сливане не може да преминете към друг клон.\n"
+"Пробвайте с „git merge --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на прилагане на поредица от кръпки не може да преминете към друг "
+"клон.\n"
+"Пробвайте с „git am --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на пребазиране не може да преминете към друг клон.\n"
+"Пробвайте с „git rebase --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на отбиране на подавания не може да преминете към друг клон.\n"
+"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на отмяна на подавания не може да преминете към друг клон.\n"
+"Пробвайте с „git revert --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "преминаване към друг клон по време на двоично търсене"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "клон"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "създаване и преминаване към нов клон"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "създаване/зануляване на клон и преминаване към него"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "създаване на журнал на указателите за нов клон"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "задаване на кой клон бива следен при създаването на новия клон"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "НОВ_КЛОН"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "нов клон без родител"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "изтегляне на вашата версия на неслетите файлове"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "изтегляне на чуждата версия на неслетите файлове"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "извършване на тройно сливане с новия клон"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "обновяване на игнорираните файлове (стандартно)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "СТИЛ"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "действие при конфликт (сливане или тройна разлика)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr ""
-"опит за отгатване на име на клон след неуспешен опит с „git checkout "
-"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr "без проверка дали друго работно дърво държи указателя"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "извършване на тройно сливане с новия клон"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "СТИЛ"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "действие при конфликт (сливане или тройна разлика)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "отделяне на указателя „HEAD“ към указаното подаване"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "задаване на кой клон бива следен при създаването на новия клон"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "НОВ_КЛОН"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "нов клон без родител"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "обновяване на игнорираните файлове (стандартно)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "без проверка дали друго работно дърво държи указателя"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "изтегляне на вашата версия на неслетите файлове"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "изтегляне на чуждата версия на неслетите файлове"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "без ограничаване на изброените пътища само до частично изтеглените"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "опциите „-p“ и „--overlay“ са несъвместими"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "„%s“ не може да бъде открит"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "трябва да укажете поне един път за възстановяване"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -9238,7 +10951,7 @@
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -9268,37 +10981,108 @@
"\n"
" checkout.defaultRemote=origin"
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "клон"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "създаване и преминаване към нов клон"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "създаване/зануляване на клон и преминаване към него"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "създаване на журнал на указателите за нов клон"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"опит за отгатване на име на клон след неуспешен опит с „git checkout "
+"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "използване на припокриващ режим (стандартно)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "създаване и преминаване към нов клон"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "създаване/зануляване на клон и преминаване към него"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+"опит за отгатване на име на клон след неуспешен опит с „git switch "
+"НЕСЪЩЕСТВУВАЩ_КЛОН“"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "зануляване на локалните промени"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "към кой указател към дърво да се премине"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "възстановяване на индекса"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "възстановяване на работното дърво (стандартно)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "пренебрегване на неслетите елементи"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "използване на припокриващ режим"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ШАБЛОН] [-x | -X] [--] ПЪТ…"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Изтриване на „%s“\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Файлът „%s“ ще бъде изтрит\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Прескачане на хранилището „%s“\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Хранилището „%s“ ще бъде прескочено\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "не може да се получи информация чрез „lstat“ за „%s“\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9311,7 +11095,7 @@
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9332,39 +11116,39 @@
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
#
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9382,64 +11166,64 @@
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Избор на следващо действие"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9447,7 +11231,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9456,150 +11240,164 @@
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "път"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
-msgstr "версия"
+msgstr "ВЕРСИЯ"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
"зададения с „--branch“"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"без клониране на етикети, като последващите доставяния няма да ги следят"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "специфични за сървъра"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "опция за пренос"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "всички клонирани подмодули ще ползват следящите си клони"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9607,151 +11405,148 @@
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "директорията „%s“ не може да бъде отворена"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
+msgid "failed to start iterator over '%s'"
+msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:443
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "неуспешно изтриване на „%s“"
-
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "неуспешно итериране по „%s“"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Клонирането бе успешно за разлика от подготовката на работното дърво\n"
"за определен клон. Все пак можете да проверите кои файлове и от кой\n"
"клон в момента са изтеглени с командата „git status“. Можете да\n"
-"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
+"завършите изтеглянето на клона с командата:\n"
+"\n"
+" git restore --source=HEAD :/\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9759,44 +11554,44 @@
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -9832,15 +11627,83 @@
msgid "--command must be the first argument"
msgstr "опцията „--command“ трябва да е първият аргумент"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p РОДИТЕЛ)…] [-S[ИДЕНТИФИКАТОР]] [(-m СЪОБЩЕНИЕ)…] [(-F "
+"ФАЙЛ)…] ДЪРВО"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "прескачане на повтарящ се родител: „%s“"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "неправилно име на обект: „%s“"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: „%s“ не може да се отвори"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: „%s“ не може да се прочете"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: „%s“ не може да се затвори"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "родител"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "СЪОБЩЕНИЕ"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+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:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "подписване на подаването с GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "трябва да е точно едно дърво"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: не може да се прочете"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/commit.c:50
+#: 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"
@@ -9852,7 +11715,7 @@
"с опцията „--allow-empty“, или да го изтриете от историята с командата:\n"
"„git reset HEAD^“.\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9867,81 +11730,90 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "В противен случай използвайте командата „git reset“\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr ""
+"В противен случай използвайте командата:\n"
+"\n"
+" git cherry-pick --skip\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Ако искате да прескочите това подаване, използвайте командата:\n"
+"след това изпълнете:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
-"останалите подавания.\n"
+"и ще продължите да отбирате останалите подавания.\n"
+"За да прескочите това подаване, изпълнете:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "новият индекс не може да бъде записан"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9949,38 +11821,38 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9992,10 +11864,10 @@
"\n"
"Изглежда, че подавате сливане. Ако това не е така, изтрийте файла:\n"
"\n"
-" %s\n"
+" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -10008,10 +11880,10 @@
"Изглежда, че извършвате отбрано подаване. Ако това не е така, изтрийте "
"файла:\n"
"\n"
-" %s\n"
+" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -10020,7 +11892,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -10031,155 +11903,151 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не можете да поправяте."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Несъществуващ режим на изчистване „%s“"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Опцията „-a“ е несъвместима със задаването на пътища."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -10188,11 +12056,11 @@
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -10201,257 +12069,261 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "СЪОБЩЕНИЕ"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "СЪОБЩЕНИЕ при подаване"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "стандартно"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "подписване на подаването с GPG"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"хранилището е обновено, но новият файл за индекс „new_index“\n"
"не е записан. Проверете дали дискът не е препълнен или не сте\n"
-"превишили дисковата си квота. След това изпълнете „git reset HEAD“."
+"превишили дисковата си квота. За възстановяване изпълнете:\n"
+"\n"
+" git restore --staged :/"
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir ДИР_ОБЕКТИ]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "директория"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Графът с подаванията не може да се отвори: „%s“"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "обхождането да започне от всички указатели"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"проверка на подаванията за индексите на пакетите изброени на командния ред"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "започване на обхождането при подаванията подадени на стандартния вход"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "максимален брой подавания в небазово ниво на раздробен граф"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"максимално отношение на броя подавания в две последователни нива в раздробен "
+"граф"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
@@ -10460,7 +12332,7 @@
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "непознат аргумент „--type“: %s"
@@ -10570,7 +12442,7 @@
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "стойността е от този вид"
@@ -10616,7 +12488,7 @@
"извеждане на мястото на задаване на настройката (файл, стандартен вход, "
"обект-BLOB, команден ред)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "СТОЙНОСТ"
@@ -10624,48 +12496,48 @@
msgid "with --get, use default value when missing entry"
msgstr "с „--get“ се използва стандартна СТОЙНОСТ при липсваща"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "неправилен брой аргументи, трябва да е точно %d"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "неправилен брой аргументи, трябва да е от %d до %d включително"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "неправилен шаблон за ключ: „%s“"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "неуспешно форматиране на стандартната стойност на настройка: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "„%s“ не може да се анализира като цвят"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "неразпозната стойност на стандартния цвят"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "не е в директория под Git"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "не се поддържа записване в стандартния вход"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "обекти-BLOB в настройките не се поддържат"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10680,23 +12552,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "само по един конфигурационен файл"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "„--local“ може да се използва само в хранилище"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "„--blob“ може да се използва само в хранилище"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "променливата „HOME“ не е зададена"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10707,20 +12579,20 @@
"повече информация вижте раздела „CONFIGURATION FILE“ в\n"
"„git help worktree“"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "опцията „--get-color“ не съответства на вида на променливата"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "само по едно действие"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
"опцията „--name-only“ е приложима само към опциите „--list“ и „--get-regexp“"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -10728,33 +12600,33 @@
"опцията „--show-origin“ е приложима само към опциите „--get“, „--get-all“, "
"„--get-regexp“ и „--list“"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "опцията „--default“ е приложима само към опцията „--get“"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "конфигурационният файл „%s“ не може да бъде прочетен"
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "грешка при обработката на конфигурационен файл"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "не се поддържа редактиране на стандартния вход"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "не се поддържа редактиране на обекти-BLOB"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационният файл „%s“ не може да бъде създаден"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10764,7 +12636,7 @@
"За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
"replace-all“."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "такъв раззел няма: %s"
@@ -10777,57 +12649,57 @@
msgid "print sizes in human readable format"
msgstr "извеждане на размерите на обектите във формат лесно четим от хора"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [ОПЦИЯ…] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "основно"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "кратко"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "анотирано"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "не съществува анотиран етикет „%s“"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "в анотирания етикет „%s“ липсва вградено име"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е всъщност „%s“"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "никой етикет не напасва точно „%s“"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "търсенето приключи при „%s“\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10836,7 +12708,7 @@
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10845,12 +12717,12 @@
"Никой етикет не описва „%s“.\n"
"Пробвайте с опцията „--always“ или създайте етикети."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "претърсени са %lu подавания\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10859,121 +12731,121 @@
"открити са над %i етикета, изведени са последните %i,\n"
"търсенето бе прекратено при „%s“.\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "описание на „%s“\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "Неправилно име на обект „%s“"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "„%s“ не е нито подаване, нито обект-BLOB"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "откриване на етикета, който следва подаване"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr ""
"извеждане на информация за трасиране на стратегията за търсене на "
"стандартната грешка"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "използване на произволен указател"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "използване на всеки етикет — включително и неанотираните"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "винаги да се ползва дългият формат"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "проследяване само на първия родител"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "извеждане само на точните съвпадения"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "МАРКЕР"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "опцията „--broken“ е несъвместима с указател към подаване"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "неправилна опция: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта-BLOB: „%s“"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
@@ -10982,27 +12854,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "неуспешно действие с изходен код: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -11010,55 +12882,55 @@
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -11066,161 +12938,224 @@
"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
"ненулев код"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "подава се към „diff“"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕНЛИВИ"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "ВИД"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "стандартна, резервна стойност за „git_env_*(…)“"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"без извеждане на информация — стойността на „git_env_*()“ да е изходен код"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"опцията „--default“ изисква булева стойност при „--type=bool“, а не „%s“"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"опцията „--default“ изисква целочислена стойност без знак при „--"
+"type=ulong“, а не „%s“"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"как да се обработват съобщенията за подаване, които са в друго кодиране"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Указване на родителите, които не са в потока на бързо изнасяне, с "
+"идентификатор на обект"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "принудително презаписване на локален указател"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
-"хранилище и махане на променените"
+"хранилище и презаписване на променените"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -11228,109 +13163,132 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "специфични за сървъра"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "опция за пренос"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти могат са достижими при започване от този"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "изпълняване на „gc --auto“ след доставяне"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "проверка за принудителни обновявания на всички клони"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+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 ""
+"За да я включите еднократно ползвайте опцията „--show-forced-updates“, а за "
+"да я включите за постоянно, изпълнете:\n"
+"\n"
+" git config fetch.showForcedUpdates true"
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите "
+"еднократно с опцията „--no-show-forced-updates“, а за да я извключите за "
+"постоянно, изпълнете:\n"
+"\n"
+" git config fetch.showForcedUpdates false\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11340,57 +13298,58 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
-"настройката „core.partialClone“"
+"настройката „extensions.partialClone“"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11398,44 +13357,52 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
+"настройката „extensions.partialClone“"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11500,91 +13467,274 @@
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "извеждане само на слетите указатели"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "извеждане само на неслетите указатели"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "непознат"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "грешка в %s „%s“: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "предупреждение за %s „%s“: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "скъсана връзка от %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "неправилен вид обект във връзката"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"скъсана връзка от %7s %s\n"
+" към %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "липсващ обект: %s „%s“"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "недостижим обект: %s „%s“"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "извън клон: %s „%s“"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "„lost-found“ не може да се създаде"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "„%s“ не може да се завърши"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Проверка на „%s“"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Проверка на свързаността (%d обекта)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Проверяване на %s „%s“"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "скъсани връзки"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "начална директория „%s“"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: липсващ или повреден обект"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: неправилен запис в журнала за указатели „%s“"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Проверка на журнала на указателите: „%s“ до „%s“"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "„%s“: неправилен указател за SHA1: „%s“"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: не е подаване!"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "внимание: няма указатели по подразбиране"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "„%s“: липсващ обект: „%s“"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "„%s“: не може да се анализира: „%s“"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "неправилен ред с контролна сума по SHA1: „%s“"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Проверка на директория с обекти"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Проверка на връзките на „%s“"
+
+#
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "неправилен указател „%s“"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "„%s“ сочи към нещо необичайно (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Проверка на дървото на кеша"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "в дървото на кеша има нещо, което не е дърво"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
-# FIXME bad message
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
-msgstr "проследяване на указателите от журнала като глави (стандартно)"
+msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Проверка на обектите"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "„%s“: липсващ обект"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [ОПЦИЯ…]"
@@ -11594,17 +13744,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "стойността на „%s“ — „%s“ не може да се анализира"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11621,58 +13776,58 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "препакетиране на всичко без най-големия пакет"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "неразпозната стойност на „gc.logexpiry“ %s"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "неразпозната стойност на периода за окастряне: %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11681,23 +13836,23 @@
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Има прекалено много недостижими, непакетирани обекти.\n"
"Използвайте „git prune“, за да ги окастрите."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -11706,276 +13861,276 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулярния израз"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "опцията е несъвместима с „--recurse-submodules“"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11983,38 +14138,34 @@
"git hash-object [-t ВИД] [-w] [--path=ФАЙЛ | --no-filters] [--stdin] [--] "
"ФАЙЛ…"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "ВИД"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "ВИД на обекта"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "записване на обекта в базата от данни за обектите"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "изчитане на обекта от стандартния вход"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "запазване на файла както е — без филтри"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-"създаване и хеширане на произволни данни за повредени обекти за трасиране на "
-"Git"
+"създаване и изчисляване на контролни суми на произволни данни за повредени "
+"обекти за трасиране на Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "обработване на ФАЙЛа все едно е с този път"
@@ -12054,30 +14205,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМАНДА]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "непознат формат на помощта „%s“"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Неуспешно стартиране на „emacsclient“."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Версията на „emacsclient“ не може да се анализира."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -12086,7 +14237,7 @@
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -12095,339 +14246,328 @@
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "неправилен низ за настройката „alias.%s“: „%s“"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "За повече информация изпълнете „git help config“"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетният файл „%s“ не може да бъде създаден"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:555
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт"
msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект-BLOB „%s“"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "грешка при проверката на пакетирани обекти"
-# FIXME perhaps invalid object or pack
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "неправилен обект „%s“"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr ""
"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "действието завърши с %d локален обект"
msgstr[1] "действието завърши с %d локални обекта"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "дължината на веригата е %d: %lu обект"
msgstr[1] "дължината на веригата е %d: %lu обекта"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "грешка при проверка с „fsck“ на пакетните обекти"
@@ -12471,43 +14611,43 @@
msgid "not copying templates from '%s': %s"
msgstr "шаблоните няма да бъдат копирани от „%s“: „%s“"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "файлове от вид %d не се поддържат"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "Директорията „%s“ вече съществува"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
"Инициализиране наново на съществуващо, споделено хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Инициализиране наново на съществуващо хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Инициализиране на празно, споделено хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12515,27 +14655,27 @@
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--"
"shared[=ПРАВА]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"указване, че хранилището на Git ще бъде споделено от повече от един "
"потребител"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да се влезе в директорията „%s“"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12544,12 +14684,12 @@
"%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недостъпно"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12557,473 +14697,465 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "директно редактиране на файловете"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "изчистване на празните епилози"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "къде да се постави новият епилог"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "действие, ако епилог вече съществува"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "действие при липсващ епилог"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "извеждане само на епилозите"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "без прилагане на правилата за настройките"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "сливане на стойностите последване от знаци за интервали"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "опции при анализ"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "„---“ няма специално значение"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "епилог"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "епилози за добавяне"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "опцията „--trailer“ е несъвместима с „--name-only“"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "не е зададен входен файл за редактиране на място"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "без извеждане на разликите"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr ""
"Използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване само на редовете във файла в диапазона от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
-msgstr "Обектът не може да бъде прочетен: %s"
+msgid "could not read object %s"
+msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
-msgstr "Неизвестен вид: %d"
+msgid "unknown type: %d"
+msgstr "неизвестен вид: %d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
+msgid "cannot open patch file %s"
+msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "Трябва да зададете точно един диапазон."
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "Не е диапазон."
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "не е диапазон"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "Придружаващото писмо трябва да е форматирано като е-писмо"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "неуспешно създаване на придружаващо писмо"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
-msgstr "Можете да укажете максимум една директория за изход."
+#: builtin/log.c:1244
+msgid "two output directories?"
+msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
-msgstr "Непознато подаване „%s“"
+msgid "unknown commit %s"
+msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Не може да се открие към какво сочи „%s“."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "„%s“ не е указател или не сочи към нищо"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "Точната база за сливане не може да се открие."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Следеният клон не може да бъде установен. Ако искате ръчно да го\n"
+"следеният клон не може да бъде установен. Ако искате ръчно да го\n"
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
-msgstr "Точната база при сливане не може да бъде открита"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
+msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "неуспешно определяне на диапазоните за разлика"
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
-msgstr "в заглавната част „From:“ (от) хешът да е само от нули"
+msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
-msgstr "да не се включват кръпки, които присъстват в следения клон"
+msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "ВЕРС"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "опциите „-n“ и „-k“ са несъвместими"
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Директорията „%s“ не може да бъде създадена"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка<"
+"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
-msgstr "Изходните файлове не могат да бъдат създадени"
+#: builtin/log.c:1975
+msgid "failed to create output files"
+msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -13031,109 +15163,109 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "малки букви за файловете за командата „fsmonitor clean“"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
@@ -13151,7 +15283,7 @@
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "КОМАНДА"
@@ -13169,17 +15301,17 @@
#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
-msgstr "без извеждане на проследените етикети"
+msgstr "без проследяване на непреките етикети"
#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr "взимане предвид на „url.БАЗА.insteadOf“"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "изход с код 2, ако не се открият съвпадащи указатели"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "извеждане на указателя заедно с обекта сочен от него"
@@ -13226,266 +15358,286 @@
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "опцията „%s“ изисква стойност"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "преустановяване без промяна на индекса и работното дърво"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr ""
"проверка на куката при промяна на съобщението при подаване (commit-msg)"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (няма какво да се вкара)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"В съобщението при подаване добавете информация за причината за\n"
"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-"\n"
-"Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n"
-"преустановява подаването.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Празно съобщение предотвратява подаването.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
+"съобщение преустановява подаването.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "опцията „--quit“ не приема аргументи"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13493,7 +15645,7 @@
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13501,99 +15653,103 @@
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Опцията „--squash“ е несъвместима с „--commit“."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без история, всички сливания са превъртания, не може да се "
"извърши същинско сливане изисквано от опцията „--no-ff“"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Вече е обновено."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Вече е обновено!"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Не може да се извърши превъртане, преустановяване на действието."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13681,33 +15837,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "непозната опция: „%s“"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "неуспешен анализ на обекта „%s“"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "не се поддържа повече от %d база. „%s“ се прескача."
msgstr[1] "не се поддържат повече от %d бази. „%s“ се прескача."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "поддържа се само сливане на точно две истории."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "указателят „%s“ не може да бъде изтрит"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Сливане на „%s“ с „%s“\n"
@@ -13720,7 +15876,7 @@
msgid "input is NUL terminated"
msgstr "входните записи са разделени с нулевия знак „NUL“"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "разрешаване на липсващи обекти"
@@ -13728,162 +15884,178 @@
msgid "allow creation of more than one tree"
msgstr "разрешаване на създаването на повече от едно дърво"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify|expire|repack --"
+"batch-size=РАЗМЕР)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със "
"съответния им индекс"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
+"се обединяват в пакети с по-голям от този размер"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "прекалено много аргументи"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "непознат глагол: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "опцията „--batch-size“ изисква подкомандата „repack“"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "непозната подкоманда: %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Директорията „%s“ е в индекса, но не е подмодул"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
"или ги скатайте"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "„%.*s“ вече е в индекса"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "принудително преместване/преименуване дори целта да съществува"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ съществува и не е директория"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "извеждане само на имената (без сумите по SHA1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "използване само на етикетите за именуване на подаванията"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "използване само на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "игнориране на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на всички подавания, които могат да бъдат достигнати от всички "
"указатели"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "четене от стандартния вход"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
@@ -14030,14 +16202,14 @@
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не може да се открие към какво сочи „%s“."
@@ -14073,38 +16245,38 @@
"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/"
"notes/“."
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "няма бележки за обекта „%s“."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "низ, който е съдържанието на бележката"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "ФАЙЛ със съдържанието на бележката"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на указания ОБЕКТ-бележка"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "преизползване на указания ОБЕКТ-бележка"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "замяна на съществуващите бележки"
@@ -14117,31 +16289,31 @@
"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "изчитане на обектите от стандартния вход"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
"опцията „--stdin“)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "прекалено малко параметри"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -14150,12 +16322,12 @@
"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "няма бележки за обекта-източник „%s“. Не може да се копира."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -14166,52 +16338,52 @@
"Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "неуспешно сливане на бележките"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "непозната стратегия за сливане на бележки „%s“"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -14221,46 +16393,46 @@
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "трябва да укажете указател към бележка за сливане."
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -14271,177 +16443,182 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Не може да се открие към какво сочи „%s“."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < "
"СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "лоша контролна сума за пакетирания обект „%s“"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "пакетиран обект с грешки за „%s“"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "рекурсивна разлика за обект „%s“"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "подредени бяха %u обекта, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "неправилен пакетен файл: „%s“"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "пакетният файл „%s“ не може да бъде повторно отворен"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "неуспешно търсене в преизползван пакетен файл"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "неуспешно четене от преизползван пакетен файл"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Преброяване на обектите"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "размерът на „%s“ не може да бъде получен"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "обектът „%s“ не може да се прочете"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "неоптимизиран пакет — паметта свърши"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Делта компресията ще използва до %d нишки"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
"обектите, които могат да бъдат достигнати от етикета „%s“, не може да бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "неправилен брой разлики"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -14450,7 +16627,7 @@
"очаква се идентификатор на краен обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -14459,269 +16636,277 @@
"очаква се идентификатор на обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "неправилна стойност за „--missing“"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "индексът на пакетния файл не може да бъде отворен"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да бъде наложено"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "неправилна версия „%s“"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "скорошните обекти не могат да бъдат добавени"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "използване на алгоритъм за частична достижимост"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "пропускане на този пакет"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "записване на индекси на база битови маски при възможност"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "как да се обработват липсващите обекти"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "без пакетиране на обекти в гарантиращи пакети"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "без промяна на групите при делта компресия"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
"Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се "
"ползва %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
"файлове за пренос"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "минималният размер на пакетите е 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "опцията „-filter“ изисква „-stdout“"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Общо %<PRIu32> (разлики %<PRIu32>), преизползвани %<PRIu32> (разлики "
"%<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [ОПЦИЯ…]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "пакетиране на всичко"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "окастряне на недостижимите указатели (стандартно)"
@@ -14737,69 +16922,69 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "информация за окастрените обекти"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "окастряне на обектите по-стари от това ВРЕМЕ"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Неправилна стойност за „%s“: „%s“"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14807,14 +16992,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14822,7 +17007,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14833,44 +17018,44 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14879,32 +17064,32 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14914,7 +17099,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14926,20 +17111,20 @@
msgstr ""
"Работното ви копие не може да бъде превъртяно.\n"
"След като запазите всичко необходимо посочено от командата:\n"
-" $ git diff %s\n"
+" git diff %s\n"
"изпълнете:\n"
-" $ git reset --hard\n"
+" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -14956,7 +17141,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "опцията „--delete“ приема за цел само прости имена на указатели"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14965,7 +17150,7 @@
"За да включите тази опция за постоянно, погледнете документацията за "
"настройката „push.default“ в „git help config“."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14990,7 +17175,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -15004,7 +17189,7 @@
"\n"
" git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -15018,14 +17203,14 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да "
"изтласкате."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -15037,14 +17222,14 @@
"Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения "
"клон."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Не сте указали версия за подаване, а настройката „push.default“ е "
"„nothing“ (нищо без изрично указана версия да не се изтласква)"
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -15058,7 +17243,7 @@
"преди отново да изтласкате промените. За повече информация вижте раздела\n"
"„Note about fast-forwards“ в страницата от ръководството „git push --help“."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -15072,7 +17257,7 @@
"информация погледнете раздела „Note about fast-forwards“ в страницата от\n"
"ръководството „git push --help“."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -15091,14 +17276,14 @@
"страницата\n"
"от ръководството „git push --help“."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува "
"етикет,\n"
"който ще припокриете с етикет от вашето хранилище."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -15108,22 +17293,22 @@
"указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
"да го промените да сочи към подобен обект.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Изтласкване към „%s“\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -15145,107 +17330,107 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ са несъвместими"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
@@ -15269,20 +17454,20 @@
msgid "use simple diff colors"
msgstr "използване на прости цветове за разликите"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "„..“ липсва в диапазона „%s“"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "вариантът с единствен аргумент изисква симетричен диапазон"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "необходими са два диапазона с подавания"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -15293,71 +17478,75 @@
"checkout] [--index-output=ФАЙЛ] (--empty | УКАЗАТЕЛ_КЪМ_ДЪРВО_1 "
"[УКАЗАТЕЛ_КЪМ_ДЪРВО_2 [УКАЗАТЕЛ_КЪМ_ДЪРВО_3]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "запазване на индекса в този ФАЙЛ"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "само зануляване на индекса"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Сливане"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "да се извърши и сливане след освен изчитането"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "тройно сливане, ако не се налага пофайлово сливане"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "тройно сливане при добавяне на добавяне и изтриване на файлове"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "същото като опцията „-m“, но неслетите обекти се пренебрегват"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "изчитане на дървото към индекса като да е в тази ПОДДИРЕКТОРИЯ/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "обновяване на работното дърво с резултата от сливането"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "ФАЙЛ_С_ИЗКЛЮЧЕНИЯ"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "позволяване на презаписването на изрично пренебрегваните файлове"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "без проверка на работното дърво след сливането"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "без обновяване и на индекса, и на работното дърво"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "без прилагане на филтъра за частично изтегляне"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "изчистване на грешки в командата „unpack-trees“"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "без информационни съобщения"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
@@ -15365,47 +17554,230 @@
"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА] [КЛОН_ИЗТОЧНИК] "
"[КЛОН]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА] --root [КЛОН]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "„%s“ не може да се запише."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "Липсва указател „HEAD“"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "не може да се създаде временна директория „%s“"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "невъзможно задаване на интерактивна работа"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "файлът с командите не може да се генерира"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [ОПЦИЯ…]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "запазване на празните подавания"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "позволяване на празни съобщения при подаване"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "пребазиране на подаванията със сливания"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+"запазване на първоначалните точки на разклоняване на сестринските клони"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "подписване на подаванията"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "извеждане на статистика с промените в следения клон"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "продължаване на пребазирането"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "прескачане на подаване"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "редактиране на списъка с команди за изпълнение"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "извеждане на текущата кръпка"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "съкратени идентификатори в списъка за изпълнение"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "пълни идентификатори в списъка за изпълнение"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "проверка на списъка за изпълнение"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr ""
+"преподреждане на редовете за вкарване на подаванията подаванията в "
+"предходните им със и без смени на съобщението"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "върху"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "ограничена версия"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "ограничена версия"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "подаване, в което другите да се вкарат"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "подаване, в което другите да се вкарат"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "подаване на източника"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "име на върха"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "име на върха"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "стратегия на пребазиране"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "опции на стратегията"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "опции на стратегията"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "преминаване към"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "клонът, към който да се премине"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "име на база"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "име на база"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "команда"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "команда за изпълнение"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "„%s“ изисква интерактивно пребазиране"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "Пътят „%s“ не може да бъде прочетен"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "не може да се определи към какво да сочи указателят „HEAD“"
+
+#: builtin/rebase.c:950 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"
@@ -15413,17 +17785,31 @@
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
-"След коригирането на конфликтите, отбележете решаването им чрез:\n"
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
"„git add/rm ФАЙЛ_С_КОНФЛИКТ…“ и изпълнете „git rebase --continue“.\n"
"Ако предпочитате да прескочите тази кръпка, изпълнете „git rebase --skip“.\n"
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "не може да се определи към какво да сочи указателят „HEAD“"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"Грешка при приготвянето на кръпките за прилагането на следните версии:\n"
+"\n"
+" %s\n"
+"\n"
+"В резултат те не могат да се пребазират."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -15440,7 +17826,7 @@
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15453,159 +17839,169 @@
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "командите за изпълнение не може да съдържат нови редове"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "празна команда за изпълнение"
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "извеждане на статистика с промените в следения клон"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr ""
"добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "подава се на командата „git am“"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия за сливане"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "пресъздаване на сливанията вместо да се прескачат"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(остаряло) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "позволяване на „rerere“ да обнови индекса с корекцията на конфликт"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "запазване на празните подавания при пребазиране"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
"преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
-" git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]"
+" git merge-base --fork-point"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "„%s“ не може да се изпълни"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"поддръжката на „rebase.useBuiltin“ е премахната.\n"
+"За повече информация вижте „git help config“."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
+"нея."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15613,21 +18009,16 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не могат да бъдат занулени"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "„%s“ не може да бъде изтрит"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15648,351 +18039,180 @@
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1226
-#, c-format
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
+"interactive“"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+"опциите за „am“ са несъвместими с опциите за сливане или за интерактивна "
+"работа"
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"грешка: опциите за интерактивна работа („--interactive“, „--exec“, „--rebase-"
-"merges“, „--preserve-merges“, „--keep-empty“, „--root“ и „--onto“) са "
-"несъвместими с опциите за командата „am“ („%s“)"
+"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
+"несъвместими"
-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr ""
-"грешка: опциите за сливане („--merge“, „--strategy“ и „--strategy-option“) "
-"са несъвместими с опциите за командата „am“ („%s“)"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "опциите „--rebase-merges“ и „--strategy-option“ са несъвместими"
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-"грешка: опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "опциите „--rebase-merges“ и „--strategy“ са несъвместими"
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-"грешка: опциите „--rebase-merges“ и „--strategy-option“ са несъвместими"
-
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "грешка: опциите „--rebase-merges“ и „--strategy“ са несъвместими"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Неочакван резултат при скатаване: „%s“"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Директорията за „%s“ не може да бъде създадена"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Автоматично скатано: „%s“\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "неуспешно изпълнение на „git reset --hard“"
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
-msgstr "Указателят „HEAD“ е напълно актуален. Пребазирането е принудително."
+msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr ""
-"Текущият клон „%s“ е напълно актуален. Пребазирането е принудително.\n"
+msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която "
"пребазирате…\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
-msgstr "Указателят „HEAD“ не може да се отдели"
+msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "Липсва указател „HEAD“"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "не може да се създаде временна директория „%s“"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "невъзможно задаване на интерактивна работа"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "„%s“ не може да се отвори"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "файлът с командите не може да се генерира"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [ОПЦИЯ…]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "запазване на празните подавания"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "позволяване на празни съобщения при подаване"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "пребазиране на подаванията със сливания"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr ""
-"запазване на първоначалните точки на разклоняване на сестринските клони"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "подписване на подаванията"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "продължаване на пребазирането"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "прескачане на подаване"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "редактиране на списъка с команди за изпълнение"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "извеждане на текущата кръпка"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "съкратени идентификатори в списъка за изпълнение"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "пълни идентификатори в списъка за изпълнение"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "проверка на списъка за изпълнение"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr ""
-"преподреждане на редовете за вкарване на подаванията подаванията в "
-"предходните им със и без смени на съобщението"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "върху"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "ограничена версия"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "подаване, в което другите да се вкарат"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "подаване на източника"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "име на върха"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "име на върха"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "стратегия на пребазиране"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "опции на стратегията"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "опции на стратегията"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "преминаване към"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "клонът, към който да се премине"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "име на база"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "име на база"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "команда"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "команда за изпълнение"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -16025,7 +18245,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -16046,19 +18266,73 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=ВРЕМЕ] [--expire-unreachable=ВРЕМЕ] [--rewrite] "
+"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] УКАЗАТЕЛ…"
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"УКАЗАТЕЛ…"
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists УКАЗАТЕЛ"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Отбелязване на достижимите обекти…"
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "„%s“ не сочи наникъде!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "не е указан журнал с подавания за изтриване"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "„%s“ не е журнал с подавания"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "липсва журнал с подаванията за „%s“"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "неправилен формат на указател: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -16590,104 +18864,144 @@
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"командата „pack-objects“ не може да се стартира за препакетирането на "
+"гарантиращите обекти"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: от „pack-objects“ се очакват редове само с пълни шестнайсетични "
+"указатели."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"командата „pack-objects“ не може да завърши за препакетирането на "
+"гарантиращите обекти"
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Нищо ново за пакетиране"
+
+#: builtin/repack.c:478
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: За да бъдат заменени с нови версии, някои\n"
+"ПРЕДУПРЕЖДЕНИЕ: пакетни файлове бяха преименувани, като към\n"
+"ПРЕДУПРЕЖДЕНИЕ: имената им бе добавен префиксът „old-“.\n"
+"ПРЕДУПРЕЖДЕНИЕ: Тази операция бе неуспешна, както и обратната\n"
+"ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n"
+"ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
@@ -16716,12 +19030,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=ФОРМАТ] [-l [ШАБЛОН]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "„%s“ не е указател или не сочи към нищо"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16730,27 +19039,27 @@
"неправилен формат са заместване: „%s“\n"
"възможните формати са „short“ (кратък), „medium“ (среден) и „long“ (дълъг)"
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "указателят за замяна „%s“ не може да бъде открит"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Указателят за замяна е изтрит: „%s“"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "„%s“ е неправилно име за указател за замяна"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "указателят за замяна „%s“ вече съществува"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16761,76 +19070,81 @@
"„%s“ сочи към заменен обект „%s“,\n"
"а „%s“ сочи към заместващ обект от вид „%s“."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "изпълнението на „cat-file“ завърши с грешка"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "„%s“ не може да бъде отворен за четене"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "не може да се създаде процес за „mktree“"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "не може да се прочете от „mktree“"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "„mktree“ завърши с грешка"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "„mktree“ не върна име на обект"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "„fstat“ не може да се изпълни върху „%s“"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "обектът не може да бъде записан в базата от данни"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "неправилно име на обект: „%s“"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "не може да се определи видът на обекта „%s“"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "неуспешно редактиране на файла с обектите"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "новият и старият обект са един и същ: „%s“"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "„%s“ не може да се анализира като подаване"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "етикетът при сливане в подаването „%s“ e неправилен"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16839,31 +19153,31 @@
"Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е "
"изхвърлен, затова използвайте опцията „--edit“, а не „--graft“."
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "първоначалното подаване „%s“ е с подпис на GPG"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "Подписът ще бъде премахнат в заменящото подаване!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "заменящото подаване за „%s“ не може да бъде записано"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "присадката за „%s“ е излишна"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "новото и старото подаване са едно и също: „%s“"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16872,71 +19186,71 @@
"следните присадки не могат да се преобразуват:\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "извеждане на списъка с указателите за замяна"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "изтриване на указателите за замяна"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "редактиране на съществуващ обект"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "смяна на родителите на подаване"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "преобразуване на файла за присадките"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "замяна на указателя, ако съществува"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "използване на този ФОРМАТ"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "опцията „--format“ изисква извеждане на списък"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "опцията „-f“ изисква запазването на заместител"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "опцията „--raw“ изисква „--edit“"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "опцията „-d“ изисква поне един аргумент"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "неправилен брой аргументи"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "опцията „-e“ изисква поне един аргумент"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "опцията „-g“ изисква поне един аргумент"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "опцията „--convert-graft-file“ не приема аргументи"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "опцията „-l“ приема точно един шаблон"
@@ -16952,128 +19266,129 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "командата „git rerere forget“ изисква указването на път"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "неуспешно генериране на разлика за „%s“"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…"
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "смесено (mixed)"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "меко (soft)"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "пълно (hard)"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "слято (merge)"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
"опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "Опцията „-N“ е съвместима само с „--mixed“"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -17086,53 +19401,53 @@
"Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n"
"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "филтрирането на обекти изисква опцията „--objects“"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "неправилна частична стойност: %s"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "зададеният низ „--“ да се тълкува като аргумент"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "спиране на анализа след първия аргумент, който не е опция"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "изход в дългия формат"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -17163,72 +19478,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick ПОДКОМАНДА"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "опцията „%s“ очаква положително число за аргумент"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: опцията „%s“ е несъвместима с „%s“"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "завършване на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "продължаване на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "отмяна на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "прескачане на текущото подаване и продължаване"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "без автоматично подаване"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "редактиране на съобщението при подаване"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "номер на родителя"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "избор на основния родител"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "стратегия на сливане"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "опция за стратегията на сливане"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "добавяне на името на подаването"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подавания"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [ОПЦИЯ…] [--] ФАЙЛ…"
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -17244,7 +19568,7 @@
"съдържание и\n"
"различно от съответстващото на HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -17252,13 +19576,13 @@
"\n"
"(за принудително изтриване използвайте опцията „-f“)"
-#: builtin/rm.c:215
+#: 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:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -17267,46 +19591,46 @@
"(за запазване на файла използвайте опцията „--cached“, а за принудително\n"
"изтриване — „-f“)"
-#: builtin/rm.c:225
+#: 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:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "да не се извеждат изтритите файлове"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "изтриване само от индекса"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "въпреки проверката за актуалността на съдържанието"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "рекурсивно изтриване"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr ""
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"за да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
"или ги скатайте"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да се изтрие"
@@ -17338,18 +19662,6 @@
msgid "print status from remote helper"
msgstr "извеждане на състоянието от отдалечената помощна функция"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [ОПЦИЯ…]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "изход след първоначалната размяна на заявка и отговор"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "изход след първоначалната обява на възможностите"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
@@ -17384,7 +19696,7 @@
"Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия "
"ред и ОТСТЪП_2 (9) за останалите"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "прекалено много аргументи извън хранилище"
@@ -17411,122 +19723,122 @@
msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател"
msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "никой указател не съвпада с „%s“"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "извеждане на следящите и локалните клони"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "извеждане на следящите клони"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветяване на „*!+-“ според клоните"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "псевдоним на „more=-1“"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "включване и на текущия клон"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "именуване на подаванията с имената им на обекти"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за сливания"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недостижимите указатели"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "извеждане на подаванията в топологическа подредба"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "извеждане само на подаванията, които не са от първия клон"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "извеждане на сливанията, които могат да се достигнат само от един връх"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БАЗА]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
"independent“ и „--merge-base“"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "опцията „--track“ изисква точно едно име на клон"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "само %d запис може да бъде показан наведнъж."
msgstr[1] "само %d записа може да бъде показани наведнъж."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "не може да се обработи повече от %d указател."
msgstr[1] "не може да се обработят повече от %d указатели."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -17534,46 +19846,274 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=ЧИСЛО]] [--abbrev[=ЧИСЛО]] [--tags] [--heads] [--] [ШАБЛОН…]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=ШАБЛОН]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "извеждане на етикетите (може да се комбинира с върховете)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "извеждане на върховете (може да се комбинира с етикетите)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "строга проверка на указателите, изисква се указател с пълен път"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "задължително извеждане и на указателя HEAD"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "да се извеждат идентификаторите на обектите-етикети"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "извеждане само на този БРОЙ цифри от всяка сума по SHA1"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"без извеждане на резултатите на стандартния изход (полезно с опцията „--"
"verify“)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"извеждане на указателите приети от стандартния вход, които липсват в "
"локалното хранилище"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [ОПЦИЯ…]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [ОПЦИЯ…] [СКАТАНО]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [СКАТАНО]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [СКАТАНО]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch КЛОН [СКАТАНО]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n"
+" [--] [ПЪТ…]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [СКАТАНО]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [СКАТАНО]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message СЪОБЩЕНИЕ] [-q|--quiet] ПОДАВАНЕ"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "„%s“ не е подаване, приличащо на нещо скатано"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Указани са прекалено много версии:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Не е открито нищо скатано."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "„%s“ е неправилно име за указател"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "командата „git stash clear“ не поддържа аргументи"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "по време на сливане не може да приложите нещо скатано"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "файлът с разликите „%s^!“ не може да се генерира"
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr ""
+"в индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
+"index“."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "дървото сочено от индекса не може да бъде запазено"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "неследени файлове не могат да се възстановят от скатаното"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Сливане на „%s“ с „%s“"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Индексът не е изваден от скатаното."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "опит за повторно създаване на индекса"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Изтрито: „%s“ (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "Скатаното „%s“ не може да бъде изтрито"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "„%s“ не е указател към нещо скатано"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Скатаното е запазено в случай, че ви потрябва отново."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Не е указано име на клон"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "съобщение при скатаване"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Не са избрани никакви промени"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Все още липсва първоначално подаване"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Състоянието на текущия индекс не може да бъде запазено"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Неследените файлове не могат да се запазят"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Състоянието на работното дърво не може да бъде запазено"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Състоянието на работното дърво не може да бъде запазено"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Пробвайте да използвате „git add“"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Няма никакви локални промени за скатаване"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Скатаването не може да стартира"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Текущото състояние не може да бъде запазено"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Промените в работното дърво не могат да бъдат занулени"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "запазване на индекса"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "скатаване в режим за кръпки"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "без извеждане на информация"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "скатаване и на неследените файлове"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "скатаване и на игнорираните файлове"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "„%s“ не може да се изпълни"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17582,49 +20122,49 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "пропускане на всички редове, които започват с „#“"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
"командата „print-default-remote“ на „submodule--helper“ не приема аргументи"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Влизане в „%s“\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17633,7 +20173,7 @@
"изпълнената команда завърши с ненулев изход за „%s“\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17644,19 +20184,19 @@
"вложени в „%s“\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Без извеждане на изход при въвеждането на всяка команда за подмодули"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Рекурсивно обхождане на подмодулите"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] КОМАНДА"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17665,55 +20205,55 @@
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper name [ПЪТ]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Заглушаване на изхода за състоянието на подмодула"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -17721,47 +20261,47 @@
"Използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "рекурсивно обхождане на подмодулите"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Синхронизиране на адреса на подмодул за „%s“\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Без извеждане на информация при синхронизирането на подмодул"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17770,7 +20310,7 @@
"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17779,83 +20319,83 @@
"Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17863,96 +20403,96 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17961,42 +20501,50 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper name embed-git-dir [ПЪТ…]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "изтриване на настройка във файла „.gitmodules“"
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset ИМЕ"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -18031,17 +20579,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ] "
-"ЕТИКЕТ [ВРЪХ]"
+"git tag [-a | -s | -u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ | -F ФАЙЛ]\n"
+" ЕТИКЕТ [ВРЪХ]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d ЕТИКЕТ…"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -18050,21 +20598,21 @@
"git tag -l [-n[БРОЙ]] [--contains ПОДАВАНЕ] [--points-at ОБЕКТ]\n"
" [--format=ФОРМАТ] [--[no-]merged [ПОДАВАНЕ]] [ШАБЛОН…]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -18074,10 +20622,10 @@
msgstr ""
"\n"
"Въведете съобщение за етикета.\n"
-" %s\n"
+" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -18088,150 +20636,164 @@
msgstr ""
"\n"
"Въведете съобщение за етикет.\n"
-" %s\n"
+" %s\n"
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
-#: builtin/tag.c:218
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+"Създали сте непряк етикет — обектът, сочен от новосъздадения етикет,\n"
+"е също етикет. Ако вместо това искате новият етикет да сочи към това,\n"
+"което се сочи от стария, изпълнете:\n"
+"\n"
+" git tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -18240,218 +20802,218 @@
msgid "Unpacking objects"
msgstr "Разпакетиране на обектите"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "файлът „%s“ не може да бъде създаден"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нов файл"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нова директория"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след "
"обновяването на нов файл"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след добавянето "
"на файл в поддиректория"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на файл"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на директория"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "файлове да могат да заменят директории и обратно"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неследените файлове"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неследените файлове без проверка на файловата система"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "запис на индекса, дори да не е отбелязан като променен"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "включване или изключване на наблюдението на файловата система"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "отбелязване на файловете, че могат да се следят чрез файловата система"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "изчистване на флага за следенето чрез файловата система"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -18459,7 +21021,7 @@
"Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я "
"изтрийте, за да включите разделянето на индекса"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -18467,7 +21029,7 @@
"Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или "
"я изтрийте, за да изключите разделянето на индекса."
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -18475,11 +21037,11 @@
"Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я "
"или я изтрийте, за да изключите кеша за неследените файлове"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Кешът за неследените файлове е изключен"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -18487,29 +21049,29 @@
"Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я "
"или я изтрийте, за да включите кеша за неследените файлове"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кешът за неследените файлове е включен за „%s“"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "следенето чрез файловата система е включено"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите "
"следенето чрез файловата система."
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "следенето чрез файловата система е изключено"
@@ -18555,6 +21117,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
+#: 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 "изход след първоначалната обява на указатели"
@@ -18568,15 +21134,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-tag [-v | --verbose] ПОДАВАНЕ…"
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "извеждане на съдържанието на подаването"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "извеждане на необработения изход от състоянието на „gpg“"
@@ -18592,64 +21158,64 @@
msgid "show statistics only"
msgstr "извеждане само на статистиката"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18658,37 +21224,37 @@
"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
"местоположение"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "докладване на окастрените работни дървета"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "дървото „%s“ не може да бъде добавено наново"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18698,7 +21264,7 @@
"За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или "
"„remove“"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18713,120 +21279,120 @@
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "целта „%s“ вече съществува"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18835,7 +21401,7 @@
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18843,41 +21409,41 @@
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "не може да изпълни „git status“ върху „%s“"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
"работното дърво „%s“ не е чисто, за принудително изтриване е необходима "
"опцията „--force“ "
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18886,7 +21452,7 @@
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18894,28 +21460,28 @@
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "ПРЕФИКС/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "запис на обект-дърво за поддиректорията започваща с тази ПРЕФИКС"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "само за изчистване на грешки"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18930,7 +21496,7 @@
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "извеждане на съобщенията за трасиране на стандартната грешка"
@@ -18943,6 +21509,14 @@
msgid "too many commits marked reachable"
msgstr "прекалено много подавания са отбелязани като достижими"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [ОПЦИЯ…]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "изход след първоначалната обява на възможностите"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18962,111 +21536,163 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
"наличните\n"
"въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
"за\n"
-"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n"
+"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n"
+"системата за помощ използвайте „git help git“.\n"
"\n"
"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n"
"http://i-can.eu/progit2-bg/progit.html"
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "опцията „--git-dir“ изисква директория\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "опцията „--namespace“ изисква име\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "опцията „--work-tree“ изисква директория\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "опцията „--super-prefix“ изисква префикс\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "опцията „-c“ изисква низ за настройка\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "опцията „-C“ изисква директория\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "непозната опция: „%s“\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "при заместването на псевдоним „%s“: „%s“"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"псевдонимът „%s“ променя променливи на средата.\n"
+"За това може да ползвате „!git“ в псевдонима"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "празен псевдоним за „%s“"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "зациклен псевдоним: „%s“"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "грешка при запис на стандартния изход"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "неизвестна грешка при запис на стандартния изход"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "грешка при затваряне на стандартния изход"
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "„%s“ не може да се обработи като вградена команда"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"употреба: %s\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
"git\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "командата „%s“ не може да се изпълни: %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без "
"поддръжка на SSL"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
"друга"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -19077,39 +21703,178 @@
" ● заявен адрес: %s\n"
" ● пренасочване: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
+"„%s“"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
+"пакет „flush“"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "неправилен отговор от сървъра, бе получено: „%s“"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "хранилището „%s“ липсва"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Неуспешна идентификация към „%s“"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "няма достъп до „%s“: %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "пренасочване към „%s“"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "получен е EOF, в режим без поддръжка за това"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"данните за POST не могат да се прочетат наново, пробвайте да увеличите "
+"настройката „http.postBuffer“"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "Неуспешно отдалечено извикване. %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "толкова големи изтласквания не може да се изпълнят"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
+"декомпресиране: %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "опростеният транспорт по http не поддържа плитки клиенти"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "неуспешно доставяне."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "умният вариант на http не може да доставя по SHA1"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "транспортът по http не поддържа „%s“"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "неуспешно изпълнение на „git-http-push“"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: грешка при изчитането на потока команди от git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: опит за доставяне без локално хранилище"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: непозната команда „%s“ от git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "АРГУМЕНТИ"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "филтриране по вид на обекта"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "период на валидност/запазване"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "повече подробности"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "по-малко подробности"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+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 "Указателят „HEAD“ не е свързан и е при "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Добавяне на съдържанието на файла към индекса"
@@ -19120,7 +21885,7 @@
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr "Анотиране на редовете на файловете с информация за подаванията"
+msgstr "Добавяне на информация за подаванията към редовете на файловете"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
@@ -19378,9 +22143,9 @@
msgstr "Незабавно разглеждане на работното ви хранилище чрез „gitweb“"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
-"добавяне или обработка на структурирана информация в съобщенията при подаване"
+"Добавяне или обработка на структурирана информация в съобщенията при подаване"
#: command-list.h:114
msgid "The Git repository browser"
@@ -19552,224 +22317,226 @@
msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Възстановяване на файловете в работното дърво"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Отменяне на съществуващи подавания"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Извеждане на подаванията в обратна хронологическа подредба"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Избор и промяна на параметри"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекса"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Изпращане на поредица от кръпки по е-поща"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Обобщен изход от „git log“"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Извеждане на различните видове обекти в Git"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Извеждане на клоните и подаванията в тях"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Извеждане на индекса на пакетирания архив"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Извеждане на указателите в локално хранилище"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Настройки на Git за скриптовете на обвивката"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Добавяне на съдържанието на файла към индекса"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Преминаване към друг клон"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Уеб интерфейс на Git"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git за потребители на CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Речник с термините на Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Въвеждащ урок за Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"при възможност преизползване на решението на конфликта за обновяване на "
-"индекса"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Започнете като изпълните командата „git bisect start“"
@@ -19781,142 +22548,52 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не"
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "непозната опция „${arg}“"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "„$arg“ не изглежда като указател към версия"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Текущият указател „HEAD“ е неправилен."
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Неуспешно преминаване към „${start_head}“. Изпълнете командата „git bisect "
-"reset СЪЩЕСТВУВАЩ_КЛОН“."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-"не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
-"„cogito“"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Неправилен указател „HEAD“"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Неправилен аргумент на функцията „bisect_write“: „${state}“"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Неправилна версия: „${arg}“"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Неправилна версия: „$bisected_head“"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Неправилна версия: „${rev}“"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "Командата „git bisect ${TERM_BAD}“ приема само един аргумент."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: двоично търсене само по ${TERM_BAD} подаване."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Трябва да зададете поне една ${bad_syn} и една ${good_syn} версия. (Това "
-"може да се\n"
-"направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
-"${good_syn}“.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Трябва да започнете двоичното търсене чрез командата „git bisect start“.\n"
-"трябва да зададете поне една добра и една лоша версия. (Това може да се\n"
-"направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
-"${good_syn}“.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "В момента не се извършва двоично търсене."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "„${invalid}“ е неправилно подаване"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"Първоначално указаният клон „${branch}“ в указателя „HEAD“ не може да бъде\n"
-"изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Не е зададен журнален файл"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
"Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят "
"командите от него наново"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
"Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "неуспешно двоично търсене, не е зададена команда."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "изпълнение на командата „${command}“"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19926,11 +22603,11 @@
"изходният код от командата „${command}“ е ${res} — това е извън интервала "
"[0, 128)"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "двоичното търсене не може да продължи"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19939,29 +22616,13 @@
"неуспешно двоично търсене:\n"
"функцията „bisect_state ${state}“ завърши с код за грешка ${res}"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "успешно двоично търсене"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Неправилна команда: в момента се изпълнява двоично търсене по ${TERM_BAD}/"
-"${TERM_GOOD}."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "не са указани управляващи думи"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"на „git bisect terms“ е подаден неправилен аргумент „${arg}“\n"
-"Поддържат се опциите „--term-good|--term-old“ и „--term-bad|--term-new“."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "В момента не се извършва двоично търсене."
#: git-merge-octopus.sh:46
msgid ""
@@ -20001,274 +22662,121 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простото сливане не сработи, пробва се автоматично сливане."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Връщането към „${head_name}“ е невъзможно"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Вече съществува директория „${state_dir_base}“. Възможно ли е да сте\n"
-"в процес на друго пребазиране? Ако това е така, изпълнете:\n"
-" ${cmd_live_rebase}\n"
-"Ако не сте в процес на друго пребазиране, изпълнете:\n"
-" ${cmd_clear_stale_rebase}\n"
-"и отново започнете пребазирането. Текущото пребазиране се преустановява, "
-"за\n"
-"да не загубите случайно промени."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "грешка: опциите „--signoff“ и „--preserve-merges“ са несъвместими"
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "неправилна основа за сравнение „${upstream_name}“"
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr ""
-"указателят „${onto_name}“ може да сочи към повече от една основа за "
-"пребазирането"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Указателят „${onto_name}“ не сочи към подаване"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Автоматично скатано: „${stash_abbrev}“"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Текущият клон „${branch_name}“ е напълно актуален."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
-"Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е "
-"принудително."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Промените в „${onto}“:"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Промените от „${mb}“ към „${onto}“:"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…"
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "Командата „git stash clear“ не поддържа аргументи"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Все още липсва първоначално подаване"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Състоянието на текущия индекс не може да бъде запазено"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Неследените файлове не могат да се запазят"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Състоянието на работното дърво не може да бъде запазено"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Не са избрани никакви промени"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Временният индекс не може да бъде изтрит"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Състоянието на работното дърво не може да бъде запазено"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
"Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Няма никакви локални промени за скатаване"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Скатаването не може да стартира"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Текущото състояние не може да бъде запазено"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
"Състоянието на работната директория и индекса са запазени: „$stash_msg“"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Промените в работното дърво не могат да бъдат занулени"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "непозната опция: ${opt}"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Не е открито нищо скатано."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Указани са прекалено много версии: „${REV}“"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "Указателят „${reference}“ е грешен"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "„${args}“ не е подаване, приличащо на нещо скатано"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "„${args}“ не е указател към нещо скатано"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "индексът не може да бъде обновен"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "По време на сливане не може да приложите нещо скатано"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Дървото сочено от индекса не може да бъде запазено"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "Неследени файлове не могат да се възстановят от скатаното"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Променените файлове не могат да бъдат извадени от индекса"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Индексът не е скатан."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Скатаното е запазено в случай, че ви потрябва отново"
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Изтрито е скатаното „${REV}“ ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Не е указано име на клон"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Относителен път може да се ползва само от основната директория на работното "
"дърво"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
"„./“ или „../“"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "„${sm_path}“ вече съществува в индекса"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "в „${sm_path}“ не е изтеглено подаване"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -20279,24 +22787,24 @@
"${sm_path}\n"
"Използвайте опцията „-f“, ако за да го добавите наистина."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "„${sm_path}“ съществува, а не е хранилище на Git"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Открита е локална директория на Git — „${sm_name}“, която сочи към "
"отдалечените хранилища:"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -20313,37 +22821,37 @@
"правилното хранилище или ако не знаете какво означава това, използвайте\n"
"друго име като аргумент към опцията „--name“."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -20352,94 +22860,98 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно "
+"доставяне на „${sha1}“"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
-"„$sha1“. Директното доставяне на това подаване е неуспешно."
+"„${sha1}“. Директното доставяне на това подаване е неуспешно."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ са несъвместими"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -20451,12 +22963,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“"
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Автоматично скатаното е приложено."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "„$stash_sha1“ не може да бъде запазен"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Пребазиране ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -20500,7 +23021,7 @@
"Може да променяте последователността на редовете — те се изпълняват\n"
"последователно отгоре-надолу.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -20519,84 +23040,84 @@
"\n"
" git rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: това не е подаване, което може да бъде отбрано"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Неправилно име на подаване: „$sha1“"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
"Заместващата сума по SHA1 за текущото подаване не може да бъде запазена"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Превъртане до „$sha1“"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Не може да се превърти до „$sha1“"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Подаването не може да се смачка: „$sha1“"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Грешка при повтарянето на сливането на „$sha1“"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "„$sha1“ не може да се отбере."
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Това е съобщение при подаване №${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Съобщение при подаване №${n} ще бъде прескочено."
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Това е обединение от $count подаване."
msgstr[1] "Това е обединение от $count подавания."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Това е обединение от 2 подавания"
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Не може да се подаде $sha1… $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20612,31 +23133,31 @@
"коригирате,\n"
"преди да можете да промените подаването."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Спиране при „$sha1_abbrev…“ $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Без предходно подаване не може да се изпълни „$squash_style“"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "В момента се изпълнява: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Неуспешно изпълнение: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "и промени индекса и/или работното дърво"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20647,7 +23168,7 @@
" git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20662,25 +23183,25 @@
"\n"
" git rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Непозната команда: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Успешно пребазиране и обновяване на „$head_name“."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20710,11 +23231,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Не може да бъде открит автор за поправянето на подаването"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20722,33 +23243,33 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Промените в индекса не могат да бъдат подадени."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Текстовият редактор не може да бъде стартиран"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "„$switch_to“ не може да се изтегли"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Липсва указател „HEAD“"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Пребазирането не е интерактивно"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -20757,7 +23278,7 @@
msgstr[1] ""
"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
@@ -20766,144 +23287,144 @@
msgid "usage: $dashless $USAGE"
msgstr "Употреба: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Не може да се премине към „$cdup“ — основната директория на работното дърво."
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"ФАТАЛНА ГРЕШКА: „$program_name“ не може да се ползва без работно дърво."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Не може да пребазирате, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Не може да презапишете клоните, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Не можете да издърпвате при това пребазиране, защото има промени, които не "
"са в индекса."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Не можете да изпълните „$action“, защото има промени, които не са в индекса."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "Не може да пребазирате, защото в индекса има неподадени промени."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Не можете да издърпвате при това пребазиране, защото в индекса има "
"неподадени промени."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Не можете да изпълните „$action“, защото в индекса има неподадени промени."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Освен това в индекса има неподадени промени."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Тази команда трябва да се изпълни от основната директория на работното дърво"
-#: git-sh-setup.sh:377
+#: 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:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%14s %14s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "в индекса"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "извън индекса"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "двоично"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "нищо"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "няма промени"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d файл добавен\n"
msgstr[1] "%d файла добавени\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d файл обновен\n"
msgstr[1] "%d файла обновени\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d файл с отменени промени\n"
msgstr[1] "%d файла с отменени промени\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d файл засегнат\n"
msgstr[1] "%d файла засегнати\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Обновяване"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Отмяна"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Добавяне на неследени"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Няма неследени файлове.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20912,7 +23433,7 @@
"незабавно\n"
"добавено към индекса"
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20921,7 +23442,7 @@
"незабавно\n"
"скътано"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20930,7 +23451,8 @@
"незабавно\n"
"извадено от индекса."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20939,7 +23461,8 @@
"незабавно\n"
"набелязано за прилагане."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20948,16 +23471,16 @@
"незабавно\n"
"набелязано за зануляване."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20972,7 +23495,7 @@
"Редовете, които започват с „%s“ ще бъдат пропуснати.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20982,7 +23505,7 @@
"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n"
"редактирането — отказано.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
@@ -20994,7 +23517,7 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
@@ -21002,7 +23525,7 @@
"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
"„n“ (не)? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -21016,7 +23539,7 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -21030,7 +23553,7 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -21044,7 +23567,7 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -21058,7 +23581,7 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -21075,7 +23598,7 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -21092,7 +23615,7 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -21109,7 +23632,21 @@
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y — прилагане на парчето към работното дърво\n"
+"n — без прилагане на парчето към работното дърво\n"
+"q — изход, без прилагане на това и всички оставащи парчета\n"
+"a — прилагане на това и всички следващи парчета от файла\n"
+"d — без прилагане на това и всички следващи парчета от файла"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -21131,220 +23668,237 @@
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Избраните парчета не могат да се добавят в индекса!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Да се приложат ли към работното дърво? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Нищо не е приложено.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "пренебрегване на неслятото: „%s“\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
"n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
"q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
+"%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Няма други парчета\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "към кое парче да се придвижи? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неправилен номер: „%s“\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Има само %d парче.\n"
msgstr[1] "Има само %d парчета.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Няма други парчета за търсене\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "да се търси с регулярен израз? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Сгрешен регулярен израз „%s“: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Никое парче не напасва на регулярния израз\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Няма друго парче преди това\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Няма друго парче след това\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Това парче не може да бъде разделено\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Разделяне на %d парче.\n"
msgstr[1] "Разделяне на %d парчета.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Това парче не може да бъде редактирано\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Преглед на разликата"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -21365,18 +23919,19 @@
" и индекса\n"
"add untracked — добавяне на неследените файлове към промените в индекса\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "„--“ липсва"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
@@ -21391,31 +23946,31 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
"текстовият редактор приключи работата с грешка, всичко се преустановява"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -21423,40 +23978,40 @@
"„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния "
"ред, или чрез настройките)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Непозната стойност за „--confirm“: %s\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: псевдоними за sendmail съдържащи кавички („\"“) не се "
"поддържат: %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -21471,12 +24026,12 @@
" ● укажете „./%s“ за файл;\n"
" ● използвате опцията „--format-patch“ за диапазон.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Директорията „%s“ не може да се отвори: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -21485,7 +24040,7 @@
"ФАТАЛНА ГРЕШКА: %s: %s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -21495,17 +24050,17 @@
"Не са указани кръпки!\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "В „%s“ липсва тема"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "„%s“ не може да се отвори за запис: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -21520,27 +24075,27 @@
"\n"
"Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "„%s“ не може да се отвори: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "„%s.final“ не може да се отвори: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Обобщаващото писмо е празно и се прескача\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -21548,11 +24103,11 @@
"Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
"Transfer-Encoding“.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21565,22 +24120,22 @@
"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "На кой да се пратят е-писмата (незадължително поле)"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ е псевдоним на себе си\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Идентификатор на съобщение „Message-ID“, което да се използва за обявяването "
"на отговор „In-Reply-To“ (незадължително поле)"
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
@@ -21588,18 +24143,18 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
"„e“ (редактиране): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Пътят към сертификат „%s“ не съществува."
-#: git-send-email.perl:1412
+#: 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"
@@ -21627,132 +24182,132 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Изпращане на е-писмото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
"„a“ (всичко): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Изискване на отговор към това е-писмо"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Сървърът за SMTP не е настроен правилно."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сървърът не поддържа „STARTTLS“! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Неуспешно изпълнение на STARTTLS! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
"използвайте опцията: „--smtp-debug“."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "„%s“ не може да бъде изпратен\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Проба за изпращане на „%s“\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Изпращане на „%s“\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Успех при пробата. От журнала:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "Успех. От журнала:\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Резултат: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "„%s“: кръпката съдържа ред с над 988 знака"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "„%s“ се пропуска, защото е с разширение за архивен файл: „%s“.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
diff --git a/po/ca.po b/po/ca.po
index f473bb8..73a0824 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
# Catalan translations for Git.
# This file is distributed under the same license as the Git package.
# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2018
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2019
#
# Terminologia i criteris utilitzats
#
@@ -9,6 +9,7 @@
# -----------------+---------------------------------
# ahead | davant per
# amend | esmenar
+# bundle | farcell
# broken | malmès
# delta | diferència
# deprecated | en desús
@@ -25,7 +26,7 @@
# unset | desassignar
# upstream | font
#
-# Alguns termes que són comandes específiques del git i d'àmbit molt tècnic
+# Alguns termes que són ordres específiques del git i d'àmbit molt tècnic
# hem decidit no traduir-los per facilitar-ne la compressió a l'usuari i perquè
# no tenen una transcendència al gran públic. Es tracta de casos similars
# a «ping» en l'àmbit de xarxes.
@@ -48,8 +49,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-11-20 10:05+0800\n"
-"PO-Revision-Date: 2018-11-25 15:32+0200\n"
+"POT-Creation-Date: 2019-07-30 09:59+0800\n"
+"PO-Revision-Date: 2019-07-30 08:23+0200\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -57,39 +58,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.2.1\n"
-#: advice.c:99
-#, fuzzy, c-format
+#: advice.c:109
+#, c-format
msgid "%shint: %.*s%s\n"
-msgstr "pista: %.*s\n"
+msgstr "%spista: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No és possible %s perquè teniu fitxers sense fusionar."
-#: advice.c:170
+#: advice.c:180
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."
@@ -98,141 +99,156 @@
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
-#: advice.c:192
-#, c-format
+#: advice.c:202
+#, fuzzy, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
"Avís: s'està agafant «%s».\n"
"\n"
-"Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n"
-"experimentals i cometre-los i podeu descartar qualsevol comissió que feu\n"
-"en aquest estat sense impactar cap branca realitzant un altre agafament.\n"
+"Esteu en un estat de «HEAD separat». Podeu mirar al voltant, fer canvis\n"
+"experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n"
+"en aquest estat sense cap branca realitzant un altre agafament.\n"
"\n"
"Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
-"poder fer així (ara o més tard) usant -b de nou amb l'ordre checkout.\n"
+"poder fer-ho (ara o més tard) usant -b de nou amb l'ordre checkout.\n"
"Exemple:\n"
"\n"
" git checkout -b <nom-de-branca-nova>\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "la línia d'ordres acaba amb \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc «%s» no reconeguda"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way no es poden usar junts."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached i --3way no es poden usar junts."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
"línia %d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia "
"%d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la "
"línia %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode no vàlid en la línia %d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "línies de capçalera %d i %d inconsistents"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -247,83 +263,83 @@
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d components de nom de camí inicial (línia %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
-msgstr "inici de línia no vàlid: '%c'"
+msgstr "inici de línia no vàlid: «%c»"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -332,23 +348,23 @@
"tot cercant:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -356,288 +372,289 @@
"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
"rebut %s)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: «%s»"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta la informació sha1 o és inútil per al submòdul %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "canvi de mode per a %s, el qual no està en la HEAD actual"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "error intern"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -646,145 +663,144 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "camí"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "número"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3310 builtin/rebase.c:839
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
msgid "action"
msgstr "acció"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "arrel"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
@@ -807,99 +823,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "no existeix la referència: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "no és un nom d'objecte vàlid: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "no és un objecte d'arbre: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "no es segueix el directori de treball actual"
+
+#: archive.c:457
msgid "fmt"
msgstr "format"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1597
msgid "prefix"
msgstr "prefix"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fitxer"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "comprimeix més ràpidament"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "dipòsit"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "ordre"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Paràmetre no admès per al format «%s»: -%d"
@@ -919,32 +954,31 @@
msgid "cannot read %s"
msgstr "no es pot llegir «%s»"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "no s'ha pogut iniciar el filtre «%s»"
-#: archive-tar.c:461
-#, fuzzy
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
-msgstr "no s'ha pogut actualitzar l'índex"
+msgstr "no s'ha pogut redirigir el descriptor"
-#: archive-tar.c:468
-#, fuzzy, c-format
+#: archive-tar.c:469
+#, c-format
msgid "'%s' filter reported error"
-msgstr "«%s» és fora del dipòsit"
+msgstr "«%s» error reportat pel filtre"
#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
-msgstr ""
+msgstr "el camí no és vàlid en UTF-8: %s"
#: archive-zip.c:318
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
+msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
@@ -952,14 +986,19 @@
#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
+msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s no està permès: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -972,17 +1011,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -991,7 +1030,7 @@
"La base de fusió %s és errònia.\n"
"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1000,7 +1039,7 @@
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1009,7 +1048,7 @@
"La base de fusió %s és %s.\n"
"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1020,7 +1059,7 @@
"git bisect no pot funcionar correctament en aquest cas.\n"
"Potser heu confós les revisions %s i %s?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1032,22 +1071,22 @@
"%s.\n"
"Continuem de totes maneres."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
@@ -1087,46 +1126,46 @@
msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse i --first-parent-together requereixen una última comissió "
"especificada"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
+#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent junts requereixen un rang de la cadena de mares "
"primeres"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "no hi ha tal camí %s en %s"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no es pot llegir el blob %s per al camí %s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1139,97 +1178,97 @@
"intentar corregir la informació de seguiment remot\n"
"invocant \"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "No s'està establint la branca %s com a la seva pròpia font."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
"fent «rebase»."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la branca local «%s» fent "
"«rebase»."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
"«rebase»."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
"La branca «%s» està configurada per a seguir la referència remota «%s»."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"La branca «%s» està configurada per a seguir la referència local «%s» fent "
"«rebase»."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "No es pot escriure la configuració de la branca font"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» no és un nom de branca vàlid."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una branca amb nom «%s» ja existeix."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
"una branca."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada «%s» no existeix"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1250,27 +1289,27 @@
"«git push -u» per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: «%s»."
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: «%s»."
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: «%s»."
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» ja s'ha agafat a «%s»"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD de l'arbre de treball %s no està actualitzat"
@@ -1285,71 +1324,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir «%s»"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "cal un dipòsit per verificar un farcell"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El farcell conté aquesta referència:"
msgstr[1] "El farcell conté aquestes %d referències:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El farcell requereix aquesta referència:"
msgstr[1] "El farcell requereix aquestes %d referències:"
-#: bundle.c:267
-#, fuzzy
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
-msgstr "no s'ha pogut actualitzar l'índex"
+msgstr "no s'ha pogut duplicar el descriptor del farcell"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
@@ -1358,9 +1400,8 @@
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -1370,7 +1411,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1382,27 +1423,27 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La comissió %s té una signatura GPG bona de %s\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1413,98 +1454,254 @@
"la variable de configuració i18n.commitencoding a la codificació que\n"
"usi el vostre projecte.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X"
+
+#: commit-graph.c:199
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
+
+#: commit-graph.c:206
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X"
+
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: commit-graph.c:122
-#, fuzzy, c-format
-msgid "graph version %X does not match version %X"
-msgstr "el camí «%s» no té la seva versió"
-
-#: commit-graph.c:129
-#, fuzzy, c-format
-msgid "hash version %X does not match version %X"
-msgstr "el camí «%s» no té la seva versió"
-
-#: commit-graph.c:153
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
+msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la cadena del graf de comissions no coincideix"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "no es poden trobar tots els fitxers del graf de comissions"
+
+#: commit-graph.c:553 commit-graph.c:613
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posició de la comissió no vàlida. Probablement el graf de comissions està malmès"
+
+#: commit-graph.c:574
#, c-format
msgid "could not find commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1001 builtin/pack-objects.c:2651
#, c-format
msgid "unable to get type of object %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-#: commit-graph.c:651
-#, fuzzy
-msgid "Annotating commits in commit graph"
-msgstr "masses comissions per escriure un graf"
+#: commit-graph.c:1033
+msgid "Loading known commits in commit graph"
+msgstr "S'estan carregant comissions conegudes al graf de comissions"
-#: commit-graph.c:691
+#: commit-graph.c:1050
+msgid "Expanding reachable commits in commit graph"
+msgstr "S'estan expandint les comissions abastables al graf de comissions"
+
+#: commit-graph.c:1069
+msgid "Clearing commit marks in commit graph"
+msgstr "S'estan netejant les marques de comissions al graf de comissions"
+
+#: commit-graph.c:1088
msgid "Computing commit graph generation numbers"
-msgstr ""
+msgstr "S'estan calculant els nombres de generació del graf de comissions"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-#, fuzzy
-msgid "Finding commits for commit graph"
-msgstr "masses comissions per escriure un graf"
+#: commit-graph.c:1162
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
+msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
-#: commit-graph.c:812
+#: commit-graph.c:1175
#, c-format
msgid "error adding pack %s"
msgstr "error en afegir paquet %s"
-#: commit-graph.c:814
+#: commit-graph.c:1179
#, c-format
msgid "error opening index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
-#: commit-graph.c:868
+#: commit-graph.c:1203
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència"
+msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències"
-#: commit-graph.c:895
-#, fuzzy
-msgid "too many commits to write graph"
-msgstr "masses comissions per escriure un graf"
+#: commit-graph.c:1237
+msgid "Finding commits for commit graph among packed objects"
+msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1252
+msgid "Counting distinct commits in commit graph"
+msgstr "S'estant comptant les comissions diferents al graf de comissions"
+
+#: commit-graph.c:1283
+msgid "Finding extra edges in commit graph"
+msgstr "S'estan cercant les vores addicionals al graf de comissions"
+
+#: commit-graph.c:1331
+msgid "failed to write correct number of base graph ids"
+msgstr "s'ha produït un error en escriure el nombre correcte d'ids base del graf"
+
+#: commit-graph.c:1364 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: commit-graph.c:1002
+#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: commit-graph.c:1436
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "S'està escrivint el graf de comissions en %d pas"
+msgstr[1] "S'està escrivint el graf de comissions en %d passos"
+
+#: commit-graph.c:1477
+msgid "unable to open commit-graph chain file"
+msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
+
+#: commit-graph.c:1489
+msgid "failed to rename base commit-graph file"
+msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
+
+#: commit-graph.c:1509
+msgid "failed to rename temporary commit-graph file"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+
+#: commit-graph.c:1620
+msgid "Scanning merged commits"
+msgstr "S'estan escanejant les comissions fusionades"
+
+#: commit-graph.c:1631
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de comissió duplicat %s no esperat"
+
+#: commit-graph.c:1656
+msgid "Merging commit-graph"
+msgstr "S'està fusionant el graf de comissions"
+
+#: commit-graph.c:1842
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "el format del graf de comissions no pot escriure %d comissions"
+
+#: commit-graph.c:1853
+msgid "too many commits to write graph"
+msgstr "massa comissions per escriure un graf"
+
+#: commit-graph.c:1943
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
+"el fitxer commit-graph (graf de comissions) té una suma de verificació "
+"incorrecta i probablement és corrupte"
-#: commit-graph.c:1046
-msgid "Verifying commits in commit graph"
+#: commit-graph.c:1953
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1963 commit-graph.c:1978
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:1970
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "s'ha produït un error en analitzar la comissió %s del graf de comissions"
+
+#: commit-graph.c:1987
+msgid "Verifying commits in commit graph"
+msgstr "S'estan verificant les comissions al graf de comissions"
+
+#: commit-graph.c:2000
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2007
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2017
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2026
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2039
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2044
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2048
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2063
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2069
+#, 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 "memòria esgotada"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1514,302 +1711,302 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "les inclusions de configuració relatives han de venir de fitxers"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-#: config.c:348
+#: config.c:375
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
-#: config.c:354
+#: config.c:381
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clau no conté un nom de variable: «%s»"
-#: config.c:378 sequencer.c:2296
+#: config.c:405 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: config.c:384
+#: config.c:411
#, c-format
msgid "invalid key (newline): %s"
msgstr "clau no vàlida (línea nova): %s"
-#: config.c:420 config.c:432
+#: config.c:447 config.c:459
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
-#: config.c:467
+#: config.c:494
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
-#: config.c:793
+#: config.c:820
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:797
+#: config.c:824
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:801
+#: config.c:828
#, c-format
msgid "bad config line %d in standard input"
msgstr "línia de configuració %d errònia en l'entrada estàndard"
-#: config.c:805
+#: config.c:832
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "línia de configuració %d errònia en el blob de submòdul %s"
-#: config.c:809
+#: config.c:836
#, c-format
msgid "bad config line %d in command line %s"
msgstr "línia de configuració %d errònia en la línia d'ordres %s"
-#: config.c:813
+#: config.c:840
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:952
+#: config.c:977
msgid "out of range"
msgstr "fora de rang"
-#: config.c:952
+#: config.c:977
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:958
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:963
+#: config.c:997
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
-#: config.c:966
+#: config.c:1000
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
-#: config.c:969
+#: config.c:1003
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
-#: config.c:972
+#: config.c:1006
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
"%s: %s"
-#: config.c:975
+#: config.c:1009
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
-#: config.c:978
+#: config.c:1012
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
-#: config.c:1073
+#: config.c:1107
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
-#: config.c:1082
+#: config.c:1116
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» per a «%s» no és una marca de temps vàlida"
-#: config.c:1173
+#: config.c:1207
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1221 config.c:1232
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1290
+#: config.c:1324
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1357
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1395
+#: config.c:1429
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
-#: config.c:1421
+#: config.c:1455
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: config.c:1422
+#: config.c:1456
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1481 builtin/pack-objects.c:3389
+#: config.c:1517 builtin/pack-objects.c:3399
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
-#: config.c:1602
+#: config.c:1638
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
-#: config.c:1605
+#: config.c:1641
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la referència «%s» no assenyala a un blob"
-#: config.c:1622
+#: config.c:1658
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
-#: config.c:1652
+#: config.c:1688
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
-#: config.c:1705
+#: config.c:1744
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:2037
+#: config.c:2093
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2207
+#: config.c:2263
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
-#: config.c:2250
+#: config.c:2306
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte "
"«keep»"
-#: config.c:2276
+#: config.c:2332
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
-#: config.c:2319
+#: config.c:2378
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
-#: config.c:2321
+#: config.c:2380
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
-#: config.c:2402
+#: config.c:2461
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
-#: config.c:2434
+#: config.c:2493
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2463
+#: config.c:2522
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
-#: config.c:2714 config.c:3038
+#: config.c:2774 config.c:3098
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-#: config.c:2725
+#: config.c:2785
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
-#: config.c:2760 builtin/config.c:327
+#: config.c:2820 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
-#: config.c:2785
+#: config.c:2845
#, c-format
msgid "invalid config file %s"
-msgstr "fitxer de configuració vàlid %s"
+msgstr "fitxer de configuració no vàlid %s"
-#: config.c:2798 config.c:3051
+#: config.c:2858 config.c:3111
#, c-format
msgid "fstat on %s failed"
-msgstr "ha fallat fstat a %s"
+msgstr "ha fallat «fstat» a %s"
-#: config.c:2809
-#, fuzzy, c-format
+#: config.c:2869
+#, c-format
msgid "unable to mmap '%s'"
-msgstr "no s'ha pogut accedir a «%s»"
+msgstr "no s'ha pogut fer «mmap» «%s»"
-#: config.c:2818 config.c:3056
+#: config.c:2878 config.c:3116
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
-#: config.c:2903 config.c:3153
+#: config.c:2963 config.c:3213
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-#: config.c:2937
+#: config.c:2997
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:2939 builtin/remote.c:782
+#: config.c:2999 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
-#: config.c:3029
+#: config.c:3089
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
-#: config.c:3196
+#: config.c:3256
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
@@ -1838,7 +2035,7 @@
#: connect.c:103
#, c-format
msgid "server doesn't support feature '%s'"
-msgstr "el servidor no es compatible amb la característica «%s»"
+msgstr "el servidor no és compatible amb la característica «%s»"
#: connect.c:114
msgid "expected flush after capabilities"
@@ -1854,65 +2051,63 @@
msgstr ""
#: connect.c:273
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+msgstr ""
+"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
#: connect.c:275
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "error remot: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "paquet no vàlid"
-#: connect.c:336
-#, fuzzy, c-format
+#: connect.c:333
+#, c-format
msgid "protocol error: unexpected '%s'"
-msgstr "error de protocol: capçalera de paquet errònia"
+msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
-#: connect.c:444
-#, fuzzy, c-format
+#: connect.c:441
+#, c-format
msgid "invalid ls-refs response: %s"
-msgstr "referència no vàlida: %s"
+msgstr "resposta de ls-refs no vàlida: %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "el protocol «%s» no és compatible"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
-msgstr ""
+msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
-#: connect.c:638 connect.c:701
-#, fuzzy, c-format
+#: connect.c:635 connect.c:698
+#, c-format
msgid "Looking up %s ... "
-msgstr "S'està comprovant el pedaç %s..."
+msgstr "S'està cercant %s..."
-#: connect.c:642
-#, fuzzy, c-format
+#: connect.c:639
+#, c-format
msgid "unable to look up %s (port %s) (%s)"
-msgstr "no s'ha pogut moure %s a %s"
+msgstr "no s'ha pogut trobar %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
+"fet.\n"
+"S'està connectant a %s (port %s) ... "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1922,176 +2117,173 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "fet."
-#: connect.c:705
-#, fuzzy, c-format
+#: connect.c:702
+#, c-format
msgid "unable to look up %s (%s)"
-msgstr "no s'ha pogut obrir %s: %s\n"
+msgstr "no s'ha pogut trobar %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "port desconegut %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
-msgstr ""
+msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
-msgstr ""
+msgstr "s'ha bloquejat el port estrany «%s»"
-#: connect.c:860
-#, fuzzy, c-format
+#: connect.c:857
+#, c-format
msgid "cannot start proxy %s"
-msgstr "no es pot fer stat en «%s»"
+msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
+msgstr "no s'ha especificat un camí; vegeu «git help pull» per la sintaxis vàlida per URL"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
-msgstr ""
+msgstr "la variant «simple» d'ssh no és compatible amb -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
-msgstr ""
+msgstr "la variant «simple» d'ssh no és compatible amb -6"
-#: connect.c:1151
-#, fuzzy
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
-msgstr "el destí receptor no admet pujar --signed"
+msgstr "la variant «simple» d'ssh no permet definir el port"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
-msgstr ""
+msgstr "s'ha bloquejat el nom de fitxer extrany «%s»"
#: connect.c:1307
-#, fuzzy
msgid "unable to fork"
-msgstr "no s'ha pogut obrir %s"
+msgstr "no s'ha pogut bifurcar"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
-#, fuzzy, c-format
+#: convert.c:206
+#, c-format
msgid "CRLF would be replaced by LF in %s"
-msgstr "LF reemplaçaria CRLF en %s."
+msgstr "CRLF es reemplaçà per LF en %s."
-#: convert.c:209
-#, fuzzy, c-format
+#: convert.c:208
+#, 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 ""
-"LF reemplaçarà CRLF en %s.\n"
+"CRLF serà reemplaçat per LF en %s.\n"
"El fitxer tindrà els seus terminadors de línia originals en el vostre "
"directori de treball."
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
-msgstr "CRLF reemplaçaria LF en %s"
+msgstr "LF es reemplaçà per LF en %s"
-#: convert.c:219
-#, fuzzy, c-format
+#: convert.c:218
+#, 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 ""
-"CRLF reemplaçarà LF en %s.\n"
+"LF serà reemplaçat per CRLF en %s.\n"
"El fitxer tindrà els seus terminadors de línia originals en el vostre "
"directori de treball."
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr ""
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:307
+#: 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:425 convert.c:496
-#, fuzzy, c-format
+#: convert.c:424 convert.c:495
+#, c-format
msgid "failed to encode '%s' from %s to %s"
-msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»"
+msgstr "s'ha produït un error en codificar «%s» des de %s a %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr ""
+msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
-#: convert.c:674
-#, fuzzy, c-format
+#: convert.c:673
+#, c-format
msgid "cannot fork to run external filter '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent «%s»"
+msgstr "no es pot bifurcar per a executar el filtre extern «%s»"
-#: convert.c:694
-#, fuzzy, c-format
+#: convert.c:693
+#, c-format
msgid "cannot feed the input to external filter '%s'"
-msgstr "no es poden llegir els continguts actuals de «%s»"
+msgstr "no es pot alimentar l'entrada al filtre extern «%s»"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "el filtre extern «%s» ha fallat %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "la lectura del filtre extern «%s» ha fallat"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "el filtre extern «%s» ha fallat"
#: convert.c:844
-#, fuzzy
msgid "unexpected filter type"
-msgstr "final de fitxer inesperat"
+msgstr "tipus de filtre inesperat"
#: convert.c:855
msgid "path name too long for external filter"
@@ -2109,62 +2301,62 @@
msgstr ""
#: convert.c:1398 convert.c:1432
-#, fuzzy, c-format
+#, c-format
msgid "%s: clean filter '%s' failed"
-msgstr "la creació de «%s» ha fallat"
+msgstr "%s: el filtre de netejat «%s» ha fallat"
#: convert.c:1476
#, fuzzy, c-format
msgid "%s: smudge filter %s failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "en el futur"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "fa %<PRIuMAX> segon"
msgstr[1] "fa %<PRIuMAX> segons"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "fa %<PRIuMAX> minut"
msgstr[1] "fa %<PRIuMAX> minuts"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "fa %<PRIuMAX> hora"
msgstr[1] "fa %<PRIuMAX> hores"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "fa %<PRIuMAX> dia"
msgstr[1] "fa %<PRIuMAX> dies"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "fa %<PRIuMAX> setmana"
msgstr[1] "fa %<PRIuMAX> setmanes"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "fa %<PRIuMAX> mes"
msgstr[1] "fa %<PRIuMAX> mesos"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2172,43 +2364,46 @@
msgstr[1] "%<PRIuMAX> anys"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "fa %s i %<PRIuMAX> mes"
msgstr[1] "fa %s i %<PRIuMAX> mesos"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "fa %<PRIuMAX> any"
msgstr[1] "fa %<PRIuMAX> anys"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
-msgstr ""
+msgstr "S'estan propagant les marques d'illa"
-#: delta-islands.c:286
-#, fuzzy, c-format
+#: delta-islands.c:290
+#, c-format
msgid "bad tree object %s"
-msgstr "s'ha produït un error en llegir l'objecte «%s»."
+msgstr "objecte d'arbre malmès %s"
-#: delta-islands.c:330
-#, fuzzy, c-format
+#: delta-islands.c:334
+#, c-format
msgid "failed to load island regex for '%s': %s"
-msgstr "S'ha produït un error en cercar l'arbre de %s."
+msgstr ""
+"s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
+"l'expressió regular de l'illa des de la configuració té massa grups de "
+"captura (màx=%d)"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
-msgstr ""
+msgstr "Marcades %d illes, fet.\n"
#: diffcore-order.c:24
#, c-format
@@ -2219,50 +2414,59 @@
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "l'opció «%s» requereix un valor"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opcions>] <camí> <camí>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del "
+"directori de treball"
+
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" S'ha produït un error en analitzar el percentatge limitant de dirstat "
"«%s»\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut «%s»\n"
-#: diff.c:291
-#, fuzzy
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-"el paràmetre de color en moviment ha de ser «no», «default», «zebra», "
-"«dimmed_zebra» o «plain»"
+"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
+"«zebra», «dimmed-zebra» o «plain»"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr ""
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"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:394
+#: 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 ""
"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2271,24 +2475,35 @@
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S and --find-object són mútuament excloents"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor --stat no vàlid: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numèric"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2297,22 +2512,499 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
+
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconegut després de ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "no s'ha pogut resoldre «%s»"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
msgstr ""
-"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:5823
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s esperava un caràcter, s'ha rebut «%s»"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "paràmetre --color-moved incorrecte: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode «%s» no vàlid en -color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'opció diff-algorithm accepta «myers», «minimalminimal», \"patience\" and "
+"«histogram»"
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argument no vàlid a %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr ""
+"s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "paràmetre --word-diff incorrecte: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Opcions del format de sortida del diff"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "generant pedaç"
+
+#: diff.c:5275 builtin/log.c:182
+msgid "suppress diff output"
+msgstr "omet la sortida de diferències"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "genera diffs amb <n> línies de context"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "genera el diff en format cru"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "sinònim de per a «-p --raw»"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "sinònim de per a «-p --stat»"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "llegible per màquina --stat"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "mostra només l'última línia de --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinònim per -dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinònim per --dirstat=files,param1,param2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "mostra només els noms de fitxers canviats"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "mostra només els noms i l'estat dels fitxers canviats"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "genera diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<amplada>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "genera diffstat amb una amplada donada"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "genera diffstat amb un nom d'amplada donat"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "genera diffstat amb una amplada de graf donada"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<comptador>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "genera diffstat amb línies limitades"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "genera un resum compacte a diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "diff amb sortida binaria que pot ser aplicada"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "mostra un diff amb colors"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<prefix>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "afegir un prefix addicional per a cada línia de sortida"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "no mostris cap prefix d'origen o destí"
+
+#: diff.c:5371
+#, fuzzy
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<char>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Opcions de canvi de nom del diff"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "detecta els canvis de noms"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "omet les preimatges per les supressions"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "detecta còpies"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "usa els fitxers no modificats com a font per trobar còpies"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "inhabilita la detecció de canvis de nom"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "usa els blobs buits com a font de canvi de nom"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Opcions d'algorisme Diff"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "produeix el diff més petit possible"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignora els espai en blanc en comparar línies"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignora els canvis en la quantitat d'espai en blanc"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignora els canvis d'espai en blanc al final de la línia"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignora els retorns de línia al final de la línia"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora els canvis en línies que estan en blanc"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera diff usant l'algorisme «patience diff»"
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera diff usant l'algorisme «histogram diff»"
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algorisme>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "escolliu un algorisme pel diff"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<text>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera diff usant l'algorisme «anchored diff»"
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5469
+#, fuzzy
+msgid "Other diff options"
+msgstr "Opcions genèriques"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "tracta tots els fitxers com a text"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "inhabilita totes les sortides del programa"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<quan>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignora els canvis als submòduls en la generació del diff"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "especifiqueu com es mostren els canvis als submòduls"
+
+#: diff.c:5496
+#, fuzzy
+msgid "hide 'git add -N' entries from the index"
+msgstr "usa .gitattributes només des de l'índex"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<cadena>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5508
+#, fuzzy
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostra els fitxers coincidents en el paginador"
+
+#: diff.c:5511
+#, fuzzy
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "usa les expressions regulars POSIX ampliades"
+
+#: diff.c:5514
+#, fuzzy
+msgid "control the order in which files appear in the output"
+msgstr "mostra en la sortida els altres fitxers"
+
+#: diff.c:5515
+#, fuzzy
+msgid "<object-id>"
+msgstr "objecte"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "seleccioneu els fitxer per tipus de diff"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<fitxer>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Sortida a un fitxer específic"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
-msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers."
+msgstr "s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -2320,42 +3012,42 @@
"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
"l'ordre."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no es pot usar %s com a fitxer d'exclusió"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "no s'ha pogut obrir el directori «%s»"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "el fitxer d'índex al dipòsit %s és malmès"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "no s'han pogut crear directoris per %s"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
@@ -2369,7 +3061,7 @@
msgid "Filtering content"
msgstr "S'està filtrant el contingut"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
@@ -2384,7 +3076,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "no s'ha pogut establir GIT_DIR a «%s»"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
@@ -2397,249 +3089,237 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista superficial esperada"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+#, fuzzy
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: llista superficial esperada"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "no s'ha pogut escriure al remot"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
-msgstr "s'està rendint"
+msgstr "s'abandona"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fet"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "El servidor no permet clients superficials"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "El servidor accepta multi_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "El servidor accepta no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "El servidor accepta multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "El servidor accepta side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "El servidor accepta banda lateral"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "El servidor accepta allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "El servidor accepta allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "El servidor accepta ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "El servidor accepta filtre"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor accepta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "El servidor no permet clients superficials"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1153
-#, fuzzy
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
-msgstr "El servidor no permet clients superficials"
+msgstr "El servidor no permet peticions superficials"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "El servidor accepta filtratge"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "no s'ha pogut escriure la petició al remot"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "línia de confirmació inesperada: «%s»"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, fuzzy, c-format
msgid "error processing acks: %d"
msgstr "error en llegir %s"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+msgstr "s'espera l'enviament del fitxer de paquet després de «ready»"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
+msgstr "s'espera que cap altra seccions s'enviï després de no «ready»"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
-msgstr ""
+msgstr "s'ha produït un error en processar la informació superficial: %d"
-#: fetch-pack.c:1314
-#, fuzzy, c-format
+#: fetch-pack.c:1353
+#, c-format
msgid "expected wanted-ref, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-#: fetch-pack.c:1324
-#, fuzzy, c-format
+#: fetch-pack.c:1358
+#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr "final de fitxer inesperat"
+msgstr "wanted-ref inesperat: «%s»"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "s'ha produït un error en processar les referències desitjades: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
@@ -2649,18 +3329,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
@@ -2703,93 +3383,91 @@
#: help.c:35
msgid "Low-level Commands / Manipulators"
-msgstr ""
+msgstr "Ordres de baix nivell / Manipuladors"
#: help.c:36
msgid "Low-level Commands / Interrogators"
-msgstr ""
+msgstr "Ordres de baix nivell / Interrogadors"
#: help.c:37
msgid "Low-level Commands / Synching Repositories"
-msgstr ""
+msgstr "Ordres de baix nivell / Sincronització de dipòsits"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
-msgstr ""
+msgstr "Ordres de baix nivell / Ajudants interns"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en «%s»"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr ""
"Aquestes són ordres del Git habitualment usades en diverses situacions:"
-#: help.c:361 git.c:90
-#, fuzzy, c-format
+#: help.c:363 git.c:98
+#, c-format
msgid "unsupported command listing type '%s'"
-msgstr "versió d'índex no compatible %s"
+msgstr "tipus de llistat de l'ordre no compatible «%s»"
-#: help.c:408
-#, fuzzy
+#: help.c:403
msgid "The common Git guides are:"
-msgstr "Les guies de Git comunes són:\n"
+msgstr "Les guies de Git comunes són:"
+
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Vegeu «git help <ordre>» per llegir sobre un subordre específic"
#: help.c:517
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr ""
-
-#: help.c:522
-#, fuzzy
msgid "External commands"
-msgstr "s'està executant $command"
+msgstr "Ordres externes"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
-msgstr ""
+msgstr "Àlies d'ordres"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"«%s» sembla una ordre de git, però no hem pogut\n"
+"«%s» sembla un ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
+"ADVERTÈNCIA: Heu invocat un ordre de Git amb nom «%s», la qual no existeix."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» no és una ordre de git. Vegeu 'git --help'."
+msgstr "git: «%s» no és un ordre de git. Vegeu «git --help»."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2801,18 +3479,18 @@
"L'ordre més similar és"
msgstr[1] ""
"\n"
-"Les ordres més similar són"
+"Les ordres més similars són"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2826,7 +3504,7 @@
"\n"
"Volíeu dir un d'aquests?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2851,54 +3529,77 @@
"per a establir la identitat predeterminada del vostre compte.\n"
"Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
"inhabilitada"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
"rebut «%s»)"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr ""
"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
-msgstr ""
+msgstr "no es poden combinar múltiples especificacions de filtratge"
#: list-objects-filter-options.c:58
-#, fuzzy
-msgid "only 'tree:0' is supported"
-msgstr "el protocol «%s» no és compatible"
+msgid "expected 'tree:<depth>'"
+msgstr "s'esperava «tree:<profunditat>»"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtre d'especificació no vàlid: «%s»"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr ""
@@ -2916,8 +3617,8 @@
"No s'ha pogut crear '%s.lock': %s.\n"
"\n"
"Sembla que un altre procés de git s'està executant en aquest\n"
-"dipòsit, per exemple, un editor obert per 'git commit'. \n"
-"Assegureu-vos que tots els processos s'hagin terminat i\n"
+"dipòsit, per exemple, un editor obert per «git commit». \n"
+"Assegureu-vos que tots els processos s'hagin acabat i\n"
"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
"git ha tingut un error:\n"
"elimineu el fitxer manualment per a continuar."
@@ -2925,119 +3626,123 @@
#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
-msgstr "No s'ha pogut crear '%s.lock': %s"
+msgstr "No s'ha pogut crear «%s.lock»: %s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
#: merge-recursive.c:345
-#, fuzzy, c-format
+#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat per al camí «%s»"
+msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió."
-#: merge-recursive.c:353
-#, fuzzy, c-format
+#: merge-recursive.c:354
+#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat per al camí «%s»"
+msgstr "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se sap què fer amb %06o %s «%s»"
-#: merge-recursive.c:1212
-#, fuzzy, c-format
+#: merge-recursive.c:1177
+#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
+msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
-#: merge-recursive.c:1219
-#, fuzzy, c-format
+#: merge-recursive.c:1184
+#, c-format
msgid "Failed to merge submodule %s (commits not present)"
-msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
+msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (les comissions no "
+"segueixen merge-base)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr ""
+msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
-#, fuzzy, c-format
+#: merge-recursive.c:1202 merge-recursive.c:1214
+#, c-format
msgid "Fast-forwarding submodule %s"
-msgstr "Avanç ràpid a $sha1"
+msgstr "Avançament ràpid al submòdul %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1275
-#, fuzzy, c-format
+#: merge-recursive.c:1241
+#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
-
-#: merge-recursive.c:1276
-msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1242
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
+
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3048,31 +3753,33 @@
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
+"fusions)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1416
-#, fuzzy, c-format
+#: merge-recursive.c:1387
+#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
+msgstr "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3081,7 +3788,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3090,7 +3797,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3099,7 +3806,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3108,63 +3815,64 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
#, c-format
msgid "Refusing to lose dirty file at %s"
-msgstr "s'està refusant a perdre el fitxer brut a %s"
+msgstr "S'està refusant a perdre el fitxer brut a %s"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig de l'operació."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit %s a "
+"%s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
"com a %s"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
-"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la "
+"branca «%s» canvi de nom «%s»->«%s» en «%s»%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
-
-#: merge-recursive.c:1746
-#, fuzzy, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3172,21 +3880,21 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, 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:1994
+#: merge-recursive.c:2077
#, 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:2086
+#: merge-recursive.c:2169
#, fuzzy, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3195,251 +3903,296 @@
"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
"nom %s->%s en %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
+"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell mateix ja havia canviat de nom."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
-"%s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "S'està afegint %s fusionat"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "S'està afegint com a %s en lloc d'això"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2937
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2940
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3004
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3004
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:3017
+#: merge-recursive.c:3016
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3020
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3043
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3065 git-submodule.sh:937
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3066
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3096
+#, c-format
+msgid "Adding as %s instead"
+msgstr "S'està afegint com a %s en lloc d'això"
+
+#: merge-recursive.c:3178
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3181
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3185
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3188
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3302
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3325
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3330
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3337
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
"%s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3346
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:3300
-#, fuzzy, c-format
+#: merge-recursive.c:3355
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
+
+#: merge-recursive.c:3393
+#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
-"%%s"
+"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
+" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3404
msgid "Already up to date!"
msgstr "Ja està al dia!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3413
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3512
msgid "Merging:"
msgstr "S'està fusionant:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3525
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "s'ha trobat %u avantpassat en comú:"
msgstr[1] "s'han trobat %u avantpassats en comú:"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3564
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3630
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:91
+#: midx.c:95
#, fuzzy, c-format
msgid "hash version %u does not match"
msgstr "el camí «%s» no té la seva versió"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:205
+#: midx.c:211
#, c-format
-msgid "bad pack-int-id: %u (%u total packs"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:407
+#: midx.c:470
#, fuzzy, c-format
msgid "failed to add packfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: midx.c:413
+#: midx.c:476
#, fuzzy, c-format
msgid "failed to open pack-index '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: midx.c:507
+#: midx.c:536
#, fuzzy, c-format
msgid "failed to locate object %d in packfile"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1036
#, fuzzy, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "s'ha produït un error en netejar l'índex"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "S'estan cercant fitxers de paquets referenciats"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr ""
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:996
-#, fuzzy
-msgid "Verifying object offsets"
-msgstr "S'estan escrivint els objectes"
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "S'estan ordenant els objectes per fitxer de paquet"
-#: midx.c:1004
+#: midx.c:1144
+msgid "Verifying object offsets"
+msgstr "S'estan verificant els desplaçaments dels objectes"
+
+#: midx.c:1160
#, fuzzy, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: midx.c:1010
+#: midx.c:1166
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "no s'ha pogut executar el pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "no s'ha pogut finalitzar el pack-objects"
+
#: name-hash.c:532
#, fuzzy, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3455,7 +4208,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3466,21 +4219,21 @@
"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
"avortar la fusió prèvia abans de començar una fusió de notes nova."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Valor de notes.rewriteMode erroni: «%s»"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
@@ -3489,57 +4242,112 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Valor erroni de %s: «%s»"
#: object.c:54
-#, fuzzy, c-format
+#, c-format
msgid "invalid object type \"%s\""
-msgstr "objecte de blob no vàlid %s"
+msgstr "tipus d'objecte «%s» no vàlid"
-#: object.c:173
-#, fuzzy, c-format
+#: object.c:174
+#, c-format
msgid "object %s is a %s, not a %s"
-msgstr "l'objecte %s no és un blob"
+msgstr "l'objecte %s és %s, no pas %s"
-#: object.c:233
-#, fuzzy, c-format
+#: object.c:234
+#, c-format
msgid "object %s has unknown type id %d"
-msgstr "L'objecte %s no té cap nota\n"
+msgstr "l'objecte %s té un identificador de tipus %d desconegut"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
+msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requereix un valor"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s és incompatible amb %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: és incompatible amb alguna altra cosa"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no accepta cap valor"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no és disponible"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opció desconeguda «%s»"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "«switch» «%c» desconegut"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opció no ascii desconeguda en la cadena: «%s»"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
@@ -3547,201 +4355,265 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:37
-#, fuzzy, c-format
-msgid "malformed expiration date '%s'"
-msgstr "full d'opcions mal format: «%s»"
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "àlies de --%s"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'opció «%s» espera un valor numèric"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data de venciment «%s» mal formada"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'opció «%s» espera «always», «auto» o «never»"
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format «%s»"
+msgstr "nom d'objecte «%s» mal format"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-"El caràcter d'escapament '\\' no està permès com a últim caràcter en un "
+"El caràcter d'escapament «\\» no està permès com a últim caràcter en un "
"valor d'un atribut"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
-msgstr "Només es permet una especificació 'attr:'."
+msgstr "Només es permet una especificació «attr:»."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "una especificació d'atribut no pot estar buida"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'atribut no vàlid %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són "
+"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
"incompatibles"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-"el paràmetre d'especificació de camí 'literal' global és incompatible amb "
+"el paràmetre d'especificació de camí «literal» global és incompatible amb "
"tots els altres paràmetres d'especificació de camí globals"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'"
+msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "')' mancant al final de la màgia d'especificació de camí en «%s»"
+msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada '%c' en «%s»"
+msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' i 'glob' són incompatibles"
+msgstr "%s: «literal» i «glob» són incompatibles"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: «%s» és fora del dipòsit"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
-msgstr "«%s» (mnemònic: '%c')"
+msgstr "«%s» (mnemònic: «%c»)"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
-#: pkt-line.c:104
-#, fuzzy
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "no s'ha pogut escriure el paquet de buidatge"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "no s'ha pogut escriure el paquet delim"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgstr "s'ha produït un error en escriure el paquet de buidatge"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
-msgstr ""
+msgstr "error de protocol: longitud de línia impossible"
-#: pkt-line.c:158 pkt-line.c:160
-#, fuzzy
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgstr "ha fallat l'escriptura del paquet amb format"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
+"no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
+"paquet"
-#: pkt-line.c:199 pkt-line.c:206
-#, fuzzy
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgstr "no s'ha pogut escriure el paquet"
-#: pkt-line.c:291
-#, fuzzy
+#: pkt-line.c:295
msgid "read error"
-msgstr "error de lectura d'entrada"
+msgstr "error de lectura"
-#: pkt-line.c:299
-#, fuzzy
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
-msgstr "El costat remot ha penjat en el moment de contacte inicial"
+msgstr "el remot ha penjat inesperadament"
-#: pkt-line.c:327
-#, fuzzy, c-format
+#: pkt-line.c:331
+#, c-format
msgid "protocol error: bad line length character: %.4s"
-msgstr "error de protocol: capçalera de paquet errònia"
+msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
-#, fuzzy, c-format
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
msgid "protocol error: bad line length %d"
-msgstr "error de protocol: capçalera de paquet errònia"
+msgstr "error de protocol: longitud de línia errònia %d"
-#: preload-index.c:118
-#, fuzzy
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "error remot: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
-msgstr "no s'ha pogut actualitzar l'índex"
+msgstr "S'està actualitzant l'índex"
-#: preload-index.c:137
+#: preload-index.c:138
#, fuzzy, c-format
msgid "unable to create threaded lstat: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: range-diff.c:56
-#, fuzzy
+#: range-diff.c:70
msgid "could not start `log`"
-msgstr "no s'ha pogut fer stat a %s"
+msgstr "no s'ha pogut iniciar «log»"
-#: range-diff.c:59
-#, fuzzy
+#: range-diff.c:72
msgid "could not read `log` output"
-msgstr "no s'ha pogut llegir la sortida de 'show'"
+msgstr "no s'ha pogut llegir la sortida de «log»"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
-#: range-diff.c:224
-#, fuzzy
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
+
+#: range-diff.c:274
msgid "failed to generate diff"
-msgstr "s'ha produït un error en executar «%s»"
+msgstr "s'ha produït un error en generar el diff"
-#: range-diff.c:455 range-diff.c:457
-#, fuzzy, c-format
+#: range-diff.c:506 range-diff.c:508
+#, c-format
msgid "could not parse log for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
+msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
-#: read-cache.c:1490
-#, fuzzy
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "no es pot crear un blob buit a la base de dades d'objectes"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s: només pot afegir fitxers normals, enllaços simbolics o directoris git"
+
+#: read-cache.c:723
+#, fuzzy, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "«%s» no assenyala una comissió"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "no es pot llegir indexar el fitxer «%s»"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "no s'ha pogut afegir «%s» a l'índex"
+
+#: read-cache.c:805
+#, fuzzy, c-format
+msgid "unable to stat '%s'"
+msgstr "no s'ha pogut actualitzar %s"
+
+#: read-cache.c:1314
+#, fuzzy, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "%s existeix i no és directori"
+
+#: read-cache.c:1499
msgid "Refresh index"
-msgstr "no s'ha pogut actualitzar l'índex"
+msgstr "Actualitza l'índex"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3750,7 +4622,7 @@
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3759,60 +4631,151 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "signatura malmesa 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "versió d'índex incorrecta %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "signatura sha1 malmesa al fitxer d'índex"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "s'està ignorant l'extensió %.4s"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "Format d'entrada d'índex desconeguda «0x%08x»"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
+msgstr "camp del nom mal formatat l'index, camí a prop «%s»"
+
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1836
+#, fuzzy, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "nom d'identitat buit (per <%s>) no és permès"
+
+#: read-cache.c:1839
+#, fuzzy, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "no s'han pogut crear directoris per %s"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, fuzzy, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, fuzzy, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2200
+#: read-cache.c:2133
+#, fuzzy, c-format
+msgid "%s: index file open failed"
+msgstr "s'ha produït un error en actualitzar els fitxers"
+
+#: read-cache.c:2137
+#, fuzzy, c-format
+msgid "%s: cannot stat the open index"
+msgstr "no es pot llegir l'índex"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: fitxer d'índex més petit que s'esperava"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: no es pot mapar el fitxer d'índex"
+
+#: read-cache.c:2187
#, fuzzy, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2227
+#: read-cache.c:2214
#, fuzzy, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, fuzzy, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "no s'ha pogut llegir el fitxer «%s»"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:3039
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:3051
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, fuzzy, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "no s'ha pogut resoldre la revisió: %s"
+
+#: read-cache.c:3291
+#, fuzzy, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "no es pot canviar de directori a %s"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
+"ignorant."
+
+#: rebase-interactive.c:35
#, fuzzy
msgid ""
"\n"
@@ -3848,16 +4811,23 @@
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, fuzzy, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
+msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
-"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
+"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
"comissió.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3865,7 +4835,7 @@
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3879,7 +4849,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3889,126 +4859,156 @@
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
-msgstr "Nota que les comissions buides estan comentades"
+msgstr "Tingueu en compte que les comissions buides estan comentades"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+msgid "could not write '%s'"
+msgstr "no s'ha pogut escriure «%s»"
-#: refs.c:192
-#, fuzzy, c-format
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "no s'ha pogut copiar «%s» a «%s»."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
+"Les comissions descartades (més nova a més vella):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
+"comissió.\n"
+"\n"
+"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
+"d'advertències.\n"
+"Els comportaments possibles són: ignore, warn, error.\n"
+
+#: refs.c:262
+#, c-format
msgid "%s does not point to a valid object!"
-msgstr "«%s» no assenyala una comissió"
+msgstr "%s no apunta a un objecte vàlid"
-#: refs.c:583
+#: refs.c:667
#, fuzzy, c-format
msgid "ignoring dangling symref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: refs.c:711
-#, fuzzy, c-format
+#: refs.c:804
+#, c-format
msgid "could not open '%s' for writing: %s"
-msgstr "no s'ha pogut obrir «%s» per a escriptura"
+msgstr "no s'ha pogut obrir «%s» per a escriptura: %s"
-#: refs.c:721 refs.c:772
-#, fuzzy, c-format
+#: refs.c:814 refs.c:865
+#, c-format
msgid "could not read ref '%s'"
-msgstr "No s'ha pogut llegir la referència %s"
+msgstr "no s'ha pogut llegir la referència «%s»"
-#: refs.c:727
-#, fuzzy, c-format
+#: refs.c:820
+#, c-format
msgid "ref '%s' already exists"
-msgstr "«%s» ja existeix"
+msgstr "la referència «%s» ja existeix"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
-msgstr ""
+msgstr "ID d'objecte no esperat en escriure «%s»"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir «%s» per a escriptura"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
-msgstr ""
+msgstr "ID d'objecte no esperat en suprimir «%s»"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1061
-#, fuzzy, c-format
+#: refs.c:1155
+#, c-format
msgid "refusing to update ref with bad name '%s'"
-msgstr "s'està ignorant la referència amb nom malmès %s"
+msgstr "s'està refusant la referència amb nom malmès «%s»"
-#: refs.c:1137
+#: refs.c:1231
#, fuzzy, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: refs.c:1911
+#: refs.c:2012
#, fuzzy, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-#: refs.c:2039 refs.c:2069
-#, fuzzy, c-format
+#: refs.c:2140 refs.c:2170
+#, c-format
msgid "'%s' exists; cannot create '%s'"
-msgstr "no es pot crear «%s»"
+msgstr "«%s» existeix; no es pot crear «%s»"
-#: refs.c:2045 refs.c:2080
-#, fuzzy, c-format
+#: refs.c:2146 refs.c:2181
+#, c-format
msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
+msgstr "no es poden processar «%s» i «%s» a la vegada"
-#: refs/files-backend.c:1227
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: refs/files-backend.c:1241 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1244 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "no s'han pogut suprimir les referències: %s"
@@ -4018,365 +5018,478 @@
msgid "invalid refspec '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "no hi és"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "davant per %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "darrere per %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "paràmetre %%(%s) desconegut: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:235
-#, c-format
-msgid "%%(objectsize) does not take arguments"
+#: ref-filter.c:269
+#, fuzzy, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "paràmetre %%(objectname) no reconegut: %s"
+
+#: ref-filter.c:277
+#, fuzzy, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr "%%(objectsize) no accepta paràmetres"
-#: ref-filter.c:247
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "paràmetre %%(trailers) desconegut: %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positiu esperat nom d'objecte:curt=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "paràmetre %%(if) no reconegut: %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1424
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: ref-filter.c:1485
+#, fuzzy, c-format
+msgid "no branch, rebasing %s"
msgstr "(cap branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1427
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
+#: ref-filter.c:1488
+#, fuzzy, c-format
+msgid "no branch, rebasing detached HEAD %s"
msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "no branch, bisect started on %s"
msgstr "(cap branca, bisecció començada en %s)"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD separat a %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "sense branca"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD separat de %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(cap branca)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "l'opció «%s» és incompatible amb --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "l'opció «%s» és incompatible amb --no-merged"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "l'opció «%s» ha d'apuntar a una comissió"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr ""
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No es poden obtenir ambdós %s i %s a %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Error intern"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#: remote.c:1000
+#, fuzzy, c-format
+msgid "src refspec %s does not match any"
+msgstr "%s: no coincideix amb l'índex"
+
+#: remote.c:1005
+#, 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:1020
+#, 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:1040
+#, 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:1045
+#, 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:1050
+#, 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:1055
+#, 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:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "«%s» no es pot resoldre a una branca"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: «%s»"
+msgstr "no existeix la branca: «%s»"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca «%s»"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca «%s» no té cap remot al qual pujar"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les especificacions de referència de «%s» no inclouen «%s»"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és 'nothing')"
+msgstr "push no té destí (push.default és «nothing)"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "no s'ha pogut trobar la referència remota %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "La vostra branca està al dia amb «%s».\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "La vostra branca està davant de «%s» per %d comissió.\n"
-msgstr[1] "La vostra branca està davant de «%s» per %d comissions.\n"
+msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
+msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
-#: remote.c:1962
+#: remote.c:2043
#, 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] ""
-"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se "
+"La vostra branca està %2$d comissió per darrere de «%1$s», i pot avançar-se "
"ràpidament.\n"
msgstr[1] ""
-"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se "
-"ràpidament.\n"
+"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
+"se ràpidament.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
+msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4391,9 +5504,14 @@
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
+msgstr " (useu «git pull» per a fusionar la branca remota a la vostra)\n"
+
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
#: replace-object.c:21
#, fuzzy, c-format
@@ -4419,11 +5537,6 @@
msgid "unable to write rerere record"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, fuzzy, c-format
-msgid "could not write '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
#: rerere.c:495
#, fuzzy, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4474,8 +5587,8 @@
msgid "Recorded preimage for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori «%s»"
@@ -4510,60 +5623,64 @@
msgid "unable to open rr-cache directory"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "s'ha produït un error en obrir /dev/null"
-#: run-command.c:1229
+#: run-command.c:1269
#, fuzzy, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: run-command.c:1293
+#: 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:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
"remot"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "s'ha produït un error en el desempaquetament remot: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4571,42 +5688,47 @@
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
-#: sequencer.c:287
+#: sequencer.c:292
#, fuzzy, c-format
msgid "could not delete '%s'"
msgstr "No s'ha pogut suprimir %s"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revertir"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, fuzzy, c-format
msgid "unknown action: %d"
msgstr "Acció desconeguda: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4614,7 +5736,7 @@
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4624,110 +5746,115 @@
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir «%s»"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode de neteja no vàlid %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: sequencer.c:684
+#: sequencer.c:743
#, fuzzy, c-format
msgid "no key present in '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:695
+#: sequencer.c:754
#, fuzzy, c-format
msgid "unable to dequote value of '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
+msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
+msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
+msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-#: sequencer.c:756
-#, fuzzy, c-format
+#: sequencer.c:815
+#, c-format
msgid "unknown variable '%s'"
-msgstr "Format d'arxiu desconegut «%s»"
+msgstr "variable «%s» desconeguda"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
+msgstr "falta «GIT_AUTHOR_NAME»"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
+msgstr "falta «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
+msgstr "falta «GIT_AUTHOR_DATE»"
-#: sequencer.c:825
+#: sequencer.c:884
#, fuzzy, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "format de data no vàlid: %s"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4757,16 +5884,16 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
#, fuzzy
msgid "writing root commit"
msgstr "no hi ha res a cometre\n"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4781,19 +5908,19 @@
" git commit --amend --reset-author\n"
msgstr ""
"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
+"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
"Comproveu que siguin correctes. Podeu suprimir aquest\n"
"missatge establint-los explícitament. Executeu l'ordre següent i\n"
"seguiu les instruccions en el vostre editor per editar el vostre\n"
"fitxer de configuració:\n"
"\n"
" git config --global --edit\n"
-"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"Després de fer això, podeu esmenar la identitat usada per a aquesta\n"
"comissió amb:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4819,301 +5946,354 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD separat"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:1739
+#: sequencer.c:1805
#, fuzzy
msgid "cannot fixup root commit"
msgstr "no es pot trobar la comissió %s (%s)"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-"s'ha especificat la línia principal però la comissió %s no és una fusió."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no accepta paràmetres: «%s»"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "falten els arguments per %s"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, fuzzy, c-format
+msgid "could not parse '%.*s'"
+msgstr "no s'ha pogut analitzar «%s»"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
+
+#: sequencer.c:2323
+#, fuzzy
+msgid "cancelling a cherry picking in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2330
+#, fuzzy
+msgid "cancelling a revert in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
+#: sequencer.c:2668
+#, fuzzy
+msgid "revert is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, fuzzy, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+#, fuzzy
+msgid "cherry-pick is already in progress"
+msgstr "un «cherry pick» o una reversió ja està en curs"
+
+#: sequencer.c:2675
+#, fuzzy, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+#, fuzzy
+msgid "no revert in progress"
+msgstr "No hi ha un «rebase» en curs?"
+
+#: sequencer.c:2867
+#, fuzzy
+msgid "no cherry-pick in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2877
+#, fuzzy
+msgid "failed to skip the commit"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: sequencer.c:2762
-#, fuzzy, c-format
+#: sequencer.c:3066
+#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, fuzzy, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5132,27 +6312,27 @@
"\n"
"\tgit rebase --continue"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999
-#: builtin/rebase.c:1350 builtin/rebase.c:1404
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5167,11 +6347,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5187,79 +6367,79 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
-#: sequencer.c:2954
+#: sequencer.c:3263
#, fuzzy
msgid "writing fake root commit"
msgstr "no hi ha res a cometre\n"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: sequencer.c:3015 builtin/rebase.c:603
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: sequencer.c:3068
+#: sequencer.c:3379
#, fuzzy
msgid "cannot merge without a current revision"
msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "no hi ha res per fusionar «%.*s»"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3126
+#: sequencer.c:3437
#, fuzzy, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:3274
-#, fuzzy, c-format
+#: sequencer.c:3590
+#, c-format
msgid "could not even attempt to merge '%.*s'"
-msgstr "no s'ha pogut obrir o llegir «%s»"
+msgstr "no s'ha pogut fusionar «%.*s»"
-#: sequencer.c:3290
+#: sequencer.c:3606
#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5270,31 +6450,31 @@
"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, fuzzy, c-format
msgid "could not checkout %s"
msgstr "no es pot agafar %s"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, fuzzy, c-format
msgid "%s: not a valid OID"
msgstr "«%s» no és un terme vàlid"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, fuzzy, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, fuzzy, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5307,48 +6487,48 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5358,83 +6538,42 @@
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, fuzzy, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "llista per a fer inestable: «%s»"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
-"ignorant."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
-"Les comissions descartades (més nova a més vella):\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
-"comissió.\n"
-"\n"
-"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
-"d'advertències.\n"
-"Els comportaments possibles són: ignore, warn, error.\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5443,34 +6582,15 @@
"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
"continue'.\n"
-#: sequencer.c:4848 sequencer.c:4886
-#, fuzzy
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
-msgstr "no hi ha res a cometre\n"
+msgstr "res a fer"
-#: sequencer.c:4852
-#, fuzzy, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-
-#: sequencer.c:4864
-#, fuzzy, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no s'ha pogut copiar «%s» a «%s»"
-
-#: sequencer.c:4868 sequencer.c:4897
-#, fuzzy
-msgid "could not transform the todo list"
-msgstr "no s'ha pogut escriure la llista per a fer"
-
-#: sequencer.c:4900
-#, fuzzy
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
-msgstr "omet els «picks» no necessaris"
+msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
@@ -5479,33 +6599,34 @@
msgid "'%s' is outside repository"
msgstr "«%s» és fora del dipòsit"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin "
+"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
"localment."
-#: setup.c:185
+#: setup.c:186
#, 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 ""
-"paràmetre ambigu «%s»: revisió no coneguda o camí no en l'arbre de treball.\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
+"paràmetre ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
+"treball.\n"
+"Useu «--» per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "l'opció «%s» ha de venir abans dels arguments opcionals"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5513,95 +6634,96 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
+"Useu '--' per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
-"no s'ha pogut configurar un arbre de treball utilitzant una configuració no vàlida"
+"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
+"vàlida"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "aquesta operació s'ha d'executar en un arbre de treball"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "massa larg per a ser un fitxer .git: «%s»"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "no és un dipòsit de git: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un dipòsit de git: «%s»"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no es pot canviar de directori a «%s»"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "no es pot tornar al directori de treball actual"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5612,7 +6734,7 @@
"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"no està establert)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5623,295 +6745,300 @@
"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
"escriptura."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "s'ha produït un error en obrir /dev/null o dup"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "el «fork» ha fallat"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "l'«stash» ha fallat"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:432
+#: sha1-file.c:504
#, fuzzy, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:510
+#: sha1-file.c:583
#, fuzzy, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:565
+#: sha1-file.c:626
#, fuzzy
msgid "unable to fdopen alternates lockfile"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: sha1-file.c:583
+#: sha1-file.c:644
#, fuzzy
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer d'índex"
-#: sha1-file.c:590
+#: sha1-file.c:651
#, fuzzy
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el dipòsit de referència «%s» no és un dipòsit local."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència «%s» és superficial"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència «%s» és empeltat"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, 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:806
-#, fuzzy
+#: sha1-file.c:968
msgid "mmap failed"
-msgstr "%s ha fallat"
+msgstr "mmap ha fallat"
-#: sha1-file.c:973
-#, fuzzy, c-format
+#: sha1-file.c:1132
+#, c-format
msgid "object file %s is empty"
-msgstr "tipus d'objecte"
+msgstr "el tipus d'objecte %s és buit"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1256 sha1-file.c:2395
#, fuzzy, c-format
msgid "corrupt loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1258 sha1-file.c:2399
#, fuzzy, c-format
msgid "garbage at end of loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:1137
+#: sha1-file.c:1300
#, fuzzy
msgid "invalid object type"
msgstr "el tipus d'objecte és incorrecte."
-#: sha1-file.c:1219
+#: sha1-file.c:1384
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1222
+#: sha1-file.c:1387
#, fuzzy, c-format
msgid "unable to unpack %s header"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:1228
+#: sha1-file.c:1393
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1231
+#: sha1-file.c:1396
#, fuzzy, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:1422
+#: sha1-file.c:1587
#, fuzzy, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: sha1-file.c:1426
+#: sha1-file.c:1591
#, fuzzy, c-format
msgid "replacement %s not found for %s"
msgstr "no s'han trobat les plantilles %s"
-#: sha1-file.c:1430
+#: sha1-file.c:1595
#, fuzzy, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
-#: sha1-file.c:1434
+#: sha1-file.c:1599
#, fuzzy, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
-#: sha1-file.c:1536
+#: sha1-file.c:1702
#, fuzzy, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgid "unable to write file %s"
+msgstr "no s'ha pogut escriure %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1709
#, fuzzy, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: sha1-file.c:1550
+#: sha1-file.c:1716
#, fuzzy
msgid "file write error"
msgstr "escriptura fallada al rev-list"
-#: sha1-file.c:1569
+#: sha1-file.c:1735
#, fuzzy
-msgid "error when closing sha1 file"
+msgid "error when closing loose object file"
msgstr "error en tancar el fitxer de paquet"
-#: sha1-file.c:1635
+#: sha1-file.c:1800
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1802
#, fuzzy
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un índex temporal"
-#: sha1-file.c:1661
+#: sha1-file.c:1826
#, fuzzy
-msgid "unable to write sha1 file"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgid "unable to write loose object file"
+msgstr "no s'ha pogut escriure l'objecte de nota"
-#: sha1-file.c:1667
+#: sha1-file.c:1832
#, fuzzy, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: sha1-file.c:1671
+#: sha1-file.c:1836
#, fuzzy, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "ha fallat fstat a %s"
-#: sha1-file.c:1675
+#: sha1-file.c:1840
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1850 builtin/pack-objects.c:920
#, fuzzy, c-format
msgid "failed utime() on %s"
msgstr "s'ha produït un error en obrir «%s»"
-#: sha1-file.c:1760
+#: sha1-file.c:1925
#, fuzzy, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "no es pot llegir $file per a reproducció"
+msgid "cannot read object for %s"
+msgstr "no es pot llegir l'objecte %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1965
#, fuzzy
msgid "corrupt commit"
msgstr "autor corregit de la comissió"
-#: sha1-file.c:1813
+#: sha1-file.c:1973
#, fuzzy
msgid "corrupt tag"
msgstr "informa de les etiquetes"
-#: sha1-file.c:1912
+#: sha1-file.c:2072
#, fuzzy, c-format
msgid "read error while indexing %s"
msgstr "error en llegir %s"
-#: sha1-file.c:1915
+#: sha1-file.c:2075
#, fuzzy, c-format
msgid "short read while indexing %s"
msgstr "no es pot llegir l'índex"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2148 sha1-file.c:2157
#, fuzzy, c-format
msgid "%s: failed to insert into database"
msgstr "gpg ha fallat en signar les dades"
-#: sha1-file.c:2003
+#: sha1-file.c:2163
#, fuzzy, c-format
msgid "%s: unsupported file type"
msgstr "versió d'índex no compatible %s"
-#: sha1-file.c:2027
+#: sha1-file.c:2187
#, fuzzy, c-format
msgid "%s is not a valid object"
msgstr "«%s» no és una terme vàlid"
-#: sha1-file.c:2029
+#: sha1-file.c:2189
#, fuzzy, c-format
msgid "%s is not a valid '%s' object"
-msgstr "«%s» no és una terme vàlid"
+msgstr "%s no és un objecte de «%s» vàlid"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2216 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2406 sha1-file.c:2458
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2250
+#: sha1-file.c:2430
#, fuzzy, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut obrir %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2435
#, fuzzy, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:2261
+#: sha1-file.c:2441
#, fuzzy, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut llegir %s"
-#: sha1-file.c:2272
+#: sha1-file.c:2452
#, fuzzy, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'ha pogut analitzar el contacte: %s"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1-name.c:770
+#: sha1-name.c:800
+#, fuzzy
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 checkout -b $br $(git rev-parse ...)\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"
@@ -5929,71 +7056,133 @@
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, fuzzy, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, fuzzy, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "octets"
+msgstr[1] "octets"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
"de fusió"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "al submòdul no populat «%s»"
+msgstr "al submòdul sense popular «%s»"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
-#: submodule.c:1404
+#: submodule.c:1481
+#, fuzzy, c-format
+msgid "Could not access submodule '%s'"
+msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» no reconegut com un dipòsit git"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
-#: submodule.c:1648
+#: submodule.c:1817
+#, fuzzy, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1700
+#: submodule.c:1959
#, fuzzy, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submòduls canviats però no actualitzats:"
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -6001,12 +7190,12 @@
"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -6017,16 +7206,16 @@
"«%s» a\n"
"«%s»\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
@@ -6036,21 +7225,21 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
@@ -6085,7 +7274,7 @@
msgid "could not read from stdin"
msgstr "no s'ha pogut llegir des de stdin"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
@@ -6124,30 +7313,38 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:625
#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:816
+#: transport.c:825
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconegut «%s» per a la clau «%s»"
-#: transport.c:882
+#: transport.c:891
#, fuzzy, c-format
msgid "transport '%s' not allowed"
msgstr "no s'ha trobat la branca «%s»."
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6156,7 +7353,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6182,191 +7379,186 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "S'està avortant."
-#: transport.c:1182
+#: transport.c:1193
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
#, fuzzy
msgid "operation not supported by protocol"
msgstr "opció no admesa amb --recurse-submodules."
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
#: transport-helper.c:51 transport-helper.c:80
#, fuzzy
msgid "full write to remote helper failed"
msgstr "imprimeix l'estat des de l'ajudant remot"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, fuzzy, c-format
msgid "unable to find remote helper for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, fuzzy, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "blob esperat per a %s «%s»"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s també ha bloquejat %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
#, fuzzy
msgid "couldn't run fast-import"
msgstr "no s'ha pogut executar «stash»."
-#: transport-helper.c:502
+#: transport-helper.c:504
#, fuzzy
msgid "error while running fast-import"
msgstr "error en tancar el fitxer de paquet"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, fuzzy, c-format
msgid "could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, fuzzy, c-format
msgid "unknown response to connect: %s"
msgstr "opció desconeguda: %s\n"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:600
+#: transport-helper.c:602
#, fuzzy
msgid "invalid remote service path"
msgstr "referència no vàlida: %s"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:713
+#: transport-helper.c:720
#, fuzzy, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "blob esperat per a %s «%s»"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, fuzzy, c-format
msgid "helper reported unexpected status of %s"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, fuzzy, c-format
msgid "helper %s does not support dry-run"
msgstr "El servidor no admet --deepen"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, fuzzy, c-format
msgid "helper %s does not support --signed"
msgstr "El servidor no admet --shallow-since"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, fuzzy, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "el destí receptor no admet pujar --signed"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, fuzzy, c-format
msgid "helper %s does not support 'push-option'"
msgstr "el destí receptor no admet opcions de pujada"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:937
+#: transport-helper.c:950
#, fuzzy, c-format
msgid "helper %s does not support 'force'"
msgstr "El servidor no admet --deepen"
-#: transport-helper.c:984
+#: transport-helper.c:997
#, fuzzy
msgid "couldn't run fast-export"
msgstr "no s'ha pogut executar «stash»."
-#: transport-helper.c:989
+#: transport-helper.c:1002
#, fuzzy
msgid "error while running fast-export"
msgstr "error en tancar el fitxer de paquet"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, 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:1077
+#: transport-helper.c:1091
#, fuzzy, c-format
msgid "malformed response in ref list: %s"
msgstr "full d'opcions mal format: «%s»"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, fuzzy, c-format
msgid "read(%s) failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, fuzzy, c-format
msgid "write(%s) failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, fuzzy, c-format
msgid "%s thread failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, fuzzy, c-format
msgid "%s thread failed to join: %s"
msgstr "s'ha produït un error en obrir «%s»"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, fuzzy, c-format
msgid "%s process failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr ""
@@ -6382,11 +7574,11 @@
msgid "empty filename in tree entry"
msgstr "nom de fitxer buit en una entrada d'arbre"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6396,7 +7588,7 @@
"agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6406,7 +7598,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6416,7 +7608,7 @@
"fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6426,7 +7618,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6435,7 +7627,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de %s."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6444,7 +7636,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6453,7 +7645,7 @@
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6463,7 +7655,7 @@
"agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6473,7 +7665,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6483,7 +7675,7 @@
"fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6493,7 +7685,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6502,7 +7694,7 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6511,7 +7703,7 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6522,7 +7714,7 @@
"agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6533,7 +7725,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6543,7 +7735,7 @@
"fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6553,7 +7745,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6563,7 +7755,7 @@
"%s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6573,12 +7765,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6588,7 +7780,7 @@
"dia:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6599,7 +7791,7 @@
"actualitzar l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6610,7 +7802,7 @@
"l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6619,16 +7811,17 @@
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "S'estan agafant fitxers"
+#: unpack-trees.c:318
+#, fuzzy
+msgid "Updating files"
+msgstr "S'està actualitzant %s"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6664,32 +7857,32 @@
msgid "invalid '..' path segment"
msgstr "segment de camí '..' no vàlid"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir «%s»"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» no existeix"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "«%s» no és un fitxer .git, codi d'error %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "«%s» no assenyala de tornada a «%s»"
@@ -6708,155 +7901,160 @@
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+#: wt-status.c:187 wt-status.c:219
+#, fuzzy
+msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, fuzzy, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:227
+#: wt-status.c:241
+#, fuzzy
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-" (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
+msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el que es cometrà)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "L'«stash» té actualment %d entrada"
msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6864,109 +8062,117 @@
"No modifiqueu o suprimiu la línia de dalt.\n"
"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1097
+#: 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 "Teniu camins sense fusionar."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Última ordre feta (%d ordre feta):"
msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1284
+#: 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] "Ordre següent a fer (manca %d ordre):"
msgstr[1] "Ordres següents a fer (manquen %d ordres):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Actualment esteu fent «rebase»."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (arregleu els conflictes i després executeu \"git rebase --continue\")"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (useu \"git rebase --abort\" per a agafar la branca original)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -6974,132 +8180,144 @@
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un «rebase»."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vegada que el vostre directori de treball sigui net, executeu \"git "
"rebase --continue\")"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
"«%s» en «%s»."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
"vostres canvis)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+#, fuzzy
+msgid "Cherry-pick currently in progress."
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1376
+#: wt-status.c:1432
+#, fuzzy
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry "
"pick»)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+#, fuzzy
+msgid "Revert currently in progress."
+msgstr "avorta la fusió en curs actual"
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1459
+#, fuzzy
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD separat a "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD separat de "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara."
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7111,31 +8329,31 @@
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"'git help status')."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7144,192 +8362,192 @@
"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
"\" per a seguir-los)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
"los)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "diferent"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "elimina «%s»\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No s'ha pogut obrir «%s» per a escriptura."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "registra només el fet que el camí s'afegirà més tard"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7360,12 +8578,12 @@
"\n"
"Vegeu \"git help submodule\" per a més informació."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "s'està afegint un dipòsit incrustat: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
@@ -7374,137 +8592,137 @@
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir «git add .»?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
"\"."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "El pedaç està buit."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7512,29 +8730,24 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -7542,36 +8755,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7581,7 +8795,7 @@
"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7594,17 +8808,17 @@
"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel "
"fitxer."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7612,144 +8826,144 @@
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:307 builtin/stash.c:806
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:836
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "mostra el pedaç que s'està aplicant."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:880 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2254 builtin/rebase.c:881 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7757,18 +8971,18 @@
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. No l'useu més."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7777,10 +8991,14 @@
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
@@ -7798,228 +9016,471 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Remot sense URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: %s NACK"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: error de protocol"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: s'esperava una neteja"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+#, fuzzy
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:26
+#, fuzzy
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+
+#: builtin/bisect--helper.c:27
+#, fuzzy
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+
+#: builtin/bisect--helper.c:28
+#, fuzzy
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+
+#: builtin/bisect--helper.c:29
+#, fuzzy
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
+"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "«%s» no és un terme vàlid"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no es pot usar l'ordre interna «%s» com a terme"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no es pot canviar el significat del terme «%s»"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "useu dos termes distintes"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "no s'ha pogut obrir el BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, fuzzy, c-format
+msgid "We are not bisecting.\n"
+msgstr "No estem bisecant."
+
+#: builtin/bisect--helper.c:163
+#, fuzzy, c-format
+msgid "'%s' is not a valid commit"
+msgstr "«%s» no és un terme vàlid"
+
+#: builtin/bisect--helper.c:174
+#, fuzzy, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"No s'ha pogut agafar la HEAD original '$branch'.\n"
+"Proveu 'git bisect reset <comissió>'."
+
+#: builtin/bisect--helper.c:215
+#, fuzzy, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Paràmetre bisect_write incorrecte: $state"
+
+#: builtin/bisect--helper.c:220
+#, fuzzy, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "no es pot canviar el significat del terme «%s»"
+
+#: builtin/bisect--helper.c:232
+#, fuzzy, c-format
+msgid "couldn't open the file '%s'"
+msgstr "no s'ha pogut crear el fitxer «%s»"
+
+#: builtin/bisect--helper.c:258
+#, fuzzy, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
+
+#: builtin/bisect--helper.c:285
+#, fuzzy, 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 ""
+"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
+"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
+
+#: builtin/bisect--helper.c:289
+#, fuzzy, 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 ""
+"Cal començar amb \"git bisect start\".\n"
+"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
+"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
+
+#: builtin/bisect--helper.c:321
+#, fuzzy, c-format
+msgid "bisecting only with a %s commit"
+msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "N'esteu segur [Y/n]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "cap terme definit"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:389
+#, fuzzy, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
+"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, fuzzy, c-format
+msgid "unrecognized option: '%s'"
+msgstr "posició no reconeguda:%s"
+
+#: builtin/bisect--helper.c:479
+#, fuzzy, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'$arg' no sembla una revisió vàlida"
+
+#: builtin/bisect--helper.c:511
+#, fuzzy
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD incorrecte - Cal un HEAD"
+
+#: builtin/bisect--helper.c:526
+#, fuzzy, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
+"vàlida>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
+
+#: builtin/bisect--helper.c:550
+#, fuzzy
+msgid "bad HEAD - strange symbolic ref"
+msgstr "HEAD incorrecte - referència simbòlica estranya"
+
+#: builtin/bisect--helper.c:574
+#, fuzzy, c-format
+msgid "invalid ref: '%s'"
+msgstr "fitxer no vàlid: «%s»"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "realitza 'git bisect next'"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escriu els termes a .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "neteja l'estat de la bisecció"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "comprova les revisions esperades"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+#, fuzzy
+msgid "reset the bisection state"
+msgstr "neteja l'estat de la bisecció"
+
+#: builtin/bisect--helper.c:640
+#, fuzzy
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "neteja l'estat de la bisecció"
+
+#: builtin/bisect--helper.c:642
+#, fuzzy
+msgid "check and set terms in a bisection state"
+msgstr "neteja l'estat de la bisecció"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:646
+#, fuzzy
+msgid "print out the bisect terms"
+msgstr "imprimeix només les etiquetes de l'objecte"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms requereix dos paràmetres"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+#, fuzzy
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/bisect--helper.c:684
+#, fuzzy
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/bisect--helper.c:690
+#, fuzzy
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/bisect--helper.c:696
+#, fuzzy
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/bisect--helper.c:702
+#, fuzzy
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--write-terms requereix dos paràmetres"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, fuzzy, c-format
msgid "expecting a color: %s"
msgstr "respecta els colors del format"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, fuzzy, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
#, fuzzy
msgid "invalid value for blame.coloring"
msgstr "valor no vàlid per a --missing"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, fuzzy, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "no s'ha pogut resoldre la revisió: %s"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
"desactivat)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
"desactivat)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1646
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+#, fuzzy
+msgid "Ignore <rev> when blaming"
+msgstr "ignora l'índex en comprovar"
+
+#: builtin/blame.c:862
+#, fuzzy
+msgid "Ignore revisions from <file>"
+msgstr "llegiu el missatge des d'un fitxer"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usa un heurístic experimental per a millorar les diferències"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -8032,18 +9493,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "el fitxer %s té només %lu línia"
msgstr[1] "el fitxer %s té només %lu línies"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
@@ -8075,7 +9536,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8085,7 +9546,7 @@
" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8095,12 +9556,12 @@
" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8109,116 +9570,126 @@
"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca «%s»."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot «%s»"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca «%s»"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no s'ha pogut analitzar la cadena de format"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+#, fuzzy
+msgid "could not resolve HEAD"
+msgstr "no s'ha pogut resoldre la comissió HEAD"
+
+#: builtin/branch.c:466
+#, fuzzy, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD no trobat sota refs/heads!"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "no es pot copiar branca actual mentre no s'és a cap."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "La còpia de la branca ha fallat"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branca està canviada de nom, però l'actualització del fitxer de "
"configuració ha fallat"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branca està copiada, però l'actualització del fitxer de configuració ha "
"fallat"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8227,224 +9698,222 @@
msgstr ""
"Editeu la descripció de la branca\n"
" %s\n"
-"S'eliminaran les línies que comencin amb '%c'.\n"
+"S'eliminaran les línies que comencin amb «%c».\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Desassigna la informació de font"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "mou/canvia de nom una branca i el seu registre de referència"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copia una branca i el seu registre de referència"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copia una branca, encara que el destí existeixi"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+#, fuzzy
+msgid "show current branch name"
+msgstr "No hi ha cap branca actual."
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "clau"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "nom del camp en el qual ordenar"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "objecte"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "no es pot editar la descripció de més d'una branca"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "hi ha massa arguments per a una operació remota"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "hi ha massa arguments per a establir una nova font"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
-msgstr "no hi ha tal branca «%s»"
+msgstr "no existeix la branca «%s»"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca «%s» no existeix"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "hi ha massa arguments per a desassignar la font"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca «%s» no té informació de font"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+#, fuzzy
+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 ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8465,7 +9934,7 @@
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8473,7 +9942,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8481,136 +9950,136 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
#, fuzzy
msgid "only one batch option may be specified"
msgstr "Cap nom de branca especificat"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
"en els objectes de blob, executa els filtres en el contingut de l'objecte"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "informa de tots els atributs establerts en el fitxer"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "usa .gitattributes només des de l'índex"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "llegeix els noms de fitxer de stdin"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "mostra els camins d'entrada que no coincideixin"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "ignora l'índex en comprovar"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "no es poden especificar noms de camí amb --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z només té sentit amb --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "cap camí especificat"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet només és vàlid amb un sol nom de camí"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "no es poden especificar --quiet i --verbose alhora"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching és vàlid només amb --verbose"
@@ -8631,55 +10100,55 @@
msgid "no contacts specified"
msgstr "no hi ha contactes especificats"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "«stage» ha de ser entre 1 i 3 o all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "agafa tots els fitxers en l'índex"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "força la sobreescriptura de fitxers existents"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "no agafis fitxers nous"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "llegeix la llista de camins des de l'entrada estàndard"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "cadena"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "en crear fitxers, anteposa <cadena>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
@@ -8691,106 +10160,166 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+#, fuzzy
+msgid "git switch [<options>] [<branch>]"
+msgstr "git checkout [<opcions>] <branca>"
+
+#: builtin/checkout.c:42
+#, fuzzy
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí «%s» no té la nostra versió"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí «%s» no té la seva versió"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "el camí «%s» no té totes les versions necessàries"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí «%s» no té les versions necessàries"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí «%s»: no es pot fusionar"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, fuzzy, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»"
+msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»"
+
+#: builtin/checkout.c:379
+#, fuzzy, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "actualitzat %d camí\n"
+msgstr[1] "actualitzats %d camins\n"
+
+#: builtin/checkout.c:386
+#, fuzzy, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "S'ha produït un error en llegir l'índex"
+msgstr[1] "S'ha produït un error en llegir l'índex"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» no es pot usar amb actualització de camins"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» no es pot usar amb %s"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr ""
+
+#: builtin/checkout.c:437
+#, fuzzy, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "«%s» no es pot usar amb «%s»"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, fuzzy, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "%s: %s no es pot usar amb %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:736
+#, fuzzy, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a «%s»: %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en «%s»\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8804,16 +10333,16 @@
"%s\n"
msgstr[0] ""
"Advertència: esteu deixant enrere %d comissió, no\n"
-"connectada a cap de les vostres branques:\n"
+"vinculada a cap de les vostres branques:\n"
"\n"
"%s\n"
msgstr[1] ""
"Advertència: esteu deixant enrere %d comissions, no\n"
-"connectades a cap de les vostres branques:\n"
+"vinculades a cap de les vostres branques:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8840,163 +10369,234 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+#, fuzzy
+msgid "only one reference expected"
+msgstr "s'esperava només una referència, s'han donat %d."
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, fuzzy, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
+
+#: builtin/checkout.c:1305
+#, fuzzy, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, fuzzy, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+
+#: builtin/checkout.c:1309
+#, fuzzy, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "La vostra branca està al dia amb «%s».\n"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1345
+#, fuzzy
+msgid "you are switching branch while bisecting"
+msgstr "Actualment esteu bisecant."
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, fuzzy, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "«%s» no es pot usar amb actualització de camins"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No es pot canviar la branca a la no comissió «%s»"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "branca"
+#: builtin/checkout.c:1395
+#, fuzzy
+msgid "missing branch or commit argument"
+msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "crea i agafa una branca nova"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "crea/restableix i agafa una branca"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "crea un registre de referència per a la branca nova"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "separa HEAD a la comissió anomenada"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "estableix la informació de font de la branca nova"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "branca-nova"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "branca òrfena nova"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "agafa la versió nostra dels fitxers sense fusionar"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "agafa la versió seva dels fitxers sense fusionar"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "agafa a la força (descarta qualsevol modificació local)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "realitza una fusió de 3 vies amb la branca nova"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "actualitza els fitxers ignorats (per defecte)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "estil"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "estil de conflicte (fusió o diff3)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "no limitis les especificacions de camí només a entrades disperses"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "dubta 'git checkout <cap-branca-així>'"
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr "no comprovis si altre arbre de treball té la referència donada"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "realitza una fusió de 3 vies amb la branca nova"
+
+#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+msgid "style"
+msgstr "estil"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "estil de conflicte (fusió o diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "separa HEAD a la comissió anomenada"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "estableix la informació de font de la branca nova"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "agafa a la força (descarta qualsevol modificació local)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "branca-nova"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "branca òrfena nova"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "actualitza els fitxers ignorats (per defecte)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "no comprovis si altre arbre de treball té la referència donada"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "agafa la versió nostra dels fitxers sense fusionar"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "agafa la versió seva dels fitxers sense fusionar"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "no limitis les especificacions de camí només a entrades disperses"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mútuament excloents"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+#, fuzzy
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-n i -k són mútuament excloents."
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
#, fuzzy
msgid "missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, fuzzy, c-format
+msgid "could not resolve %s"
+msgstr "no s'ha pogut resoldre «%s»"
+
+#: builtin/checkout.c:1623
+#, fuzzy
+msgid "you must specify path(s) to restore"
+msgstr "Heu d'especificar un directori."
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
"comissió"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -9004,7 +10604,7 @@
"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
"agafar de l'índex."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -9021,38 +10621,115 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branca"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crea i agafa una branca nova"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crea/restableix i agafa una branca"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crea un registre de referència per a la branca nova"
+
+#: builtin/checkout.c:1697
+#, fuzzy
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "dubta 'git checkout <cap-branca-així>'"
+
+#: builtin/checkout.c:1698
+#, fuzzy
+msgid "use overlay mode (default)"
+msgstr "poda les referències soltes (per defecte)"
+
+#: builtin/checkout.c:1734
+#, fuzzy
+msgid "create and switch to a new branch"
+msgstr "crea i agafa una branca nova"
+
+#: builtin/checkout.c:1736
+#, fuzzy
+msgid "create/reset and switch to a branch"
+msgstr "crea/restableix i agafa una branca"
+
+#: builtin/checkout.c:1738
+#, fuzzy
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "dubta 'git checkout <cap-branca-així>'"
+
+#: builtin/checkout.c:1740
+#, fuzzy
+msgid "throw away local modifications"
+msgstr "agafa a la força (descarta qualsevol modificació local)"
+
+#: builtin/checkout.c:1772
+#, fuzzy
+msgid "where the checkout from"
+msgstr "llegeix l'objecte des de stdin"
+
+#: builtin/checkout.c:1774
+#, fuzzy
+msgid "restore the index"
+msgstr "S'ha produït un error en llegir l'índex"
+
+#: builtin/checkout.c:1776
+#, fuzzy
+msgid "restore the working tree (default)"
+msgstr "Mostra l'estat de l'arbre de treball"
+
+#: builtin/checkout.c:1778
+#, fuzzy
+msgid "ignore unmerged entries"
+msgstr "s'està ignorant %s no fusionat\n"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr ""
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "S'està eliminant %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Eliminaria %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "S'està ometent el dipòsit %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Ometria el dipòsit %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, fuzzy, c-format
+msgid "could not lstat %s\n"
+msgstr "no s'ha pogut fer stat a %s"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9065,7 +10742,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9086,38 +10763,38 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
-msgstr "Adeu.\n"
+msgstr "Adéu.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9135,64 +10812,64 @@
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "força"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9200,7 +10877,7 @@
"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9208,147 +10885,162 @@
"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "especificació de camí"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3299 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3308 builtin/repack.c:330
msgid "name"
msgstr "nom"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc de la HEAD del remot"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3290
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
msgid "time"
msgstr "hora"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:813
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "específic al servidor"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "opció a transmetre"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+#, fuzzy
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualsevol submòdul clonat serà superficial"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9356,148 +11048,149 @@
"No s'ha pogut endevinar cap nom de directori.\n"
"Especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:426
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "s'ha produït un error en fer stat a '%s'\n"
+#: builtin/clone.c:428
+#, fuzzy, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, fuzzy, c-format
+msgid "failed to iterate over '%s'"
+msgstr "s'ha produït un error en eliminar «%s»"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
+#, fuzzy
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"El clonatge ha tingut èxit, però l'agafament ha\n"
"fallat. Podeu inspeccionar què s'ha agafat amb\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit «%s» no existeix"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1653
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu «%s»...\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9505,38 +11198,38 @@
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -9572,15 +11265,86 @@
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, fuzzy, c-format
+msgid "duplicate parent %s ignored"
+msgstr "suprimeix les referències reemplaçades"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
+#, fuzzy, c-format
+msgid "not a valid object name %s"
+msgstr "no és un nom d'objecte vàlid: %s"
+
+#: builtin/commit-tree.c:93
+#, fuzzy, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
+
+#: builtin/commit-tree.c:96
+#, fuzzy, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: builtin/commit-tree.c:98
+#, fuzzy, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: builtin/commit-tree.c:111
+#, fuzzy
+msgid "parent"
+msgstr "pare"
+
+#: builtin/commit-tree.c:112
+#, fuzzy
+msgid "id of a parent commit object"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "missatge"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "missatge de comissió"
+
+#: builtin/commit-tree.c:118
+#, fuzzy
+msgid "read commit log message from file"
+msgstr "llegiu el missatge des d'un fitxer"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "signa la comissió amb GPG"
+
+#: builtin/commit-tree.c:133
+#, fuzzy
+msgid "must give exactly one tree"
+msgstr "Cal exactament un rang."
+
+#: builtin/commit-tree.c:140
+#, fuzzy
+msgid "git commit-tree: failed to read"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/commit.c:50
+#: 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"
@@ -9590,7 +11354,7 @@
"deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
"podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9605,81 +11369,79 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/commit.c:63
+#, fuzzy
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "D'altra manera, useu «git reset»\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Si voleu ometre aquesta comissió, useu:\n"
-"\n"
-" git reset\n"
-"\n"
-"Llavors \"git cherry-pick --continue\" reprendrà\n"
-"com a «cherry pick» les comissions restants.\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9687,38 +11449,38 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9733,7 +11495,7 @@
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9748,17 +11510,17 @@
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, 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 ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies començant amb '%c', i un missatge de\n"
+"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9766,154 +11528,150 @@
"An empty message aborts the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les "
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
"vosaltres\n"
"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "mode ignorat no vàlid «%s»"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambdós --reset-author i --author no té sentit"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Només un de -c/-C/-F/--fixup es pot usar."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author només es pot usar amb -C, -c o --amend."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1180 builtin/tag.c:546
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Mode de neteja no vàlid %s"
-
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
+#: builtin/commit.c:1208
+#, fuzzy, c-format
+msgid "paths '%s ...' with -a does not make sense"
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:892
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -9921,11 +11679,11 @@
"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
"(Per defecte: traditional, matching, no.)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -9933,253 +11691,252 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1338
-#, fuzzy
+#: builtin/commit.c:1366
msgid "do not detect renames"
-msgstr "no consultis els remots"
+msgstr "no detectis canvis de noms"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
-msgstr ""
+msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "data"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "missatge"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "missatge de comissió"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
"especificada"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
"especificada"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "per defecte"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "com suprimir els espais i #comentaris del missatge"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "signa la comissió amb GPG"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els lligams de precomissió i missatge de comissió"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
#, fuzzy
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-"S'ha actualitzat el dipòsit, però no es pot escriure el\n"
+"s'ha actualitzat el dipòsit, però no es pot escriure el\n"
"fitxer new_index. Comproveu que el disc no estigui ple i\n"
-"que la quota no estigui excedida, i després\n"
-"«git reset HEAD» per a recuperar."
+"que no s'hagi excedit la quota, i després feu \n"
+"«git reset HEAD» per a recuperar-ho."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1601
msgid "dir"
msgstr "directori"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, fuzzy, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+#, fuzzy
+msgid "allow writing an incremental commit-graph file"
+msgstr "Escriu i verifica els fitxers commit-graph de Git"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
@@ -10187,15 +11944,14 @@
msgid "git config [<options>]"
msgstr "git config [<opcions>]"
-#: builtin/config.c:103
-#, fuzzy, c-format
+#: builtin/config.c:103 builtin/env--helper.c:23
+#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "paràmetre no reconegut: %s"
+msgstr "paràmetre --type no reconegut, %s"
#: builtin/config.c:115
-#, fuzzy
msgid "only one type at a time"
-msgstr "emet només coincidències exactes"
+msgstr "només un tipus cada cop"
#: builtin/config.c:124
msgid "Config file location"
@@ -10214,9 +11970,8 @@
msgstr "usa el fitxer de configuració del dipòsit"
#: builtin/config.c:128
-#, fuzzy
msgid "use per-worktree config file"
-msgstr "usa el fitxer de configuració del dipòsit"
+msgstr "usa un fitxer de configuració per dipòsit"
#: builtin/config.c:129
msgid "use given config file"
@@ -10295,10 +12050,9 @@
msgid "Type"
msgstr "Tipus"
-#: builtin/config.c:147
-#, fuzzy
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
-msgstr "el valor és una data de venciment"
+msgstr "el valor té donat aquest tipus"
#: builtin/config.c:148
msgid "value is \"true\" or \"false\""
@@ -10342,7 +12096,7 @@
"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
"d'ordres)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valor"
@@ -10350,51 +12104,50 @@
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "patró de la clau no vàlid: %s"
-#: builtin/config.c:343
-#, fuzzy, c-format
+#: builtin/config.c:344
+#, c-format
msgid "failed to format default config value: %s"
-msgstr "s'ha produït un error en crear el fitxer %s"
+msgstr ""
+"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "no es pot analitzar el color «%s»"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "no s'ha pogut analitzar el valor de color per defecte"
-#: builtin/config.c:495 builtin/config.c:741
-#, fuzzy
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
-msgstr "no és en un dipòsit de git"
+msgstr "no és en un directori git"
-#: builtin/config.c:498
-#, fuzzy
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+msgstr "no s'admet escriure a stdin"
-#: builtin/config.c:501
+#: builtin/config.c:502
#, fuzzy
msgid "writing config blobs is not supported"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10409,79 +12162,75 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
-msgstr ""
+msgstr "només un fitxer de configuració cada cop"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local només es pot usar dins d'un dipòsit git"
-#: builtin/config.c:618
-#, fuzzy
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
-msgstr "--local només es pot usar dins d'un dipòsit git"
+msgstr "--blob només es pot usar dins d'un dipòsit git"
-#: builtin/config.c:637
-#, fuzzy
+#: builtin/config.c:638
msgid "$HOME not set"
-msgstr "no usar"
+msgstr "$HOME no està establerta"
-#: builtin/config.c:657
+#: builtin/config.c:658
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:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
-msgstr ""
+msgstr "--get-color i el tipus de variable són incoherents"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
-msgstr ""
+msgstr "només una acció cada cop"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
-msgstr ""
+msgstr "--name-only només és aplicable a --list o --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
+"--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
-msgstr ""
+msgstr "--default només és aplicable a --get"
-#: builtin/config.c:730
-#, fuzzy, c-format
+#: builtin/config.c:731
+#, c-format
msgid "unable to read config file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
+msgstr "no s'ha pogut llegir el fitxer de configuració «%s»"
-#: builtin/config.c:733
-#, fuzzy
+#: builtin/config.c:734
msgid "error processing config file(s)"
-msgstr "usa el fitxer de configuració del dipòsit"
+msgstr "s'ha produït un error processant els fitxers de configuració"
-#: builtin/config.c:743
-#, fuzzy
+#: builtin/config.c:744
msgid "editing stdin is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+msgstr "no hi ha compatibilitat per a l'edició a stdin"
-#: builtin/config.c:745
-#, fuzzy
+#: builtin/config.c:746
msgid "editing blobs is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+msgstr "no hi ha compatibilitat per l'edició de blobs"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "no es pot crear el fitxer de configuració %s"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10490,10 +12239,10 @@
"no es poden sobreescriure múltiples valors amb un sol valor\n"
" Useu una expressió regular, --add o --replace-all per a canviar %s."
-#: builtin/config.c:846 builtin/config.c:857
-#, fuzzy, c-format
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
msgid "no such section: %s"
-msgstr "no hi ha tal referència %s"
+msgstr "no existeix la secció: %s"
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
@@ -10503,57 +12252,57 @@
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opcions>] [<comissió>...]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opcions>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "davant per"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "lleuger"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "anotat"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'etiqueta «%s» realment és «%s» aquí"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "cap etiqueta coincideix exactament amb «%s»"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10562,7 +12311,7 @@
"Cap etiqueta anotada pot descriure «%s».\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10571,12 +12320,12 @@
"Cap etiqueta pot descriure «%s».\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10585,118 +12334,118 @@
"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
"s'ha renunciat la cerca a %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "descriu %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s no és una comissió o un blob"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "usa qualsevol referència"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "sempre usa el format llarg"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "només segueix la primera mare"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken és incompatible amb les comissions"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: «%s»"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat «%s»."
@@ -10705,27 +12454,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10733,55 +12482,54 @@
"els formats de diff combinats ('-c' and '--cc') no són admesos \n"
"en el mode diff per directoris ('-d' and '--dir-diff')."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
-msgstr "existeix un fitxer temporal a %s'."
+msgstr "existeix un fitxer temporal a «%s»."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:706
-#, fuzzy
+#: builtin/difftool.c:699
msgid "tool"
-msgstr "<tool>"
+msgstr "eina"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10789,160 +12537,216 @@
"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de "
"sortida diferent de zero"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
-msgstr "especifiqueu una ordre personalitzada per veure diffs"
+msgstr "especifiqueu un ordre personalitzat per veure diffs"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "passa-ho a «diff»"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool requereix worktree o --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff és incompatible amb --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool and --extcmd són mútuament excloents"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipus"
+
+#: 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 "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+#, fuzzy
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1649
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:120
-#, fuzzy
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
-msgstr "força la sobreescriptura de la branca local"
+msgstr "força la sobreescriptura de la referència local"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "aprofundeix la història d'un clon superficial basat en temps"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -10950,108 +12754,107 @@
"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
"els fitxers de configuració)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "específic al servidor"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "opció a transmetre"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+#, fuzzy
+msgid "run 'gc --auto' after fetching"
+msgstr "poda els remots després d'obtenir-los"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuració fetch.output conté un valor no vàlid %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:879
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:900
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:991 builtin/fetch.c:1124
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1002
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11061,55 +12864,80 @@
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1008
+msgid ""
+"Fetch normally indicates which branches had a forced update, but that check "
+"has been disabled."
+msgstr ""
+
+#: builtin/fetch.c:1009
+msgid ""
+"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
+"showForcedUpdates true'."
+msgstr ""
+
+#: builtin/fetch.c:1011
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
+"updates'\n"
+msgstr ""
+
+#: builtin/fetch.c:1013
+msgid ""
+"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+msgstr ""
+
+#: builtin/fetch.c:1094
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1095
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1127
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1128 builtin/remote.c:1036
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1151
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1170
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
+msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1173
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
-msgstr "S'ignora l'opció \"%s\" per a %s\n"
+msgstr "S'ignora l'opció «%s» per a %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1477
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1479 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1525
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1549
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11117,43 +12945,49 @@
"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1586
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1637
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1639
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1644
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1646
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1662
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1664
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1673
#, c-format
msgid "No such remote or remote group: %s"
-msgstr "No hi ha tal remot ni tal grup remot: %s"
+msgstr "No existeix un remot ni un grup remot: %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1680
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
+#: builtin/fetch.c:1696
+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>]"
@@ -11218,90 +13052,272 @@
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respecta els colors del format"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "imprimeix només les referències que assenyalin l'objecte donat"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "imprimeix només les referències que s'han fusionat"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "imprimeix només les referències que no s'han fusionat"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "desconegut"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "error en %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "tipus d'objecte incorrecte en l'enllaç"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "manca %s %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "inabastable %s %s"
+
+#: builtin/fsck.c:340
+#, fuzzy, c-format
+msgid "dangling %s %s"
+msgstr "S'estan actualitzant %s..%s\n"
+
+#: builtin/fsck.c:349
+#, fuzzy
+msgid "could not create lost-found"
+msgstr "no s'ha pogut crear el fitxer «%s»"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no s'ha pogut finalitzar «%s»"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "S'està comprovant %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "S'està comprovant la connectivitat (%d objectes)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "S'està comprovant %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "enllaços trencats"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "arrel %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objecte corrupte o no trobat"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr " %s: entrada de referència no vàlida %s"
+
+#: builtin/fsck.c:523
+#, fuzzy, c-format
+msgid "Checking reflog %s->%s"
+msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: punter sha1 no vàlid: %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: no és una comissió"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "avís: no hi ha referències per defecte"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objecte corrupte o no trobat: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "fitxer sha1 malmès: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "S'està comprovant el directori d'objecte"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "S'està comprovant l'enllaç %s"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "%s no vàlid"
+
+#: builtin/fsck.c:712
+#, fuzzy, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s - no és una cosa que puguem fusionar"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "S'està comprovant l'arbre de la memòria cau"
+
+#: builtin/fsck.c:739
+#, fuzzy, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
+#: builtin/fsck.c:887
+#, fuzzy, c-format
+msgid "%s: object missing"
+msgstr "mostra la mida de l'objecte"
+
+#: builtin/fsck.c:899
+#, fuzzy, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
@@ -11311,17 +13327,22 @@
msgid "Failed to fstat %s: %s"
msgstr "S'ha produït un error en fer fstat %s: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, fuzzy, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "s'ha produït un error en moure «%s» a «%s»"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11336,77 +13357,78 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, fuzzy, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, fuzzy, c-format
msgid "failed to parse prune expiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
-"òptim.\n"
+"S'està empaquetant el dipòsit automàticament en el rerefons per a un "
+"rendiment òptim.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
+msgstr ""
+"S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Vegeu \"git help gc\" per neteja manual.\n"
+msgstr "Vegeu «git help gc» per a neteja manual.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-"
"los."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
@@ -11415,275 +13437,268 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2722
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:824
-#, fuzzy
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
-msgstr "poda les referències soltes (per defecte)"
+msgstr "cerca als subdirectories (per defecte)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:843
-#, fuzzy
+#: builtin/grep.c:856
msgid "show column number of first match"
-msgstr "mostra només els noms dels fitxers sense coincidència"
+msgstr "mostra el nombre de columna de la primera coincidència"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:859
-#, fuzzy
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
-msgstr "mostra les línies no coincidents"
+msgstr "mostra només les parts de coincidents de la línia"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:977
-#, fuzzy
+#: builtin/grep.c:990
msgid "no pattern given"
-msgstr "cap patró donat."
+msgstr "no s'ha donat cap patró"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1051
-#, fuzzy
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
-msgstr "no hi ha suport de fils, s'està ignorant --threads"
+msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3395
+#: builtin/grep.c:1068 builtin/pack-objects.c:3405
msgid "no threads support, ignoring --threads"
msgstr "no hi ha suport de fils, s'està ignorant --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:1103
-#, fuzzy
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opció no admesa amb --recurse-submodules."
-#: builtin/grep.c:1109
-#, fuzzy
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
#, fuzzy
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
#, fuzzy
msgid "both --cached and trees are given"
msgstr "s'han donat ambdós --caches i arbres."
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11691,38 +13706,34 @@
"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
"[--] <fitxer>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "tipus"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipus d'objecte"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "escriu l'objecte a la base de dades d'objectes"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "llegeix l'objecte des de stdin"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "emmagatzema el fitxer tal com és sense filtres"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
"depurar al Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "processa el fitxer com si fos d'aquest camí"
@@ -11764,30 +13775,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut «%s»"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11796,7 +13807,7 @@
"«%s»: camí a un visualitzador de manuals no compatible.\n"
"Considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11805,330 +13816,320 @@
"«%s»: ordre per a un visualitzador de manuals compatible.\n"
"Considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:600
msgid "pack too large for current definition of off_t"
msgstr "paquet massa gran per a la definició actual d'off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet «%s»"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr ""
"desbordament de valor de desplaçament per a l'objecte base de diferències"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
-msgstr "no es pot fer pread en el fitxer de paquet"
+msgstr "no es pot fer pread en el fitxer empaquetat"
-#: builtin/index-pack.c:555
+#: 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] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet"
+msgstr[0] "el final del fitxer empaquetat és prematur, manca %<PRIuMAX> octet"
msgstr[1] ""
-"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
+"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
#, fuzzy
msgid "fsck error in packed object"
msgstr "ignora els objectes empaquetats"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "%s no vàlid"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No tots els objectes fills de %s són abastables"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "s'ha completat amb %d objecte local"
msgstr[1] "s'ha completat amb %d objectes locals"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "El paquet té %d diferència no resolta"
msgstr[1] "El paquet té %d diferències no resoltes"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no es pot escriure «%s» al fitxer «%s»"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
-msgstr "error en tancar el fitxer de paquet"
+msgstr "error en tancar el fitxer empaquetat"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
-msgstr "no es pot emmagatzemar el fitxer de paquet"
+msgstr "no es pot emmagatzemar el fitxer empaquetat"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorrecte"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent «%s»"
+msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "sense diferències: %d objecte"
msgstr[1] "sense diferències: %d objectes"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longitud de cadena = %d: %lu objecte"
msgstr[1] "longitud de cadena = %d: %lu objectes"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un dipòsit git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
#, fuzzy
msgid "fsck error in pack objects"
msgstr "error en objecte: %s"
@@ -12173,42 +14174,42 @@
msgid "not copying templates from '%s': %s"
msgstr "no s'estan copiant plantilles de «%s»: %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12216,25 +14217,25 @@
"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12243,12 +14244,12 @@
"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
"dir=<directori>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No es pot accedir a l'arbre de treball «%s»"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12256,180 +14257,200 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "edita els fitxers in situ"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "escurça els remolcs buits"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "on ubica"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "acció si el «trailer» ja existeix"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "acció si el «trailer» falta"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "mostra només els «trailer»"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "no apliquis les regles de configuració"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "uneix els valors continus amb espais en blanc"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "estableix les opcions d'anàlisi"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "remolc"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "remolcs a afegir"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer amb --only-input no té sentit"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "omet la sortida de diferències"
+#: builtin/log.c:160
+msgid ""
+"log.mailmap is not set; its implicit value will change in an\n"
+"upcoming release. To squelch this message and preserve current\n"
+"behaviour, set the log.mailmap configuration value to false.\n"
+"\n"
+"To squelch this message and adopt the new behaviour now, set the\n"
+"log.mailmap configuration value to true.\n"
+"\n"
+"See 'git help config' and search for 'log.mailmap' for further information."
+msgstr ""
-#: builtin/log.c:163
+#: builtin/log.c:183
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:164
+#: builtin/log.c:184
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:166
+#: builtin/log.c:186
msgid "only decorate refs that match <pattern>"
msgstr "només decora les referències que coincideixin amb <patró>"
-#: builtin/log.c:168
+#: builtin/log.c:188
msgid "do not decorate refs that match <pattern>"
msgstr "no decoris les referències que coincideixen amb <patró>"
-#: builtin/log.c:169
+#: builtin/log.c:189
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:172
+#: builtin/log.c:192
msgid "Process line range n,m in file, counting from 1"
msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
-#: builtin/log.c:270
+#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:551
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:537 builtin/log.c:631
-#, c-format
-msgid "Could not read object %s"
+#: builtin/log.c:566 builtin/log.c:660
+#, fuzzy, c-format
+msgid "could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:655
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/log.c:685
+#, fuzzy, c-format
+msgid "unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:776
+#: builtin/log.c:808
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:877
+#: builtin/log.c:925
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:893
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/log.c:941
+#, fuzzy, c-format
+msgid "cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
+#: builtin/log.c:958
+#, fuzzy
+msgid "need exactly one range"
msgstr "Cal exactament un rang."
-#: builtin/log.c:920
-msgid "Not a range."
+#: builtin/log.c:968
+#, fuzzy
+msgid "not a range"
msgstr "No és un rang."
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
+#: builtin/log.c:1091
+#, fuzzy
+msgid "cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1119
+#: builtin/log.c:1097
+#, fuzzy
+msgid "failed to create cover-letter file"
+msgstr "S'ha produït un error en crear els fitxers de sortida"
+
+#: builtin/log.c:1176
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1203
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
+#: builtin/log.c:1261
+#, fuzzy
+msgid "two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#, fuzzy, c-format
+msgid "unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
+#: builtin/log.c:1387
+#, fuzzy
+msgid "could not find exact merge base"
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1330
+#: builtin/log.c:1391
+#, fuzzy
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
"base\n"
@@ -12437,281 +14458,274 @@
"seguir una branca remota. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1411
+#, fuzzy
+msgid "failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
-#: builtin/log.c:1361
+#: builtin/log.c:1422
msgid "base commit should be the ancestor of revision list"
msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
-#: builtin/log.c:1365
+#: builtin/log.c:1426
msgid "base commit shouldn't be in revision list"
msgstr "la comissió base no ha de ser en la llista de revisions"
-#: builtin/log.c:1418
+#: builtin/log.c:1479
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1470
+#: builtin/log.c:1531
#, fuzzy
msgid "failed to infer range-diff ranges"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/log.c:1515
+#: builtin/log.c:1576
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1518
+#: builtin/log.c:1579
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1522
+#: builtin/log.c:1583
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1524
+#: builtin/log.c:1585
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1526
+#: builtin/log.c:1587
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1527
+#: builtin/log.c:1588
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1528
+#: builtin/log.c:1589
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1530
+#: builtin/log.c:1591
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1532
+#: builtin/log.c:1593
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1534
+#: builtin/log.c:1595
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1537
+#: builtin/log.c:1598
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1540
+#: builtin/log.c:1601
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1543
+#: builtin/log.c:1604
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1546
+#: builtin/log.c:1607
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1548
+#: builtin/log.c:1609
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1550
+#: builtin/log.c:1611
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1552
+#: builtin/log.c:1613
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1554
+#: builtin/log.c:1615
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1555
+#: builtin/log.c:1616
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1556
+#: builtin/log.c:1617
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1618 builtin/log.c:1620
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1557
+#: builtin/log.c:1618
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1559
+#: builtin/log.c:1620
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1561
+#: builtin/log.c:1622
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1562
+#: builtin/log.c:1623
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1564
+#: builtin/log.c:1625
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1565
+#: builtin/log.c:1626
msgid "make first mail a reply to <message-id>"
msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1627 builtin/log.c:1630
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1567
+#: builtin/log.c:1628
msgid "attach the patch"
msgstr "adjunta el pedaç"
-#: builtin/log.c:1570
+#: builtin/log.c:1631
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1574
+#: builtin/log.c:1635
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1576
+#: builtin/log.c:1637
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1577
+#: builtin/log.c:1638
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1578
+#: builtin/log.c:1639
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1579
+#: builtin/log.c:1640
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
-#: builtin/log.c:1581
+#: builtin/log.c:1642
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1582
+#: builtin/log.c:1643
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1584
+#: builtin/log.c:1645
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1647
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1589
+#: builtin/log.c:1650
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1591
+#: builtin/log.c:1652
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1666
+#: builtin/log.c:1727
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1742
#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k són mútuament excloents."
-#: builtin/log.c:1683
+#: builtin/log.c:1744
#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k són mútuament excloents."
-#: builtin/log.c:1691
+#: builtin/log.c:1752
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1693
+#: builtin/log.c:1754
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1695
+#: builtin/log.c:1756
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1727
+#: builtin/log.c:1788
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "No s'ha pogut crear el directori «%s»"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1820
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1821
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1827
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1831
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1839
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1840
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1851
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:1887
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
+#: builtin/log.c:1992
+#, fuzzy
+msgid "failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
-#: builtin/log.c:1989
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -12719,109 +14733,109 @@
"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
"manualment.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr ""
"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "fes que la sortida sigui relativa al directori superior del projecte"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"pretén que els camins eliminats després de <arbre> encara siguin presents"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "mostra les dades de depuració"
@@ -12840,7 +14854,7 @@
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:885
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "executable"
@@ -12864,11 +14878,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr "tingues en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostra la referència subjacent a més de l'objecte que senyali"
@@ -12914,262 +14928,290 @@
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "l'opció «m» requereix un valor"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, fuzzy, c-format
+msgid "option `%s' requires a value"
+msgstr "l'opció «%s» requereix un valor"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "mostra les estadístiques de diferència al final de la fusió"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
"de fusió"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:898 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+#, fuzzy
+msgid "--abort but leave index and working tree alone"
+msgstr "restableix HEAD, l'índex i l'arbre de treball"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verifica el lligam de missatge de comissió"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "No s'està gestionant res a part de la fusió de dos caps."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
-#: builtin/merge.c:797
-#, c-format
+#: builtin/merge.c:804
+#, fuzzy
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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Introduïu un missatge de comissió per a explicar per què\n"
"aquesta fusió és necessària, especialment si fusiona una font\n"
"actualitzada a una branca temàtica.\n"
"\n"
-"S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
+"S'ignoraran les línies que comencin amb «%c», i un missatge buit\n"
"avorta la comissió.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+#, fuzzy
+msgid "An empty message aborts the commit.\n"
+msgstr "edita el missatge abans de cometre"
+
+#: builtin/merge.c:812
+#, fuzzy, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
+"comissió buit avorta la comissió.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
"resultat.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "No hi ha cap font per defecte definida per a la branca actual."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+#, fuzzy
+msgid "--quit expects no arguments"
+msgstr "--abort no accepta paràmetres"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13177,7 +15219,7 @@
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13185,94 +15227,99 @@
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+#, fuzzy
+msgid "You cannot combine --squash with --commit."
+msgstr "No podeu combinar --squash amb --no-ff."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hi ha una comissió especificada i merge.defaultToUpstream no està "
"establert."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Es pot fusionar només una comissió a un HEAD buit"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13360,33 +15407,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "opció desconeguda %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "no s'està gestionant res a part de la fusió de dos caps."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "no s'ha pogut resoldre la referència «%s»"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "S'està fusionant %s amb %s\n"
@@ -13399,7 +15446,7 @@
msgid "input is NUL terminated"
msgstr "l'entrada és acabada amb NUL"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "permet els objectes absents"
@@ -13407,158 +15454,170 @@
msgid "allow creation of more than one tree"
msgstr "permet la creació de més d'un arbre"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
msgstr ""
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "hi ha massa paràmetres"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "paràmetre no reconegut: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, fuzzy, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subordre desconeguda: %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opcions>] <font>... <destí>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s és en l'índex"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "el destí «%s» no és un directori"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "font incorrecta"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "el directori font està buit"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "s'està sobreescrivint «%s»"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "múltiples fonts per al mateix destí"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignora les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "llegeix de stdin"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
@@ -13707,14 +15766,14 @@
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir «%s»"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
@@ -13747,38 +15806,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "massa paràmetres"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
@@ -13791,30 +15850,30 @@
"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "llegeix els objectes des de stdin"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13823,12 +15882,12 @@
"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
"Useu '-f' per a sobreescriure les notes existents."
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "manquen notes a l'objecte font %s. No es pot copiar."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13837,53 +15896,53 @@
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -13891,48 +15950,48 @@
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusió de notes a %s ja està en curs a %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
"actual (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13943,449 +16002,459 @@
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "l'intent d'eliminar una nota no existent no és un error"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
"<llista-de-objectes>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:424
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:435
#, fuzzy, c-format
msgid "corrupt packed object for %s"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:566
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:777
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:790
#, fuzzy, c-format
msgid "packfile is invalid: %s"
msgstr "%s no vàlid"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:794
#, fuzzy, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:798
#, fuzzy
msgid "unable to seek in reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:809
#, fuzzy
msgid "unable to read from reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:837
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
"a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:850
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "s'ha produït un error en fer stat a %s"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:965
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1161
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
"s'empaqueten"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1591
#, fuzzy, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1600
#, fuzzy, c-format
msgid "delta base offset out of bound for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1869
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:1999
#, fuzzy, c-format
msgid "unable to get size of %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2014
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
+#: builtin/pack-objects.c:2110
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "objecte %s no trobat"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2124
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2450
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2582
#, fuzzy, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2669
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2675
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2756
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2855
+#: builtin/pack-objects.c:2860
msgid "invalid value for --missing"
msgstr "valor no vàlid per a --missing"
-#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
#, fuzzy
msgid "cannot open pack index"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2950
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3030
+#: builtin/pack-objects.c:3035
#, fuzzy
msgid "unable to force loose object"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/pack-objects.c:3120
+#: builtin/pack-objects.c:3127
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "no es pot llegir «%s»"
-#: builtin/pack-objects.c:3123
+#: builtin/pack-objects.c:3130
#, c-format
msgid "bad revision '%s'"
msgstr "revisió incorrecte «%s»"
-#: builtin/pack-objects.c:3148
+#: builtin/pack-objects.c:3155
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
-#: builtin/pack-objects.c:3201
+#: builtin/pack-objects.c:3208
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:3205
+#: builtin/pack-objects.c:3212
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:3235
+#: builtin/pack-objects.c:3242
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3244
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3246
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3249
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/pack-objects.c:3243
+#: builtin/pack-objects.c:3250
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3251
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escriu el fitxer d'índex de paquet en la versió de format d'índex "
"especificada"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3254
msgid "maximum size of each output pack file"
-msgstr "mida màxima de cada fitxer de paquet de sortida"
+msgstr "mida màxima de cada fitxer empaquetat de sortida"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3256
msgid "ignore borrowed objects from alternate object store"
msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3258
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3260
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3262
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3264
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longitud màxima de la cadena de diferències permesa en el paquet resultant"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3266
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3268
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3270
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3272
msgid "use threads when searching for best delta matches"
msgstr "usa fils en cercar les millores coincidències de diferències"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3274
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3276
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3278
msgid "limit the objects to those that are not yet packed"
msgstr "limita els objectes als quals encara no s'hagin empaquetat"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3281
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:3277
+#: builtin/pack-objects.c:3284
msgid "include objects referred by reflog entries"
msgstr ""
"inclou els objectes als quals facin referència les entrades del registre de "
"referències"
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3287
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:3283
+#: builtin/pack-objects.c:3290
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3292
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3294
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3296
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3298
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3301
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3303
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3305
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3307
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3309
#, fuzzy
msgid "ignore this pack"
msgstr "usa el paquet prim"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3311
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3313
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3315
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un índex de mapa de bits, si està disponible, per a accelerar el "
"recompte d'objectes"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3317
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3320
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3323
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3325
#, fuzzy
msgid "respect islands during delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/pack-objects.c:3340
+#: builtin/pack-objects.c:3350
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3355
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3409
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3411
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3416
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3419
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/pack-objects.c:3415
+#: builtin/pack-objects.c:3425
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "no es pot usar -a amb -d"
-#: builtin/pack-objects.c:3474
-#, fuzzy
+#: builtin/pack-objects.c:3486
msgid "Enumerating objects"
-msgstr "S'estan escrivint els objectes"
+msgstr "S'estan enumerant els objectes"
-#: builtin/pack-objects.c:3493
+#: builtin/pack-objects.c:3516
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
+"Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències "
+"%<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opcions>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "empaqueta-ho tot"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
@@ -14401,70 +16470,70 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un dipòsit d'objectes preciosos"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor no vàlid per a %s: %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14472,13 +16541,13 @@
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14486,7 +16555,7 @@
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14497,44 +16566,44 @@
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:432 builtin/rebase.c:760 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:766 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:548 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:447 builtin/rebase.c:758 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14543,33 +16612,33 @@
"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:565
-#, fuzzy, c-format
+#: builtin/pull.c:581
+#, c-format
msgid "unable to access commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
+msgstr "no s'ha pogut accedir a la comissió %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14580,7 +16649,7 @@
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14598,15 +16667,15 @@
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -14624,7 +16693,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14633,7 +16702,7 @@
"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help "
"config'."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14644,7 +16713,7 @@
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
-" git push %s %s\n"
+" git push %s HEAD\n"
"%s"
msgstr ""
"La branca font de la vostra branca actual no coincideix\n"
@@ -14655,10 +16724,10 @@
"\n"
"Per a pujar a la branca del mateix nom en el remot, useu\n"
"\n"
-" git push %s %s\n"
+" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14673,7 +16742,7 @@
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14686,13 +16755,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14703,14 +16772,14 @@
"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No heu especificat cap especificació de referència a pujar, i push.default "
"és \"nothing\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14722,7 +16791,7 @@
"els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14735,7 +16804,7 @@
"abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14750,12 +16819,12 @@
"pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14766,22 +16835,22 @@
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"'--force'.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "S'està pujant a %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha produït un error en pujar algunes referències a «%s»"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit incorrecte «%s»"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14803,105 +16872,104 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:561 builtin/send-pack.c:181
-#, fuzzy
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
-msgstr "nom-de-referència>:<esperat"
+msgstr "<nom-de-referència>:<esperat>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "evita el lligam de prepujada"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
@@ -14927,20 +16995,20 @@
msgid "use simple diff colors"
msgstr "utilitza colors simples de diff"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "cap .. en rang: «%s»"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "el format de l'argument únic ha de ser de rang simètric"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "calen dos rangs de comissió"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -14950,71 +17018,76 @@
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "escriu l'índex resultant al <fitxer>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "només buida l'índex"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "S'està fusionant"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "realitza una fusió a més d'una lectura"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "el mateix que -m, però descarta les entrades no fusionades"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<subdirectori>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "actualitza l'arbre de treball amb el resultat de fusió"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "no comprovis l'arbre de treball després de fusionar"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "no actualitzis l'índex ni l'arbre de treball"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "omet l'aplicació del filtre d'agafament parcial"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+#, fuzzy
+msgid "suppress feedback messages"
+msgstr "omet els missatges informatius"
+
+#: builtin/rebase.c:32
#, fuzzy
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
@@ -15023,46 +17096,236 @@
"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "llista per a fer inestable: «%s»"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "no s'ha pogut escriure a «%s»."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "no hi ha cap HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "no s'ha pogut crear el fitxer temporal %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "no s'ha pogut marcar com a interactiu"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "no s'ha pogut generar la llista per a fer"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<opcions>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "mantén les comissions buides"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "fes «rebase» de les comissions de fusió"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "signa les comissions"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "continua el «rebase»"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "omet la comissió"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "edita la llista a fer"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "mostra el pedaç actual"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "escurça els ids de les comissions en la llista per a fer"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "expandeix els ids de les comissions en la llista per a fer"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "comprova la llista a fer"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "reorganitza les línies «fixup/pick»"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "expandeix les ordres exec en la llista per a fer"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+#, fuzzy
+msgid "restrict-revision"
+msgstr "revisió"
+
+#: builtin/rebase.c:481
+#, fuzzy
+msgid "restrict revision"
+msgstr "revisió"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+#, fuzzy
+msgid "the upstream commit"
+msgstr "Desassigna la informació de font"
+
+#: builtin/rebase.c:488
+#, fuzzy
+msgid "head-name"
+msgstr "canvi de nom"
+
+#: builtin/rebase.c:488
+#, fuzzy
+msgid "head name"
+msgstr "davant per "
+
+#: builtin/rebase.c:493
+#, fuzzy
+msgid "rebase strategy"
+msgstr "estratègia de fusió"
+
+#: builtin/rebase.c:494
+#, fuzzy
+msgid "strategy-opts"
+msgstr "estratègia"
+
+#: builtin/rebase.c:495
+#, fuzzy
+msgid "strategy options"
+msgstr "opcions de decoració"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+#, fuzzy
+msgid "onto-name"
+msgstr "nom"
+
+#: builtin/rebase.c:498
+#, fuzzy
+msgid "onto name"
+msgstr "nom del remot"
+
+#: builtin/rebase.c:499
+#, fuzzy
+msgid "cmd"
+msgstr "ordre"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "l'ordre a executar"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requereix un «rebase» interactiu"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, fuzzy, c-format
msgid "could not get 'onto': '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, fuzzy, c-format
msgid "invalid orig-head: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "No s'ha pogut llegir «%s»"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "No es pot emmagatzemar %s"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "no s'ha pogut determinar la revisió de HEAD"
+
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15077,12 +17340,20 @@
"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
"executeu «git rebase --abort»."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "no s'ha pogut determinar la revisió de HEAD"
+#: builtin/rebase.c:1031
+#, 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:752
-#, fuzzy, c-format
+#: builtin/rebase.c:1318
+#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
@@ -15090,10 +17361,16 @@
"\n"
" git rebase '<branch>'\n"
"\n"
-msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
+msgstr ""
+"%s\n"
+"Especifiqueu sobre què branca voleu fer «rebase».\n"
+"Vegeu git-rebase(1) per detalls.\n"
+"\n"
+" git rebase '<branca>'\n"
+"\n"
-#: builtin/rebase.c:768
-#, fuzzy, c-format
+#: builtin/rebase.c:1334
+#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
@@ -15101,160 +17378,170 @@
"\n"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:"
+"amb:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
-#: builtin/rebase.c:814
+#: builtin/rebase.c:1364
+#, fuzzy
+msgid "exec commands cannot contain newlines"
+msgstr "expandeix les ordres exec en la llista per a fer"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
-#: builtin/rebase.c:816
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
-#: builtin/rebase.c:818
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
-#: builtin/rebase.c:821
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:824
+#: builtin/rebase.c:1406
#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/rebase.c:827
+#: builtin/rebase.c:1409
#, fuzzy
msgid "add a Signed-off-by: line to each commit"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/rebase.c:829 builtin/rebase.c:833 builtin/rebase.c:835
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passa-ho a «git am»"
-#: builtin/rebase.c:837 builtin/rebase.c:839
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passa-ho a «git-apply»"
-#: builtin/rebase.c:841 builtin/rebase.c:844
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
-#: builtin/rebase.c:846
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:849
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
-#: builtin/rebase.c:851
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
-#: builtin/rebase.c:854
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
-#: builtin/rebase.c:855
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
-#: builtin/rebase.c:858
-#, fuzzy
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
-msgstr "mostra el pedaç que s'està aplicant."
+msgstr "mostra el pedaç que s'està aplicant o fusionant"
-#: builtin/rebase.c:861
+#: builtin/rebase.c:1443
#, fuzzy
msgid "use merging strategies to rebase"
msgstr "estratègia de fusió a usar"
-#: builtin/rebase.c:865
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:869
-msgid "try to recreate merges instead of ignoring them"
-msgstr ""
+#: builtin/rebase.c:1451
+#, fuzzy
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "intenta recrear les "
-#: builtin/rebase.c:873
-msgid "allow rerere to update index with resolved conflict"
-msgstr ""
-
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1455
#, fuzzy
msgid "preserve empty commits during rebase"
msgstr "preserva les comissions inicialment buides"
-#: builtin/rebase.c:878
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:884
+#: builtin/rebase.c:1463
#, fuzzy
msgid "automatically stash/stash pop before and after"
msgstr ""
"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-#: builtin/rebase.c:886
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:890
+#: builtin/rebase.c:1469
#, fuzzy
msgid "allow rebasing commits with empty messages"
msgstr "permet les comissions amb missatges buits"
-#: builtin/rebase.c:893
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1475
#, fuzzy
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/rebase.c:898
-#, fuzzy
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
-msgstr "opció d'estratègia de fusió"
+msgstr "utilitza l'estratègia de fusió donada"
-#: builtin/rebase.c:900 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opció"
-#: builtin/rebase.c:901
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
-msgstr "passa l'argument a l'estratègia de fussió"
+msgstr "passa l'argument a l'estratègia de fusió"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins l'arrel"
-#: builtin/rebase.c:920
-#, c-format
-msgid "could not exec %s"
-msgstr "no s'ha pogut executar %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
-#: builtin/rebase.c:938 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
-#: builtin/rebase.c:979 git-legacy-rebase.sh:387
+#: builtin/rebase.c:1547
+#, fuzzy
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: builtin/rebase.c:982 git-legacy-rebase.sh:398
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: builtin/rebase.c:995 git-legacy-rebase.sh:405
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: builtin/rebase.c:1008 git-legacy-rebase.sh:408
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15262,21 +17549,16 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: builtin/rebase.c:1026
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
-#: builtin/rebase.c:1044
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
-#: builtin/rebase.c:1055 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir «%s»"
-
-#: builtin/rebase.c:1081
+#: builtin/rebase.c:1673
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15297,358 +17579,180 @@
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: builtin/rebase.c:1102
-#, fuzzy
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
-msgstr "l'opció «%c» espera un valor numèric"
+msgstr "«switch» «c» espera un valor numèric"
-#: builtin/rebase.c:1139
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
-#: builtin/rebase.c:1204
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1797
+#, fuzzy
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--strategy requereix --merge o --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/rebase.c:1209
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr ""
-
-#: builtin/rebase.c:1229 git-legacy-rebase.sh:528
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+#: builtin/rebase.c:1828
+#, fuzzy
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-#: builtin/rebase.c:1234 git-legacy-rebase.sh:534
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+#: builtin/rebase.c:1832
+#, fuzzy
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+
+#: builtin/rebase.c:1838
+#, fuzzy
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-#: builtin/rebase.c:1237 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+#: builtin/rebase.c:1841
+#, fuzzy
+msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
-#: builtin/rebase.c:1261
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
-#: builtin/rebase.c:1267
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "no s'ha pogut crear una comissió arrel nova"
-#: builtin/rebase.c:1285
+#: builtin/rebase.c:1889
#, fuzzy, c-format
msgid "'%s': need exactly one merge base"
msgstr "Cal exactament un rang."
-#: builtin/rebase.c:1292
+#: builtin/rebase.c:1896
#, fuzzy, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: builtin/rebase.c:1317
+#: builtin/rebase.c:1921
#, fuzzy, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: builtin/rebase.c:1325 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1940
#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: builtin/rebase.c:1377 git-legacy-rebase.sh:657
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: builtin/rebase.c:1380
+#: builtin/rebase.c:1984
#, fuzzy, c-format
msgid "Unexpected stash response: '%s'"
msgstr "final de fitxer inesperat"
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1990
#, fuzzy, c-format
msgid "Could not create directory for '%s'"
msgstr "No s'ha pogut crear el directori «%s»"
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1993
#, fuzzy, c-format
msgid "Created autostash: %s\n"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1996
#, fuzzy
msgid "could not reset --hard"
msgstr "No s'ha pogut llegir orig-head"
-#: builtin/rebase.c:1393 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/rebase.c:1409 git-legacy-rebase.sh:666
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
-#: builtin/rebase.c:1436
-#, fuzzy, c-format
+#: builtin/rebase.c:2040
+#, c-format
msgid "could not parse '%s'"
-msgstr "no s'ha pogut analitzar %s"
+msgstr "no s'ha pogut analitzar «%s»"
-#: builtin/rebase.c:1447
-#, fuzzy, c-format
+#: builtin/rebase.c:2053
+#, c-format
msgid "could not switch to %s"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "no s'ha pogut commutar a %s"
-#: builtin/rebase.c:1458 git-legacy-rebase.sh:689
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
-#: builtin/rebase.c:1460
-#, fuzzy, c-format
+#: builtin/rebase.c:2066
+#, c-format
msgid "Current branch %s is up to date.\n"
-msgstr "La branca actual $branch_name està al dia."
+msgstr "La branca actual %s està al dia.\n"
-#: builtin/rebase.c:1468 git-legacy-rebase.sh:699
-#, fuzzy, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
-msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
+msgstr "La branca actual està al dia, «rebase» forçat."
-#: builtin/rebase.c:1470
-#, fuzzy, c-format
+#: builtin/rebase.c:2076
+#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
+msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
-#: builtin/rebase.c:1478 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: builtin/rebase.c:1484
-#, fuzzy, c-format
-msgid "Changes from %s to %s:\n"
-msgstr "Canvis de $mb a $onto:"
+#: builtin/rebase.c:2091
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Canvis a %s:\n"
-#: builtin/rebase.c:1507
-#, fuzzy, c-format
+#: builtin/rebase.c:2094
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Canvis de %s a %s:\n"
+
+#: builtin/rebase.c:2119
+#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
+"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
+"damunt...\n"
-#: builtin/rebase.c:1513
-#, fuzzy
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
-msgstr "no s'ha pogut separar HEAD"
+msgstr "No s'ha pogut separar HEAD"
-#: builtin/rebase.c:1522
-#, fuzzy, c-format
-msgid "Fast-forwarded %s to %s. \n"
-msgstr "Avanç ràpid a $sha1"
+#: builtin/rebase.c:2137
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Avanç ràpid %s a %s.\n"
-#: builtin/rebase--interactive.c:24
-#, fuzzy
-msgid "no HEAD?"
-msgstr "No hi ha cap HEAD?"
-
-#: builtin/rebase--interactive.c:51
-#, fuzzy, c-format
-msgid "could not create temporary %s"
-msgstr "no s'ha pogut crear el fitxer temporal"
-
-#: builtin/rebase--interactive.c:57
-#, fuzzy
-msgid "could not mark as interactive"
-msgstr "No s'ha pogut marcar com a interactiu"
-
-#: builtin/rebase--interactive.c:101
-#, fuzzy, c-format
-msgid "could not open %s"
-msgstr "no s'ha pogut obrir «%s»"
-
-#: builtin/rebase--interactive.c:114
-#, fuzzy
-msgid "could not generate todo list"
-msgstr "no s'ha pogut escriure la llista per a fer"
-
-#: builtin/rebase--interactive.c:129
-#, fuzzy
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--helper [<opcions>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "mantén les comissions buides"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
-#: builtin/rebase--interactive.c:151
-#, fuzzy
-msgid "rebase merge commits"
-msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase--interactive.c:156
-#, fuzzy
-msgid "sign commits"
-msgstr "signa les comissions amb GPG"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "continua el «rebase»"
-
-#: builtin/rebase--interactive.c:160
-#, fuzzy
-msgid "skip commit"
-msgstr "comissió"
-
-#: builtin/rebase--interactive.c:161
-#, fuzzy
-msgid "edit the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase--interactive.c:163
-#, fuzzy
-msgid "show the current patch"
-msgstr "omet el pedaç actual"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "expandeix els ids de els comissions en la llista per a fer"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "reorganitza les línies «fixup/pick»"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "expandeix les ordres exec en la llista per a fer"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:177
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisió"
-
-#: builtin/rebase--interactive.c:177
-#, fuzzy
-msgid "restrict revision"
-msgstr "revisió"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:181
-#, fuzzy
-msgid "the upstream commit"
-msgstr "Desassigna la informació de font"
-
-#: builtin/rebase--interactive.c:182
-#, fuzzy
-msgid "head-name"
-msgstr "canvi de nom"
-
-#: builtin/rebase--interactive.c:182
-#, fuzzy
-msgid "head name"
-msgstr "davant per "
-
-#: builtin/rebase--interactive.c:187
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratègia de fusió"
-
-#: builtin/rebase--interactive.c:188
-#, fuzzy
-msgid "strategy-opts"
-msgstr "estratègia"
-
-#: builtin/rebase--interactive.c:189
-#, fuzzy
-msgid "strategy options"
-msgstr "opcions de decoració"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase--interactive.c:192
-#, fuzzy
-msgid "onto-name"
-msgstr "nom"
-
-#: builtin/rebase--interactive.c:192
-#, fuzzy
-msgid "onto name"
-msgstr "nom del remot"
-
-#: builtin/rebase--interactive.c:193
-#, fuzzy
-msgid "cmd"
-msgstr "ordre"
-
-#: builtin/rebase--interactive.c:193
-#, fuzzy
-msgid "the command to run"
-msgstr "No s'ha fet cap ordre."
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15679,7 +17783,7 @@
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15701,19 +17805,70 @@
"\n"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: 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:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» no és una marca de temps vàlida"
+#: builtin/reflog.c:605
+#, fuzzy, c-format
+msgid "Marking reachable objects..."
+msgstr "retén els objectes inabastables"
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+#, fuzzy
+msgid "no reflog specified to delete"
+msgstr "cap remot especificat"
+
+#: builtin/reflog.c:704
+#, fuzzy, c-format
+msgid "not a reflog: %s"
+msgstr "no es pot llegir «%s»"
+
+#: builtin/reflog.c:709
+#, fuzzy, c-format
+msgid "no reflog for '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "format de referència no vàlid: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -15878,9 +18033,9 @@
msgstr "(suprimir)"
#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
-#, fuzzy, c-format
+#, c-format
msgid "No such remote: '%s'"
-msgstr "No hi ha tal remot «%s»"
+msgstr "No existeix el remot «%s»"
#: builtin/remote.c:646
#, c-format
@@ -16219,7 +18374,7 @@
#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
#: builtin/remote.c:1641
#, c-format
@@ -16240,99 +18395,128 @@
"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
"writebitmaps."
-#: builtin/repack.c:294
+#: builtin/repack.c:201
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:240 builtin/repack.c:418
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:257
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:295
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:296
+#: builtin/repack.c:297
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:299
+#: builtin/repack.c:300
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:302
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:306
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:314
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "with -A, do not loosen objects older than this"
msgstr "amb -A, no soltis els objectes més vells que aquest"
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:320 builtin/repack.c:326
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
-#: builtin/repack.c:322
+#: builtin/repack.c:323
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
-#: builtin/repack.c:324
+#: builtin/repack.c:325
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
-#: builtin/repack.c:326
+#: builtin/repack.c:327
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:328
+#: builtin/repack.c:329
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:331
#, fuzzy
msgid "do not repack this pack"
msgstr "crea paquets prims"
-#: builtin/repack.c:340
+#: builtin/repack.c:341
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
-#: builtin/repack.c:344
+#: builtin/repack.c:345
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:427
+#, fuzzy
+msgid "Nothing new to pack."
+msgstr "usa el paquet prim"
+
+#: builtin/repack.c:488
+#, 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:536
#, c-format
msgid "failed to remove '%s'"
msgstr "s'ha produït un error en eliminar «%s»"
@@ -16361,39 +18545,34 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<patró>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, fuzzy, c-format
msgid "replace ref '%s' not found"
msgstr "no s'ha trobat la branca «%s»."
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, fuzzy, c-format
msgid "Deleted replace ref '%s'"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, fuzzy, c-format
msgid "'%s' is not a valid ref name"
msgstr "«%s» no és un nom de remot vàlid"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, fuzzy, c-format
msgid "replace ref '%s' already exists"
msgstr "el destí «%s» ja existeix"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16401,82 +18580,87 @@
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, fuzzy, c-format
msgid "unable to open %s for writing"
msgstr "No s'ha pogut obrir «%s» per a escriptura"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, fuzzy, c-format
msgid "unable to open %s for reading"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
#, fuzzy
msgid "unable to spawn mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
#, fuzzy
msgid "unable to read from mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
#, fuzzy
msgid "mktree reported failure"
msgstr "la reversió ha fallat"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
#, fuzzy
msgid "mktree did not return an object name"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, fuzzy, c-format
msgid "unable to fstat %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
#, fuzzy
msgid "unable to write object to database"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, fuzzy, c-format
msgid "not a valid object name: '%s'"
msgstr "No és un nom d'objecte vàlid: «%s»"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, fuzzy, c-format
msgid "unable to get object type for %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
#, fuzzy
msgid "editing object file failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, fuzzy, c-format
+msgid "could not parse %s as a commit"
+msgstr "no s'ha pogut analitzar la comissió HEAD"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "etiqueta de fusió mal formada en la comissió «%s»"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16485,111 +18669,107 @@
"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
-#: builtin/replace.c:460
-#, fuzzy, c-format
+#: builtin/replace.c:467
+#, c-format
msgid "the original commit '%s' has a gpg signature"
-msgstr "la comissió original «%s» té una signatura gpg."
+msgstr "la comissió original «%s» té una signatura gpg"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
-msgstr ""
+msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
-#: builtin/replace.c:514
+#: builtin/replace.c:525
#, fuzzy, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr "Eliminaria l'ítem següent:"
-#: builtin/replace.c:535
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "llista les referències reemplaçades"
-#: builtin/replace.c:536
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:537
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "edita un objecte existent"
-#: builtin/replace.c:538
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "canvia les mares d'una comissió"
-#: builtin/replace.c:539
+#: builtin/replace.c:550
#, fuzzy
msgid "convert existing graft file"
msgstr "força la sobreescriptura de fitxers existents"
-#: builtin/replace.c:540
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
-#: builtin/replace.c:542
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
-#: builtin/replace.c:543
+#: builtin/replace.c:554
msgid "use this format"
msgstr "usa aquest format"
-#: builtin/replace.c:556
+#: builtin/replace.c:567
#, fuzzy
msgid "--format cannot be used when not listing"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/replace.c:564
+#: builtin/replace.c:575
#, fuzzy
msgid "-f only makes sense when writing a replacement"
msgstr "-z només té sentit amb --stdin"
-#: builtin/replace.c:568
-#, fuzzy
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
-msgstr "-z només té sentit amb --stdin"
+msgstr "--raw només té sentit amb --edit"
-#: builtin/replace.c:574
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:580
+#: builtin/replace.c:591
msgid "bad number of arguments"
-msgstr ""
+msgstr "nombre incorrecte d'arguments"
-#: builtin/replace.c:586
-#, fuzzy
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
-msgstr "Cal exactament un rang."
+msgstr "-e necessita exactament un argument"
-#: builtin/replace.c:592
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
-msgstr ""
+msgstr "-g necessita almenys un argument"
-#: builtin/replace.c:598
-#, fuzzy
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
-msgstr "--continue no accepta paràmetres"
+msgstr "--convert-graft-file arguments"
-#: builtin/replace.c:604
-#, fuzzy
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
-msgstr "combina els patrons especificats amb -e"
+msgstr "només es pot especificar un patró amb -l"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
@@ -16603,126 +18783,127 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr ""
-#: builtin/rerere.c:111
-#, fuzzy, c-format
+#: builtin/rerere.c:113
+#, c-format
msgid "unable to generate diff for '%s'"
-msgstr "s'ha produït un error en executar «%s»"
+msgstr "s'ha pogut generar el diff per a «%s»"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<arbre>] [--] <camins>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "mixt"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "suau"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "dur"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "fusió"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "registra només el fet que els camins eliminats s'afegiran després"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc "
"d'això."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un dipòsit nu"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16731,53 +18912,53 @@
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
+msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "el filtratge d'objectes requereix --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valor parcial no vàlid: «%s»"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "retén el «--» passat com a paràmetre"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16808,72 +18989,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subordre>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "l'opció «%s» espera un nombre major que zero"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s no es pot usar amb %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "acaba la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "reprèn la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "omet la comissió actual i continua"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "no cometis automàticament"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "edita el missatge de comissió"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "número del pare"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "selecciona la línia principal del pare"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "estratègia de fusió"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opció d'estratègia de fusió"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "nom de la comissió a annexar"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "preserva les comissions inicialment buides"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opcions>] [--] <fitxer>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -16887,7 +19077,7 @@
"els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
"el fitxer i la HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -16895,13 +19085,13 @@
"\n"
"(useu -f per a forçar l'eliminació)"
-#: builtin/rm.c:215
+#: 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] "el fitxer següent té canvis «staged» en l'índex:"
msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -16909,45 +19099,45 @@
"\n"
"(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "el fitxer següent té modificacions locals:"
msgstr[1] "els fitxers següents tenen modificacions locals:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "no llistis els fitxers eliminats"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "només elimina de l'índex"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "passa per alt la comprovació d'actualitat"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "permet l'eliminació recursiva"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no s'està eliminant «%s» recursivament sense -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
@@ -16980,20 +19170,6 @@
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
-#: builtin/serve.c:7
-#, fuzzy
-msgid "git serve [<options>]"
-msgstr "git repack [<opcions>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-
-#: builtin/serve.c:19
-#, fuzzy
-msgid "exit immediately after advertising capabilities"
-msgstr "surt immediatament després de l'anunci inicial de referència"
-
#: builtin/shortlog.c:14
#, fuzzy
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
@@ -17029,7 +19205,7 @@
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
#, fuzzy
msgid "too many arguments given outside repository"
msgstr "hi ha massa arguments per a desassignar la font"
@@ -17057,119 +19233,119 @@
msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "no hi ha referències coincidents amb %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "omet anomenar cadenes"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevol altra referència"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "mostra només les comissions que no siguin en la primera branca"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostra les <n> entrades més recents començant a la base"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "l'opció --reflog necessita un nom de branca"
-#: builtin/show-branch.c:742
+#: 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] "es pot mostrar només %d entrada a la vegada."
msgstr[1] "es poden mostrar només %d entrades a la vegada."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "no hi ha tal referència %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no es pot gestionar més d'%d revisió."
msgstr[1] "no es poden gestionar més de %d revisions."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» no és una referència vàlida."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no es pot trobar la comissió %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -17177,44 +19353,280 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patró>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "mostra només les etiquetes (es pot combinar amb heads)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "mostra només els caps (es pot combinar amb tags)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"comprovació de referència més estricta, requereix el camí de referència "
"exacte"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostra la referència HEAD, encara que es filtrés"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "desreferencia les etiquetes a ID d'objecte"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "mostra el hash SHA1 usant només <n> xifres"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
+#: builtin/stash.c:22 builtin/stash.c:37
+#, fuzzy
+msgid "git stash list [<options>]"
+msgstr "git worktree list [<opcions>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+#, fuzzy
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git remote show [<opcions>] <nom>"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+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:62
+#, fuzzy
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:77
+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:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: builtin/stash.c:127
+#, fuzzy, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'$args' no és una comissió de tipus magatzem"
+
+#: builtin/stash.c:147
+#, fuzzy, c-format
+msgid "Too many revisions specified:%s"
+msgstr "S'han especificat massa revisions: $REV"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "No s'ha trobat cap «stash»."
+
+#: builtin/stash.c:175
+#, fuzzy, c-format
+msgid "%s is not a valid reference"
+msgstr "«%s» no és un nom de remot vàlid"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear amb paràmetres no està implementat"
+
+#: builtin/stash.c:403
+#, fuzzy
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "No es pot aplicar un magatzem enmig d'una fusió"
+
+#: builtin/stash.c:414
+#, fuzzy, c-format
+msgid "could not generate diff %s^!."
+msgstr "no s'ha pogut generar la llista per a fer"
+
+#: builtin/stash.c:421
+#, fuzzy
+msgid "conflicts in index.Try without --index."
+msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
+
+#: builtin/stash.c:427
+#, fuzzy
+msgid "could not save index tree"
+msgstr "No s'ha pogut desar l'arbre d'índex"
+
+#: builtin/stash.c:434
+#, fuzzy
+msgid "could not restore untracked files from stash"
+msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
+
+#: builtin/stash.c:448
+#, fuzzy, c-format
+msgid "Merging %s with %s"
+msgstr "S'està fusionant %s amb %s\n"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "L'índex no estava sense emmagatzemar."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+#, fuzzy
+msgid "attempt to recreate the index"
+msgstr "S'ha produït un error en llegir l'índex"
+
+#: builtin/stash.c:549
+#, fuzzy, c-format
+msgid "Dropped %s (%s)"
+msgstr "${REV} ($s) descartada"
+
+#: builtin/stash.c:552
+#, fuzzy, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
+
+#: builtin/stash.c:577
+#, fuzzy, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'$args' no és una referència de magatzem"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Cap nom de branca especificat"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, fuzzy, c-format
+msgid "Cannot update %s with %s"
+msgstr "No es pot actualitzar $ref_stash amb $w_commit"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#, fuzzy
+msgid "stash message"
+msgstr "missatge d'etiqueta"
+
+#: builtin/stash.c:818
+#, fuzzy
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "No hi ha canvis seleccionats"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Encara no teniu la comissió inicial"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "No es pot desar l'estat d'índex actual"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "No es poden desar els fitxers no seguits"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "No es pot desar l'estat d'arbre de treball actual"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "No es pot registrar l'estat de l'arbre de treball"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
+
+#: builtin/stash.c:1285
+#, fuzzy
+msgid "Did you forget to 'git add'?"
+msgstr "Potser volíeu dir «git add .»?\n"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "No hi ha canvis locals a desar"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "No es pot inicialitzar el magatzem"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "No es pot desar l'estat actual"
+
+#: builtin/stash.c:1327
+#, fuzzy, c-format
+msgid "Saved working directory and index state %s"
+msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "No es poden eliminar els canvis de l'arbre de treball"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+#, fuzzy
+msgid "keep index"
+msgstr "Actualitza l'índex"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+#, fuzzy
+msgid "quiet mode"
+msgstr "silenciós"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+#, fuzzy
+msgid "include untracked files in stash"
+msgstr "mostra els fitxers no seguits en columnes"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+#, fuzzy
+msgid "include ignore files"
+msgstr "elimina només els fitxers ignorats"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "no s'ha pogut executar %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17223,56 +19635,56 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"omet i elimina totes les línies que comencin amb el caràcter de comentari"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "S'espera un nom de referència ple, s'ha rebut %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
-#: builtin/submodule--helper.c:521
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:522
+#, c-format
msgid "Entering '%s'\n"
-msgstr "s'està sobreescrivint «%s»"
+msgstr "S'està entrant a «%s»\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17280,22 +19692,21 @@
"."
msgstr ""
-#: builtin/submodule--helper.c:561
-#, fuzzy
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Inclou recursivament els submòduls imbrincats"
-#: builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:570
#, fuzzy
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]"
-#: builtin/submodule--helper.c:595
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:597
+#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
@@ -17303,105 +19714,106 @@
"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és "
"el seu dipòsit font autoritzat."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
"«%s»\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"S'ha produït un error en registrar el mode d'actualització per al camí de "
"submòdul «%s»"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
+#: builtin/submodule--helper.c:713
+#, fuzzy
+msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Suprimeix la sortida de l'estat del submòdul"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "inclou recursivament els submòduls imbrincats"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Omet la sortida de la sincronització de l'url del submòdul"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17410,7 +19822,7 @@
"L'arbre de treball de submòdul «%s» conté un directori .git\n"
"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17419,82 +19831,82 @@
"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' "
"per a descartar-les"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "S'ha netejat el directori «%s»\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no s'ha pogut crear el directori de submòdul buit %s"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis "
"locals"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Desregistra recursivament tots els submòduls"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17502,96 +19914,93 @@
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
-#: builtin/submodule--helper.c:1469
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1474
+#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr ""
-"S'ha produït un error en registrar el mode d'actualització per al camí de "
-"submòdul «%s»"
+msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1473
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1478
+#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-"S'ha produït un error en registrar el mode d'actualització per al camí de "
-"submòdul «%s»"
+"Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "valor incorrecte per al paràmetre update"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17600,49 +20009,59 @@
"La branca de submòdul (%s) està configurada per a heretar la branca del "
"superprojecte, però el superprojecte no és en cap branca"
-#: builtin/submodule--helper.c:2057
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2061
+#, c-format
msgid "could not get a repository handle for submodule '%s'"
-msgstr "no s'ha trobat el nom pel submòdul «%s»"
+msgstr "no s'ha pogut obtenir el gestor del dipòsit pel submòdul «%s»"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/submodule--helper.c:2100
+#, fuzzy
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<camí>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
-msgstr ""
+msgstr "comprova si és segur escriure al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2157
+#: builtin/submodule--helper.c:2159
#, fuzzy
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper name <camí>"
+msgid "unset the config in the .gitmodules file"
+msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
#, fuzzy
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config name [valor]"
+
+#: builtin/submodule--helper.c:2165
+#, fuzzy
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config name [valor]"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper init [<camí>]"
+msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, fuzzy, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
"per a procedir"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "«%s» no és una subordre vàlida de submodule--helper"
+msgstr "«%s» no és un subordre vàlid de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -17673,18 +20092,19 @@
msgstr "raó de l'actualització"
#: builtin/tag.c:25
+#, fuzzy
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
"d'etiqueta> [<cap>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17694,21 +20114,21 @@
"[--points-at <objecte>]\n"
"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "no s'ha trobat l'etiqueta «%s»."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17719,9 +20139,9 @@
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
-"Les línies que comencin amb '%c' s'ignoraran.\n"
+"Les línies que comencin amb «%c» s'ignoraran.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17733,149 +20153,158 @@
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
-"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
+"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:218
+#: 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 "el tipus d'objecte és incorrecte."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "força l'edició del missatge de l'etiqueta"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "es permet l'opció --no-contains només amb mode llista"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta «%s» actualitzada (era %s)\n"
@@ -17884,208 +20313,208 @@
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "s'ha produït un error en crear el directori %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "s'ha produït un error en crear el fitxer %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "s'ha produït un error en suprimir el fitxer %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "s'ha produït un error en suprimir el directori %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "S'està provant mtime en «%s» "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
"la informació d'stat de directori no canvia després d'afegir un fitxer nou"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"la informació d'stat de directori no canvia després d'afegir un directori nou"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
"la informació d'stat de directori canvia després d'actualitzar un fitxer"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"la informació d'stat de directori canvia després d'afegir un fitxer dins "
"d'un subdirectori"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
"la informació d'stat de directori no canvia després de suprimir un fitxer"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"la informació d'stat de directori no canvia després de suprimir un directori"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
"d'objectes"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"elimina els camins anomenats encara que estiguin presents en l'arbre de "
"treball"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "habilita o inhabilita el monitor del sistema de fitxers"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "marca els fitxers com a vàlids pel fsmonitor"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "neteja el bit de validesa del fsmonitor"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -18093,7 +20522,7 @@
"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
"voleu habilitar l'índex dividit"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -18101,7 +20530,7 @@
"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
"voleu inhabilitar l'índex dividit"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -18109,11 +20538,11 @@
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -18121,29 +20550,29 @@
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a «%s»"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
"habilitar fsmonitor"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor habilitat"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
"inhabilitar fsmonitor"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor inhabilitat"
@@ -18166,7 +20595,7 @@
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
-msgstr "actualitza <nom de referència>, no la que assenyali"
+msgstr "actualitza <nom de referència>, no la que apunti"
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
@@ -18188,6 +20617,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
@@ -18205,11 +20638,11 @@
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <comissió>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:69
msgid "print commit contents"
msgstr "imprimeix els continguts de la comissió"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "imprimeix la sortida crua de l'estat gpg"
@@ -18233,55 +20666,55 @@
msgid "print tag contents"
msgstr "imprimeix els continguts de l'etiqueta"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opcions>] <camí> [<commit-ish>"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opcions>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opcions>] <camí>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre de treball> <camí-nou>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opcions>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree lock [<opcions>] <arbre de treball>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
-#, fuzzy, c-format
+#: builtin/worktree.c:61 builtin/worktree.c:899
+#, c-format
msgid "failed to delete '%s'"
-msgstr "s'ha produït un error en executar «%s»"
+msgstr "s'ha produït un error en suprimir «%s»"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18290,44 +20723,44 @@
"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven "
"%<PRIuMAX> bytes, llegits %<PRIuMAX>)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "informa dels arbres de treball podats"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "«%s» ja existeix"
-#: builtin/worktree.c:251
-#, fuzzy, c-format
+#: builtin/worktree.c:252
+#, c-format
msgid "unable to re-add worktree '%s'"
-msgstr "no s'ha pogut llegir l'arbre (%s)"
+msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, 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:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18339,197 +20772,197 @@
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
-#: builtin/worktree.c:445
-#, c-format
+#: builtin/worktree.c:457
+#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "configura el mode de seguiment (vegeu git-branch(1))"
-#: builtin/worktree.c:500
-#, fuzzy
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
-msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
+msgstr ""
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
+"remot"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mútuament excloents"
-#: builtin/worktree.c:569
-#, fuzzy
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
-msgstr "--local només es pot usar dins d'un dipòsit git"
+msgstr "--[no-]track només es pot usar si es crea una branca nova"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
#, fuzzy
msgid "force move even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "el destí «%s» ja existeix"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, fuzzy, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
#, fuzzy
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
-#: builtin/worktree.c:851
-#, fuzzy, c-format
+#: builtin/worktree.c:879
+#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:860
-#, fuzzy, c-format
+#: builtin/worktree.c:888
+#, c-format
msgid "failed to run 'git status' on '%s', code %d"
-msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
#, fuzzy
msgid "force removal even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, fuzzy, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
#, fuzzy
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<prefix>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18543,19 +20976,28 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
#: t/helper/test-reach.c:152
-#, fuzzy, c-format
+#, c-format
msgid "commit %s is not marked reachable"
-msgstr "la comissió %s no té pare %d"
+msgstr "la comissió %s no està marcada com abastable"
#: t/helper/test-reach.c:162
-#, fuzzy
msgid "too many commits marked reachable"
-msgstr "masses comissions per escriure un graf"
+msgstr "masses comission marcades com abastable"
+
+#: t/helper/test-serve-v2.c:7
+#, fuzzy
+msgid "test-tool serve-v2 [<options>]"
+msgstr "git serve [<opcions>]"
+
+#: t/helper/test-serve-v2.c:19
+#, fuzzy
+msgid "exit immediately after advertising capabilities"
+msgstr "surt immediatament després de l'anunci inicial de referència"
#: git.c:27
msgid ""
@@ -18571,101 +21013,151 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
-"'git help -a' i 'git help -g' llisten subordres disponibles i\n"
-"algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
-"'git help <concepte>' per a llegir sobre una subordre o concepte específic."
+"«git help -a» i «git help -g» llisten subordres disponibles i\n"
+"algunes guies de concepte. Vegeu «git help <ordre>» o\n"
+"«git help <concepte>» per a llegir sobre un subordre o concepte específic.\n"
+"Vegeu «git help git» per a una visió general del sistema."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no s'ha especificat un directori per --git-dir\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no s'ha especificat un nom d'espai per --namespace\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no s'ha especificat un directori per --work-tree\n"
-#: git.c:215
+#: git.c:228
#, fuzzy, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "%s no admet --super-prefix"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera una cadena de configuració\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "no s'ha especificat un directori per -C\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "opció desconeguda: %s\n"
-#: git.c:719
+#: 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:377
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "àlies recursiu: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "fallada d'escriptura en la sortida estàndard"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "ha fallat el tancament en la sortida estàndard"
+
+#: git.c:796
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:802
+#: git.c:846
+#, fuzzy, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
+
+#: git.c:859
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"ús: %s\n"
+"\n"
+
+#: git.c:879
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:814
-#, fuzzy, c-format
+#: git.c:891
+#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr "s'ha produït un error en obrir «%s»: %s"
+msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
#, fuzzy
-msgid "CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
#, fuzzy
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1057
+#: http.c:1096
#, fuzzy, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No s'ha pogut tornar a $head_name"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18676,40 +21168,174 @@
" petició: %s\n"
" redirecció: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, fuzzy, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "valor parcial no vàlid: «%s»"
+
+#: remote-curl.c:254
+#, fuzzy, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "«%s» no reconegut com un dipòsit git"
+
+#: remote-curl.c:355
+#, fuzzy
+msgid "invalid server response; expected service, got flush packet"
+msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+
+#: remote-curl.c:386
+#, fuzzy, c-format
+msgid "invalid server response; got '%s'"
+msgstr "referència no vàlida: %s"
+
+#: remote-curl.c:446
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "no s'ha trobat la branca «%s»."
+
+#: remote-curl.c:450
+#, fuzzy, c-format
+msgid "Authentication failed for '%s'"
+msgstr "falta el valor per «%s»"
+
+#: remote-curl.c:454
+#, fuzzy, c-format
+msgid "unable to access '%s': %s"
+msgstr "no s'ha pogut accedir a '%s': %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, fuzzy, c-format
+msgid "RPC failed; %s"
+msgstr "STARTTLS ha fallat! %s"
+
+#: remote-curl.c:764
+#, fuzzy
+msgid "cannot handle pushes this big"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+#, fuzzy
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "El servidor no permet clients superficials"
+
+#: remote-curl.c:1028
+#, fuzzy
+msgid "fetch failed."
+msgstr "l'«stash» ha fallat"
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, fuzzy, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, fuzzy, c-format
+msgid "http transport does not support %s"
+msgstr "la variant «simple» d'ssh no és compatible amb -4"
+
+#: remote-curl.c:1174
+#, fuzzy
+msgid "git-http-push failed"
+msgstr "l'«stash» ha fallat"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "args"
-#: list-objects-filter-options.h:61
-#, fuzzy
+#: list-objects-filter-options.h:62
msgid "object filtering"
-msgstr "tipus d'objecte"
+msgstr "filtratge d'objecte"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "data-de-caducitat"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "com suprimir els espais i #comentaris del missatge"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "clau"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "nom del camp en el qual ordenar"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualitza l'índex amb la resolució de conflicte reusada si és possible"
+
+#: wt-status.h:68
+msgid "HEAD detached at "
+msgstr "HEAD separat a "
+
+#: wt-status.h:69
+msgid "HEAD detached from "
+msgstr "HEAD separat de "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Afegeix els continguts dels fitxers a l'índex"
@@ -18740,7 +21366,9 @@
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
-msgstr "Mostra quina revisió i autor ha modificat per últim cop cada línia d'un fitxer"
+msgstr ""
+"Mostra quina revisió i autor ha modificat per últim cop cada línia d'un "
+"fitxer"
#: command-list.h:58
msgid "List, create, or delete branches"
@@ -18752,16 +21380,16 @@
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
-msgstr "Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
+msgstr ""
+"Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
#: command-list.h:61
-#, fuzzy
msgid "Display gitattributes information"
-msgstr "usa .gitattributes només des de l'índex"
+msgstr "Mostra la informació de .gitattributes"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
-msgstr ""
+msgstr "Depura gitignore / fitxers d'exclusió"
#: command-list.h:63
#, fuzzy
@@ -18773,39 +21401,36 @@
msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
#: command-list.h:65
-#, fuzzy
msgid "Copy files from the index to the working tree"
-msgstr "camí a l'arbre de treball"
+msgstr "Copia fitxers des de l'índex a l'arbre de treball"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
-msgstr ""
+msgstr "Assegura que un nom de referència està ben format"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
-msgstr ""
+msgstr "Troba les comissions que encara s'han d'aplicar a la font"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
-msgstr ""
+msgstr "Aplica els canvis introduïts per algunes comissions existents"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
-msgstr ""
+msgstr "Alternativa gràfica a git-commit"
#: command-list.h:70
-#, fuzzy
msgid "Remove untracked files from the working tree"
-msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
+msgstr "Suprimeix els fitxers no seguits de l'arbre de treball"
#: command-list.h:71
msgid "Clone a repository into a new directory"
msgstr "Clona un dipòsit a un directori nou"
#: command-list.h:72
-#, fuzzy
msgid "Display data in columns"
-msgstr "llista les branques en columnes"
+msgstr "Mostra les dades en columnes"
#: command-list.h:73
msgid "Record changes to the repository"
@@ -18813,16 +21438,15 @@
#: command-list.h:74
msgid "Write and verify Git commit-graph files"
-msgstr ""
+msgstr "Escriu i verifica els fitxers commit-graph de Git"
#: command-list.h:75
-#, fuzzy
msgid "Create a new commit object"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "Crea un objecte de comissió nou"
#: command-list.h:76
msgid "Get and set repository or global options"
-msgstr ""
+msgstr "Obté o estableix opcions de dipòsit o globals"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
@@ -18838,7 +21462,7 @@
#: command-list.h:80
msgid "Helper to store credentials on disk"
-msgstr ""
+msgstr "Ajudant per a emmagatzemar credencials a disc"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
@@ -18850,15 +21474,15 @@
#: command-list.h:83
msgid "A CVS server emulator for Git"
-msgstr ""
+msgstr "Un emulador de servidor CVS per al Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
-msgstr ""
+msgstr "Un servidor realment senzill per a dipòsits Git"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
-msgstr ""
+msgstr "Dóna un nom llegible per humans basant-se en les referències disponibles"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
@@ -18866,14 +21490,12 @@
"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
#: command-list.h:87
-#, fuzzy
msgid "Compares files in the working tree and the index"
-msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
+msgstr "Compara fitxers en l'arbre de treball i l'índex"
#: command-list.h:88
-#, fuzzy
msgid "Compare a tree to the working tree or index"
-msgstr "camí a l'arbre de treball"
+msgstr "Compara un arbre amb l'arbre de treball o l'índex"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
@@ -18881,52 +21503,47 @@
#: command-list.h:90
msgid "Show changes using common diff tools"
-msgstr ""
+msgstr "Mostra els canvis usant eines diff comunes"
#: command-list.h:91
msgid "Git data exporter"
-msgstr ""
+msgstr "Explorador de dades del Git"
#: command-list.h:92
msgid "Backend for fast Git data importers"
-msgstr ""
+msgstr "Rerefons per a importadors ràpids de dades de Git"
#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "Baixa objectes i referències d'un altre dipòsit"
#: command-list.h:94
-#, fuzzy
msgid "Receive missing objects from another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Rep els objectes que manquen des d'un altre dipòsit"
#: command-list.h:95
-#, fuzzy
msgid "Rewrite branches"
-msgstr " Branca remota:%s"
+msgstr "Torna a escriure les branques"
#: command-list.h:96
-#, fuzzy
msgid "Produce a merge commit message"
-msgstr "edita el missatge de comissió"
+msgstr "Produeix un missatge de comissió de fusió"
#: command-list.h:97
-#, fuzzy
msgid "Output information on each ref"
-msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
+msgstr "Mostra la informació en cada referència"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
-msgstr ""
+msgstr "Prepara pedaços per enviar-los per correu electrònic"
#: command-list.h:99
-#, fuzzy
msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "escriu l'objecte a la base de dades d'objectes"
+msgstr "Verifica la connectivitat i validesa del objectes a la base de dades"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "Neteja els fitxers innecessaris i optimitza el dipòsit local"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
@@ -18938,24 +21555,23 @@
#: command-list.h:103
msgid "A portable graphical interface to Git"
-msgstr ""
+msgstr "Una interfície gràfic portable per al Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
+msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer"
#: command-list.h:105
msgid "Display help information about Git"
-msgstr ""
+msgstr "Mostra informació d'ajuda del Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:107
-#, fuzzy
msgid "Download from a remote Git repository via HTTP"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Baixa des d'un dipòsit Git remot via HTTP"
#: command-list.h:108
#, fuzzy
@@ -18979,32 +21595,28 @@
msgstr ""
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
-#, fuzzy
msgid "The Git repository browser"
-msgstr "no és un dipòsit de git: %s"
+msgstr "El navegador de dipòsits Git"
#: command-list.h:115
msgid "Show commit logs"
msgstr "Mostra els registres de comissió"
#: command-list.h:116
-#, fuzzy
msgid "Show information about files in the index and the working tree"
-msgstr "i ha fet canvis a l'índex o l'arbre de treball"
+msgstr "Mostra informació sobre els fitxer a l'índex i a l'arbre de treball"
#: command-list.h:117
-#, fuzzy
msgid "List references in a remote repository"
-msgstr "dipòsit de referència"
+msgstr "Mostra les referències d'un dipòsit remot"
#: command-list.h:118
-#, fuzzy
msgid "List the contents of a tree object"
-msgstr "imprimeix només les etiquetes de l'objecte"
+msgstr "Mostra els continguts d'un objecte de l'arbre"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
@@ -19039,7 +21651,7 @@
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
+msgstr "Executa eines de resolució de conflictes per a resoldre conflictes de fussió"
#: command-list.h:127
msgid "Show three-way merge without touching index"
@@ -19050,9 +21662,8 @@
msgstr ""
#: command-list.h:129
-#, fuzzy
msgid "Creates a tag object"
-msgstr "edita un objecte existent"
+msgstr "Crea un objecte etiqueta"
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
@@ -19067,23 +21678,20 @@
msgstr ""
#: command-list.h:133
-#, fuzzy
msgid "Add or inspect object notes"
-msgstr "no s'ha rebut l'objecte esperat %s"
+msgstr "Afegeix o inspecciona notes de l'objecte"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
-msgstr ""
+msgstr "Importa des de i envia a dipòsits Perforce"
#: command-list.h:135
-#, fuzzy
msgid "Create a packed archive of objects"
-msgstr "ignora els objectes empaquetats"
+msgstr "Crea un arxiu empaquetat d'objectes"
#: command-list.h:136
-#, fuzzy
msgid "Find redundant pack files"
-msgstr "no es pot fer pread en el fitxer de paquet"
+msgstr "Troba fitxers empaquetats redundants"
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
@@ -19171,240 +21779,230 @@
msgstr "Restableix la HEAD actual a l'estat especificat"
#: command-list.h:156
-#, fuzzy
-msgid "Revert some existing commits"
-msgstr "no es pot esmenar una comissió no existent"
+msgid "Restore working tree files"
+msgstr "Restaura els fitxers de l'arbre de treball"
#: command-list.h:157
-#, fuzzy
-msgid "Lists commit objects in reverse chronological order"
-msgstr "mostra les comissions en ordre topològic"
+msgid "Revert some existing commits"
+msgstr "Reverteix comissions existents"
#: command-list.h:158
-#, fuzzy
-msgid "Pick out and massage parameters"
-msgstr "massa paràmetres"
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Mostra les comissions en ordre topològic invers"
#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr "Escolleix i personalitza els paràmetres"
+
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
-#: command-list.h:160
-msgid "Send a collection of patches as emails"
-msgstr ""
-
#: command-list.h:161
-#, fuzzy
-msgid "Push objects over Git protocol to another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgid "Send a collection of patches as emails"
+msgstr "Envia una col·leció de pedaços com a correus electrònics"
#: command-list.h:162
+msgid "Push objects over Git protocol to another repository"
+msgstr "Puja objectes sobre el protocol Git a un altre dipòsit"
+
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr ""
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Mostra diversos tipus d'objectes"
-#: command-list.h:165
-#, fuzzy
-msgid "Show branches and their commits"
-msgstr "imprimeix només les branques que continguin la comissió"
-
#: command-list.h:166
-msgid "Show packed archive index"
-msgstr ""
+msgid "Show branches and their commits"
+msgstr "Mostra les branques i les seves comissions"
#: command-list.h:167
-#, fuzzy
-msgid "List references in a local repository"
-msgstr "el dipòsit de referència «%s» no és un dipòsit local."
+msgid "Show packed archive index"
+msgstr "Mostra l'índex d'arxius empaquetat"
#: command-list.h:168
+msgid "List references in a local repository"
+msgstr "Llista les referències en un dipòsit local"
+
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: command-list.h:169
-msgid "Common Git shell script setup code"
-msgstr ""
-
#: command-list.h:170
+msgid "Common Git shell script setup code"
+msgstr "Codi de scripts de configuració comuns pel Git shell"
+
+#: command-list.h:171
#, fuzzy
msgid "Stash the changes in a dirty working directory away"
msgstr "%s: ja existeix en el directori de treball"
-#: command-list.h:171
+#: command-list.h:172
#, fuzzy
msgid "Add file contents to the staging area"
msgstr "Afegeix els continguts dels fitxers a l'índex"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Mostra l'estat de l'arbre de treball"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Suprimeix l'espai en blanc innecessari"
-#: command-list.h:174
-#, fuzzy
-msgid "Initialize, update or inspect submodules"
-msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
-
#: command-list.h:175
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
+msgid "Initialize, update or inspect submodules"
+msgstr "Inicialitza, actualitza o inspecciona submòduls"
#: command-list.h:176
-#, fuzzy
-msgid "Read, modify and delete symbolic refs"
-msgstr "suprimeix la referència simbòlica"
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Operació bidireccional entre un dipòsit a Subversion i Git"
#: command-list.h:177
+msgid "Switch branches"
+msgstr "Commuta branques"
+
+#: command-list.h:178
+msgid "Read, modify and delete symbolic refs"
+msgstr "Llegeix, modifica i suprimeix referències simbòliques"
+
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
-#: command-list.h:178
-msgid "Creates a temporary file with a blob's contents"
-msgstr ""
-
-#: command-list.h:179
-msgid "Unpack objects from a packed archive"
-msgstr ""
-
#: command-list.h:180
-#, fuzzy
-msgid "Register file contents in the working tree to the index"
-msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Crea un fitxer temporal amb els continguts dels blobs"
#: command-list.h:181
-msgid "Update the object name stored in a ref safely"
-msgstr ""
+msgid "Unpack objects from a packed archive"
+msgstr "Desempaqueta objectes d'un arxiu empaquetat"
#: command-list.h:182
+msgid "Register file contents in the working tree to the index"
+msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex"
+
+#: command-list.h:183
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+"Actualitza el nom de l'objecte emmagatzema en una referència de forma segura"
+
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: command-list.h:183
-msgid "Send archive back to git-archive"
-msgstr ""
-
-#: command-list.h:184
-msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
-
#: command-list.h:185
-msgid "Show a Git logical variable"
-msgstr ""
+msgid "Send archive back to git-archive"
+msgstr "Envia l'arxiu de tornada al git-archive"
#: command-list.h:186
-#, fuzzy
-msgid "Check the GPG signature of commits"
-msgstr "signa la comissió amb GPG"
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
#: command-list.h:187
-#, fuzzy
-msgid "Validate packed Git archive files"
-msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
+msgid "Show a Git logical variable"
+msgstr "Mostra una variable lògica del Git"
#: command-list.h:188
-msgid "Check the GPG signature of tags"
-msgstr ""
+msgid "Check the GPG signature of commits"
+msgstr "Verifica la signatura GPG de les comissions"
#: command-list.h:189
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
+msgid "Validate packed Git archive files"
+msgstr "Valida els fitxers d'arxius Git empaquetats"
#: command-list.h:190
-msgid "Show logs with difference each commit introduces"
-msgstr ""
+msgid "Check the GPG signature of tags"
+msgstr "Verifica la signatura GPG de les etiquetes"
#: command-list.h:191
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfície web del Git (interfície web pels dipòsits Git)"
+
+#: command-list.h:192
+msgid "Show logs with difference each commit introduces"
+msgstr "Mostra registres amb la diferència introduïda per cada comissió"
+
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples arbres de treball"
-#: command-list.h:192
-#, fuzzy
+#: command-list.h:194
msgid "Create a tree object from the current index"
-msgstr "llegeix l'objecte des de stdin"
+msgstr "Crea un objecte arbre des de l'índex actual"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: command-list.h:194
-msgid "Git command-line interface and conventions"
-msgstr ""
-
-#: command-list.h:195
-msgid "A Git core tutorial for developers"
-msgstr ""
-
#: command-list.h:196
-msgid "Git for CVS users"
-msgstr ""
+msgid "Git command-line interface and conventions"
+msgstr "Interfície i convencions de la línia d'ordres del Git"
#: command-list.h:197
+msgid "A Git core tutorial for developers"
+msgstr "Un tutorial bàsic del Git per a desenvolupadors"
+
+#: command-list.h:198
+msgid "Git for CVS users"
+msgstr "Git per a usuaris del CVS"
+
+#: command-list.h:199
#, fuzzy
msgid "Tweaking diff output"
msgstr "omet la sortida de diferències"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
+msgstr "Un conjunt mínim útil d'ordres diàries del Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un glossari de Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Lligams utilitzats pel Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Espais de noms del Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
-msgstr ""
+msgstr "Disposició del dipòsit del Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: command-list.h:206
-#, fuzzy
-msgid "A tutorial introduction to Git: part two"
-msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)"
-
-#: command-list.h:207
-#, fuzzy
-msgid "A tutorial introduction to Git"
-msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)"
-
#: command-list.h:208
+msgid "A tutorial introduction to Git: part two"
+msgstr "Un tutorial d'introducció al Git: segona part"
+
+#: command-list.h:209
+msgid "A tutorial introduction to Git"
+msgstr "Un tutorial d'introducció al Git"
+
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"actualitza l'índex amb la resolució de conflicte reusada si és possible"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Cal començar per \"git bisect start\""
@@ -19416,134 +22014,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Voleu que ho faci per vostè [Y/n]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opció no reconeguda: '$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' no sembla una revisió vàlida"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "HEAD incorrecte - Cal un HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
-"vàlida>'."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD incorrecte - referència simbòlica estranya"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Paràmetre bisect_write incorrecte: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió errònia: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Entrada de revisió errònia: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Introducció de revisió errònia: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "N'esteu segur [Y/n]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
-"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Cal començar amb \"git bisect start\".\n"
-"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
-"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "No estem bisecant."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' no és una comissió vàlida"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"No s'ha pogut agafar la HEAD original '$branch'.\n"
-"Proveu 'git bisect reset <comissió>'."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Cap fitxer de registre donat"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no es pot llegir $file per a reproducció"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? de què parleu?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "s'està executant $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19552,11 +22065,11 @@
"el pas de bisecció ha fallat:\n"
"el codi de sortida $res de '$command' és < 0 o >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "el pas de bisecció no pot continuar més"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19565,28 +22078,13 @@
"el pas de bisecció ha fallat:\n"
"'bisect_state $state' ha sortit amb el codi d'error $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "pas de bisecció reeixit"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "cap terme definit"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
-"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "No estem bisecant."
#: git-merge-octopus.sh:46
msgid ""
@@ -19629,259 +22127,115 @@
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-legacy-rebase.sh:426
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "No s'ha pogut tornar a $head_name"
-
-#: git-legacy-rebase.sh:452
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Sembla que ja hi ha un directori $state_dir_base, i\n"
-"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
-"cas, proveu\n"
-"\t$cmd_live_rebase\n"
-"Si no és el cas, \n"
-"\t$cmd_clear_stale_rebase\n"
-"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
-"de valor."
-
-#: git-legacy-rebase.sh:517
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-
-#: git-legacy-rebase.sh:562
-#, fuzzy, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "font no vàlida $upstream_name"
-
-#: git-legacy-rebase.sh:586
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: ja hi ha més d'una base de fusió"
-
-#: git-legacy-rebase.sh:589 git-legacy-rebase.sh:593
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: no hi ha cap base de fusió"
-
-#: git-legacy-rebase.sh:598
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "No assenyala una comissió vàlida: $onto_name"
-
-#: git-legacy-rebase.sh:624
-#, fuzzy, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "fatal: no hi ha tal branca: $branch_name"
-
-#: git-legacy-rebase.sh:662
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-
-#: git-legacy-rebase.sh:691
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "La branca actual $branch_name està al dia."
-
-#: git-legacy-rebase.sh:701
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-
-#: git-legacy-rebase.sh:713
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Canvis de $mb a $onto:"
-
-#: git-legacy-rebase.sh:722
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
-
-#: git-legacy-rebase.sh:732
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear amb paràmetres no està implementat"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Encara no teniu la comissió inicial"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "No es pot desar l'estat d'índex actual"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "No es poden desar els fitxers no seguits"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "No es pot desar l'estat d'arbre de treball actual"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "No hi ha canvis seleccionats"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "No es pot registrar l'estat de l'arbre de treball"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "No hi ha canvis locals a desar"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "No es pot inicialitzar el magatzem"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "No es pot desar l'estat actual"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "No es poden eliminar els canvis de l'arbre de treball"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "No s'ha trobat cap «stash»."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "L'índex no estava sense emmagatzemar."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Cap nom de branca especificat"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ja existeix en l'índex i no és submòdul"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, fuzzy, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "el camí «%s» no té la seva versió"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -19892,23 +22246,23 @@
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Es troba un directori de git per a '$sm_name' localment amb els remots:"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -19925,39 +22279,39 @@
"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
"name'."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"S'està reactivant el directori de git local per al submòdul '$sm_name'."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "S'ha produït un error en afegir el submòdul '$sm_path'"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -19966,12 +22320,14 @@
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:596
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+#: git-submodule.sh:606
+#, fuzzy, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -19980,76 +22336,76 @@
"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
"L'obtenció directa d'aquella comissió ha fallat."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"S'ha produït un error en recorre recursivament dins del camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
@@ -20059,12 +22415,22 @@
msgid "See git-${cmd}(1) for details."
msgstr "Vegeu git-${cmd}(1) per detalls."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+#, fuzzy
+msgid "Applied autostash."
+msgstr "S'ha aplicat el magatzem automàtic."
+
+#: git-rebase--preserve-merges.sh:112
+#, fuzzy, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No es pot emmagatzemar $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "S'està fent «rebase» ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
#, fuzzy
msgid ""
"\n"
@@ -20099,7 +22465,7 @@
"\n"
"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -20118,83 +22484,83 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no és una comissió que es pugui escollir"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de comissió no vàlid: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avanç ràpid a $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No es pot avançar ràpidament a $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No es pot moure HEAD a $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20210,31 +22576,31 @@
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20245,7 +22611,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20260,25 +22626,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20309,13 +22675,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
"la comissió"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20323,40 +22689,40 @@
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu «git rebase --continue» de nou."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "No s'han pogut iniciar les comissions reescrites"
@@ -20365,138 +22731,138 @@
msgid "usage: $dashless $USAGE"
msgstr "ús: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
"treball"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No es pot $action: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "No s'ha pogut determinar el camí absolut del directori de git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "staged"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "unstaged"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binari"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "res"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "sense canvis"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "afegit %d camí\n"
msgstr[1] "afegits %d camins\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertit %d camí\n"
msgstr[1] "revertits %d camins\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "modificat %d camí\n"
msgstr[1] "modificat %d camins\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20504,7 +22870,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «staging»."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20512,7 +22878,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «stashing»."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20520,7 +22886,8 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «unstaging»."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20528,7 +22895,8 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per aplicar-se."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20536,17 +22904,17 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per descartar-se."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20560,7 +22928,7 @@
"Les línies que comencin per %s seran suprimides.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20571,7 +22939,7 @@
"s'avorta\n"
"i el tros es deixa sense cap canvi.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
@@ -20582,14 +22950,14 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
"descartarà) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20603,7 +22971,7 @@
"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20617,7 +22985,7 @@
"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20631,7 +22999,7 @@
"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20645,7 +23013,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20659,7 +23027,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20673,7 +23041,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20687,7 +23055,22 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+#, fuzzy
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplica aquest tros a l'índex i l'arbre de treball\n"
+"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
+"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20709,216 +23092,232 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Els trossos seleccionats no apliquen a l'índex\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, fuzzy, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, fuzzy, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, fuzzy, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "No hi ha altres trossos on anar-hi\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "vés a quin tros (<ret> per veure'n més)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "vés a quin tros? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
-msgstr "Número no vàlid: '%s'\n"
+msgstr "Número no vàlid: «%s»\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Només %d tros disponible.\n"
msgstr[1] "Només %d trossos disponibles.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "No hi ha cap altre tros a cercar\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "Cerca per expressió regular? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "No es pot dividir aquest tros\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Divideix en %d tros.\n"
msgstr[1] "Divideix en %d trossos.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "No es pot editar aquest tros\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Reviseu les diferències"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -20937,18 +23336,19 @@
"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
"canvis «staged»\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "manca --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
@@ -20961,66 +23361,66 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' conté el correu redactat.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
-#: git-send-email.perl:398
+#: 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:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "--confirm setting desconegut: «%s»\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: `:include:` no està suportat: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -21035,12 +23435,12 @@
" * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
" * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error en obrir el directori %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -21049,7 +23449,7 @@
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -21059,17 +23459,17 @@
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "S'ha produït un error en obrir per escriptura %s: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -21083,27 +23483,27 @@
"\n"
"Netegeu el contingut del cos si no voleu enviar un resum.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "S'ha produït un error en obrir %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "El correu electrònic de resum està buit, s'omet\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Esteu segur que voleu usar <%s> [y/N]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -21111,11 +23511,11 @@
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21128,23 +23528,23 @@
"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si "
"realment voleu enviar-lo.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
"cap)? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
@@ -21152,16 +23552,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
-msgstr "el camí CA \"%s\" no existeix"
+msgstr "el camí CA «%s» no existeix"
-#: git-send-email.perl:1412
+#: 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"
@@ -21188,229 +23588,282 @@
#. 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:1427
-#, fuzzy
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): "
+msgstr ""
+"Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Requereix resposta en enviar el correu"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS ha fallat! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
"useu --smtp-debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codificació de transferència no vàlida"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
#, fuzzy
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "no s'ha pogut establir «%s» a «%s»"
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "el camí «%s» no té la seva versió"
-#, fuzzy
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "Valor erroni de %s: «%s»"
+#~ msgid "option '%s' requires a value"
+#~ msgstr "l'opció «%s» requereix un valor"
-#, fuzzy
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "El servidor accepta multi_ack_detailed"
-#~ msgid "Can't stat %s"
-#~ msgstr "No es pot fer stat en %s"
+#~ msgid "Server supports no-done"
+#~ msgstr "El servidor accepta no-done"
-#~ msgid "abort rebase"
-#~ msgstr "avorta el «rebase»"
+#~ msgid "Server supports multi_ack"
+#~ msgstr "El servidor accepta multi_ack"
-#~ msgid "make rebase script"
-#~ msgstr "fes un script de «rebase»"
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "El servidor accepta side-band-64k"
-#~ msgid "No such remote: %s"
-#~ msgstr "No hi ha tal remot: %s"
+#~ msgid "Server supports side-band"
+#~ msgstr "El servidor accepta banda lateral"
-#, fuzzy
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "No es pot registrar l'estat de l'arbre de treball"
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "El servidor accepta allow-tip-sha1-in-want"
-#, fuzzy
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "No es pot registrar l'estat de l'arbre de treball"
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "El servidor accepta allow-reachable-sha1-in-want"
-#~ msgid "Applied autostash."
-#~ msgstr "S'ha aplicat el magatzem automàtic."
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "El servidor accepta ofs-delta"
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "No es pot emmagatzemar $stash_sha1"
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD separat a %s)"
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD separat de %s)"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "no s'ha pogut transformar la llista per a fer"
+
+#~ msgid "Checking out files"
+#~ msgstr "S'estan agafant fitxers"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
#~ msgstr ""
-#~ "\n"
-#~ "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
-#~ "\n"
+#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Índex brut: no es pot fusionar (bruts: %s)"
+#~ msgid "failed to stat %s\n"
+#~ msgstr "s'ha produït un error en fer stat a '%s'\n"
#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
+#~ "If you wish to skip this commit, use:\n"
#~ "\n"
-#~ "\t%.*s"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
#~ msgstr ""
-#~ "Primera línia del missatge de «squash» no esperada:\n"
+#~ "Si voleu ometre aquesta comissió, useu:\n"
#~ "\n"
-#~ "\t%.*s"
+#~ " git reset\n"
+#~ "\n"
+#~ "Llavors \"git cherry-pick --continue\" reprendrà\n"
+#~ "com a «cherry pick» les comissions restants.\n"
+
+#~ msgid "default"
+#~ msgstr "per defecte"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "No s'ha pogut crear el directori «%s»"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "paràmetre no reconegut: %s"
+
+#~ msgid "could not open %s"
+#~ msgstr "no s'ha pogut obrir «%s»"
+
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "No s'ha pogut tornar a $head_name"
#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
+#~ "It seems that there is already a $state_dir_base directory, and\n"
+#~ "I wonder if you are in the middle of another rebase. If that is the\n"
+#~ "case, please try\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "If that is not the case, please\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "and run me again. I am stopping in case you still have something\n"
+#~ "valuable there."
#~ msgstr ""
-#~ "Primera línia del missatge de «squash» no vàlida:\n"
-#~ "\n"
-#~ "\t%.*s"
+#~ "Sembla que ja hi ha un directori $state_dir_base, i\n"
+#~ "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
+#~ "cas, proveu\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "Si no és el cas, \n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
+#~ "de valor."
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»"
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-#~ msgid "<command>"
-#~ msgstr "<command>"
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Git quotidià amb més o menys 20 ordres"
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»"
-#~ msgid "Error in object"
-#~ msgstr "Error en objecte"
+#, fuzzy
+#~ msgid "invalid upstream '$upstream_name'"
+#~ msgstr "font no vàlida $upstream_name"
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: no hi ha cap base de fusió"
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "S'està entrant '$displaypath'"
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "No assenyala una comissió vàlida: $onto_name"
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
+#, fuzzy
+#~ msgid "fatal: no such branch/commit '$branch_name'"
+#~ msgstr "fatal: no hi ha tal branca: $branch_name"
+
+#~ msgid "Created autostash: $stash_abbrev"
+#~ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
+
+#~ msgid "Current branch $branch_name is up to date."
+#~ msgstr "La branca actual $branch_name està al dia."
+
+#~ msgid "Current branch $branch_name is up to date, rebase forced."
+#~ msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
+
+#~ msgid "Changes to $onto:"
+#~ msgstr "Canvis a $onto:"
+
+#~ msgid "Changes from $mb to $onto:"
+#~ msgstr "Canvis de $mb a $onto:"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
+
+#~ msgid "First, rewinding head to replay your work on top of it..."
#~ msgstr ""
-#~ "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
+#~ "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
+#~ "damunt..."
diff --git a/po/de.po b/po/de.po
index d511343..6d80cfb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,59 +1,60 @@
# German translations for Git.
-# Copyright (C) 2010-2016 Ralf Thielow <ralf.thielow@gmail.com>
+# Copyright (C) 2019 Matthias Rüster <matthias.ruester@gmail.com>
# This file is distributed under the same license as the Git package.
-# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2016.
+# Matthias Rüster <matthias.ruester@gmail.com>, 2019.
+# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
"PO-Revision-Date: 2016-11-28 18:10+0100\n"
-"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
-"Language-Team: German <>\n"
+"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
+"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
"haben."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:170
+#: advice.c:180
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."
@@ -62,146 +63,166 @@
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
-"Hinweis: Checke '%s' aus.\n"
+"Hinweis: Wechsle zu '%s'.\n"
"\n"
"Sie befinden sich im Zustand eines 'losgelösten HEAD'. Sie können sich\n"
"umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
"Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
-"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie einen\n"
-"weiteren Checkout durchführen.\n"
+"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie zu einem\n"
+"anderen Branch wechseln.\n"
"\n"
"Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
-"zu behalten, können Sie das (jetzt oder später) durch einen weiteren "
-"Checkout\n"
-"mit der Option -b tun. Beispiel:\n"
+"zu behalten, können Sie das (jetzt oder später) durch Nutzung von\n"
+"'switch' mit der Option -c tun. Beispiel:\n"
"\n"
-" git checkout -b <neuer-Branchname>\n"
+" git switch -c <neuer-Branchname>\n"
+"\n"
+"Oder um diese Operation rückgängig zu machen:\n"
+" git switch -\n"
+"\n"
+"Sie können diesen Hinweis ausschalten, indem Sie die Konfigurationsvariable\n"
+"'advice.detachedHead' auf 'false' setzen.\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "Befehlszeile endet mit \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "Nicht geschlossene Anführungszeichen."
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "nicht erkannte Whitespace-Option: '%s'"
+msgstr "Nicht erkannte Whitespace-Option: '%s'"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "Ungültiger Modus in Zeile %d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "Inkonsistente Kopfzeilen %d und %d."
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -216,72 +237,72 @@
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
"%d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -289,12 +310,12 @@
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -303,25 +324,25 @@
"bei der Suche nach:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
"umgekehrten Patch-Block auf '%s'"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -329,441 +350,441 @@
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
"entspricht"
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
"zurückzufallen."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Falle zurück auf 3-Wege-Merge ...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "unterdrückte %d Whitespace-Fehler"
msgstr[1] "unterdrückte %d Whitespace-Fehler"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "Pfad"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "Anzahl"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
"ausgegeben"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
"ausgeben"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "Aktion"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
@@ -786,99 +807,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "Keine solche Referenz: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "Kein gültiger Objektname: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "Kein Tree-Objekt: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
+
+#: archive.c:457
msgid "fmt"
msgstr "Format"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "Präfix"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "Datei"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "nur speichern"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "Repository"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "Programm"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
@@ -898,16 +938,16 @@
msgid "cannot read %s"
msgstr "Kann %s nicht lesen."
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "Konnte '%s' Filter nicht starten."
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "Konnte Descriptor nicht umleiten."
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' Filter meldete Fehler."
@@ -922,7 +962,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
@@ -932,12 +972,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s ist kein gültiger Attributname"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s nicht erlaubt: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -950,17 +995,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -969,7 +1014,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -978,7 +1023,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -987,7 +1032,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -998,7 +1043,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1010,22 +1055,22 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
@@ -1065,48 +1110,48 @@
msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr ""
"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse und --first-parent zusammen erfordern die Angabe eines "
"endgültigen\n"
"Commits"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
"\"first-parent\"-Kette"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "Pfad %s nicht in %s"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1120,89 +1165,89 @@
"\"git branch --set-upstream-to=%s%s%s\"\n"
"erneut setzen."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Branch '%s' folgt nun lokalem Branch '%s'."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Branch '%s' folgt nun Remote-Referenz '%s'."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Branch '%s' folgt nun lokaler Referenz '%s'."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
"mehrdeutig."
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' ist kein gültiger Branchname."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Branch '%s' existiert bereits."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
"Branch."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1223,27 +1268,27 @@
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ungültiger Objekt-Name: '%s'"
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
@@ -1258,70 +1303,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "Um ein Paket zu überprüfen wird ein Repository benötigt."
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Das Paket enthält diese Referenz:"
msgstr[1] "Das Paket enthält diese %d Referenzen:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Das Paket speichert eine komplette Historie."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Das Paket benötigt diese Referenz:"
msgstr[1] "Das Paket benötigt diese %d Referenzen:"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
@@ -1330,9 +1379,8 @@
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -1342,7 +1390,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1363,28 +1411,28 @@
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1396,97 +1444,263 @@
"Encoding,\n"
"welches von ihrem Projekt verwendet wird.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "Graph-Datei %s ist zu klein."
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "Commit-Graph-Datei ist zu klein."
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "Graph-Signatur %X stimmt nicht mit Signatur %X überein."
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "Graph-Version %X stimmt nicht mit Version %X überein."
+msgid "commit-graph version %X does not match version %X"
+msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "Hash-Version %X stimmt nicht mit Version %X überein."
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei "
+"möglicherweise unvollständig"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "Unzulässiger Chunk-Offset %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "Chunk-Id %08x kommt mehrfach vor."
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "Commit-Graph Verkettung stimmt nicht überein."
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "Konnte Commit %s nicht finden."
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Annotiere Commits in Commit-Graphen"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Lade bekannte Commits in Commit-Graph"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "Erweitere erreichbare Commits in Commit-Graph"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Lösche Commit-Markierungen in Commit-Graph"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Commit-Graph Generierungsnummern berechnen"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Bestimme Commits für Commit-Graphen"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
+msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "Fehler beim Hinzufügen von Paket %s."
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "Fehler beim Öffnen des Index für %s."
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Suche Commits für Commit-Graph in %d Referenz"
+msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "Zu viele Commits zum Schreiben des Graphen."
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Zähle Commits in Commit-Graph"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Suche zusätzliche Ränder in Commit-Graph"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
+msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen."
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen."
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Durchsuche zusammengeführte Commits"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "Unerwartete doppelte Commit-ID %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Zusammenführen von Commit-Graph"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "Zu viele Commits zum Schreiben des Graphen."
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
"beschädigt."
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Commit in Commit-Graph überprüfen"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
+"null"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
+"null"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1502,312 +1716,312 @@
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
"müssen\n"
"aus Dateien kommen."
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
"%s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
"%s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
"%s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "Ungültiger Wert für %s."
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
"liegen."
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "mmap für '%s' fehlgeschlagen"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
@@ -1863,50 +2077,45 @@
"Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
"enthalten"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "Fehler am anderen Ende: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "Ungültiges Paket."
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "Protokollfehler: unerwartetes '%s'"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "Ungültige ls-refs Antwort: %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "Erwartete Flush nach Auflistung der Referenzen."
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "Protokoll '%s' wird nicht unterstützt."
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "Kann SO_KEEPALIVE bei Socket nicht setzen."
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "Suche nach %s ..."
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "Fehler bei Suche nach %s (Port %s) (%s)."
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1915,7 +2124,7 @@
"Fertig.\n"
"Verbinde nach %s (Port %s) ... "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1925,53 +2134,53 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "Fertig."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "Fehler bei der Suche nach %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "Unbekannter Port %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "Merkwürdigen Hostnamen '%s' blockiert."
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "Merkwürdigen Port '%s' blockiert."
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "Kann Proxy %s nicht starten."
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"Kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax."
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "SSH-Variante 'simple' unterstützt kein -4."
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "SSH-Variante 'simple' unterstützt kein -6."
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports."
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "Merkwürdigen Pfadnamen '%s' blockiert."
@@ -1980,33 +2189,33 @@
msgid "unable to fork"
msgstr "Kann Prozess nicht starten."
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "Unerlaubte crlf_action %d"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF würde in %s durch LF ersetzt werden."
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -2016,12 +2225,12 @@
"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
"behalten."
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF würde in %s durch CRLF ersetzt werden."
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -2031,12 +2240,12 @@
"Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
"behalten."
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert."
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -2045,12 +2254,12 @@
"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n"
"als Codierung im Arbeitsverzeichnis."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM ist erforderlich in '%s', wenn als %s codiert."
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2060,37 +2269,37 @@
"oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n"
"Arbeitsverzeichnis."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "Fehler beim Codieren von '%s' von %s nach %s."
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe."
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "Kann externen Filter '%s' nicht starten."
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben."
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "Externer Filter '%s' fehlgeschlagen %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "Lesen von externem Filter '%s' fehlgeschlagen."
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "Externer Filter '%s' fehlgeschlagen."
@@ -2125,53 +2334,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s: smudge-Filter '%s' fehlgeschlagen."
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "in der Zukunft"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "vor %<PRIuMAX> Sekunde"
msgstr[1] "vor %<PRIuMAX> Sekunden"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "vor %<PRIuMAX> Minute"
msgstr[1] "vor %<PRIuMAX> Minuten"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "vor %<PRIuMAX> Stunde"
msgstr[1] "vor %<PRIuMAX> Stunden"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "vor %<PRIuMAX> Tag"
msgstr[1] "vor %<PRIuMAX> Tagen"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "vor %<PRIuMAX> Woche"
msgstr[1] "vor %<PRIuMAX> Wochen"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "vor %<PRIuMAX> Monat"
msgstr[1] "vor %<PRIuMAX> Monaten"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2179,42 +2388,43 @@
msgstr[1] "vor %<PRIuMAX> Jahren"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, und %<PRIuMAX> Monat"
msgstr[1] "%s, und %<PRIuMAX> Monaten"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "vor %<PRIuMAX> Jahr"
msgstr[1] "vor %<PRIuMAX> Jahren"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Erzeuge Delta-Island Markierungen"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "Ungültiges Tree-Objekt %s."
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
-msgstr "Fehler beim Laden des regulären Ausdrucks des Delta-Island für '%s': %s"
+msgstr ""
+"Fehler beim Laden des regulären Ausdrucks des Delta-Island für '%s': %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"Regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
"viele Capture-Gruppen (maximal %d)."
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d Delta-Islands markiert, fertig.\n"
@@ -2228,23 +2438,30 @@
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "Option '%s' erfordert einen Wert."
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
+"Arbeitsverzeichnisses zu vergleichen."
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2252,25 +2469,29 @@
"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
"'blocks', 'zebra', 'dimmed_zebra', 'plain'"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "Ignoriere unbekannten 'color-moved-ws'-Modus '%s'."
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
"color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
"Whitespace-Modi kombiniert werden."
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2279,25 +2500,36 @@
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "Ungültiger --stat Wert: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s erwartet einen numerischen Wert."
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2306,22 +2538,523 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s"
+
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "konnte '%s' nicht auflösen"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s erwartet die Form <n>/<m>"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s erwartet ein Zeichen, '%s' bekommen"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "Ungültiges --color-moved Argument: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "Ungültiger Modus '%s' in --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "Ungültiges Argument für %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:5823
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "Ungültiges --word-diff Argument: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Diff-Optionen zu Ausgabeformaten"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "Erzeuge Patch"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "Ausgabe der Unterschiede unterdrücken"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "Erstelle Unterschiede im Rohformat"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "Synonym für '-p --raw'"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "Synonym für '-p --stat'"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "maschinenlesbare Ausgabe von --stat"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "nur die letzte Zeile von --stat ausgeben"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<Parameter1,Parameter2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"Gebe die Verteilung des relativen Umfangs der Änderungen für jedes "
+"Unterverzeichnis aus"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "Synonym für --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
+"Änderungen der Datei-Rechte"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "nur Dateinamen der geänderten Dateien anzeigen"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "Generiere Zusammenfassung der Unterschiede"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<Breite>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<Anzahl>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen"
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "Zeige farbige Unterschiede"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<Art>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
+"Unterschieden hervor"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
+"Ausgabefeldern bei --raw oder --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<Präfix>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "Zeige keine Quell- oder Ziel-Präfixe an"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von "
+"Zeilen."
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<Zeichen>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Diff-Optionen zur Umbenennung"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
+"\"erstellen\""
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "Umbenennungen erkennen"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "Preimage für Löschungen weglassen."
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "Kopien erkennen"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "Erkennung von Umbenennungen deaktivieren"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "Nutze leere Blobs als Quelle von Umbennungen"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
+"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Diff Algorithmus-Optionen"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "Erzeuge die kleinstmöglichen Änderungen"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "Ignoriere Änderungen in leeren Zeilen"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
+"verschieben"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<Algorithmus>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "Ein Algorithmus für Änderungen wählen"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<Text>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<Modus>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<Regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "Verschobene Codezeilen sind andersfarbig"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "Wie Whitespaces in --color-moved ignoriert werden"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Andere Diff-Optionen"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
+"zeige relative Pfade an"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "alle Dateien als Text behandeln"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "Keine Ausgaben vom Programm"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "Erlaube die Ausführung eines externes Programms für Änderungen"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
+"werden"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<wann>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<Format>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "verstecke 'git add -N' Einträge vom Index"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "Behandle 'git add -N' Einträge im Index als echt"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<Zeichenkette>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
+"Zeichenkette verändern"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"regulären Ausdrucks verändern"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "zeige alle Änderungen im Changeset mit -S oder -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr ""
+"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<Objekt-ID>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"Objektes verändern"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "Wähle Dateien anhand der Art der Änderung"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<Datei>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Ausgabe zu einer bestimmten Datei"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -2329,43 +3062,43 @@
"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
"erneut versuchen."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein."
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "Kann %s nicht als exclude-Filter benutzen."
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht öffnen."
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
"Cache für unversionierte Dateien ist auf diesem System oder\n"
"für dieses Verzeichnis deaktiviert."
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "Index-Datei in Repository %s beschädigt."
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
@@ -2379,7 +3112,7 @@
msgid "Filtering content"
msgstr "Filtere Inhalt"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "Konnte Datei '%s' nicht lesen."
@@ -2394,7 +3127,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "Zu viele Argumente angegeben, um %s auszuführen."
@@ -2407,248 +3140,236 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "konnte nicht zum Remote schreiben"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "Ungültige shallow-Zeile: %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "Ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "Kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "Ungültiger Commit %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "Gebe auf"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "Fertig"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Server unterstützt keine shallow-Clients"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Server unterstützt multi_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "Server unterstützt no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Server unterstützt multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Server unterstützt side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Server unterstützt side-band"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Server unterstützt allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Server unterstützt allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Server unterstützt ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "Server unterstützt Filter"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Server unterstützt %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Server unterstützt keine shallow-Clients"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Server unterstützt keine shallow-Anfragen."
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Server unterstützt Filter"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "konnte Anfrage nicht zum Remote schreiben"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "Erwartete Versand einer Packdatei nach 'ready'."
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "Unerwartetes wanted-ref: '%s'"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "keine solche Remote-Referenz %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
@@ -2658,18 +3379,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
@@ -2726,41 +3447,43 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Systembefehle / Interne Hilfsbefehle"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "Vorhandene Git-Befehle in '%s'"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Die allgemeinen Git-Anleitungen sind:"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu lesen."
+msgstr ""
+"Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
+"lesen."
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Externe Befehle"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Alias-Befehle"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2769,32 +3492,32 @@
"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2808,16 +3531,16 @@
"\n"
"Die ähnlichsten Befehle sind"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2831,7 +3554,7 @@
"\n"
"Haben Sie eines von diesen gemeint?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2857,48 +3580,73 @@
"Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
"für dieses Repository zu setzen.\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "Mehrere filter-specs können nicht kombiniert werden."
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "Es wird nur 'tree:0' unterstützt."
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<Tiefe>' erwartet"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "Keine Unterstützung für sparse:path Filter mehr"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "Ungültige filter-spec '%s'"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "Kann Remote-Repository für partielles Klonen nicht ändern."
@@ -2931,12 +3679,13 @@
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
@@ -2945,103 +3694,103 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n"
"Merge wird abgebrochen."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Spule Submodul %s vor"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
"gefunden)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3058,33 +3807,33 @@
"\n"
"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
"schreibe stattdessen nach %s."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3093,7 +3842,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3102,7 +3851,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich gelassen."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3111,7 +3860,7 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3120,33 +3869,46 @@
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
"%s wurde im Arbeitsbereich bei %s gelassen."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Verweigere geänderte Datei bei %s zu verlieren."
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
+"ist."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
+"%s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
"hinzu"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3155,30 +3917,18 @@
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
"in %s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
-"ist."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3191,7 +3941,7 @@
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3202,7 +3952,7 @@
"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
"Pfade dahin zu setzen: %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3213,7 +3963,7 @@
"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
"zu setzen: %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3222,7 +3972,7 @@
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3231,38 +3981,21 @@
"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
"wurde."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
-"%s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Füge zusammengeführte Datei %s hinzu"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Füge stattdessen als %s hinzu"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "geändert"
@@ -3270,50 +4003,97 @@
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Füge stattdessen als %s hinzu"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
+"umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: merge-recursive.c:3182
+#, 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 ""
+"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
+"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
+"verschoben werden."
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3323,151 +4103,180 @@
"überschrieben werden:\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index-Datei %s ist zu klein."
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
+msgstr ""
+"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index-Version %d nicht erkannt."
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "Hash-Version %u stimmt nicht überein."
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "Ungültiger Chunk-Offset (zu groß)"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet."
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein."
+msgstr ""
+"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein."
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "Fehler beim Hinzufügen von Packdatei '%s'."
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "Fehler beim Löschen des multi-pack-index bei %s"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Suche nach referenzierten Pack-Dateien"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
+"fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Verifiziere OID-Reihenfolge in MIDX"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Sortiere Objekte nach Pack-Datei"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "Konnte 'pack-objects' nicht ausführen"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "Konnte 'pack-objects' nicht beenden"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3483,7 +4292,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht beitreten: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3498,22 +4307,22 @@
"Merge\n"
"von Notizen beginnen."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
@@ -3523,7 +4332,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
@@ -3533,45 +4342,102 @@
msgid "invalid object type \"%s\""
msgstr "Ungültiger Objekttyp \"%s\""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "Objekt %s ist ein %s, kein %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "SHA-1 passt nicht zu %s"
+msgid "hash mismatch %s"
+msgstr "Hash stimmt nicht mit %s überein."
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s erfordert einen Wert."
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s ist inkompatibel mit %s."
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: inkompatibel mit etwas anderem"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s erwartet keinen Wert"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s ist nicht verfügbar."
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
+"Suffix"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "Meinten Sie `--%s` (mit zwei Strichen?)"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "Unbekannte Option: `%s'"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "Unbekannter Schalter `%c'"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
@@ -3579,59 +4445,74 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "Alias für --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "Option `%s' erwartet einen numerischen Wert."
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "Fehlerhaftes Ablaufdatum '%s'"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "Angabe von 'attr:' darf nicht leer sein"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "Ungültiger Attributname %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
"inkompatibel."
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3639,130 +4520,190 @@
"Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
"mit allen anderen Optionen."
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: '%s' liegt außerhalb des Repositories"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "Konnte Flush-Paket nicht schreiben."
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "Konnte Delim-Paket nicht schreiben."
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "Protokollfehler: unmöglich lange Zeile"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "Schreiben des Pakets fehlgeschlagen."
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "Lesefehler"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "Die Gegenseite hat unerwartet abgebrochen."
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "Protokollfehler: ungültige Zeilenlänge %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "Fehler am anderen Ende: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Aktualisiere Index"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "Kann Thread für lstat nicht erzeugen: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "Konnte Git-Header '%.*s' nicht parsen."
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "Konnte Log für '%s' nicht parsen."
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
+"hinzufügen."
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' hat keinen Commit ausgecheckt"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "Konnte Datei '%s' nicht indizieren."
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "Konnte '%s' nicht dem Index hinzufügen."
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "Konnte '%s' nicht lesen."
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein."
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Aktualisiere Index"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3771,7 +4712,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3780,60 +4721,151 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "Ungültige Signatur 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "Ungültige Index-Version %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "Ungültige SHA1-Signatur der Index-Datei."
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "Ignoriere Erweiterung %.4s"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "Ungeordnete Stage-Einträge im Index."
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "Ungeordnete Stage-Einträge für '%s'."
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: Kann geöffneten Index nicht lesen."
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: Index-Datei ist kleiner als erwartet."
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: Konnte Index-Datei nicht einlesen."
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: Kann nicht auf Stufe #0 wechseln."
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
+"Ignoriere."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3860,22 +4892,32 @@
"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
+"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
+"verwerfen\n"
"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-"b, break = hier anhalten (Rebase später mit 'git rebase --continue' fortsetzen)\n"
+"b, break = hier anhalten (Rebase später mit 'git rebase --continue' "
+"fortsetzen)\n"
"d, drop <Commit> = Commit entfernen\n"
"l, label <Label> = aktuellen HEAD mit Label versehen\n"
"t, reset <Label> = HEAD zu einem Label umsetzen\n"
"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
-". (oder die eine Zeile, wenn keine originale Merge-Commit-Beschreibung\n"
+". (oder die eine Zeile, wenn keine originale Merge-Commit-"
+"Beschreibung\n"
". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
". Commit-Beschreibung.\n"
"\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase von %s auf %s (%d Kommando)"
+msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3884,7 +4926,7 @@
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3892,7 +4934,7 @@
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3906,7 +4948,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3916,127 +4958,157 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
+msgid "could not write '%s'"
+msgstr "Konnte '%s' nicht schreiben."
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "Konnte '%s' nicht nach '%s' kopieren."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
+"Entfernte Commits (neu zu alt):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
+"entfernen.\n"
+"\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
+"Warnungen zu ändern.\n"
+"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s zeigt auf kein gültiges Objekt!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "Konnte Referenz '%s' nicht lesen."
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "Referenz '%s' existiert bereits."
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'."
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "Unerwartete Objekt-ID beim Löschen von '%s'."
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "Log für Referenz %s hat eine Lücke nach %s."
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "Log für Referenz %s unerwartet bei %s beendet."
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "Log für %s ist leer."
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'."
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt."
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten."
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existiert; kann '%s' nicht erstellen"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten."
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "Konnte Referenzen nicht entfernen: %s"
@@ -4046,351 +5118,492 @@
msgid "invalid refspec '%s'"
msgstr "Ungültige Refspec '%s'"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "entfernt"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "%d voraus"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "%d hinterher"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) akzeptiert keine Argumente"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) akzeptiert keine Argumente"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) akzeptiert keine Argumente"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "Positiver Wert erwartet objectname:short=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "nicht erkanntes %%(objectname) Argument: %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
-msgstr "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
+msgstr ""
+"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "Format: %%(end) Atom mehr als einmal verwendet"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(kein Branch, Rebase von Branch %s im Gange)"
+msgid "no branch, rebasing %s"
+msgstr "kein Branch, Rebase von %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "kein Branch, Rebase von losgelöstem HEAD %s"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(kein Branch, binäre Suche begonnen bei %s)"
+msgid "no branch, bisect started on %s"
+msgstr "kein Branch, binäre Suche begonnen bei %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD losgelöst bei %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "kein Branch"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD losgelöst von %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(kein Branch)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "Die Option `%s' ist inkompatibel mit --merged."
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "Die Option `%s' ist inkompatibel mit --no-merged."
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "Die Option `%s' muss auf einen Commit zeigen."
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
+"beginnen: %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Interner Fehler"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "Schlüssel '%s' des Musters hatte kein '*'."
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "Wert '%s' des Musters hat kein '*'."
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "Src-Refspec %s entspricht keiner Referenz."
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/"
+"\").\n"
+"Wir versuchten zu erraten, was Sie meinten, mit:\n"
+"\n"
+"- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n"
+"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads,"
+"tags}\"\n"
+" ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix "
+"auf\n"
+" der Remote-Seite hinzufügen würden.\n"
+"\n"
+"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
+"Referenz mit vollqualifizierten Namen angeben."
+
+#: remote.c:1040
+#, 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 ""
+"Der <Quelle> Teil der Refspec ist ein Commit-Objekt.\n"
+"Meinten Sie, einen neuen Branch mittels Push nach\n"
+"'%s:refs/heads/%s' zu erstellen?"
+
+#: remote.c:1045
+#, 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 ""
+"Der <Quelle> Teil der Refspec ist ein Tag-Objekt.\n"
+"Meinten Sie, einen neuen Tag mittels Push nach\n"
+"'%s:refs/tags/%s' zu erstellen?"
+
+#: remote.c:1050
+#, 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 ""
+"Der <Quelle> Teil der Refspec ist ein Tree-Objekt.\n"
+"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
+"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
+
+#: remote.c:1055
+#, 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 ""
+"Der <Quelle> Teil der Refspec ist ein Blob-Objekt.\n"
+"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
+"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s kann nicht zu Branch aufgelöst werden."
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "Konnte Remote-Referenz %s nicht finden."
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (benutzen Sie \"%s\" für Details)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4400,12 +5613,12 @@
msgstr[1] ""
"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4420,12 +5633,17 @@
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4449,11 +5667,6 @@
msgid "unable to write rerere record"
msgstr "Konnte Rerere-Eintrag nicht schreiben."
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "Konnte '%s' nicht schreiben."
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4504,8 +5717,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
@@ -4539,29 +5752,33 @@
msgid "unable to open rr-cache directory"
msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "Öffnen von /dev/null fehlgeschlagen"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "Konnte Thread für async nicht erzeugen: %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4571,30 +5788,30 @@
"Sie können diese Warnung mit `git config advice.ignoredHook false` "
"deaktivieren."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4602,42 +5819,47 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "Konnte '%s' nicht löschen"
+
+#: sequencer.c:321
msgid "revert"
msgstr "Revert"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "interaktives Rebase"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4645,7 +5867,7 @@
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4655,111 +5877,116 @@
"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Ungültiger \"cleanup\" Modus %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "Ungültiges Datumsformat '%s' in '%s'"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4790,15 +6017,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "Root-Commit schreiben"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4826,7 +6053,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4852,301 +6079,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
-msgstr " (Basis-Commit)"
+msgstr " (Root-Commit)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen."
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "Konnte '%.*s' nicht parsen."
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "Abbrechen eines laufenden \"cherry-pick\""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "Abbrechen eines laufenden \"revert\""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "Unbenutzbares squash-onto."
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "\"revert\" ist bereits im Gange"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "\"cherry-pick\" wird bereits durchgeführt"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
-msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
+msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "Kein Revert im Gange"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "kein \"cherry-pick\" im Gange"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "Überspringen des Commits fehlgeschlagen"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "Nichts zum Überspringen vorhanden"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Haben Sie bereits committet?\n"
+"Versuchen Sie \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5165,27 +6441,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen."
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "Konnte den Index nicht lesen."
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5201,11 +6477,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5223,77 +6499,77 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "Unerlaubter Beschriftungsname: '%.*s'"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "Konnte Index nicht schreiben."
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "Konnte '%s' nicht auflösen."
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "Kann nicht ohne einen aktuellen Commit mergen."
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "Konnte '%.*s' nicht parsen."
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "Nichts zum Zusammenführen: '%.*s'"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden."
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5304,31 +6580,31 @@
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "Konnte %s nicht auschecken."
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: keine gültige OID"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5350,50 +6626,50 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5404,82 +6680,42 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "Unbenutzbare TODO-Liste: '%s'"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
-"Ignoriere."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
-"Entfernte Commits (neu zu alt):\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
-"entfernen.\n"
-"\n"
-"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
-"Warnungen zu ändern.\n"
-"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5489,31 +6725,15 @@
"'git rebase --continue' aus.\n"
"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "Nichts zu tun."
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase von %s auf %s (%d Kommando)"
-msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "Konnte '%s' nicht nach '%s' kopieren."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "Konnte die TODO-Liste nicht umwandeln."
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
@@ -5522,7 +6742,7 @@
msgid "'%s' is outside repository"
msgstr "'%s' liegt außerhalb des Repositories."
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5532,7 +6752,7 @@
"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
"nicht existieren."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5544,13 +6764,13 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
"Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5561,92 +6781,92 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "Fehler beim Öffnen von '%s'."
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "Fehler beim Lesen von '%s'."
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "Ungültiges gitfile-Format: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "Kein Pfad in gitfile: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "Kein Git-Repository: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' zu groß"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "Kein Git-Repository: '%s'"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "Kann nicht in Verzeichnis '%s' wechseln."
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "Konnte '%*s%s%s' nicht lesen."
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "Kann nicht nach '%s' wechseln."
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5657,7 +6877,7 @@
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5666,291 +6886,296 @@
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "fork fehlgeschlagen"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "setsid fehlgeschlagen"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "Konnte \"alternates\"-Datei nicht lesen."
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
"Arbeitsverzeichnis unterstützt."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap fehlgeschlagen"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "Objektdatei %s ist leer."
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "Fehlerhaftes loses Objekt '%s'."
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "ungültiger Objekt-Typ"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "Konnte %s Kopfbereich nicht entpacken."
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "Konnte %s Kopfbereich nicht parsen."
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "Ersetzung %s für %s nicht gefunden."
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "Konnte SHA1-Dateiname %s nicht schreiben."
+msgid "unable to write file %s"
+msgstr "Konnte Datei %s nicht schreiben."
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "Fehler beim Schreiben einer Datei."
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "Fehler beim Schließen der SHA1-Datei."
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "Fehler beim Schließen der Datei für lose Objekte."
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
"Datenbank %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "Konnte temporäre Datei nicht erstellen."
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "Konnte SHA1-Datei nicht schreiben."
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "Kann SHA1-Datei für %s nicht lesen."
+msgid "cannot read object for %s"
+msgstr "Kann Objekt für %s nicht lesen."
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "fehlerhafter Commit"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "fehlerhaftes Tag"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "Lesefehler beim Indizieren von '%s'."
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "read() zu kurz beim Indizieren von '%s'."
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: Fehler beim Einfügen in die Datenbank"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: nicht unterstützte Dateiart"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s ist kein gültiges Objekt"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "SHA-1 für %s passen nicht zusammen (%s erwartet)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "Konnte mmap nicht auf %s ausführen."
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "Konnte Kopfbereich von %s nicht entpacken."
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "Konnte Kopfbereich von %s nicht parsen."
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "Konnte Inhalt von %s nicht entpacken."
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "Kurzer SHA-1 %s ist mehrdeutig."
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Die Kandidaten sind:"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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"
@@ -5961,7 +7186,7 @@
"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
"erzeugt worden sein. Zum Beispiel,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
@@ -5969,71 +7194,133 @@
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u Byte"
+msgstr[1] "%u Bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u Byte/s"
+msgstr[1] "%u Bytes/s"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
"Sie zuerst die Konflikte auf"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "In nicht ausgechecktem Submodul '%s'."
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "Konnte nicht auf Submodul '%s' zugreifen."
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -6041,12 +7328,12 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -6057,16 +7344,16 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
@@ -6076,21 +7363,23 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "Ignoriere verdächtigen Submodulnamen: %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden würde."
+msgstr ""
+"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
+"würde."
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
@@ -6125,7 +7414,7 @@
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
@@ -6164,29 +7453,37 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige --depth Option '%s'"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "Übertragungsart '%s' nicht erlaubt."
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync wird nicht länger unterstützt."
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6195,7 +7492,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6222,39 +7519,34 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Abbruch."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "Die Operation wird von dem Protokoll nicht unterstützt."
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "Konnte Remote-Helper für '%s' nicht finden."
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
"Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
"ausführen."
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6263,100 +7555,100 @@
"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
"wahrscheinlich eine neuere Version von Git."
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "unerwartete Ausgabe von %s: '%s'"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s sperrte auch %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "Konnte \"fast-import\" nicht ausführen."
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "Fehler beim Ausführen von 'fast-import'."
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "Unbekannte Antwort auf 'connect': %s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt."
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "Ungültiger Remote-Service Pfad."
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "Kann keine Verbindung zu Subservice %s herstellen."
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus."
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "Remote-Helper meldete unerwarteten Status von %s."
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "Remote-Helper %s unterstützt kein Trockenlauf."
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "Remote-Helper %s unterstützt kein --signed."
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "Remote-Helper %s unterstützt kein --signed=if-asked."
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "Remote-Helper %s unterstützt nicht 'push-option'."
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "Remote-Helper %s unterstützt kein 'force'."
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "Konnte \"fast-export\" nicht ausführen."
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "Fehler beim Ausführen von \"fast-export\"."
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6365,47 +7657,47 @@
"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "Ungültige Antwort in Referenzliste: %s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "Lesen von %s fehlgeschlagen."
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "Schreiben von %s fehlgeschlagen."
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "Thread %s fehlgeschlagen."
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "Fehler beim Beitreten zu Thread %s: %s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "Fehler beim Warten von Prozess %s."
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "Prozess %s fehlgeschlagen"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "Kann Thread zum Kopieren von Daten nicht starten."
@@ -6421,11 +7713,11 @@
msgid "empty filename in tree entry"
msgstr "leerer Dateiname in Tree-Eintrag"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6436,7 +7728,7 @@
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6446,7 +7738,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6456,7 +7748,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6466,7 +7758,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6476,7 +7768,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6485,7 +7777,7 @@
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6495,7 +7787,7 @@
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6505,7 +7797,7 @@
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6516,7 +7808,7 @@
"Checkout entfernt werden:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6526,7 +7818,7 @@
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6537,7 +7829,7 @@
"Merge entfernt werden:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6547,7 +7839,7 @@
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6557,7 +7849,7 @@
"den %s entfernt werden:\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6568,7 +7860,7 @@
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6580,7 +7872,7 @@
"Checkout überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6590,7 +7882,7 @@
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6600,7 +7892,7 @@
"den Merge überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6610,7 +7902,7 @@
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6621,12 +7913,12 @@
"%s überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6636,7 +7928,7 @@
"sind nicht aktuell:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6647,7 +7939,7 @@
"über einen partiellen Checkout überschrieben werden:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6658,7 +7950,7 @@
"über einen partiellen Checkout entfernt werden:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6667,16 +7959,16 @@
"Kann Submodul nicht aktualisieren:\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Checke Dateien aus"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Aktualisiere Dateien"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6715,32 +8007,32 @@
msgid "invalid '..' path segment"
msgstr "ungültiges '..' Pfadsegment"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' existiert nicht."
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' zeigt nicht zurück auf '%s'"
@@ -6759,167 +8051,173 @@
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr ""
-" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
-"Area)"
+" (benutzen Sie \"git restore --staged <Datei>...\" zum Entfernen aus der "
+"Staging-Area)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (benutzen Sie \"git restore --source=%s --staged <Datei>...\" zum "
+"Entfernen aus der Staging-Area)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
"markieren)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
+" (benutzen Sie \"git restore <Datei>...\", um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
"in den Submodulen)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "neue Datei:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "kopiert:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "gelöscht:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "geändert:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "umbenannt:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "Typänderung:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "unbekannt:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "nicht gemerged:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "neue Commits, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Ihr Stash hat gerade %d Eintrag"
msgstr[1] "Ihr Stash hat gerade %d Einträge"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6927,114 +8225,126 @@
"Ändern oder entfernen Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird ignoriert."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Es wurden %.2f Sekunden benötigt, um die voraus/hinterher-Werte zu "
+"berechnen.\n"
+"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
"wiederherzustellen)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1284
+#: 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] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
"aus)"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
"auszuchecken)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -7042,138 +8352,146 @@
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
"continue\" aus)"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
"'%s'."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
"abgeschlossen sind)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick zurzeit im Gange."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
"\" aus)"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
"abzubrechen)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Revert zurzeit im Gange."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade beim Revert von Commit '%s'."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Noch keine Commits"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7184,32 +8502,32 @@
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7218,200 +8536,200 @@
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
"anzuzeigen)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Noch keine Commits in "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "unterschiedlich"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
"-u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7445,12 +8763,12 @@
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
@@ -7459,142 +8777,144 @@
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Meinten Sie vielleicht 'git add .'?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden."
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
"Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
"\" aus."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
"Patches abzubrechen, führen Sie \"%s --abort\" aus."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
-msgstr "Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte verloren gehen."
+msgstr ""
+"Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte "
+"verloren gehen."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Patch ist leer."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "Ungültige Identifikationszeile: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
"zurückzufallen."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7602,30 +8922,24 @@
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
-"Terminal verbunden ist."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -7633,36 +8947,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch', um den\n"
"fehlgeschlagenen Patch zu sehen."
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7673,7 +8988,7 @@
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7686,17 +9001,17 @@
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7704,144 +9019,144 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "Format"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "den Patch, der gerade angewendet wird, anzeigen"
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7849,16 +9164,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7867,10 +9182,14 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
@@ -7888,226 +9207,461 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Externes Archiv ohne URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: Protokollfehler"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: erwartete eine Spülung (flush)"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<Commit>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> "
+"<Begriff_gut> <Begriff_schlecht>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> "
+"<Begriff_schlecht>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> "
+"[<Begriff>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new,"
+"bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' ist kein gültiger Begriff."
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "Kann den eingebauten Befehl '%s' nicht als Begriff verwenden."
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "Kann die Bedeutung von dem Begriff '%s' nicht ändern."
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "Bitte verwenden Sie zwei verschiedene Begriffe."
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "Konnte die Datei BISECT_TERMS nicht öffnen."
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Keine binäre Suche im Gange.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' ist kein gültiger Commit."
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
+"Versuchen Sie 'git bisect reset <Commit>'."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Ungültiges \"bisect_write\" Argument: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "Konnte die OID der Revision '%s' nicht erhalten."
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "Konnte die Datei '%s' nicht öffnen."
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Ungültiger Befehl: Sie sind gerade bei einer binären %s/%s Suche."
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
+"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Sie müssen mit \"git bisect start\" beginnen.\n"
+"Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
+"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "Binäre Suche nur mit einem %s Commit."
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Sind Sie sicher [Y/n]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "Keine Begriffe definiert."
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
+"und %s für den neuen Zustand.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"Ungültiges Argument %s für 'git bisect terms'.\n"
+"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "Nicht erkannte Position: '%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' scheint kein gültiger Commit zu sein."
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "Ungültiger HEAD - HEAD wird benötigt."
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
+"<gültiger-Branch>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz."
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "Ungültige Referenz: '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "'git bisect next' ausführen"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "den Zustand der binären Suche aufräumen"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "auf erwartete Commits prüfen"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "den Zustand der binären Suche zurücksetzen"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "die Begriffe für die binäre Suche ausgeben"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "Sitzung für binäre Suche starten"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "kein Log für BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms benötigt zwei Argumente."
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state erwartet keine Argumente."
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit."
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente."
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms benötigt 3 Argumente."
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check benötigt 2 oder 3 Argumente."
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms benötigt 0 oder 1 Argument."
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "Erwarte eine Farbe: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "Muss mit einer Farbe enden."
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines."
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "Ungültiger Wert für blame.coloring."
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "Konnte Commit %s zum Ignorieren nicht finden"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "Commit"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Ignoriere <rev> beim Ausführen von 'blame'"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Ignoriere Commits aus <Datei>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
"eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
"von Unterschieden verwenden"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -8121,18 +9675,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "Datei %s hat nur %lu Zeile"
msgstr[1] "Datei %s hat nur %lu Zeilen"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
@@ -8164,7 +9718,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<Optionen>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8173,7 +9727,7 @@
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8182,12 +9736,12 @@
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8197,119 +9751,128 @@
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "Konnte HEAD-Commit nicht auflösen."
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8320,187 +9883,181 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "nicht verwenden"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "Zeige aktuellen Branch-Namen."
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "Schüssel"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "sortiere nach diesem Feld"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "Objekt"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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 "für die Ausgabe zu verwendendes Format"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -8508,40 +10065,43 @@
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
"entfernen"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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 ""
-"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
-"Branchnamen verwendet werden."
+"Die Optionen -a und -r bei 'git branch' können nicht mit einem Branchnamen "
+"verwendet werden.\n"
+"Wollten Sie -a|-r --list <Muster> benutzen?"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8562,7 +10122,7 @@
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8570,7 +10130,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8578,138 +10138,138 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "Blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
"--batch oder --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "Ausgabe von --batch-all-objects nicht ordnen"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "alle Attribute einer Datei ausgeben"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "nur .gitattributes vom Index verwenden"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "Dateinamen von der Standard-Eingabe lesen"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "Index bei der Prüfung ignorieren"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "Die Option -z kann nur mit --stdin verwendet werden."
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "kein Pfad angegeben"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr ""
"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching ist nur mit --verbose zulässig"
@@ -8730,57 +10290,57 @@
msgid "no contacts specified"
msgstr "keine Kontakte angegeben"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "alle Dateien im Index auschecken"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "das Überschreiben bereits existierender Dateien erzwingen"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
"befinden"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "keine neuen Dateien auschecken"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "Dateiinformationen in der Index-Datei aktualisieren"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "Zeichenkette"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr ""
"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
@@ -8792,106 +10352,166 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<Optionen>] [<Branch>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d Merge-Konflikt wieder erstellt"
+msgstr[1] "%d Merge-Konflikte wieder erstellt"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d Pfad von %s aktualisiert"
+msgstr[1] "%d Pfade von %s aktualisiert"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d Pfad vom Index aktualisiert"
+msgstr[1] "%d Pfade vom Index aktualisiert"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "Weder '%s' noch '%s' ist angegeben"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"Zum Commit vorgemerkte Änderungen in den folgenden Dateien gehen eventuell "
+"verloren: %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8914,7 +10534,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8941,163 +10561,245 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "nur eine Referenz erwartet"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' könnte eine lokale Datei und ein Tracking-Branch sein.\n"
+"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
+"eindeutig voneinander zu unterscheiden."
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "Ein Branch wird erwartet, '%s' bekommen"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines Merges gewechselt werden.\n"
+"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'am'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'cherry-pick'-Befehls "
+"gewechselt werden.\n"
+"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "Sie wechseln den Branch während einer binären Suche"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' kann nicht <Startpunkt> bekommen"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "Branch"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "Branch- oder Commit-Argument fehlt"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "einen neuen Branch erzeugen und auschecken"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "einen Branch erstellen/umsetzen und auschecken"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "das Reflog für den neuen Branch erzeugen"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "HEAD bei benanntem Commit loslösen"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "neuer Branch"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "neuer Branch ohne Eltern-Commit"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1438
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "ignorierte Dateien aktualisieren (Standard)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1440
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "second guess 'git checkout <no-such-branch>'"
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "neuer Branch"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "neuer Branch ohne Eltern-Commit"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "ignorierte Dateien aktualisieren (Standard)"
+
+#: builtin/checkout.c:1462
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "Fortschrittsanzeige erzwingen"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p und --overlay schließen sich gegenseitig aus."
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "Kein Branchname; versuchen Sie -b."
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "Konnte %s nicht auflösen."
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -9105,7 +10807,7 @@
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -9137,38 +10839,106 @@
"bevorzugen möchten, z.B. 'origin', könnten Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "Branch"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "einen neuen Branch erzeugen und auschecken"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "einen Branch erstellen/umsetzen und auschecken"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "das Reflog für den neuen Branch erzeugen"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "benutze Overlay-Modus (Standard)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "einen neuen Branch erzeugen und dahin wechseln"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "lokale Änderungen verwerfen"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "Index wiederherstellen"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignoriere nicht zusammengeführte Einträge"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "benutze Overlay-Modus"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Lösche %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Würde %s löschen\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Überspringe Repository %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Würde Repository %s überspringen\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "Konnte 'lstat' nicht für %s ausführen\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9181,7 +10951,7 @@
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9202,38 +10972,38 @@
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Wählen Sie Einträge zum Löschen"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9251,64 +11021,64 @@
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9316,7 +11086,7 @@
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9324,152 +11094,166 @@
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "Pfadspezifikation"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "Name"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
"Zeit\n"
"erstellen"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
"Ausschluss eines Commits vertiefen"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "serverspezifisch"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "Option übertragen"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9477,147 +11261,147 @@
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "Fehler beim Öffnen von '%s'"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "Konnte %s nicht lesen\n"
+msgid "failed to start iterator over '%s'"
+msgstr "Fehler beim Starten der Iteration über '%s'"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "Fehler beim Iterieren über '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Klonen erfolgreich, Auschecken ist aber fehlgeschlagen.\n"
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
-"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
+"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
"nicht ausgecheckt werden.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9625,45 +11409,45 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"file://"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
"file://"
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -9699,15 +11483,83 @@
msgid "--command must be the first argument"
msgstr "Die Option --command muss an erster Stelle stehen."
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <Eltern-Commit>)...] [-S[<Key-ID>]] [(-m "
+"<Nachricht>)...] [(-F <Datei>)...] <Tree-Objekt>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "doppelter Vorgänger %s ignoriert"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "Kein gültiger Objektname: %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: Fehler beim Öffnen von '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: Fehler beim Lesen von '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: Fehler beim Schließen von '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "Eltern-Commit"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "ID eines Eltern-Commit-Objektes."
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "Beschreibung"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "Commit-Beschreibung"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "Commit-Beschreibung von Datei lesen"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "Commit mit GPG signieren"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "Brauche genau ein Tree-Objekt."
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: Fehler beim Lesen"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/commit.c:50
+#: 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"
@@ -9717,7 +11569,7 @@
"machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
"Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9732,82 +11584,88 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
+"Und dann nutzen Sie:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
-"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
+"um das Cherry-Picking mit den übrigen Commits fortzusetzen.\n"
+"Wenn dieser Commit übersprungen werden soll, nutzen Sie:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
-msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
+msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9815,38 +11673,38 @@
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9861,7 +11719,7 @@
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9876,7 +11734,7 @@
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9886,7 +11744,7 @@
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9899,159 +11757,155 @@
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
"Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
"vorhandenen Autor überein"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
"verwendet werden."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
"verwendet werden."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Ungültiger \"cleanup\" Modus %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -10059,11 +11913,11 @@
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -10071,257 +11925,258 @@
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "Beschreibung"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "Commit-Beschreibung"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "Standard"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr ""
-"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "Commit mit GPG signieren"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"Das Repository wurde aktualisiert, aber die \"new_index\"-Datei\n"
"konnte nicht geschrieben werden. Prüfen Sie, dass Ihre Festplatte nicht\n"
"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
-"anschließend \"git reset HEAD\" zu Wiederherstellung aus."
+"anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <Objektverzeichnis>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--"
-"reachable|--stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] "
+"[--reachable|--stdin-packs|--stdin-commits] <Split-Optionen>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Das Objektverzeichnis zum Speichern des Graphen."
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Konnte Commit-Graph '%s' nicht öffnen."
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "Durchlauf auf allen Referenzen beginnen"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
"befinden"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"Maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"Maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-"
@@ -10331,7 +12186,7 @@
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "nicht erkanntes --type Argument, %s"
@@ -10436,7 +12291,7 @@
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "Wert ist mit diesem Typ angegeben"
@@ -10482,7 +12337,7 @@
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "Wert"
@@ -10490,49 +12345,49 @@
msgid "with --get, use default value when missing entry"
msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein."
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "Ungültiges Schlüsselmuster: %s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "Kann Farbe '%s' nicht parsen."
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "Nicht in einem Git-Repository."
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstützt."
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr ""
"Das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt."
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10547,23 +12402,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "Nur eine Konfigurationsdatei zu einer Zeit möglich."
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden."
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME nicht gesetzt."
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10571,54 +12426,55 @@
msgstr ""
"--worktree kann nicht mit mehreren Arbeitsverzeichnissen verwendet werden,\n"
"außer die Konfigurationserweiterung worktreeConfig ist aktiviert. Bitte\n"
-"lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für Details"
+"lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für "
+"Details"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "Angabe von --get-color und Variablentyp sind ungültig."
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "Nur eine Aktion erlaubt."
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default ist nur anwendbar auf --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt."
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "Das Bearbeiten von Blobs wird nicht unterstützt."
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10628,7 +12484,7 @@
" Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
" zu ändern."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "Keine solche Sektion: %s"
@@ -10641,59 +12497,59 @@
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "Branch"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "nicht-annotiert"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annotiert"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "Tag '%s' ist eigentlich '%s' hier"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "kein Tag entspricht exakt '%s'"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
"Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum "
"Beschreiben\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "beendete Suche bei %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10702,7 +12558,7 @@
"Keine annotierten Tags können '%s' beschreiben.\n"
"Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10711,12 +12567,12 @@
"Keine Tags können '%s' beschreiben.\n"
"Versuchen Sie --always oder erstellen Sie einige Tags."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu Commits durchlaufen\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10725,122 +12581,122 @@
"mehr als %i Tags gefunden; führe die ersten %i auf\n"
"Suche bei %s aufgegeben\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "Beschreibe %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s ist weder ein Commit, noch ein Blob."
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "das Tag finden, das nach dem Commit kommt"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "alle Referenzen verwenden"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "jedes Tag verwenden, auch nicht-annotierte"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "immer langes Format verwenden"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "nur erstem Elternteil folgen"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "nur exakte Übereinstimmungen ausgeben"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "Kennzeichen"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
"<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
"\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
"\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -10849,27 +12705,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "fehlgeschlagen: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10877,54 +12733,54 @@
"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "Tool"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10933,167 +12789,230 @@
"Rückkehrwert\n"
"verschieden 0 ausgeführt wurde"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "an 'diff' übergeben"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "Art"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `"
+"%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--"
+"type=ulong`, nicht `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Kennzeichen in diese Datei schreiben"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Kennzeichen von dieser Datei importieren"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
+"referenzieren"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "das Überschreiben einer lokalen Referenz erzwingen"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
"befinden"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) auf "
"Zeitbasis\n"
"vertiefen"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -11101,99 +13020,121 @@
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "serverspezifisch"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "Option übertragen"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
"sind"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "Führe 'gc --auto' nach \"fetch\" aus"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+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 ""
+"Normalerweise zeigt 'fetch' welche Branches eine erzwungene Aktualisierung\n"
+"hatten, aber diese Überprüfung wurde deaktiviert. Um diese wieder zu\n"
+"aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n"
+"Sie 'git config fetch.showForcedUpdates true' aus."
+
+#: builtin/fetch.c:858
+#, 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 ""
+"Es brauchte %.2f Sekunden, um erzwungene Aktualisierungen zu überprüfen.\n"
+"Sie können die Option '--no-show-forced-updates' benutzen oder\n"
+"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
+"zu umgehen.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
@@ -11201,12 +13142,12 @@
"unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11215,59 +13156,60 @@
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
"die in core.partialClone konfiguriert sind."
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11276,48 +13218,56 @@
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
+"Die Option --unshallow kann nicht in einem Repository mit vollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
"von Refspecs verwendet werden."
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
+"die in core.partialClone konfiguriert sind."
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11381,90 +13331,273 @@
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "Formatfarben beachten"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "nur zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "nur nicht zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "unbekannt"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "Fehler in %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "Warnung in %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "Fehlerhafte Verknüpfung von %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "Falscher Objekttyp in Verknüpfung."
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"Fehlerhafte Verknüpfung von %7s %s\n"
+" nach %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "%s %s fehlt"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "%s %s nicht erreichbar"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "%s %s unreferenziert"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "Konnte lost-found nicht erstellen."
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "Konnte '%s' nicht abschließen."
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Prüfe %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Prüfe Konnektivität (%d Objekte)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Prüfe %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "Fehlerhafte Verknüpfungen"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "Wurzel %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "%s %s (%s) in %s getaggt"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: Ungültiger Reflog-Eintrag %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Prüfe Reflog %s->%s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: Ungültiger SHA1-Zeiger %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: kein Commit"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "Notiz: Keine Standardreferenzen"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: Objekt konnte nicht geparst werden: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "Ungültige SHA1-Datei: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Prüfe Objekt-Verzeichnis"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Prüfe %s Verknüpfung"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "Ungültiger Objekt-Typ %s"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s zeigt auf etwas seltsames (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: losgelöster HEAD zeigt auf nichts"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Prüfe Cache-Verzeichnis"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "non-tree in Cache-Verzeichnis"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Prüfe Objekte"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: Objekt nicht vorhanden"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
@@ -11474,17 +13607,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Konnte '%s' nicht lesen: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11500,58 +13638,58 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Die Datenbank des Repositories wird für eine optimale Performance im\n"
"Hintergrund komprimiert.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
"komprimiert.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11559,23 +13697,23 @@
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
"diese zu löschen."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -11584,270 +13722,270 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei "
"anzeigen"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "Kein Muster angegeben."
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"Die Option --open-files-in-pager kann nur innerhalb des "
"Arbeitsverzeichnisses verwendet werden."
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "Die Option wird mit --recurse-submodules nicht unterstützt."
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached und --untracked können nicht mit --no-index verwendet werden."
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
"werden."
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11855,38 +13993,34 @@
"git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
"[--] <Datei>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "Art"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "Art des Objektes"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "das Objekt in die Objektdatenbank schreiben"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "das Objekt von der Standard-Eingabe lesen"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "Datei wie sie ist speichern, ohne Filter"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
"Fehlersuche in Git, erzeugen"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
@@ -11926,30 +14060,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "nicht erkanntes Hilfeformat: %s"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Konnte emacsclient nicht starten."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Konnte Version des emacsclient nicht parsen."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11958,7 +14092,7 @@
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11967,328 +14101,318 @@
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "Für '%s' wurde der Alias '%s' angelegt."
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Ungültiger alias.%s String: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "'git help config' für weitere Informationen"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kann %d Byte nicht lesen"
msgstr[1] "kann %d Bytes nicht lesen"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "Paket überschreitet die maximal erlaubte Größe"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:555
+#: 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] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "Ungültiger Objekt-Typ %s"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "abgeschlossen mit %d lokalem Objekt"
msgstr[1] "abgeschlossen mit %d lokalen Objekten"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "Paket hat %d unaufgelöste Unterschied"
+msgstr[0] "Paket hat %d unaufgelösten Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "fsck Fehler beim Packen von Objekten"
@@ -12332,42 +14456,42 @@
msgid "not copying templates from '%s': %s"
msgstr "kopiere keine Vorlagen von '%s': %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "kann nicht mit Dateityp %d umgehen"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s existiert bereits"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Leeres Git-Repository in %s%s initialisiert\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12375,25 +14499,25 @@
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12402,12 +14526,12 @@
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12415,461 +14539,455 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<Token>[(=|:)<Wert>])...] [<Datei>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "vorhandene Dateien direkt bearbeiten"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "kürzt leere Anhänge"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "wo der neue Anhang platziert wird"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "Aktion, wenn Anhang bereits existiert"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "Aktion, wenn Anhang fehlt"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "nur Anhänge ausgeben"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "Regeln aus Konfiguration nicht anwenden"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "Optionen für das Parsen setzen"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "--- nicht speziell behandeln"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "Anhang"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "Anhang/Anhänge hinzufügen"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
"werden."
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "Ausgabe der Unterschiede unterdrücken"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
-msgstr "Kann Objekt %s nicht lesen."
+msgid "could not read object %s"
+msgstr "Konnte Objekt %s nicht lesen."
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
+msgid "unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
+msgid "cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:910
-msgid "Need exactly one range."
+#: builtin/log.c:941
+msgid "need exactly one range"
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:920
-msgid "Not a range."
+#: builtin/log.c:951
+msgid "not a range"
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
+#: builtin/log.c:1244
+msgid "two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
+msgid "unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "failed to resolve '%s' as a valid ref"
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n"
"automatisch speichern lassen möchten, benutzen Sie bitte\n"
"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "Fehler beim Ableiten des range-diff-Bereichs."
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "Header"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "Forschrittsanzeige während der Erzeugung der Patches"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "Commit"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
-msgstr "Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
+msgstr ""
+"Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
+msgstr ""
+"Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff gegen v%d:"
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor erfordert --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-Diff:"
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-Diff gegen v%d:"
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Erzeuge Patches"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
+#: builtin/log.c:1975
+msgid "failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -12877,112 +14995,112 @@
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr ""
"Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe "
"anzeigen"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch "
"vorhanden sind"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
@@ -13000,7 +15118,7 @@
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "Programm"
@@ -13024,13 +15142,13 @@
msgid "take url.<base>.insteadOf into account"
msgstr "url.<Basis>.insteadOf berücksichtigen"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-"mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n"
+"mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
"gefunden wurden"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
@@ -13077,265 +15195,286 @@
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "Option `%s' erfordert einen Wert."
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
"hinzufügen"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "commit-msg Hook überprüfen"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n"
"Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n"
"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
"\n"
-"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
-"bricht den Commit ab.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
+"und eine leere Beschreibung bricht den Commit ab.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
"Sie dann das Ergebnis.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr ""
"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nichts was wir in %s zusammenführen können: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit erwartet keine Argumente"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13343,7 +15482,7 @@
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13351,96 +15490,100 @@
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Sie können --squash nicht mit --commit kombinieren."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr ""
"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
"werden."
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Bereits aktuell."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Bereits aktuell."
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13526,33 +15669,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "unbekannte Option: %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "Konnte Referenz '%s' nicht auflösen"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Führe %s mit %s zusammen\n"
@@ -13565,7 +15708,7 @@
msgid "input is NUL terminated"
msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "fehlende Objekte erlauben"
@@ -13573,159 +15716,176 @@
msgid "allow creation of more than one tree"
msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|"
+"repack --batch-size=<Größe>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
-msgstr "Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
+msgstr ""
+"Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
+"einenStapel, welcher größer ist als diese Größe"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "Zu viele Argumente."
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "Nicht erkanntes Verb: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "Option --batch-size ist nur für den Unterbefehl 'repack'"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "Nicht erkannter Unterbefehl: %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
"benutzen\n"
"Sie \"stash\", um fortzufahren."
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s ist zum Commit vorgemerkt"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "mehrere Quellen für dasselbe Ziel"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignoriere Referenzen die <Muster> entsprechen"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
@@ -13873,14 +16033,14 @@
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -13915,38 +16075,38 @@
"Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
"zurückgewiesen"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "zu viele Parameter"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
@@ -13959,31 +16119,31 @@
"Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "zu wenig Parameter"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13992,12 +16152,12 @@
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -14006,52 +16166,52 @@
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -14059,49 +16219,49 @@
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -14113,177 +16273,182 @@
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "Ungültiges CRC für gepacktes Objekt %s."
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "Fehlerhaftes gepacktes Objekt für %s."
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "Packdatei ist ungültig: %s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen."
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "Konnte nicht von wiederverwendeter Packdatei lesen."
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
"Datei\n"
"geschrieben wurden."
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Zähle Objekte"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "Konnte Größe von %s nicht bestimmen."
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -14292,7 +16457,7 @@
"Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -14301,263 +16466,271 @@
"Erwartete Objekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "Ungültiger Wert für --missing."
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "Kann Paketindex nicht öffnen."
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "Loses Objekt bei %s konnte nicht untersucht werden."
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "Konnte loses Objekt nicht erzwingen."
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' ist kein Commit."
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "Ungültiger Commit '%s'."
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "Konnte jüngste Objekte nicht hinzufügen."
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
"verwenden"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "Bitmap-Index schreiben, wenn möglich"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
"%<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<Optionen>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "alles packen"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "lose Referenzen entfernen (Standard)"
@@ -14573,71 +16746,71 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
"Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
"Remote-Repositories einschränken"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14645,14 +16818,14 @@
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14660,7 +16833,7 @@
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14672,39 +16845,39 @@
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
@@ -14712,7 +16885,7 @@
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14722,34 +16895,34 @@
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14759,7 +16932,7 @@
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14776,15 +16949,15 @@
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -14802,7 +16975,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14811,7 +16984,7 @@
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14837,7 +17010,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14852,7 +17025,7 @@
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14866,13 +17039,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14883,14 +17056,14 @@
"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
"\"nothing\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14904,7 +17077,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14918,7 +17091,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14937,13 +17110,13 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
"im Remote-Repository existiert."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14953,22 +17126,22 @@
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Versende nach %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14990,104 +17163,104 @@
"\n"
" git push <Name>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "Referenzen löschen"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<Referenzname>:<Erwartungswert>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
@@ -15113,20 +17286,20 @@
msgid "use simple diff colors"
msgstr "einfache Diff-Farben benutzen"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "Kein .. im Bereich: '%s'"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "Benötige zwei Commit-Bereiche."
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -15137,116 +17310,304 @@
"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
"[<Commit-Referenz3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "resultierenden Index nach <Datei> schreiben"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "nur den Index leeren"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Merge"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<Unterverzeichnis>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "Anwendung des Filters für partielles Auschecken überspringen"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "unpack-trees protokollieren"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "Rückmeldungen unterdrücken"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
-msgstr "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] [<Upstream>] [<Branch>]"
+msgstr ""
+"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] "
+"[<Upstream>] [<Branch>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
-msgstr "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --root [<Branch>]"
+msgstr ""
+"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --"
+"root [<Branch>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "Unbenutzbare TODO-Liste: '%s'"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "Konnte '%s' nicht schreiben."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "Kein HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "Konnte TODO-Liste nicht erzeugen."
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<Optionen>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "leere Commits behalten"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "Commits mit leerer Beschreibung erlauben"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "Rebase auf Merge-Commits ausführen"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "originale Branch-Punkte der Cousins behalten"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "Commits signieren"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "Rebase fortsetzen"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "Commit auslassen"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "die TODO-Liste bearbeiten"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "den aktuellen Patch anzeigen"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "Commit-IDs in der TODO-Liste verkürzen"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "Commit-IDs in der TODO-Liste erweitern"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "die TODO-Liste prüfen"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash-Zeilen umordnen"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "auf"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "Begrenzungscommit"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "Begrenzungscommit"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "squash onto"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "der Upstream-Commit"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "head-Name"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "head-Name"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "Rebase-Strategie"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "Strategie-Optionen"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "Strategie-Optionen"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "wechseln zu"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "der Branch oder Commit zum Auschecken"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "onto-Name"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "onto-Name"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "Befehl"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "auszuführender Befehl"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s erfordert ein interaktives Rebase"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "Konnte 'onto' nicht bestimmen: '%s'"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "Ungültiges orig-head: '%s'"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "Kann %s nicht speichern."
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "Konnte HEAD-Commit nicht bestimmen."
+
+#: builtin/rebase.c:950 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"
@@ -15262,11 +17623,27 @@
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "Konnte HEAD-Commit nicht bestimmen."
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"Git stellte einen Fehler beim Vorbereiten der Patches zur\n"
+"wiederholten Anwendung der Revisionen fest:\n"
+"\n"
+" %s\n"
+"\n"
+"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
+"ausführen."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -15277,13 +17654,14 @@
"\n"
msgstr ""
"%s\n"
-"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen möchten.\n"
+"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
+"möchten.\n"
"Siehe git-rebase(1) für Details.\n"
"\n"
" git rebase '<Branch>'\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15297,150 +17675,165 @@
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "Leerer \"exec\"-Befehl."
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
-msgstr "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
+msgstr ""
+"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "an 'git am' übergeben"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
-msgstr "Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
+msgstr ""
+"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "fortsetzen"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "versuchen, Merges wiederherzustellen anstatt sie zu ignorieren"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "Rerere erlauben, den Index mit dem aufgelöstem Konflikt zu aktualisieren"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "leere Commits während des Rebase erhalten"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "automatischer Stash/Stash-Pop davor und danach"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
-msgstr "versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
+msgstr ""
+"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
+msgstr ""
+"'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "Option"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "Konnte 'exec %s' nicht ausführen."
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n"
+"Siehe dessen Eintrag in 'git help config' für Details."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
+"rebase-merges'."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15448,21 +17841,16 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "Konnte '%s' nicht löschen"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15483,340 +17871,179 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
-msgstr "Fehler: 'interactive'-Optionen (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto ) können nicht mit 'am'-Optionen (%s) kombiniert werden."
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr "Fehler: 'merge'-Optionen (--merge, --strategy, --strategy-option) können nicht mit 'am'-Optionen (%s) kombiniert werden."
-
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "Fehler: '--preserve-merges' und '--rebase-merges' können nicht kombiniert werden."
-
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-"Fehler: '--rebase-merges' und '--strategy-option' können nicht kombiniert "
-"werden."
+"Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder "
+"\"merge\" kombiniert werden."
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-"Fehler: '--rebase-merges' und '--strategy' können nicht kombiniert werden."
+"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1832
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
+"kombiniert werden."
+
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+"'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden."
+
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "'--rebase-merges' kann nicht mit '--strategy' kombiniert werden."
+
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: Branch/Commit '%s' nicht gefunden"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen."
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Unerwartete 'stash'-Antwort: '%s'"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatischen Stash erzeugt: %s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "Konnte 'reset --hard' nicht ausführen."
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "Konnte nicht zu %s wechseln."
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr "Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu anzuwenden...\n"
+msgstr ""
+"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
+"anzuwenden...\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "Kein HEAD?"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "Konnte '%s' nicht öffnen."
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "Konnte TODO-Liste nicht erzeugen."
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<Optionen>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "leere Commits behalten"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "Commits mit leerer Beschreibung erlauben"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "Rebase auf Merge-Commits ausführen"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "originale Branch-Punkte der Cousins behalten"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "Commits signieren"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "Rebase fortsetzen"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "Commit auslassen"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "die TODO-Liste bearbeiten"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "den aktuellen Patch anzeigen"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste verkürzen"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste erweitern"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "die TODO-Liste prüfen"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash-Zeilen umordnen"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "auf"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "der Upstream-Commit"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "head-Name"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "head-Name"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "Rebase-Strategie"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "wechseln zu"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "der Branch oder Commit zum Auschecken"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "onto-Name"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "onto-Name"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "Befehl"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "auszuführender Befehl"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15848,7 +18075,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15869,19 +18096,74 @@
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<Referenzen>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<Referenzen>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <Referenz>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Markiere nicht erreichbare Objekte..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s zeigt auf nichts!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "Kein Reflog zum Löschen angegeben."
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "Kein Reflog: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "Kein Reflog für '%s'."
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "Ungültiges Format für Referenzen: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -16414,98 +18696,138 @@
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
+"Remote-Repositories nicht starten."
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
+"Remote-Repositories nicht abschließen."
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"gleiches wie oben, aber die Speichergröße anstatt der\n"
"Anzahl der Einträge limitieren"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Nichts Neues zum Packen."
+
+#: builtin/repack.c:478
+#, 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 ""
+"WARNUNG: Einige in Verwendung befindliche Pakete wurden\n"
+"WARNUNG: umbenannt, indem 'old-' an deren Namen vorrangestellt\n"
+"WARNUNG: wurde, um diese mit der neuen Dateiversion zu ersetzen.\n"
+"WARNUNG: Diese Operation ist fehlgeschlagen. Der Versuch, die\n"
+"WARNUNG: Datei zu ihrem ursprünglichen Namen umzubenennen, schlug\n"
+"WARNUNG: ebenfalls fehl.\n"
+"WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "Fehler beim Löschen von '%s'"
@@ -16534,12 +18856,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<Format>] [-l [<Muster>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16548,27 +18865,27 @@
"Ungültiges Ersetzungsformat '%s'\n"
"Gültige Formate sind 'short', 'medium' und 'long'."
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "Ersetzende Referenz '%s' nicht gefunden."
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Ersetzende Referenz '%s' gelöscht."
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' ist kein gültiger Referenzname."
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "Ersetzende Referenz '%s' existiert bereits."
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16580,76 +18897,81 @@
"während '%s' auf ein ersetzendes Objekt vom Typ '%s'\n"
"zeigt."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file meldete Fehler."
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "Konnte mktree nicht ausführen."
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "Konnte nicht von mktree lesen."
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree meldete Fehler."
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree lieferte keinen Objektnamen zurück."
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "Kann fstat auf %s nicht ausführen."
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "Konnte Objekt nicht in Datenbank schreiben."
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "Kein gültiger Objektname: '%s'"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "Konnte Objektart von %s nicht bestimmten."
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "Bearbeiten von Objektdatei fehlgeschlagen."
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "Neues Objekt ist dasselbe wie das alte: '%s'"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "Konnte nicht %s als Commit parsen."
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "ungültiger Merge-Tag in Commit '%s'"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "fehlerhafter Merge-Tag in Commit '%s'"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16658,31 +18980,31 @@
"Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
"wird; benutzen Sie --edit anstatt --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "Der originale Commit '%s' hat eine GPG-Signatur."
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig."
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "Neuer Commit ist derselbe wie der alte: '%s'"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16691,71 +19013,71 @@
"Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "ersetzende Referenzen auflisten"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "ersetzende Referenzen löschen"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "existierendes Objekt bearbeiten"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "Eltern-Commits eines Commits ändern"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "die Referenz ersetzen, wenn sie existiert"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "das angegebene Format benutzen"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "--format kann nicht beim Auflisten verwendet werden."
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn."
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw macht nur mit --edit Sinn."
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d benötigt mindestens ein Argument."
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "Ungültige Anzahl von Argumenten."
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e benötigt genau ein Argument."
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g benötigt mindestens ein Argument."
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file erwartet keine Argumente"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "Mit -l kann nur ein Muster angegeben werden."
@@ -16771,126 +19093,127 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "'git rerere forget' ohne Pfade ist veraltet."
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "Konnte kein Diff für '%s' generieren."
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "zusammenführen"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
-msgstr "weniger Ausgaben, meldet nur Fehler"
+msgstr "weniger Ausgaben, nur Fehler melden"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
"<Pfade>'."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N kann nur mit -mixed benutzt werden"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16904,56 +19227,56 @@
"das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
"auf \"true\", um das zum Standard zu machen.\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "Das Filtern von Objekten erfordert --objects."
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "Ungültiger \"sparse\"-Wert '%s'."
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16984,72 +19307,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <Unterbefehl>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "Option `%s' erwartet eine Nummer größer als 0."
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kann nicht mit %s verwendet werden"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "den aktuellen Commit auslassen und fortfahren"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "nicht automatisch committen"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "Commit-Beschreibung bearbeiten"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "Nummer des Elternteils"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "Elternteil der Hauptlinie auswählen"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "Merge-Strategie"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "Commit-Namen anhängen"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<Optionen>] [--] <Datei>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -17064,7 +19396,7 @@
"unterschiedlich\n"
"zu der Datei und HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -17072,13 +19404,13 @@
"\n"
"(benutzen Sie -f, um die Löschung zu erzwingen)"
-#: builtin/rm.c:215
+#: 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] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -17087,44 +19419,44 @@
"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen "
"zu erzwingen)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "die folgende Datei hat lokale Änderungen:"
msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "keine gelöschten Dateien auflisten"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "nur aus dem Index entfernen"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "die \"up-to-date\" Prüfung überschreiben"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "rekursives Entfernen erlauben"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n"
"benutzen Sie \"stash\", um fortzufahren."
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
@@ -17158,18 +19490,6 @@
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<Optionen>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "nach einem einzigen Request/Response-Austausch beenden"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
@@ -17202,7 +19522,7 @@
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "zu viele Argumente außerhalb des Repositories angegeben"
@@ -17229,121 +19549,121 @@
msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln"
msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "keine übereinstimmenden Referenzen mit %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
"base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "Die Option --reflog benötigt einen Branchnamen."
-#: builtin/show-branch.c:742
+#: 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] "nur %d Eintrag kann zur selben Zeit angezeigt werden"
msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden"
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "Kann nicht mehr als %d Commit behandeln."
msgstr[1] "Kann nicht mehr als %d Commits behandeln."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' ist keine gültige Referenz."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "kann Commit %s (%s) nicht finden"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -17351,46 +19671,275 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] "
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<Muster>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
"die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "Tags in Objekt-Identifikationen dereferenzieren"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
"Repository befinden"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<Optionen>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<Optionen>] [<Stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<Stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <Branch> [<Stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
+" [--] [<Pfadspezifikation>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<Nachricht>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' ist kein \"stash\"-artiger Commit"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Zu viele Commits angegeben:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Keine Stash-Einträge gefunden."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "'%s' ist kein gültiger Referenzname."
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear mit Parametern ist nicht implementiert"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "Konnte keinen Diff erzeugen %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "Konnte Index-Verzeichnis nicht speichern"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Führe %s mit %s zusammen"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Index wurde nicht aus dem Stash zurückgeladen."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "Versuche Index wiederherzustellen."
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s (%s) gelöscht"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Konnte Stash-Eintrag nicht löschen"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' ist keine Stash-Referenz"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
+"benötigen."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Kein Branchname spezifiziert"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Kann nicht %s mit %s aktualisieren."
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "Stash-Beschreibung"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" erwartet ein Argument <Commit>"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Keine Änderungen ausgewählt"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Sie haben bisher noch keinen initialen Commit"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Kann den aktuellen Zustand des Index nicht speichern"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Kann die unversionierten Dateien nicht speichern"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Haben Sie vielleicht 'git add' vergessen?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Keine lokalen Änderungen zum Speichern"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Kann \"stash\" nicht initialisieren"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Kann den aktuellen Status nicht speichern"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "behalte Index"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "Stash in Patch-Modus"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "weniger Ausgaben"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "unversionierte Dateien in Stash einbeziehen"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "ignorierte Dateien einbeziehen"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "Konnte 'exec %s' nicht ausführen."
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17399,50 +19948,50 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und "
"entfernen"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Betrete '%s'\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17451,7 +20000,7 @@
"run_command gab nicht-Null Status für '%s' zurück.\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17463,21 +20012,21 @@
"nicht-Null Status zurück.\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
"Ausgaben beim Betreten und der Befehlsausführung in einem Submodul "
"unterdrücken"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <Befehl>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17486,104 +20035,104 @@
"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
"Repository sein eigenes verbindliches Upstream-Repository ist."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<Pfad>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul '%s'."
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Ausgabe über Submodul-Status unterdrücken"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisiere Submodul-URL für '%s'\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'."
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'."
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17593,7 +20142,7 @@
"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
"löschen möchten)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17602,84 +20151,84 @@
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
"vorliegen"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "alle Submodule austragen"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17688,98 +20237,99 @@
"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
+msgstr ""
+"Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
"Historie (shallow) folgen soll"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17788,42 +20338,52 @@
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config name [Wert]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "Konfiguration in der .gitmodules-Datei entfernen"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <name> [<Wert>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <Name>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im Arbeitsverzeichnis befindet."
+msgstr ""
+"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
+"Arbeitsverzeichnis befindet."
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -17859,17 +20419,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] "
-"<Tagname> [<Commit>]"
+"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
+"\t\t<Tagname> [<Commit>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <Tagname>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17879,21 +20439,21 @@
"points-at <Objekt>]\n"
"\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17906,7 +20466,7 @@
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17921,146 +20481,160 @@
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/tag.c:218
+#: 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 ""
+"Sie haben einen verschachtelten Tag erzeugt. Das Objekt, auf welches Ihr\n"
+"neues Tag referenziert, ist bereits ein Tag. Wenn Sie das Objekt taggen\n"
+"wollten, worauf dieses zeigt, nutzen Sie:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
-msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
+msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Die Option -n ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -18069,215 +20643,215 @@
msgid "Unpacking objects"
msgstr "Entpacke Objekte"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "Konnte Datei '%s' nicht erstellen"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "Konnte Verzeichnis '%s' nicht löschen"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
"geändert"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
"Verzeichnisses nicht geändert"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
"Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
"Unterverzeichnis geändert"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
"geändert"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
"nicht geändert"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
"Datenbank hinzugefügt"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr ""
"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "Dateien als \"fsmonitor valid\" markieren"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "\"fsmonitor valid\"-Bit löschen"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -18285,7 +20859,7 @@
"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn sie wirklich das Splitting des Index aktivieren möchten."
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -18293,7 +20867,7 @@
"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich das Splitting des Index deaktivieren möchten."
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -18301,11 +20875,11 @@
"core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten."
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -18314,23 +20888,23 @@
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich aktivieren möchten."
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "Dateisystem-Monitor aktiviert"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
@@ -18338,7 +20912,7 @@
"Monitor\n"
"wirklich deaktivieren möchten."
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "Dateisystem-Monitor deaktiviert"
@@ -18383,6 +20957,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "nach einem einzigen Request/Response-Austausch beenden"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "direkt nach der initialen Angabe der Commits beenden"
@@ -18397,15 +20975,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <Commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "Commit-Inhalte ausgeben"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
@@ -18421,63 +20999,63 @@
msgid "show statistics only"
msgstr "nur Statistiken anzeigen"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "Fehler beim Löschen von '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18486,35 +21064,35 @@
"Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> "
"gelesen)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht neu hinzufügen."
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18524,7 +21102,7 @@
"Benutzen Sie 'add -f -f' zum Überschrieben, oder 'unlock' und 'prune'\n"
"oder 'remove' zum Löschen."
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18539,122 +21117,124 @@
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
"Remote-Tracking-Branch herzustellen"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
-msgstr "Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt ist"
+msgstr ""
+"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
+"gesperrt ist"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "Konnte Zielname aus '%s' nicht bestimmen."
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "Ziel '%s' existiert bereits."
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18664,7 +21244,7 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18673,36 +21253,38 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
-msgstr "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt ist"
+msgstr ""
+"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
+"ist"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18712,7 +21294,7 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18721,28 +21303,28 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<Präfix>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
-msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
+msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18758,7 +21340,7 @@
"\n"
"auszuführen."
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
@@ -18771,6 +21353,14 @@
msgid "too many commits marked reachable"
msgstr "Zu viele Commits als erreichbar gekennzeichnet."
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<Optionen>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18791,102 +21381,155 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' und 'git help -g' listet verfügbare Unterbefehle und\n"
"einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Befehl>'\n"
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
-"Konzept zu erfahren."
+"Konzept zu erfahren.\n"
+"Benutzen Sie 'git help git' für einen Überblick des Systems."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "Kein Namespace für --namespace angegeben.\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "Kein Präfix für --super-prefix angegeben.\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c erwartet einen Konfigurationsstring.\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "Kein Verzeichnis für -C angegeben.\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "Unbekannte Option: %s\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "beim Erweitern von Alias '%s': '%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"Alias '%s' ändert Umgebungsvariablen.\n"
+"Sie können '!git' im Alias benutzen, um dies zu tun."
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "leerer Alias für %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekursiver Alias: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "Fehler beim Schließen der Standard-Ausgabe."
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "Kann %s nicht als eingebauten Befehl behandeln."
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"Verwendung: %s\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
"nicht unterstützt."
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt."
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr "Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
+msgstr ""
+"Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18897,39 +21540,171 @@
" gefragt nach: %s\n"
" umgeleitet: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "Ungültige Serverantwort; '%s' bekommen"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "Repository '%s' nicht gefunden."
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Authentifizierung fehlgeschlagen für '%s'"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "konnte nicht auf '%s' zugreifen: %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "Leite nach %s um"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"Konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
+"erhöhen"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC fehlgeschlagen; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "Kann solche großen Übertragungen nicht verarbeiten."
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "\"fetch\" fehlgeschlagen."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "HTTP-Transport unterstützt nicht %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "\"git-http-push\" fehlgeschlagen"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "Argumente"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "Filtern nach Objekten"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "Verfallsdatum"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "Schüssel"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "sortiere nach diesem Feld"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Dateiinhalte zum Commit vormerken"
@@ -19201,9 +21976,9 @@
msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
-"strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
+"Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
#: command-list.h:114
msgid "The Git repository browser"
@@ -19383,227 +22158,230 @@
msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "einige bestehende Commits rückgängig machen"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Parameter herauspicken und ändern"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "eine Sammlung von Patches als E-Mails versenden"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Ausgabe von 'git log' zusammenfassen"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "verschiedene Arten von Objekten anzeigen"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Branches und ihre Commits ausgeben"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "gepackten Archiv-Index anzeigen"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Referenzen in einem lokales Repository auflisten"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Git's i18n-Konfigurationscode für Shell-Skripte"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Dateiinhalte der Staging-Area hinzufügen"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "nicht erforderlichen Whitespace entfernen"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
"Bidirektionale Operationen zwischen einem Subversion Repository und Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Branches wechseln"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "symbolische Referenzen lesen, ändern und löschen"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
"verifizieren."
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Objekte von einem gepackten Archiv entpacken"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Archiv zurück zu git-archive senden"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Objekte gepackt zurück an git-fetch-pack senden"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "eine logische Variable von Git anzeigen"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "die GPG-Signatur von Commits prüfen"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "gepackte Git-Archivdateien validieren"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "die GPG-Signatur von Tags prüfen"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "mehrere Arbeitsverzeichnisse verwalten"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Tree-Objekt vom aktuellen Index erstellen"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Git Kommandozeilenschnittstelle und Konventionen"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "eine Git Anleitung für Entwickler"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git für CVS Benutzer"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Diff-Ausgabe optimieren"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
"ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "ein Git-Glossar"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "von Git verwendete Hooks"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git Namensbereiche"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Git Repository Aufbau"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "eine einführende Anleitung zu Git: Teil zwei"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "eine einführende Anleitung zu Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Sie müssen mit \"git bisect start\" beginnen."
@@ -19615,152 +22393,62 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "nicht erkannte Option: '$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' scheint kein gültiger Commit zu sein"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Ungültiger HEAD - HEAD wird benötigt"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Auschecken von '$start_head' fehlgeschlagen. Versuchen Sie 'git bisect reset "
-"<gültiger-Branch>'."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Ungültiges \"bisect_write\" Argument: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Ungültige Referenz-Eingabe: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Ungültige Referenz-Eingabe: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Ungültige Referenz-Eingabe: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Warnung: binäre Suche nur mit einem $TERM_BAD Commit."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Sind Sie sicher [Y/n]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Sie müssen mindestens einen \"$bad_syn\" und einen \"$good_syn\" Commit "
-"angeben.\n"
-"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
-"benutzen.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Sie müssen mit \"git bisect start\" beginnen.\n"
-"Danach müssen Sie mindestens einen \"$good_syn\" und einen \"$bad_syn\" "
-"Commit angeben.\n"
-"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
-"benutzen.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "keine binäre Suche im Gange"
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' ist kein gültiger Commit"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"Konnte den ursprünglichen HEAD '$branch' nicht auschecken.\n"
-"Versuchen Sie 'git bisect reset <Commit>'."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Keine Log-Datei gegeben"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kann $file nicht für das Abspielen lesen"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? Was reden Sie da?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "führe $command aus"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"'bisect run' fehlgeschlagen:\n"
-"Rückkehrwert $res von '$command' ist < 0 oder >= 128"
+"Exit-Code $res von '$command' ist < 0 oder >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19769,29 +22457,13 @@
"'bisect run' fehlgeschlagen:\n"
"'bisect_state $state' wurde mit Fehlerwert $res beendet"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "'bisect run' erfolgreich ausgeführt"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Ungültiger Befehl: Sie sind gerade bei einer binären $TERM_BAD/$TERM_GOOD "
-"Suche."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "Keine Begriffe definiert."
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"Ungültiges Argument $arg für 'git bisect terms'.\n"
-"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "keine binäre Suche im Gange"
#: git-merge-octopus.sh:46
msgid ""
@@ -19834,271 +22506,116 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Konnte nicht zu $head_name zurückgehen"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Es sieht so aus, als ob es das Verzeichnis $state_dir_base bereits gibt\n"
-"und es könnte ein anderer Rebase im Gange sein. Wenn das der Fall ist,\n"
-"probieren Sie bitte\n"
-"\t$cmd_live_rebase\n"
-"Wenn das nicht der Fall ist, probieren Sie bitte\n"
-"\t$cmd_clear_stale_rebase\n"
-"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
-"etwas Schützenswertes vorhanden ist."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-"Fehler: '--signoff' und '--preserve-merges' können nicht kombiniert werden."
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "Ungültiger Upstream-Branch '$upstream_name'."
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: es gibt keine Merge-Basis"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "$onto_name zeigt auf keinen gültigen Commit"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Automatischen Stash erzeugt: $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
-"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Änderungen zu $onto:"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Änderungen von $mb zu $onto:"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
-"darauf neu anzuwenden ..."
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "$branch_name zu $onto_name vorgespult."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear mit Parametern ist nicht implementiert"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Sie haben bisher noch keinen initialen Commit"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Kann die unversionierten Dateien nicht speichern"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Keine Änderungen ausgewählt"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "Fehler: unbekannte Option für 'stash push': $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Keine lokalen Änderungen zum Speichern"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Kann \"stash\" nicht initialisieren"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Kann den aktuellen Status nicht speichern"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Keine Stash-Einträge gefunden."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
"Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
-"benötigen."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) gelöscht"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Kein Branchname spezifiziert"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' hat keinen Commit ausgecheckt"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -20109,24 +22626,24 @@
"$sm_path\n"
"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -20144,37 +22661,37 @@
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
"wählen Sie einen anderen Namen mit der Option '--name'."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -20183,12 +22700,16 @@
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
+"$sha1 direkt anzufordern:"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -20197,74 +22718,74 @@
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
"fehlgeschlagen"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -20275,12 +22796,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "Siehe git-${cmd}(1) für weitere Details."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Automatischen Stash angewendet."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Kann $stash_sha1 nicht speichern."
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Führe Rebase aus ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -20322,7 +22852,7 @@
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -20341,83 +22871,83 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: kein Commit der gepickt werden kann"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Ungültiger Commit-Name: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Spule vor zu $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kann nicht zu $sha1 vorspulen"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kann HEAD nicht auf $first_parent setzen"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fehler beim Wiederholen des Merges von $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Konnte $sha1 nicht picken"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Das ist Commit-Beschreibung #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Das ist eine Kombination aus $count Commit."
msgstr[1] "Das ist eine Kombination aus $count Commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kann $fixup_msg nicht schreiben"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Das ist eine Kombination aus 2 Commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "Konnte $sha1... ($rest) nicht anwenden"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20434,31 +22964,31 @@
"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
"können."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Angehalten bei $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Führe aus: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ausführung fehlgeschlagen: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20471,7 +23001,7 @@
"ausführen."
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20487,25 +23017,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Unbekannter Befehl: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20537,13 +23067,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
"finden"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20553,40 +23083,40 @@
"erneut\n"
"aus."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Kein HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
@@ -20595,154 +23125,154 @@
msgid "usage: $dashless $USAGE"
msgstr "Verwendung: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
"Arbeitsverzeichnisses."
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
"sind."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
"Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
"nicht zum Commit vorgemerkt sind."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
"Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
"Änderungen."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
"nicht committete Änderungen."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
"Änderungen."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
"ausführen."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%28s %25s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "Binär"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "Nichts"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "unverändert"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d Pfad hinzugefügt\n"
msgstr[1] "%d Pfade hinzugefügt\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d Pfad aktualisiert\n"
msgstr[1] "%d Pfade aktualisiert\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d Pfad wiederhergestellt\n"
msgstr[1] "%d Pfade wiederhergestellt\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d Pfad angefasst\n"
msgstr[1] "%d Pfade angefasst\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualisieren"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Revert"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "unversionierte Dateien hinzufügen"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20751,7 +23281,7 @@
"Block\n"
"direkt als zum Hinzufügen zur Staging-Area markiert."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20760,7 +23290,7 @@
"Block\n"
"direkt als zum Hinzufügen zum Stash markiert."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20769,7 +23299,8 @@
"Block\n"
"direkt als zum Entfernen aus der Staging-Area markiert."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20778,7 +23309,8 @@
"Block\n"
"direkt als zum Anwenden markiert."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20787,19 +23319,19 @@
"Block\n"
"direkt als zum Verwerfen markiert."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
"Kurzanleitung.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20813,7 +23345,7 @@
"Zeilen, die mit %s beginnen, werden entfernt.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20824,7 +23356,7 @@
"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
@@ -20835,14 +23367,14 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20858,7 +23390,7 @@
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20872,7 +23404,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20886,7 +23418,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20903,7 +23435,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20920,7 +23452,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20935,7 +23467,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20949,7 +23481,21 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
+"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n"
+"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
+"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20962,7 +23508,7 @@
"? - print help\n"
msgstr ""
"g - Patch-Block zum Hinspringen auswählen\n"
-"/ - nach Patch-Block suchen der gegebenem regulärem Ausdruck entspricht\n"
+"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n"
"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block "
"anzeigen\n"
"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n"
@@ -20973,218 +23519,234 @@
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Keine anderen Patch-Blöcke verbleibend\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "In %d Patch-Block aufgeteilt.\n"
msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Diff überprüfen"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -21203,18 +23765,19 @@
"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "-- fehlt"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
@@ -21228,32 +23791,32 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "Der Editor wurde unsauber beendet, breche alles ab."
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' enthält die verfasste E-Mail.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
"Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -21262,37 +23825,38 @@
"Kommandozeile\n"
"oder Konfigurationsoption)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Unbekannte --confirm Einstellung: '%s'\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
+msgstr ""
+"Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -21309,12 +23873,12 @@
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
"meinen\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -21323,7 +23887,7 @@
"fatal: %s: %s\n"
"Warnung: Es wurden keine Patches versendet.\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -21333,17 +23897,17 @@
"keine Patch-Dateien angegeben!\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Keine Betreffzeile in %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -21358,27 +23922,27 @@
"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
"möchten.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fehler beim Öffnen von %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -21386,11 +23950,11 @@
"Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
"Content-Transfer-Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21404,22 +23968,22 @@
"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
"existiert)? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -21427,18 +23991,18 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
"[e]): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA Pfad \"%s\" existiert nicht"
-#: git-send-email.perl:1412
+#: 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"
@@ -21467,513 +24031,232 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
"[a]): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Server unterstützt kein STARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS fehlgeschlagen! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
"Konfiguration\n"
"und benutzen Sie --smtp-debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fehler beim Senden %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Probeversand %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "%s gesendet\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Probeversand OK. Log enthält:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Log enthält:\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Ergebnis: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "Kann Nachricht nicht als 7bit versenden."
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "Ungültiges Transfer-Encoding"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "konnte %s nicht öffnen: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "Konnte '%s' nicht parsen (bei Suche nach '%s')."
-
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "Ungültiges Setzen von Anführungszeichen bei %s Wert in '%s'"
-
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "veraltetes Synonym für --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "Kann '%s' nicht lesen."
-
-#~ msgid "abort rebase"
-#~ msgstr "Rebase abbrechen"
-
-#~ msgid "make rebase script"
-#~ msgstr "Rebase-Skript erstellen"
-
-#~ msgid "No such remote: %s"
-#~ msgstr "Kein solches Remote-Repository: %s"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben."
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen."
-
-#~ msgid "Applied autostash."
-#~ msgstr "Automatischen Stash angewendet."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Kann $stash_sha1 nicht speichern."
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "'fetch' zeigt normalerweise, welche Branches eine erzwungene "
+#~ "Aktualisierung hatten, aber diese Überprüfung wurde deaktiviert."
#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "oder führen Sie 'git config fetch.showForcedUpdates false' aus, um diese "
+#~ "Überprüfung zu umgehen.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
#~ "\n"
-#~ "\t"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
#~ msgstr ""
+#~ "'log.mailmap' ist nicht gesetzt; der implizite Wert wird sich in einem\n"
+#~ "kommenden Release ändern. Um diese Meldung zu unterdrücken und das "
+#~ "aktuelle\n"
+#~ "Verhalten beizubehalten, setzen Sie den Konfigurationswert von'log."
+#~ "mailmap' auf 'false'.\n"
#~ "\n"
-#~ "\tWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
+#~ "Um diese Meldung zu unterdrücken und jetzt das neue Verhalten zu\n"
+#~ "übernehmen, setzen Sie den Konfigurationswert von 'log.mailmap' auf "
+#~ "'true'.\n"
#~ "\n"
-#~ "\t"
+#~ "Führen Sie 'git help config' aus und suchen Sie nach 'log.mailmap', um\n"
+#~ "weitere Informationen zu erhalten."
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Geänderter Index: kann nicht mergen (geändert: %s)"
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Server unterstützt multi_ack_detailed"
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
+#~ msgid "Server supports no-done"
+#~ msgstr "Server unterstützt no-done"
-#~ msgid "<command>"
-#~ msgstr "<Programm>"
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Server unterstützt multi_ack"
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Server unterstützt side-band-64k"
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
+#~ msgid "Server supports side-band"
+#~ msgstr "Server unterstützt side-band"
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Server unterstützt allow-tip-sha1-in-want"
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Betrete '$displaypath'"
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Server unterstützt allow-reachable-sha1-in-want"
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Server unterstützt ofs-delta"
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD losgelöst bei %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD losgelöst von %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checke Dateien aus"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
+#~ "Terminal verbunden ist."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "Fehler beim Öffnen von '%s'"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "Konnte %s nicht lesen\n"
#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
+#~ "If you wish to skip this commit, use:\n"
#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "unerwartete erste Zeile der Squash-Beschreibung:\n"
+#~ " git reset\n"
#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "ungültige erste Zeile der Squash-Beschreibung:\n"
+#~ " git reset\n"
#~ "\n"
-#~ "\t%.*s"
+#~ "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
+#~ "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
-
-#~ msgid "Error in object"
-#~ msgstr "Fehler in Objekt"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "Ungültiger filter-spec Ausdruck '%s'."
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "Pfadspezifikationen und --all sind inkompatibel."
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der "
-#~ "Konfiguration entfernt."
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr ""
-#~ "To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "Leere Strings als Pfadspezifikationen werden in kommenden Releases "
-#~ "ungültig.\n"
-#~ "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "Konnte '%s' nicht abschneiden."
-
-#~ msgid "could not finish '%s'"
-#~ msgstr "Konnte '%s' nicht abschließen."
-
-#~ msgid "could not close %s"
-#~ msgstr "Konnte '%s' nicht schließen."
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "falsch benannten Branch '%s' wegkopiert"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "'HEAD' darf nicht manuell erstellt werden"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "Weiß nicht wie %s zu klonen ist."
-
-#~ msgid "show ignored files"
-#~ msgstr "ignorierte Dateien anzeigen"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Weiß nicht wie von %s angefordert wird."
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "'$term' ist kein gültiger Begriff"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ " To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "Fehler: unbekannte Option für 'stash save': $option\n"
-#~ " Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
-#~ "'$option'\""
-
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) akzeptiert keine Argumente"
-
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
-#~ " - $line"
-
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
-#~ " - $line"
-
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
-#~ "unterstützt."
-
-#~ msgid "change upstream info"
-#~ msgstr "Informationen zum Upstream-Branch ändern"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, "
-#~ "führen Sie aus:\n"
-
-#~ msgid "basename"
-#~ msgstr "Basisname"
-
-#~ msgid "prepend parent project's basename to output"
-#~ msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
-
-#~ msgid "Could not open file '%s'"
-#~ msgstr "Konnte Datei '%s' nicht öffnen"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "Automatische Ausführung in %0.1f Sekunden ..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) fehlgeschlagen"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Initialer Commit auf "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
-#~ "Haben Sie vergessen 'git add' zu benutzen?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln.\n"
-#~ "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit "
-#~ "aufgelöst werden kann?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-
-#~ msgid "default mode for recursion"
-#~ msgstr "Standard-Modus für Rekursion"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
-
-#~ msgid "tag: tagging "
-#~ msgstr "tag: tagge "
-
-#~ msgid "commit object"
-#~ msgstr "Commit-Objekt"
-
-#~ msgid "tree object"
-#~ msgstr "Tree-Objekt"
-
-#~ msgid "blob object"
-#~ msgstr "Blob-Objekt"
-
-#, fuzzy
-#~ msgid "Submodule '%s' cannot checkout new HEAD"
-#~ msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "zu langes Objekt-Verzeichnis %.*s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "Tagname zu lang: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "Tag-Kopf zu groß."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-#~ "Block\n"
-#~ "direkt als zum Verwerfen markiert."
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
-#~ "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "nicht erkanntes Format: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= erfordert eine positive Ganzzahl als Argument"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "Referenz '%s' hat keine %ld Komponenten für :strip"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "Unbekanntes %.*s Format %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: entfernt]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: %d hinterher]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: %d voraus]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: %d voraus, %d hinterher]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** ungültige Referenz ****"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "eine experimentelle, auf Leerzeilen basierende Heuristik zur "
-#~ "Verbesserung\n"
-#~ "der Darstellung von Unterschieden verwenden"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "das folgende Submodul (oder ein geschachteltes Submodul hiervon)\n"
-#~ "benutzt ein .git-Verzeichnis:"
-#~ msgstr[1] ""
-#~ "die folgenden Submodule (oder ein geschachteltes Submodul hiervon)\n"
-#~ "benutzen ein .git-Verzeichnis:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
-#~ "seiner Historie löschen möchten)"
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr ""
-#~ "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Kann Revert nicht während eines anderen Reverts ausführen."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr ""
-#~ "Kann Cherry-Pick nicht während eines anderen Cherry-Picks ausführen."
-
-#~ msgid "Could not parse line %d."
-#~ msgstr "Konnte Zeile %d nicht parsen."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Konnte %s nicht öffnen"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Konnte %s nicht formatieren."
-
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
-
-#~ msgid "cannot open %s: %s"
-#~ msgstr "Kann %s nicht öffnen: %s"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Sie müssen zuerst die Informationen zum Commit-Ersteller setzen."
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "Nicht erkanntes Verb: %s"
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 0000000..703f46d
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,21468 @@
+# Greek translations for Git.
+# Copyright (C) 2019 Jimmy Angelakos <vyruss@hellug.gr>
+# This file is distributed under the same license as the Git package.
+#
+# Greek translations of common Git words used in this file:
+#
+# English | Greek
+# -----------------+---------------------------------
+# 3-way merge | τριπλή συγχώνευση
+# #NN | υπ' αρ. NN
+# amend | τροποποιώ
+# archive | αρχειοθήκη
+# backward |
+# compatibility | συμβατότητα προς τα πίσω
+# bare repository | γυμνό αποθετήριο
+# bisect | διχοτομώ
+# branch | κλάδος
+# bug | σφάλμα
+# bundle | δεσμίδα
+# bypass | παρακάμπτω
+# (a) checkout | εξαγωγή
+# (to) checkout | εξάγω
+# cherry-pick | επιλεκτική διαλογή
+# (a) commit | μια υποβολή
+# (to) commit | υποβάλλω
+# commit-ish | υποβολή ή φαινομενική
+# config file | αρχείο ρυθμίσεων
+# conflict | σύγκρουση
+# dangling | εκκρεμές
+# (to) debug | αποσφαλματώνω
+# debugging | αποσφαλμάτωση
+# deflate | αποσυμπιέζω
+# directory | φάκελος
+# diverge | αποκλίνω
+# editor | διορθωτής
+# entry | στοιχείο
+# fast-forward | ταχεία προώθηση
+# fast-forwarded | ταχέως προωθημένο
+# (a) fetch | ανάκτηση
+# (to) fetch | ανακτώ
+# fix conflicts | επίλυση συγκρούσεων
+# (to) format | μορφοποιώ
+# glob | αντικατάσταση μεταχαρακτήρων
+# hash | συμβολοσειρά
+# HEAD | HEAD (ουδέτερο)
+# hook | άγκιστρο
+# hunk | αλλαγή
+# inconsistency | αντίφαση
+# (to) inflate | αποσυμπιέζω
+# (a) list | παράθεση
+# (to) list | παραθέτω
+# mapping | αντιστοίχιση
+# mismatch | ασυμφωνία
+# merge | συγχώνευση
+# pack | πακέτο
+# patches | διορθώσεις
+# path | διαδρομή
+# pathspec | περιγραφή διαδρομής
+# pattern | μοτίβο
+# (to) prune | κλαδεύω
+# (a) pull | ενσωμάτωση
+# (to) pull | ενσωματώνω
+# (a) push | δημοσίευση
+# (to) push | δημοσιεύω
+# trailers | υποσημειώσεις
+# repository | αποθετήριο
+# remote | απομακρυσμένο (ή απομακρυσμένος εξυπηρετητής)
+# reset | επαναφέρω
+# resolve | επιλύω *ή* ταυτίζω
+# restore | αποκαθιστώ
+# revision | έκδοση
+# shallow | ρηχό
+# shell | κέλυφος
+# squash | συμπτύσσω/σύμπτυξη
+# stash | αποθηκευμένα
+# (to) stage | προετοιμάζω
+# (to) stash | αποθηκεύω
+# stream | ροή
+# submodule | υποενότητα
+# tag | ετικέτα
+# template | πρότυπο
+# thread | νήμα
+# timestamp | χρονοσήμανση
+# (to) track | παρακολουθώ
+# tree | δέντρο
+# tree-ish | δέντρο ή φαινομενικό
+# unstage | αποπροετοιμάζω
+# upstream | προς την πηγή
+# viewer | πρόγραμμα προβολής
+# worktree / |
+# work(ing) tree | δέντρο εργασίας
+# Jimmy Angelakos <vyruss@hellug.gr>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2019-02-15 10:09+0800\n"
+"PO-Revision-Date: 2019-02-15 02:10+0000\n"
+"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n"
+"Language-Team: Greek, Modern (1453-) <vyruss@hellug.gr>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: advice.c:101
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sνύξη: %.*s%s\n"
+
+#: advice.c:154
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+"Δεν είναι δυνατό να γίνει επιλεκτική διαλογή επειδή έχετε μη συγχωνευμένα "
+"αρχεία."
+
+#: advice.c:156
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Δεν είναι δυνατό να γίνει υποβολή επειδή έχετε μη συγχωνευμένα αρχεία."
+
+#: advice.c:158
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+"Δεν είναι δυνατό να γίνει συγχώνευση επειδή έχετε μη συγχωνευμένα αρχεία."
+
+#: advice.c:160
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+"Δεν είναι δυνατό να γίνει ενσωμάτωση επειδή έχετε μη συγχωνευμένα αρχεία."
+
+#: advice.c:162
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+"Δεν είναι δυνατό να γίνει επαναφορά επειδή έχετε μη συγχωνευμένα αρχεία."
+
+#: advice.c:164
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "Δεν είναι δυνατό να γίνει %s επειδή έχετε μη συγχωνευμένα αρχεία."
+
+#: advice.c:172
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+"Φτιάξτε τα στο δέντρο εργασίας, και μετά χρησιμοποιήστε 'git add/rm "
+"<αρχείο>'\n"
+"έτσι ώστε να επισημάνετε την επίλυση και να κάνετε μία υποβολή."
+
+#: advice.c:180
+msgid "Exiting because of an unresolved conflict."
+msgstr "Έξοδος λόγω ανεπίλυτης σύγκρουσης."
+
+#: advice.c:185 builtin/merge.c:1290
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Δεν έχετε ολοκληρώσει τη συγχώνευσή σας (Υπάρχει το MERGE_HEAD)."
+
+#: advice.c:187
+msgid "Please, commit your changes before merging."
+msgstr "Παρακαλώ, υποβάλετε τις αλλαγές σας πριν συγχωνεύσετε."
+
+#: advice.c:188
+msgid "Exiting because of unfinished merge."
+msgstr "Έξοδος λόγω μη ολοκληρωμένης συγχώνευσης."
+
+#: advice.c:194
+#, c-format
+msgid ""
+"Note: checking out '%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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Σημείωση: εξαγωγή του '%s'.\n"
+"\n"
+"Βρίσκεστε σε κατάσταση 'αποσυνδεδεμένου HEAD'. Μπορείτε να περιηγηθείτε, να "
+"κάνετε πειραματικές\n"
+"αλλαγές και να τις υποβάλετε, καθώς και να απορρίψετε ό,τι υποβολές κάνετε "
+"σε αυτήν την\n"
+"κατάσταση χωρίς να επηρεάσετε άλλους κλάδους απλά κάνοντας μια νέα εξαγωγή.\n"
+"\n"
+"Αν θέλετε να δημιουργήσετε έναν νέο κλάδο για να διατηρήσετε τις υποβολές "
+"που δημιουργείτε, μπορείτε\n"
+"να το κάνετε (τώρα ή αργότερα) χρησιμοποιώντας -b με την εντολή εξαγωγής "
+"checkout πάλι. Παράδειγμα:\n"
+"\n"
+" git checkout -b <όνομα-νέου-κλάδου>\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "γραμμή εντολών τελειώνει με \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "ανοιχτά εισαγωγικά"
+
+#: apply.c:59
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "άγνωστη επιλογή κενού χώρου '%s'"
+
+#: apply.c:75
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "άγνωστη επιλογή αγνόησης κενού χώρου '%s'"
+
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject και --3way δε γίνεται να χρησιμοποιηθούν μαζί."
+
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached και --3way δε γίνεται να χρησιμοποιηθούν μαζί.."
+
+#: apply.c:130
+msgid "--3way outside a repository"
+msgstr "--3way έξω από απόθετήριο"
+
+#: apply.c:141
+msgid "--index outside a repository"
+msgstr "--index έξω από αποθετήριο"
+
+#: apply.c:144
+msgid "--cached outside a repository"
+msgstr "--cached έξω από αποθετήριο"
+
+#: apply.c:825
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Δεν είναι δυνατή η προετοιμασία κανονικής έκφρασης χρονοσήμανσης %s"
+
+#: apply.c:834
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "Το regexec επέστρεψε %d για εισαγωγή: %s"
+
+#: apply.c:908
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "δεν είναι δυνατό να βρεθεί το όνομα αρχείου στη διόρθωση στη γραμμή %d"
+
+#: apply.c:946
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: λάθος git-diff - αναμενόταν /dev/null, βρέθηκε %s στη γραμμή %d"
+
+#: apply.c:952
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: λάθος git-diff - ασύμφωνο όνομα νέου αρχείου στη γραμμή %d"
+
+#: apply.c:953
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: λάθος git-diff - ασύμφωνο όνομα παλιού αρχείου στη γραμμή %d"
+
+#: apply.c:958
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: λάθος git-diff - αναμενόταν /dev/null στη γραμμή %d"
+
+#: apply.c:987
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "μη έγκυρη κατάσταση στη γραμμή %d: %s"
+
+#: apply.c:1306
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "ασύμφωνες γραμμές επικεφαλίδας %d και %d"
+
+#: apply.c:1478
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: μη αναμενόμενη γραμμή: %.*s"
+
+#: apply.c:1547
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "απόσπασμα διόρθωσης χωρίς επικεφαλίδα στη γραμμή %d: %.*s"
+
+#: apply.c:1567
+#, 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] ""
+"Λείπει η πληροφορία ονόματος αρχείου από την επικεφαλίδα git diff κατά την "
+"αφαίρεση του %d αρχικού συστατικού ονόματος διαδρομής (γραμμή %d)"
+msgstr[1] ""
+"Λείπει η πληροφορία ονόματος αρχείου από την επικεφαλίδα git diff κατά την "
+"αφαίρεση των %d αρχικών συστατικών ονόματος διαδρομής (γραμμή %d)"
+
+#: apply.c:1580
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+"Λείπει η πληροφορία ονόματος αρχείου από την επικεφαλίδα git diff (γραμμή %d)"
+
+#: apply.c:1768
+msgid "new file depends on old contents"
+msgstr "το νέο αρχείο εξαρτάται από τα παλιά περιεχόμενα"
+
+#: apply.c:1770
+msgid "deleted file still has contents"
+msgstr "το διεγραμμένο αρχείο έχει ακόμα περιεχόμενα"
+
+#: apply.c:1804
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "κατεστραμμένη διόρθωση στη γραμμή %d"
+
+#: apply.c:1841
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "το νέο αρχείο %s εξαρτάται από τα παλιά περιεχόμενα"
+
+#: apply.c:1843
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "το διεγραμμένο αρχείο %s έχει ακόμα περιεχόμενα"
+
+#: apply.c:1846
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** προσοχή: το αρχείο %s γίνεται κενό αλλά δε διαγράφεται"
+
+#: apply.c:1993
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "κατεστραμμένη δυαδική διόρθωση στη γραμμή %d: %.*s"
+
+#: apply.c:2030
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "μη αναγνωρίσιμη δυαδική διόρθωση στη γραμμή %d"
+
+#: apply.c:2192
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "διόρθωση με μόνο σκουπίδια στη γραμμή %d"
+
+#: apply.c:2278
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "δεν είναι δυνατή η ανάγνωση του συμβολικού δεσμού %s"
+
+#: apply.c:2282
+#, c-format
+msgid "unable to open or read %s"
+msgstr "δεν είναι δυνατό το άνοιγμα ή η ανάγνωση του %s"
+
+#: apply.c:2941
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "μη αποδεκτή αρχή γραμμής: '%c'"
+
+#: apply.c:3062
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Η αλλαγή υπ' αρ. %d πέτυχε στο %d (μετατόπιση %d γραμμή)."
+msgstr[1] "Η αλλαγή υπ' αρ. %d πέτυχε στο %d (μετατόπιση %d γραμμές)."
+
+#: apply.c:3074
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+"Το πλαίσιο μειώθηκε σε (%ld/%ld) για την εφαρμογή του αποσπάσματος στο %d"
+
+#: apply.c:3080
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"κατά την αναζήτηση για το:\n"
+"%.*s"
+
+#: apply.c:3102
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "λείπουν τα δυαδικά δεδομένα διόρθωσης για το '%s'"
+
+#: apply.c:3110
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"δεν είναι δυνατή η εφαρμογή προς τα πίσω δυαδικής διόρθωσης χωρίς την αλλαγή "
+"προς τα πίσω στο '%s'"
+
+#: apply.c:3157
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"δεν είναι δυνατή η εφαρμογή δυαδικής διόρθωσης στο '%s' χωρίς την πλήρη "
+"γραμμή ευρετηρίου"
+
+#: apply.c:3167
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"η διόρθωση εφαρμόζεται στο '%s' (%s), που δεν ταιριάζει με τα παρόντα "
+"περιεχόμενα."
+
+#: apply.c:3175
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "η διόρθωση εφαρμόζεται σε ένα κενό '%s' αλλά δεν είναι κενό"
+
+#: apply.c:3193
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "δεν είναι δυνατή η ανάγνωση της αναγκαίας postimage %s για το '%s'"
+
+#: apply.c:3206
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "η δυαδική διόρθωση δεν εφαρμόζεται στο '%s'"
+
+#: apply.c:3212
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"η δυαδική διόρθωση στο '%s' δημιουργεί λάθος αποτέλεσμα (αναμενόταν %s, "
+"βρέθηκε %s)"
+
+#: apply.c:3233
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "η διόρθωση απέτυχε: %s:%ld"
+
+#: apply.c:3356
+#, c-format
+msgid "cannot checkout %s"
+msgstr "δεν είναι δυνατή η εξαγωγή του %s"
+
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#, c-format
+msgid "failed to read %s"
+msgstr "απέτυχε η ανάγνωση του %s"
+
+#: apply.c:3416
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "ανάγνωση από το '%s' πίσω από συμβολικό δεσμό"
+
+#: apply.c:3445 apply.c:3688
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "η διαδρομή %s έχει μετονομαστεί/διαγραφεί"
+
+#: apply.c:3531 apply.c:3703
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: δεν υπάρχει στο ευρετήριο"
+
+#: apply.c:3540 apply.c:3711
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: δεν ταιριάζει με το ευρετήριο"
+
+#: apply.c:3575
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"από το αποθετήριο λείπει το αναγκαίο blob για να ακολουθηθεί η εναλλακτική "
+"της τριπλής συγχώνευσης."
+
+#: apply.c:3578
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Ακολουθείται η εναλλακτική της τριπλής συγχώνευσης...\n"
+
+#: apply.c:3594 apply.c:3598
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "δεν είναι δυνατή η ανάγνωση των τρεχόντων περιεχομένων του '%s'"
+
+#: apply.c:3610
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Απέτυχε η εναλλακτική της τριπλής συγχώνευσης...\n"
+
+#: apply.c:3624
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Η εφαρμογή της διόρθωσης στο '%s' έγινε με συγκρούσεις.\n"
+
+#: apply.c:3629
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Η εφαρμογή της διόρθωσης στο '%s' έγινε καθαρά.\n"
+
+#: apply.c:3655
+msgid "removal patch leaves file contents"
+msgstr "η διόρθωση αφαίρεσης αφήνει πίσω περιεχόμενα στο αρχείο"
+
+#: apply.c:3728
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: λάθος τύπος"
+
+#: apply.c:3730
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s έχει τύπο %o, αναμενόταν %o"
+
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299
+#, c-format
+msgid "invalid path '%s'"
+msgstr "μη έγκυρη διαδρομή '%s'"
+
+#: apply.c:3939
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: υπάρχει ήδη στο ευρετήριο"
+
+#: apply.c:3942
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: υπάρχει ήδη στον φάκελο εργασίας"
+
+#: apply.c:3962
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "η νέα κατάσταση (%o) του %s δεν ταιριάζει με την παλιά (%o)"
+
+#: apply.c:3967
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "η νέα κατάσταση (%o) του %s δεν ταιριάζει με την παλιά (%o) του %s"
+
+#: apply.c:3987
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "το αρχείο που επηρεάζεται '%s' είναι πίσω από συμβολικό δεσμό"
+
+#: apply.c:3991
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: η διόρθωση δεν εφαρμόζεται"
+
+#: apply.c:4006
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Γίνεται έλεγχος της διόρθωσης %s..."
+
+#: apply.c:4098
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "πληροφορία sha1 ελλιπής ή άχρηστη για την υποενότητα %s"
+
+#: apply.c:4105
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr ""
+
+#: apply.c:4108
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "πληροφορία sha1 ελλιπής ή άχρηστη (%s)."
+
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "το make_cache_entry απέτυχε για τη διαδρομή '%s'"
+
+#: apply.c:4117
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr ""
+
+#: apply.c:4127
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr ""
+
+#: apply.c:4265
+#, c-format
+msgid "unable to remove %s from index"
+msgstr ""
+
+#: apply.c:4299
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr ""
+
+#: apply.c:4305
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr ""
+
+#: apply.c:4313
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: apply.c:4319 apply.c:4464
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr ""
+
+#: apply.c:4362
+#, c-format
+msgid "failed to write to '%s'"
+msgstr ""
+
+#: apply.c:4366
+#, c-format
+msgid "closing file '%s'"
+msgstr ""
+
+#: apply.c:4436
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr ""
+
+#: apply.c:4534
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Η εφαρμογή της διόρθωσης '%s' έγινε καθαρά."
+
+#: apply.c:4542
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4545
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4556
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: apply.c:4578
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Η αλλαγή υπ' αρ. %d εφαρμόστηκε καθαρά."
+
+#: apply.c:4582
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Απορρίφθηκε η αλλαγή υπ' αρ. %d."
+
+#: apply.c:4692
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: apply.c:4700
+msgid "unrecognized input"
+msgstr "δεν αναγνωρίζεται η εισαγωγή"
+
+#: apply.c:4720
+msgid "unable to read index file"
+msgstr ""
+
+#: apply.c:4875
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr ""
+
+#: apply.c:4902
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4908 apply.c:4923
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4916
+#, 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:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390
+msgid "Unable to write new index file"
+msgstr ""
+
+#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
+msgid "path"
+msgstr "διαδρομή"
+
+#: apply.c:4960
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4963
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4965 builtin/am.c:2212
+msgid "num"
+msgstr "αριθ."
+
+#: apply.c:4966
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: apply.c:4969
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: apply.c:4971
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: apply.c:4975
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: apply.c:4977
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: apply.c:4979
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: apply.c:4981
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: apply.c:4983
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4985
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: apply.c:4987
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: apply.c:4990
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: apply.c:4992
+msgid "attempt three-way merge if a patch does not apply"
+msgstr ""
+
+#: apply.c:4994
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: apply.c:4999
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065
+msgid "action"
+msgstr "ενέργεια"
+
+#: apply.c:5001
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: apply.c:5004 apply.c:5007
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: apply.c:5010
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: apply.c:5012
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: apply.c:5014
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: apply.c:5016
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159
+msgid "be verbose"
+msgstr ""
+
+#: apply.c:5019
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+
+#: apply.c:5022
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+
+#: apply.c:5024 builtin/am.c:2200
+msgid "root"
+msgstr "ρίζα"
+
+#: apply.c:5025
+msgid "prepend <root> to all filenames"
+msgstr "προσθήκη του προθέματος <ρίζα> σε όλα τα ονόματα αρχείων"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<επιλογές>] <δέντρο ή φαινομενικό> [<διαδρομή>...]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <αποθετήριο> [--exec <εντολή>] [<επιλογές>] <δέντρο ή "
+"φαινομενικό> [<διαδρομή>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <αποθετήριο> [--exec <εντολή>] --list"
+
+#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "η διαδρομή '%s' δεν ταιριάζει με κανένα αρχείο"
+
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "δεν υπάρχει ref: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "μη έγκυρο όνομα αντικειμένου: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "δεν είναι αντικείμενο δέντρου: %s"
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr "ο τρέχων φάκελος εργασίας δεν παρακολουθείται"
+
+#: archive.c:455
+msgid "fmt"
+msgstr "μρφ."
+
+#: archive.c:455
+msgid "archive format"
+msgstr "μορφή αρχειοθήκης"
+
+#: archive.c:456 builtin/log.c:1549
+msgid "prefix"
+msgstr "πρόθεμα"
+
+#: archive.c:457
+msgid "prepend prefix to each pathname in the archive"
+msgstr "προσθήκη του προθέματος σε κάθε όνομα διαδρομής στην αρχειοθήκη"
+
+#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
+#: 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:162
+msgid "file"
+msgstr "αρχείο"
+
+#: archive.c:459 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "αρχειοθέτηση σε αυτό το αρχείο"
+
+#: archive.c:461
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:462
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:463
+msgid "store only"
+msgstr ""
+
+#: archive.c:464
+msgid "compress faster"
+msgstr "ταχύτερη συμπίεση"
+
+#: archive.c:472
+msgid "compress better"
+msgstr "καλύτερη συμπίεση"
+
+#: archive.c:475
+msgid "list supported archive formats"
+msgstr "παράθεση υποστηριζόμενων μορφών αρχειοθέτησης"
+
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859
+msgid "repo"
+msgstr "αποθ."
+
+#: archive.c:478 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr ""
+
+#: archive.c:480 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: archive.c:487
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:489
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:491
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:513
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Άγνωστη μορφή αρχειοθέτησης '%s'"
+
+#: archive.c:520
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "δεν είναι δυνατή η ροή του blob %s"
+
+#: archive-tar.c:260 archive-zip.c:363
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:287 archive-zip.c:353
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive-tar.c:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:314
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:211
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr ""
+
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408
+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:733
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Μη έγκυρο όνομα υποβολής %s"
+
+#: bisect.c:758
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:768
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:776
+#, 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:789
+#, 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:822
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr ""
+
+#: bisect.c:865
+#, c-format
+msgid "a %s revision is needed"
+msgstr ""
+
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: bisect.c:937 builtin/merge.c:139
+#, c-format
+msgid "could not read file '%s'"
+msgstr ""
+
+#: bisect.c:967
+msgid "reading bisect refs failed"
+msgstr ""
+
+#: bisect.c:986
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr ""
+
+#: bisect.c:994
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+
+#: bisect.c:1013
+#, 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:1019
+#, 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:1792
+msgid "--contents and --reverse do not blend well."
+msgstr ""
+
+#: blame.c:1806
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+
+#: blame.c:1827
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+
+#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
+msgstr "η αρχικοποίηση του μονοπατιού εκδόσεων απέτυχε"
+
+#: blame.c:1854
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+
+#: blame.c:1865
+#, c-format
+msgid "no such path %s in %s"
+msgstr "δεν υπάρχει τέτοια διαδρομή %s στο %s"
+
+#: blame.c:1876
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "δεν είναι δυνατή η ανάγνωση του blob %s για τη διαδρομή %s"
+
+#: branch.c:52
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"Αφού φτιάξετε την αιτία του σφάλματος μπορείτε να δοκιμάσετε να φτιάξετε\n"
+"τις πληροφορίες παρακολούθησης απομακρυσμένου καλώντας\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+
+#: branch.c:66
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "Δε γίνεται ορισμός του %s ως το προς τα πάνω του εαυτού του."
+
+#: branch.c:92
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+
+#: branch.c:97
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr ""
+
+#: branch.c:103
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+
+#: branch.c:108
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+
+#: branch.c:118
+msgid "Unable to write upstream branch configuration"
+msgstr ""
+
+#: branch.c:155
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+
+#: branch.c:188
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:207
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: branch.c:212
+msgid "Cannot force update the current branch."
+msgstr ""
+
+#: branch.c:232
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+
+#: branch.c:234
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "ο προς τα πάνω κλάδος '%s' που ζητήθηκε δεν υπάρχει"
+
+#: branch.c:236
+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:280
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Μη έγκυρο όνομα αντικειμένου: '%s'."
+
+#: branch.c:300
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Αμφίσημο όνομα αντικειμένου: '%s'."
+
+#: branch.c:305
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Μη έγκυρο σημείο κλάδου: '%s'."
+
+#: branch.c:359
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr ""
+
+#: branch.c:382
+#, 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:2215 sequencer.c:2763
+#: builtin/commit.c:776
+#, c-format
+msgid "could not open '%s'"
+msgstr "δεν ήταν δυνατό το άνοιγμα του '%s'"
+
+#: bundle.c:143
+msgid "Repository lacks these prerequisite commits:"
+msgstr ""
+
+#: bundle.c:194
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bundle.c:201
+msgid "The bundle records a complete history."
+msgstr ""
+
+#: bundle.c:203
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:276
+msgid "Could not spawn pack-objects"
+msgstr ""
+
+#: bundle.c:287
+msgid "pack-objects died"
+msgstr ""
+
+#: bundle.c:329
+msgid "rev-list died"
+msgstr ""
+
+#: bundle.c:378
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr ""
+
+#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr ""
+
+#: bundle.c:465
+msgid "Refusing to create empty bundle."
+msgstr ""
+
+#: bundle.c:475
+#, c-format
+msgid "cannot create '%s'"
+msgstr ""
+
+#: bundle.c:500
+msgid "index-pack died"
+msgstr ""
+
+#: color.c:296
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr ""
+
+#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376
+#: builtin/replace.c:448
+#, c-format
+msgid "could not parse %s"
+msgstr ""
+
+#: commit.c:52
+#, 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:1122
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Η υπογραφή %s έχει μη αξιόπιστη υπογραφή GPG, δήθεν από %s."
+
+#: commit.c:1125
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Η υποβολή %s έχει λάθος υπογραφή GPG δήθεν από %s."
+
+#: commit.c:1128
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Η υποβολή %s δεν έχει υπογραφή GPG."
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Η υποβολή %s έχει σωστή υπογραφή GPG από %s\n"
+
+#: commit.c:1385
+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:101
+#, c-format
+msgid "graph file %s is too small"
+msgstr ""
+
+#: commit-graph.c:136
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:143
+#, c-format
+msgid "graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:150
+#, c-format
+msgid "hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
+msgstr ""
+
+#: commit-graph.c:184
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:221
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:334
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:671 builtin/pack-objects.c:2646
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:752
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:869
+#, 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:882
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:884
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:898
+#, 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:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:956
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:989
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:996 midx.c:769
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1036
+#, 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:1109
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:1153
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr ""
+
+#: config.c:123
+#, 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:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr ""
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr ""
+
+#: config.c:190
+msgid "relative config include conditionals must come from files"
+msgstr ""
+
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:378 sequencer.c:2330
+#, c-format
+msgid "invalid key: %s"
+msgstr ""
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#: config.c:793
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "λάθος γραμμή ρυθμίσεων %d στο blob %s"
+
+#: config.c:797
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "λάθος γραμμή ρυθμίσεων %d στο αρχείο %s"
+
+#: config.c:801
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "λάθος γραμμή ρυθμίσεων %d στο standard input"
+
+#: config.c:805
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "λάθος γραμμή ρυθμίσεων %d στο blob υποενότητας %s"
+
+#: config.c:809
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "λάθος γραμμή ρυθμίσεων %d στη γραμμή εντολών %s"
+
+#: config.c:813
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "λάθος γραμμή ρυθμίσεων %d στο %s"
+
+#: config.c:952
+msgid "out of range"
+msgstr "εκτός ορίων"
+
+#: config.c:952
+msgid "invalid unit"
+msgstr "μη έγκυρη μονάδα μέτρησης"
+
+#: config.c:958
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s': %s"
+
+#: config.c:963
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στο blob %s: %s"
+
+#: config.c:966
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στο αρχείο %s: %s"
+
+#: config.c:969
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στo standard input: %s"
+
+#: config.c:972
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στο blob υποενότητας %s: %s"
+
+#: config.c:975
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στη γραμμή εντολών %s: %s"
+
+#: config.c:978
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "λάθος αριθμητική τιμή ρύθμισης '%s' για το '%s' στο %s: %s"
+
+#: config.c:1073
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
+
+#: config.c:1082
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' για το '%s' δεν είναι έγκυρη χρονοσήμανση"
+
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: config.c:1187 config.c:1198
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr ""
+
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1323
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr ""
+
+#: config.c:1395
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: config.c:1481 builtin/pack-objects.c:3394
+#, c-format
+msgid "bad pack compression level %d"
+msgstr ""
+
+#: config.c:1602
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "δεν ήταν δυνατό να φορτωθεί το αντικείμενο blob ρυθμίσεων '%s'"
+
+#: config.c:1605
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "η αναφορά '%s' δε δείχνει σε κάποιο blob"
+
+#: config.c:1622
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "δεν ήταν δυνατή η αναζήτηση blob ρυθμίσεων '%s'"
+
+#: config.c:1652
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+#: config.c:1705
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:2037
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+
+#: config.c:2207
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: config.c:2250
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+
+#: config.c:2276
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+
+#: config.c:2322
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+
+#: config.c:2324
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+
+#: config.c:2405
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#: config.c:2437
+#, c-format
+msgid "%s has multiple values"
+msgstr ""
+
+#: config.c:2466
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr ""
+
+#: config.c:2716 config.c:3040
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#: config.c:2727
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#: config.c:2762 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
+#: config.c:2787
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#: config.c:2800 config.c:3053
+#, c-format
+msgid "fstat on %s failed"
+msgstr ""
+
+#: config.c:2811
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr ""
+
+#: config.c:2820 config.c:3058
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#: config.c:2905 config.c:3155
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#: config.c:2939
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr ""
+
+#: config.c:2941 builtin/remote.c:782
+#, c-format
+msgid "could not unset '%s'"
+msgstr ""
+
+#: config.c:3031
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3198
+#, 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 ""
+"ολοκληρώθηκε.\n"
+"Σύνδεση στο %s (port %s) ... "
+
+#: 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:1171
+#, 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:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1259
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1304
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:100
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:193
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:206
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c:208
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:216
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: convert.c:218
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:286
+#, 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:424 convert.c:495
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:735 convert.c:738
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1398 convert.c:1432
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1476
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: date.c:137
+msgid "in the future"
+msgstr ""
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:150
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:157
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:164
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:170
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:177
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:188
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:191
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:196 date.c:201
+#, 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:466
+#, 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:544
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diff.c:108
+#, c-format
+msgid "option '%s' requires a value"
+msgstr ""
+
+#: diff.c:158
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+
+#: diff.c:163
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr ""
+
+#: diff.c:291
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#: diff.c:319
+#, 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:327
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+
+#: diff.c:400
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+
+#: diff.c:460
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+
+#: diff.c:4211
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr ""
+
+#: diff.c:4553
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+
+#: diff.c:4556
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4634
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:4800
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+
+#: diff.c:4814
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: diff.c:5900
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+
+#: diff.c:5903
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+
+#: diff.c:5906
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"μπορείτε να δοκιμάστε να ορίσετε τη μεταβλητή σας %s σε τουλάχιστον %d και "
+"να δοκιμάσετε πάλι την εντολή."
+
+#: dir.c:538
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:927
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:1842
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "δεν ήταν δυνατό το άνοιγμα του φακέλου '%s'"
+
+#: dir.c:2084
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c:2208
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c:3009
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#: dir.c:3054 dir.c:3059
+#, c-format
+msgid "could not create directories for %s"
+msgstr ""
+
+#: dir.c:3088
+#, 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:465
+#, c-format
+msgid "could not stat file '%s'"
+msgstr ""
+
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr ""
+
+#: exec-cmd.c:361
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr ""
+
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
+msgstr ""
+
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: fetch-pack.c:185
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:256
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr ""
+
+#: fetch-pack.c:358 fetch-pack.c:1264
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:364 fetch-pack.c:1271
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:366 fetch-pack.c:1273
+#, c-format
+msgid "object not found: %s"
+msgstr ""
+
+#: fetch-pack.c:369 fetch-pack.c:1276
+#, c-format
+msgid "error in object: %s"
+msgstr ""
+
+#: fetch-pack.c:371 fetch-pack.c:1278
+#, c-format
+msgid "no shallow found: %s"
+msgstr ""
+
+#: fetch-pack.c:374 fetch-pack.c:1282
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr ""
+
+#: fetch-pack.c:415
+#, c-format
+msgid "got %s %d %s"
+msgstr ""
+
+#: fetch-pack.c:432
+#, c-format
+msgid "invalid commit %s"
+msgstr ""
+
+#: fetch-pack.c:463
+msgid "giving up"
+msgstr "εγκατάλειψη"
+
+#: fetch-pack.c:475 progress.c:229
+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:740
+#, c-format
+msgid "already have %s (%s)"
+msgstr "υπάρχει ήδη %s (%s)"
+
+#: fetch-pack.c:779
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:787
+msgid "protocol error: bad pack header"
+msgstr ""
+
+#: fetch-pack.c:855
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr ""
+
+#: fetch-pack.c:871
+#, c-format
+msgid "%s failed"
+msgstr ""
+
+#: fetch-pack.c:873
+msgid "error in sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:902
+msgid "Server does not support shallow clients"
+msgstr ""
+
+#: fetch-pack.c:906
+msgid "Server supports multi_ack_detailed"
+msgstr ""
+
+#: fetch-pack.c:909
+msgid "Server supports no-done"
+msgstr ""
+
+#: fetch-pack.c:915
+msgid "Server supports multi_ack"
+msgstr ""
+
+#: fetch-pack.c:919
+msgid "Server supports side-band-64k"
+msgstr ""
+
+#: fetch-pack.c:923
+msgid "Server supports side-band"
+msgstr ""
+
+#: fetch-pack.c:927
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr ""
+
+#: fetch-pack.c:931
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr ""
+
+#: fetch-pack.c:941
+msgid "Server supports ofs-delta"
+msgstr ""
+
+#: fetch-pack.c:947 fetch-pack.c:1140
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:955
+#, c-format
+msgid "Server version is %.*s"
+msgstr ""
+
+#: fetch-pack.c:961
+msgid "Server does not support --shallow-since"
+msgstr ""
+
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-exclude"
+msgstr ""
+
+#: fetch-pack.c:967
+msgid "Server does not support --deepen"
+msgstr ""
+
+#: fetch-pack.c:984
+msgid "no common commits"
+msgstr ""
+
+#: fetch-pack.c:996 fetch-pack.c:1419
+msgid "git fetch-pack: fetch failed."
+msgstr ""
+
+#: fetch-pack.c:1134
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1184
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1190
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1229
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1234
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1244
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1246
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1287
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1318
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1322
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1646
+msgid "no matching remote head"
+msgstr ""
+
+#: fetch-pack.c:1664 builtin/clone.c:671
+msgid "remote did not send all necessary objects"
+msgstr "ο απομακρυσμένος εξυπηρετητής δεν έστειλε όλα τα αναγκαία αντικείμενα"
+
+#: fetch-pack.c:1690
+#, c-format
+msgid "no such remote ref %s"
+msgstr "δεν υπάρχει τέτοιο απομακρυσμένο ref %s"
+
+#: fetch-pack.c:1693
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr ""
+
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
+msgstr ""
+
+#: gpg-interface.c:344
+msgid "could not create temporary file"
+msgstr ""
+
+#: gpg-interface.c:347
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr ""
+
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+#: grep.c:2113
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "απέτυχε το stat του '%s'"
+
+#: grep.c:2141
+#, 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 "Κύριες Εντολές Porcelain"
+
+#: 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 / Synching 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 "εντολές git διαθέσιμες από αλλού στο $PATH σας"
+
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+"Αυτές είναι κοινές εντολές Git που χρησιμοποιούνται σε διάφορες περιπτώσεις:"
+
+#: help.c:363 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr ""
+
+#: help.c:410
+msgid "The common Git guides are:"
+msgstr ""
+
+#: help.c:519
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+"Δείτε 'git help <εντολή>' για να διαβάσετε για κάποια συγκεκριμένη υποεντολή"
+
+#: help.c:524
+msgid "External commands"
+msgstr "Εξωτερικές εντολές"
+
+#: help.c:539
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:603
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' φαίνεται να είναι εντολή git, αλλά δεν μπορέσαμε\n"
+"να την εκτελέσουμε. Μήπως το git-%s είναι χαλασμένο;"
+
+#: help.c:662
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ώπα. Το σύστημά σας δεν αναφέρει καμία απολύτως εντολή Git."
+
+#: help.c:684
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "ΠΡΟΣΟΧΗ: Καλέσατε μία εντολή Git με όνομα '%s', η οποία δεν υπάρχει."
+
+#: help.c:689
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Συνεχίζουμε υποθέτοντας πως εννοούσατε '%s'."
+
+#: help.c:694
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Συνεχίζουμε σε %0.1f δευτερόλεπτα, υποθέτοντας πως εννοούσατε '%s'."
+
+#: help.c:702
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' δεν είναι εντολή git. Δείτε 'git --help'."
+
+#: help.c:706
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Η πιο παρόμοια εντολή είναι"
+msgstr[1] ""
+"\n"
+"Οι πιο παρόμοιες εντολές είναι"
+
+#: help.c:721
+msgid "git version [<options>]"
+msgstr "git version [<επιλογές>]"
+
+#: help.c:789
+#, c-format
+msgid "%s: %s - %s"
+msgstr ""
+
+#: help.c:793
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Μήπως εννοούσατε αυτό;"
+msgstr[1] ""
+"\n"
+"Μήπως εννοούσατε ένα από αυτά;"
+
+#: ident.c:345
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Παρακαλώ πείτε μου το όνομά σας.\n"
+"\n"
+"Τρέξτε\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Το Όνομά Σας\"\n"
+"\n"
+"για να ορίσετε την προεπιλεγμένη ταυτότητα του λογαριασμού σας.\n"
+"Παραλείψετε το --global για να ορίσετε την ταυτότητα μόνο σε αυτό το "
+"αποθετήριο.\n"
+"\n"
+
+#: ident.c:369
+msgid "no email was given and auto-detection is disabled"
+msgstr "δε δόθηκε email και η αυτόματη ανίχνευση είναι απενεργοποιημένη"
+
+#: ident.c:374
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "δεν ήταν δυνατή η αυτόματη ανίχνευση διεύθυνσης email (βρέθηκε '%s')"
+
+#: ident.c:384
+msgid "no name was given and auto-detection is disabled"
+msgstr "δε δόθηκε όνομα και η αυτόματη ανίχνευση είναι απενεργοποιημένη"
+
+#: ident.c:390
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "δεν ήταν δυνατή η αυτόματη ανίχνευση ονόματος (βρέθηκε '%s')"
+
+#: ident.c:398
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "δεν επιτρέπεται κενό όνομα ident (για το <%s>)"
+
+#: ident.c:404
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "το όνομα αποτελείται μόνο από μη επιτρεπτούς χαρακτήρες: %s"
+
+#: ident.c:419 builtin/commit.c:608
+#, c-format
+msgid "invalid date format: %s"
+msgstr "μη έγκυρη μορφή ημερομηνίας: %s"
+
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:152
+msgid "cannot change partial clone promisor remote"
+msgstr ""
+
+#: lockfile.c:151
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Δε γίνεται να δημιουργηθεί το '%s.lock': %s.\n"
+"\n"
+"Φαίνεται πως μια άλλη διεργασία git τρέχει μέσα σε αυτό το αποθετήριο, π.χ.\n"
+"ένας διορθωτής που άνοιξε από το 'git commit'. Παρακαλώ σιγουρευτείτε πως "
+"όλες οι διεργασίες\n"
+"έχουν τερματιστεί και προσπαθήστε πάλι. Αν αποτυγχάνει ακόμα, μπορεί μια "
+"διεργασία git\n"
+"να έχει καταρρεύσει μέσα σε αυτό το αποθετήριο νωρίτερα:\n"
+"αφαιρέστε το αρχείο χειροκίνητα για να συνεχίσετε."
+
+#: 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:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771
+msgid "unable to write new index file"
+msgstr "δεν είναι δυνατή η εγγραφή νέου αρχείου ευρετηρίου"
+
+#: merge-recursive.c:332
+msgid "(bad commit)\n"
+msgstr ""
+
+#: merge-recursive.c:355
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:364
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:447
+msgid "error building trees"
+msgstr ""
+
+#: merge-recursive.c:902
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr ""
+
+#: merge-recursive.c:913
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr ""
+
+#: merge-recursive.c:927 merge-recursive.c:946
+msgid ": perhaps a D/F conflict?"
+msgstr ""
+
+#: merge-recursive.c:936
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr ""
+
+#: merge-recursive.c:978 builtin/cat-file.c:40
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:980
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "αναμενόταν blob για %s '%s'"
+
+#: merge-recursive.c:1004
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:1015
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:1020
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:1211
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-recursive.c:1218
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-recursive.c:1225
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-recursive.c:1233 merge-recursive.c:1245
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1236 merge-recursive.c:1248
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr ""
+
+#: merge-recursive.c:1271
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1275
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1276
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1279
+#, 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:1288
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1361
+msgid "Failed to execute internal merge"
+msgstr ""
+
+#: merge-recursive.c:1366
+#, c-format
+msgid "Unable to add %s to database"
+msgstr ""
+
+#: merge-recursive.c:1398
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-recursive.c:1419
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+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."
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (%s/διαγραφή): Έγινε διαγραφή του %s στο %s και %s στο %s. "
+"Διατηρήθηκε η έκδοση %s του %s στο δέντρο."
+
+#: merge-recursive.c:1491
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (%s/διαγραφή): Έγινε διαγραφή του %s στο %s και %s στο %s στο %s. "
+"Διατηρήθηκε η έκδοση %s του %s στο δέντρο."
+
+#: merge-recursive.c:1498
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (%s/διαγραφή): Έγινε διαγραφή του %s στο %s και %s στο %s. "
+"Διατηρήθηκε η έκδοση %s του %s στο δέντρο στο %s."
+
+#: merge-recursive.c:1503
+#, 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 ""
+"ΣΥΓΚΡΟΥΣΗ (%s/διαγραφή): Έγινε διαγραφή του %s στο %s και %s στο %s στο %s. "
+"Διατηρήθηκε η έκδοση %s του %s στο δέντρο στο %s."
+
+#: merge-recursive.c:1537
+msgid "rename"
+msgstr "μετονομασία"
+
+#: merge-recursive.c:1537
+msgid "renamed"
+msgstr "μετονομάστηκε"
+
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1643
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1706
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (μετονομασία/προσθήκη): Μετονομασία %s->%s στο %s. Έγινε προσθήκη "
+"%s στο %s"
+
+#: merge-recursive.c:1734
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1739
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1759
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (μετονομασία/μετονομασία): Μετονομασία \"%s\"->\"%s\" στον κλάδο "
+"\"%s\" μετονομασία \"%s\"->\"%s\" στον κλάδο \"%s\"%s"
+
+#: merge-recursive.c:1764
+msgid " (left unresolved)"
+msgstr " (έμεινε αταύτιστο)"
+
+#: merge-recursive.c:1868
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (μετονομασία/μετονομασία): Μετονομασία %s->%s στο %s. Μετονομασία "
+"%s->%s στο %s"
+
+#: merge-recursive.c:2064
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (ασάφεια μετονομασίας φακέλου): Δεν είναι σαφές πού να τοποθετηθεί "
+"το %s επειδή ο φάκελος %s μετονομάστηκε σε πολλαπλούς άλλους φακέλους, και "
+"κανένας προορισμός δεν πήρε τα περισσότερα αρχεία."
+
+#: merge-recursive.c:2096
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (εννοούμενη μετονομασία φακέλων): Υπάρχον αρχείο/φάκελος στο %s "
+"εμποδίζει την εννοούμενη μετονομασία που θα έβαζε τις επόμενες διαδρομές "
+"εκεί: %s."
+
+#: merge-recursive.c:2106
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (εννοούμενη μετονομασία φακέλων): Δε μπορεί να γίνει αντιστοίχιση "
+"του %s με περισσότερες από μία διαδρομές, οι εννοούμενες μετονομασίες "
+"φακέλων προσπάθησαν να βάλουν αυτές τις διαδρομές εκεί: %s"
+
+#: merge-recursive.c:2198
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (μετονομασία/μετονομασία): Μετονομασία φακέλου %s->%s στο %s. "
+"Μετονομασία φακέλου %s->%s στο %s"
+
+#: merge-recursive.c:2443
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-recursive.c:3022
+#, c-format
+msgid "cannot read object %s"
+msgstr ""
+
+#: merge-recursive.c:3025
+#, c-format
+msgid "object %s is not a blob"
+msgstr "το αντικείμενο %s δεν είναι blob"
+
+#: merge-recursive.c:3094
+msgid "modify"
+msgstr "τροποποιώ"
+
+#: merge-recursive.c:3094
+msgid "modified"
+msgstr "τροποποιημένο"
+
+#: merge-recursive.c:3105
+msgid "content"
+msgstr "περιεχόμενο"
+
+#: merge-recursive.c:3112
+msgid "add/add"
+msgstr ""
+
+#: merge-recursive.c:3160
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr ""
+
+#: merge-recursive.c:3182 git-submodule.sh:861
+msgid "submodule"
+msgstr "υποενότητα"
+
+#: merge-recursive.c:3183
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "ΣΥΓΚΡΟΥΣΗ (%s): Σύγκρουση συγχώνευσης στο %s"
+
+#: merge-recursive.c:3216
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3319
+#, c-format
+msgid "Removing %s"
+msgstr "Αφαίρεση του %s"
+
+#: merge-recursive.c:3345
+msgid "file/directory"
+msgstr ""
+
+#: merge-recursive.c:3351
+msgid "directory/file"
+msgstr ""
+
+#: merge-recursive.c:3358
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"ΣΥΓΚΡΟΥΣΗ (%s): Υπάρχει φάκελος με όνομα %s στο %s. Γίνεται προσθήκη του %s "
+"ως %s"
+
+#: merge-recursive.c:3367
+#, c-format
+msgid "Adding %s"
+msgstr ""
+
+#: merge-recursive.c:3376
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "ΣΥΓΚΡΟΥΣΗ (προσθήκη/προσθήκη): Σύγκρουση συγχώνευσης στο %s"
+
+#: merge-recursive.c:3417
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από τη "
+"συγχώνευση:\n"
+" %s"
+
+#: merge-recursive.c:3428
+msgid "Already up to date!"
+msgstr "Ήδη πλήρως ενήμερο!"
+
+#: merge-recursive.c:3437
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr ""
+
+#: merge-recursive.c:3536
+msgid "Merging:"
+msgstr ""
+
+#: merge-recursive.c:3549
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3588
+msgid "merge returned no commit"
+msgstr ""
+
+#: merge-recursive.c:3654
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr ""
+
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
+msgid "Unable to write index."
+msgstr ""
+
+#: midx.c:65
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:81
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:91
+#, c-format
+msgid "hash version %u does not match"
+msgstr ""
+
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
+msgstr ""
+
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:162
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:205
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
+
+#: midx.c:407
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:413
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:981
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:992
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:996
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1004
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1019
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: name-hash.c:531
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:553
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:559
+#, 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 ""
+"Δεν έχετε ολοκληρώσει την προηγούμενη συγχώνευση σημειώσεών σας (Υπάρχει το "
+"%s).\n"
+"Παρακαλώ, χρησιμοποιήστε 'git notes merge --commit' ή 'git notes merge --"
+"abort' για να υποβάλετε/εγκαταλείψετε την προηγούμενη συγχώνευση πριν "
+"ξεκινήσετε νέα συγχώνευση σημειώσεων."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Δεν έχετε ολοκληρώσει τη συγχώνευση σημειώσεών σας (Υπάρχει το %s)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr ""
+
+#: notes-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:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:174
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:234
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:247
+#, c-format
+msgid "unable to parse object: %s"
+msgstr ""
+
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr ""
+
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1870
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1874
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
+#: parse-options.c:35
+#, c-format
+msgid "%s requires a value"
+msgstr ""
+
+#: parse-options.c:69
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#: parse-options.c:74
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:90
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: parse-options.c:178
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: parse-options.c:194
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:322
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "αμφίσημη επιλογή: %s (θα μπορούσε να είναι --%s%s ή --%s%s)"
+
+#: parse-options.c:356 parse-options.c:364
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
+
+#: parse-options.c:649
+#, c-format
+msgid "unknown option `%s'"
+msgstr "άγνωστη επιλογή `%s'"
+
+#: parse-options.c:651
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:653
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:675
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:694
+#, c-format
+msgid "usage: %s"
+msgstr "χρήση: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:700
+#, c-format
+msgid " or: %s"
+msgstr " ή: %s"
+
+#: parse-options.c:703
+#, c-format
+msgid " %s"
+msgstr ""
+
+#: parse-options.c:742
+msgid "-NUM"
+msgstr "-ΑΡΙΘ"
+
+#: parse-options-cb.c:21
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:38
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:51
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:110
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
+#: path.c:894
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
+msgstr ""
+
+#: pathspec.c:149
+msgid "attr spec must not be empty"
+msgstr ""
+
+#: pathspec.c:192
+#, c-format
+msgid "invalid attribute name %s"
+msgstr ""
+
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:325
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:330
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:368
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:440
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr ""
+
+#: pathspec.c:514
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr ""
+
+#: pathspec.c:524
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+"%s: το magic της περιγραφής διαδρομής δεν υποστηρίζεται από την εντολή: %s"
+
+#: pathspec.c:591
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "η περιγραφή διαδρομής '%s' είναι πίσω από συμβολικό δεσμό"
+
+#: pkt-line.c:104
+msgid "flush packet write failed"
+msgstr ""
+
+#: pkt-line.c:144 pkt-line.c:230
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+#: pkt-line.c:160 pkt-line.c:162
+msgid "packet write with format failed"
+msgstr ""
+
+#: pkt-line.c:194
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#: pkt-line.c:201 pkt-line.c:208
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:293
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:301
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#: pkt-line.c:329
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
+
+#: pkt-line.c:339 pkt-line.c:344
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#: pkt-line.c:353
+#, 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:963
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: range-diff.c:56
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:59
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c:74 sequencer.c:4828
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:224
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:455 range-diff.c:457
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c:673
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+"δεν είναι δυνατή η δημιουργία κενού blob στη βάση δεδομένων αντικειμένων"
+
+#: read-cache.c:710
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#: read-cache.c:765
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#: read-cache.c:784
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#: read-cache.c:795
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#: read-cache.c:1304
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1489
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1603
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1684
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1687
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1726
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1728
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1765
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1781
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1839
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1842
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
+msgstr "το αρχείο ευρετηρίου είναι κατεστραμμένο"
+
+#: read-cache.c:2090
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2103
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2136
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2140
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2144
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2148
+#, c-format
+msgid "%s: unable to map index file"
+msgstr ""
+
+#: read-cache.c:2190
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2217
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2239
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2274
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
+#, c-format
+msgid "could not stat '%s'"
+msgstr ""
+
+#: read-cache.c:3057
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c:3069
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: read-cache.c:3088
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3237
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c:10
+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:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+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:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:583
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:585 ref-filter.c:1976
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: refs.c:711
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "δεν ήταν δυνατό το άνοιγμα του '%s' για εγγραφή: %s"
+
+#: refs.c:721 refs.c:772
+#, c-format
+msgid "could not read ref '%s'"
+msgstr ""
+
+#: refs.c:727
+#, c-format
+msgid "ref '%s' already exists"
+msgstr ""
+
+#: refs.c:732
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr ""
+
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "δεν ήταν δυνατό το άνοιγμα του '%s' για εγγραφή"
+
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr ""
+
+#: refs.c:905
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:911
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1061
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1137
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2045 refs.c:2080
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr ""
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: ref-filter.c:39 wt-status.c:1861
+msgid "gone"
+msgstr "δεν υπάρχει πια"
+
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr ""
+
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr ""
+
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr ""
+
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr ""
+
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr ""
+
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:265
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:274
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr ""
+
+#: ref-filter.c:325
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:327
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr ""
+
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr ""
+
+#: ref-filter.c:346
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr ""
+
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
+msgstr ""
+
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
+msgstr ""
+
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr ""
+
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr ""
+
+#: ref-filter.c:527
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:554
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:558
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"δεν είναι αποθετήριο git, αλλά το πεδίο '%.*s' χρειάζεται πρόσβαση στα "
+"δεδομένα αντικειμένων"
+
+#: ref-filter.c:682
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:745
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:747
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:749
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:779
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:796
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c:853
+#, c-format
+msgid "malformed format string %s"
+msgstr ""
+
+#: ref-filter.c:1447
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(κανένας κλάδος, γίνεται rebase του %s)"
+
+#: ref-filter.c:1450
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(κανένας κλάδος, γίνεται rebase του αποσυνδεδεμένου HEAD %s)"
+
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(κανένας κλάδος, η διχοτόμηση άρχισε στο %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1461
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1468
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c:1472
+msgid "(no branch)"
+msgstr "(κανένας κλάδος)"
+
+#: ref-filter.c:1506 ref-filter.c:1663
+#, c-format
+msgid "missing object %s for %s"
+msgstr ""
+
+#: ref-filter.c:1516
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr ""
+
+#: ref-filter.c:1882
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c:1971
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr ""
+
+#: ref-filter.c:2257
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c:2352
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr ""
+
+#: ref-filter.c:2355
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr ""
+
+#: ref-filter.c:2365
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: ref-filter.c:2370
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"η συντομογραφία ρύθμισης απομακρυσμένου δε γίνεται να ξεκινά με '/': %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "δόθηκαν περισσότερα από ένα receivepack, γίνεται χρήση του πρώτου"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "δόθηκαν περισσότερα από ένα uploadpack, γίνεται χρήση του πρώτου"
+
+#: remote.c:608
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Δεν είναι δυνατή η ανάκτηση του %s και του %s ταυτόχρονα στο %s"
+
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "το %s συνήθως παρακολουθεί το %s, όχι το %s"
+
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "το %s παρακολουθεί ταυτόχρονα το %s και το %s"
+
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "το κλειδί '%s' του μοτίβου δεν είχε '*'"
+
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "η τιμή '%s' του μοτίβου δεν έχει '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "το refspec πηγής %s δεν ταιριάζει με κανένα"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "το refspec πηγής %s ταιριάζει με περισσότερα από ένα"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"Ο προορισμός που εισαγάγατε δεν είναι πλήρες refname (δηλ.\n"
+"που να αρχίζει με \"refs/\"). Προσπαθήσαμε να μαντέψουμε τι εννοείτε:\n"
+"\n"
+"- Ψάχνοντας για ref που να ταιριάζει με το '%s' στην απομακρυσμένη πλευρά.\n"
+"- Κάνοντας έλεγχο εάν η <πηγή> που δημοσιεύεται ('%s')\n"
+" είναι ref μέσα σε \"refs/{heads,tags}/\". Αν είναι, προσθέτουμε το "
+"αντίστοιχο\n"
+" πρόθεμα refs/{heads,tags}/ στην απομακρυσμένη πλευρά.\n"
+"\n"
+"Κανένα από τα δύο δε δούλεψε, οπότε εγκαταλείψαμε. Πρέπει να εισάγετε "
+"ολογράφως το ref."
+
+#: remote.c:1040
+#, 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 ""
+"Το σκέλος <πηγή> του refspec είναι αντικείμενο υποβολής.\n"
+"Θέλατε να δημιουργήσετε νέο κλάδο δημοσιεύοντας στο\n"
+"'%s:refs/tags/%s';"
+
+#: remote.c:1045
+#, 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 ""
+"Το σκέλος <πηγή> του refspec είναι αντικείμενο ετικέτας.\n"
+"Θέλατε να δημιουργήσετε νέα ετικέτα δημοσιεύοντας στο\n"
+"'%s:refs/tags/%s';"
+
+#: remote.c:1050
+#, 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 ""
+"Το σκέλος <πηγή> του refspec είναι αντικείμενο δέντρου.\n"
+"Θέλατε να βάλετε ετικέτα σε νέο δέντρο δημοσιεύοντας στο\n"
+"'%s:refs/tags/%s';"
+
+#: remote.c:1055
+#, 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 ""
+"Το σκέλος <πηγή> του refspec είναι αντικείμενο blob.\n"
+"Θέλατε να βάλετε ετικέτα σε νέο blob δημοσιεύοντας στο\n"
+"'%s:refs/tags/%s';"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "δε μπορεί να γίνει ταύτιση του %s με κλάδο"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "δε μπορεί να γίνει διαγραφή του '%s': το απομακρυσμένο ref δεν υπάρχει"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "το refspec προορισμού %s ταιριάζει με περισσότερα από ένα"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "το ref προορισμού %s λαμβάνει από περισσότερες από μία πηγές"
+
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
+msgstr "Το HEAD δε δείχνει σε κάποιον κλάδο"
+
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "δεν υπάρχει ο κλάδος: '%s'"
+
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "δεν έχει ρυθμιστεί προς τα πάνω για τον κλάδο '%s'"
+
+#: remote.c:1642
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+"ο προς τα πάνω κλάδος '%s' δεν αποθηκεύεται ως κλάδος παρακολούθησης "
+"απομακρυσμένου"
+
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"ο προορισμός δημοσίευσης '%s' στον απομακρυσμένο εξυπηρετητή '%s' δεν έχει "
+"τοπικό κλάδο παρακολούθησης"
+
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "ο κλάδος '%s' δεν έχει απομακρυσμένο για δημοσίευση"
+
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "τα refspec δημοσίευσης για το '%s' δεν περιλαμβάνουν το '%s'"
+
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
+msgstr ""
+"η δημοσίευση δεν έχει προορισμό (το push.default είναι το τίποτα: 'nothing')"
+
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "δε μπορεί να γίνει ταύτιση 'simple' δημοσίευσης σε έναν μόνο προορισμό"
+
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "δεν ήταν δυνατή η εύρεση του απομακρυσμένου ref %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Γίνεται παράβλεψη του παράξενου ref '%s' τοπικά"
+
+#: remote.c:1990
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+"Ο κλάδος σας βασίζεται πάνω στο '%s', αλλά το προς τα πάνω δεν υπάρχει πια.\n"
+
+#: remote.c:1994
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr ""
+" (χρησιμοποιήστε \"git branch --unset-upstream\" για να επιδιορθώσετε)\n"
+
+#: remote.c:1997
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Ο κλάδος σας είναι ενήμερος με το '%s'.\n"
+
+#: remote.c:2001
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Ο κλάδος σας και το '%s' αναφέρονται σε διαφορετικές υποβολές.\n"
+
+#: remote.c:2004
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (χρησιμοποιήστε \"%s\" για λεπτομέρειες)\n"
+
+#: remote.c:2008
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Ο κλάδος σας είναι μπροστά από το '%s' κατά %d υποβολή.\n"
+msgstr[1] "Ο κλάδος σας είναι μπροστά από το '%s' κατά %d υποβολές.\n"
+
+#: remote.c:2014
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr ""
+" (χρησιμοποιήστε \"git push\" για να δημοσιεύσετε τις τοπικές σας "
+"υποβολές)\n"
+
+#: remote.c:2017
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Ο κλάδος σας είναι πίσω από το '%s' κατά %d υποβολή, και μπορεί να κάνει "
+"ταχεία προώθηση.\n"
+msgstr[1] ""
+"Ο κλάδος σας είναι πίσω από το '%s' κατά %d υποβολές, και μπορεί να κάνει "
+"ταχεία προώθηση.\n"
+
+#: remote.c:2025
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr ""
+" (χρησιμοποιήστε \"git pull\" για να ενημερώσετε τον τοπικό σας κλάδο)\n"
+
+#: remote.c:2028
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Ο κλάδος σας και το '%s' έχουν αποκλίνει,\n"
+"και έχουν %d και %d διαφορετική υποβολή ο καθένας, αντίστοιχα.\n"
+msgstr[1] ""
+"Ο κλάδος σας και το '%s' έχουν αποκλίνει,\n"
+"και έχουν %d και %d διαφορετικές υποβολές ο καθένας, αντίστοιχα.\n"
+
+#: remote.c:2038
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr ""
+" (χρησιμοποιήστε \"git pull\" για να συγχωνεύσετε τον απομακρυσμένο κλάδο "
+"μέσα στον δικό σας)\n"
+
+#: remote.c:2221
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "δεν είναι δυνατή η ανάλυση του αναμενόμενου ονόματος αντικειμένου '%s'"
+
+#: 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:73
+#, 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:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314
+#, c-format
+msgid "could not write '%s'"
+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 "Ταυτίστηκε το '%s' χρησιμοποιώντας την προηγούμενη ταύτιση."
+
+#: 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:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427
+#, 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:2484
+msgid "your current branch appears to be broken"
+msgstr "ο παρών κλάδος σας φαίνεται να είναι χαλασμένος"
+
+#: revision.c:2487
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ο τρέχων κλάδος σας '%s' δεν έχει ακόμα καμία υποβολή"
+
+#: revision.c:2684
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: run-command.c:742
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1231
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+#: run-command.c:1295
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:143
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:145
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr ""
+
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
+msgstr ""
+
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
+msgstr ""
+
+#: sequencer.c:184
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:288
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:314
+msgid "revert"
+msgstr ""
+
+#: sequencer.c:316
+msgid "cherry-pick"
+msgstr ""
+
+#: sequencer.c:318
+msgid "rebase -i"
+msgstr ""
+
+#: sequencer.c:320
+#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+#: sequencer.c:378
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"αφού επιλύσετε τις συγκρούσεις, επισημάνετε τις διορθωμένες διαδρομές\n"
+"με 'git add <διαδρομές>' ή 'git rm <διαδρομές>'"
+
+#: sequencer.c:381
+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 ""
+"αφού επιλύσετε τις συγκρούσεις, επισημάνετε τις διορθωμένες διαδρομές\n"
+"με 'git add <διαδρομές>' ή 'git rm <διαδρομές>'\n"
+"και υποβάλετε το αποτέλεσμα με 'git commit'"
+
+#: sequencer.c:394 sequencer.c:2671
+#, c-format
+msgid "could not lock '%s'"
+msgstr ""
+
+#: sequencer.c:401
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr ""
+
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr ""
+
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: sequencer.c:455
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "οι τοπικές αλλαγές σας θα επεγγραφόντουσαν από το %s."
+
+#: sequencer.c:459
+msgid "commit your changes or stash them to proceed."
+msgstr "υποβάλετε τις αλλαγές σας ή αποθηκεύστε τις για να προχωρήσετε."
+
+#: sequencer.c:491
+#, c-format
+msgid "%s: fast-forward"
+msgstr ""
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:582
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:598
+msgid "unable to update cache tree"
+msgstr ""
+
+#: sequencer.c:612
+msgid "could not resolve HEAD commit"
+msgstr "δεν ήταν δυνατή η ταύτιση της υποβολής HEAD"
+
+#: sequencer.c:692
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:703
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "δεν ήταν δυνατό το άνοιγμα του '%s' για ανάγνωση"
+
+#: sequencer.c:750
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' δόθηκε ήδη"
+
+#: sequencer.c:755
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' δόθηκε ήδη"
+
+#: sequencer.c:760
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' δόθηκε ήδη"
+
+#: sequencer.c:764
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:769
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:771
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:773
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:833
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
+
+#: sequencer.c:850
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"έχετε προετοιμασμένες αλλαγές στο δέντρο εργασίας σας\n"
+"Αν αυτές οι αλλαγές πρέπει να συμπτυχθούν μέσα στην προηγούμενη υποβολή, "
+"τρέξτε:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Αν πρέπει να πάνε σε νέα υποβολή, τρέξτε:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"Και στις δύο περιπτώσεις, μόλις τελειώσετε, συνεχίστε με:\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:945
+msgid "writing root commit"
+msgstr ""
+
+#: sequencer.c:1155
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+
+#: sequencer.c:1162
+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 ""
+"Το όνομα και η διεύθυνση email σας ρυθμίστηκαν αυτόματα με βάση\n"
+"το όνομα χρήστη και το όνομα υπολογιστή σας. Παρακαλώ ελέγξτε πως είναι "
+"ακριβή.\n"
+"Μπορείτε να αποκρύψετε αυτό το μήνυμα ορίζοντας τα ρητά. Τρέξτε την\n"
+"ακόλουθη εντολή και ακολουθήστε τις οδηγίες στον διορθωτή σας για να "
+"επεξεργαστείτε\n"
+"το αρχείο ρυθμίσεών σας :\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"Έπειτα, μπορείτε να διορθώσετε την ταυτότητα χρήστη που χρησιμοποιήθηκε για "
+"αυτή την υποβολή με:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: sequencer.c:1175
+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 ""
+"Το όνομα και η διεύθυνση email σας ρυθμίστηκαν αυτόματα με βάση\n"
+"το όνομα χρήστη και το όνομα υπολογιστή σας. Παρακαλώ ελέγξτε πως είναι "
+"ακριβή.\n"
+"Μπορείτε να αποκρύψετε αυτό το μήνυμα ορίζοντας τα ρητά:\n"
+"\n"
+" git config --global user.name \"Το όνομά σας\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"Έπειτα, μπορείτε να διορθώσετε την ταυτότητα χρήστη που χρησιμοποιήθηκε για "
+"αυτή την υποβολή με:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: sequencer.c:1217
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:1219
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1265
+msgid "unable to resolve HEAD after creating commit"
+msgstr "δεν ήταν δυνατή η ταύτιση του HEAD μετά τη δημιουργία της υποβολής"
+
+#: sequencer.c:1267
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1271
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1292
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1294
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "Το HEAD %s δεν είναι υποβολή!"
+
+#: sequencer.c:1298 builtin/commit.c:1546
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1350 sequencer.c:1964
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1377 sequencer.c:1433
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884
+msgid "failed to write commit object"
+msgstr ""
+
+#: sequencer.c:1460
+#, c-format
+msgid "could not parse commit %s"
+msgstr ""
+
+#: sequencer.c:1465
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:1565 sequencer.c:1675
+#, c-format
+msgid "unknown command: %d"
+msgstr ""
+
+#: sequencer.c:1622 sequencer.c:1647
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr ""
+
+#: sequencer.c:1632 sequencer.c:4808
+msgid "need a HEAD to fixup"
+msgstr ""
+
+#: sequencer.c:1634 sequencer.c:2958
+msgid "could not read HEAD"
+msgstr ""
+
+#: sequencer.c:1636
+msgid "could not read HEAD's commit message"
+msgstr ""
+
+#: sequencer.c:1642
+#, c-format
+msgid "cannot write '%s'"
+msgstr ""
+
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:1657
+#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:1664
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr ""
+
+#: sequencer.c:1670
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr ""
+
+#: sequencer.c:1758
+msgid "your index file is unmerged."
+msgstr "το αρχείο ευρετηρίου σας δεν έχει συγχωνευτεί."
+
+#: sequencer.c:1765
+msgid "cannot fixup root commit"
+msgstr ""
+
+#: sequencer.c:1784
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "η υποβολή %s είναι συγχώνευση αλλά δεν έχει δοθεί επιλογή -m."
+
+#: sequencer.c:1792 sequencer.c:1800
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "η υποβολή %s δεν έχει γονέα το %d"
+
+#: sequencer.c:1806
+#, 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:1825
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:1890
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "δεν ήταν δυνατή η μετονομασία του '%s' σε '%s'"
+
+#: sequencer.c:1945
+#, c-format
+msgid "could not revert %s... %s"
+msgstr ""
+
+#: sequencer.c:1946
+#, c-format
+msgid "could not apply %s... %s"
+msgstr ""
+
+#: sequencer.c:2005
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr ""
+
+#: sequencer.c:2012
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr ""
+
+#: sequencer.c:2094
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:2103
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:2163
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr ""
+
+#: sequencer.c:2171
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr ""
+
+#: sequencer.c:2243
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: sequencer.c:2245
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:2250
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:2261
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:2263
+msgid "cannot revert during a cherry-pick."
+msgstr ""
+
+#: sequencer.c:2333
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr ""
+
+#: sequencer.c:2420
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2436
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:2518 sequencer.c:4067
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:2526
+msgid "a cherry-pick or revert is already in progress"
+msgstr ""
+
+#: sequencer.c:2527
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr ""
+
+#: sequencer.c:2530
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr ""
+
+#: sequencer.c:2544
+msgid "could not lock HEAD"
+msgstr ""
+
+#: sequencer.c:2599 sequencer.c:3819
+msgid "no cherry-pick or revert in progress"
+msgstr "δεν υφίσταται cherry-pick ή revert"
+
+#: sequencer.c:2601
+msgid "cannot resolve HEAD"
+msgstr "δεν είναι δυνατή η ταύτιση του HEAD"
+
+#: sequencer.c:2603 sequencer.c:2638
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+
+#: sequencer.c:2624 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+#: sequencer.c:2626
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr ""
+
+#: sequencer.c:2627
+msgid "unexpected end of file"
+msgstr ""
+
+#: sequencer.c:2633
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr ""
+
+#: sequencer.c:2644
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Φαίνεται πως μετακινήσατε το HEAD. Δε γίνεται γύρισμα προς τα πίσω, ελέγξτε "
+"το HEAD σας!"
+
+#: sequencer.c:2750 sequencer.c:3735
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:2788 sequencer.c:3715
+msgid "cannot read HEAD"
+msgstr ""
+
+#: sequencer.c:2805
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2813
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Μπορείτε να τροποποιήσετε την υποβολή τώρα, με\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Όταν οι αλλαγές σας σας ικανοποιούν, τρέξτε\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:2823
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:2830
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Δεν ήταν δυνατή η συγχώνευση του %.*s"
+
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646
+msgid "could not read index"
+msgstr ""
+
+#: sequencer.c:2875
+#, 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:2881
+msgid "and made changes to the index and/or the working tree\n"
+msgstr ""
+
+#: sequencer.c:2887
+#, 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:2948
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3002
+msgid "writing fake root commit"
+msgstr ""
+
+#: sequencer.c:3007
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: sequencer.c:3063 builtin/rebase.c:448
+msgid "could not write index"
+msgstr ""
+
+#: sequencer.c:3090
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "δεν ήταν δυνατή η ταύτιση του '%s'"
+
+#: sequencer.c:3118
+msgid "cannot merge without a current revision"
+msgstr ""
+
+#: sequencer.c:3140
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:3149
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "δεν υπάρχει τίποτα προς συγχώνευση: '%.*s'"
+
+#: sequencer.c:3161
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3176
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr ""
+
+#: sequencer.c:3325
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3341
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:3409 builtin/rebase.c:298
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Έγινε εφαρμογή των αυτόματα αποθηκευμένων.\n"
+
+#: sequencer.c:3421
+#, c-format
+msgid "cannot store %s"
+msgstr ""
+
+#: sequencer.c:3424 builtin/rebase.c:314
+#, 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 ""
+"Η εφαρμογή των αυτόματα αποθηκευμένων οδήγησε σε συγκρούσεις.\n"
+"Οι αλλαγές σας είναι ασφαλείς μέσα στα αποθηκευμένα.\n"
+"Μπορείτε να τρέξετε \"git stash pop\" ή \"git stash drop\" ανά πάσα στιγμή.\n"
+
+#: sequencer.c:3478
+#, c-format
+msgid "could not checkout %s"
+msgstr ""
+
+#: sequencer.c:3492
+#, c-format
+msgid "%s: not a valid OID"
+msgstr ""
+
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:3512
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:3514
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:3522
+#, 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:3597
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr ""
+
+#: sequencer.c:3677
+#, c-format
+msgid "unknown command %d"
+msgstr ""
+
+#: sequencer.c:3723
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:3728 sequencer.c:4805
+msgid "could not read 'onto'"
+msgstr ""
+
+#: sequencer.c:3742
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr ""
+
+#: sequencer.c:3831
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: sequencer.c:3840
+msgid "cannot amend non-existing commit"
+msgstr ""
+
+#: sequencer.c:3842
+#, c-format
+msgid "invalid file: '%s'"
+msgstr ""
+
+#: sequencer.c:3844
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr ""
+
+#: sequencer.c:3847
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Έχετε μη συγχωνευμένες αλλαγές στο δέντρο εργασίας σας. Παρακαλώ, υποβάλετέ "
+"τις\n"
+"πρώτα και μετά τρέξτε 'git rebase --continue' πάλι."
+
+#: sequencer.c:3883 sequencer.c:3921
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:3936
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:3943
+msgid "could not commit staged changes."
+msgstr ""
+
+#: sequencer.c:4044
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr ""
+
+#: sequencer.c:4048
+#, c-format
+msgid "%s: bad revision"
+msgstr ""
+
+#: sequencer.c:4083
+msgid "can't revert as initial commit"
+msgstr ""
+
+#: sequencer.c:4529
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:4532
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: sequencer.c:4684
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: sequencer.c:4754
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: sequencer.c:4761
+#, 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 ""
+
+#: sequencer.c:4774
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Μπορείτε να το διορθώσετε αυτό με 'git rebase --edit-todo' και μετά να "
+"τρέξετε 'git rebase --continue'.\n"
+"Ή μπορείτε να εγκαταλείψετε το rebase με 'git rebase --abort'.\n"
+
+#: sequencer.c:4912 sequencer.c:4950
+msgid "nothing to do"
+msgstr "δεν υπάρχει τίποτα να γίνει"
+
+#: sequencer.c:4916
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: sequencer.c:4928
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr ""
+
+#: sequencer.c:4932 sequencer.c:4961
+msgid "could not transform the todo list"
+msgstr ""
+
+#: sequencer.c:4964
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:5047
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
+msgstr ""
+
+#: setup.c:172
+#, 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:185
+#, 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:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
+#: setup.c:253
+#, 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:389
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#: setup.c:393
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: setup.c:527
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr ""
+
+#: setup.c:535
+msgid "unknown repository extensions found:"
+msgstr ""
+
+#: setup.c:554
+#, c-format
+msgid "error opening '%s'"
+msgstr ""
+
+#: setup.c:556
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:558
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:560
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:562
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:564
+#, c-format
+msgid "not a git repository: %s"
+msgstr "δεν είναι αποθετήριο git: %s"
+
+#: setup.c:663
+#, c-format
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:677
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "δεν είναι αποθετήριο git: '%s'"
+
+#: setup.c:706 setup.c:708 setup.c:739
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
+msgid "cannot come back to cwd"
+msgstr ""
+
+#: setup.c:838
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr ""
+
+#: setup.c:1068
+msgid "Unable to read current working directory"
+msgstr ""
+
+#: setup.c:1077 setup.c:1083
+#, c-format
+msgid "cannot change to '%s'"
+msgstr ""
+
+#: setup.c:1088
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "δεν είναι αποθετήριο git (ή κανένας από τους πιο πάνω φακέλους): %s"
+
+#: setup.c:1094
+#, c-format
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"δεν είναι αποθετήριο git (ή κανένας πιο πάνω φάκελος μέχρι το σημείο "
+"προσάρτησης %s)\n"
+"Σταμάτημα στα όρια του συστήματος αρχείων (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"μη ορισμένο)."
+
+#: setup.c:1204
+#, 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:1247
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1262
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1267
+msgid "setsid failed"
+msgstr ""
+
+#: sha1-file.c:445
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: sha1-file.c:496
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#: sha1-file.c:568
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: sha1-file.c:575
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+#: sha1-file.c:618
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: sha1-file.c:636
+msgid "unable to read alternates file"
+msgstr ""
+
+#: sha1-file.c:643
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: sha1-file.c:678
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: sha1-file.c:704
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: sha1-file.c:710
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: sha1-file.c:716
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: sha1-file.c:838
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: sha1-file.c:863
+msgid "mmap failed"
+msgstr ""
+
+#: sha1-file.c:1027
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: sha1-file.c:1151 sha1-file.c:2288
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1153 sha1-file.c:2292
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1195
+msgid "invalid object type"
+msgstr ""
+
+#: sha1-file.c:1279
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1282
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: sha1-file.c:1288
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1291
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: sha1-file.c:1481
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: sha1-file.c:1485
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: sha1-file.c:1489
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1493
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1595
+#, c-format
+msgid "unable to write file %s"
+msgstr ""
+
+#: sha1-file.c:1602
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: sha1-file.c:1609
+msgid "file write error"
+msgstr ""
+
+#: sha1-file.c:1628
+msgid "error when closing loose object file"
+msgstr ""
+
+#: sha1-file.c:1693
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: sha1-file.c:1695
+msgid "unable to create temporary file"
+msgstr ""
+
+#: sha1-file.c:1719
+msgid "unable to write loose object file"
+msgstr ""
+
+#: sha1-file.c:1725
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: sha1-file.c:1729
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: sha1-file.c:1733
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: sha1-file.c:1743 builtin/pack-objects.c:919
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: sha1-file.c:1818
+#, c-format
+msgid "cannot read object for %s"
+msgstr ""
+
+#: sha1-file.c:1858
+msgid "corrupt commit"
+msgstr ""
+
+#: sha1-file.c:1866
+msgid "corrupt tag"
+msgstr ""
+
+#: sha1-file.c:1965
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: sha1-file.c:1968
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
+
+#: sha1-file.c:2041 sha1-file.c:2050
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: sha1-file.c:2056
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: sha1-file.c:2080
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: sha1-file.c:2082
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: sha1-file.c:2109 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
+msgstr "δεν είναι δυνατό το άνοιγμα του %s"
+
+#: sha1-file.c:2299 sha1-file.c:2351
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: sha1-file.c:2323
+#, c-format
+msgid "unable to mmap %s"
+msgstr ""
+
+#: sha1-file.c:2328
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: sha1-file.c:2334
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: sha1-file.c:2345
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: sha1-name.c:448
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr ""
+
+#: sha1-name.c:459
+msgid "The candidates are:"
+msgstr ""
+
+#: sha1-name.c:742
+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 checkout -b $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 ""
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Δεν είναι δυνατή η αλλαγή μη συγχωνευμένων .gitmodule, επιλύστε πρώτα τις "
+"συγκρούσεις συγχώνευσης"
+
+#: 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 "Η περιγραφή διαδρομής '%s' βρίσκεται μέσα στην υποενότητα '%.*s'"
+
+#: submodule.c:906
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "το στοιχείο υποενότητας '%s' (%s) είναι %s, όχι υποβολή"
+
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Απέτυχε η ταύτιση του HEAD με κάποιο έγκυρο ref."
+
+#: submodule.c:1477
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr ""
+
+#: submodule.c:1639
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr ""
+
+#: submodule.c:1777
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1790
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1895
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr ""
+
+#: submodule.c:1947
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr ""
+
+#: submodule.c:1996
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+
+#: submodule.c:2008 submodule.c:2064
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr ""
+
+#: submodule.c:2015
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+
+#: submodule.c:2099
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr ""
+
+#: submodule.c:2143
+msgid "could not start ls-files in .."
+msgstr ""
+
+#: submodule.c:2182
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr ""
+
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr ""
+
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#: submodule-config.c:479
+#, c-format
+msgid "invalid value for %s"
+msgstr ""
+
+#: submodule-config.c:754
+#, 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:295
+#, 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:701
+#, 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 "δεν ήταν δυνατή η μετονομασία προσωρινού αρχείου σε %s"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Θα όριζε το προς τα πάνω του '%s' ως '%s' του '%s'\n"
+
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:617
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:690
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:817
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:883
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:937
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1032
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Οι παρακάτω διαδρομές υποενότητας περιέχουν αλλαγές που δεν είναι\n"
+"δυνατό να βρεθούν σε κανέναν απομακρυσμένο εξυπηρετητή:\n"
+
+#: transport.c:1036
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Παρακαλώ δοκιμάστε\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ή κάντε cd στη διαδρομή και χρησιμοποιήστε\n"
+"\n"
+"\tgit push\n"
+"\n"
+"για να τα δημοσιεύσετε σε έναν απομακρυσμένο εξυπηρετητή.\n"
+"\n"
+
+#: transport.c:1044
+msgid "Aborting."
+msgstr "Εγκατάλειψη."
+
+#: transport.c:1184
+msgid "failed to push all needed submodules"
+msgstr ""
+
+#: transport.c:1317 transport-helper.c:643
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: transport.c:1421
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr ""
+
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr ""
+
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
+msgstr ""
+
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:502
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:531 transport-helper.c:1097
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:600
+msgid "invalid remote service path"
+msgstr ""
+
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr ""
+
+#: transport-helper.c:718
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:771
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:832
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:835
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:838
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:937
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:942
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:989
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:994
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1019
+#, 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:1083
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1236
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1263
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1312
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1316
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1335 transport-helper.c:1339
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1376
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1380
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1398 transport-helper.c:1407
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr ""
+
+#: tree-walk.c:116
+msgid "too-short tree file"
+msgstr ""
+
+#: unpack-trees.c:111
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από την "
+"εξαγωγή:\n"
+"%%sΠαρακαλώ υποβάλετε τις αλλαγές σας ή αποθηκεύστε τις πριν αλλάξετε κλάδο."
+
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από την "
+"εξαγωγή:\n"
+"%%s"
+
+#: unpack-trees.c:116
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από τη "
+"συγχώνευση:\n"
+"%%sΠαρακαλώ υποβάλετε τις αλλαγές σας ή αποθηκεύστε τις πριν συγχωνεύσετε."
+
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από τη "
+"συγχώνευση:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από το %s:\n"
+"%%sΠαρακαλώ υποβάλετε τις αλλαγές σας ή αποθηκεύστε τις πριν από το %s."
+
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Οι τοπικές αλλαγές σας στα ακόλουθα αρχεία θα επεγγραφόντουσαν από το %s:\n"
+"%%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
+msgstr ""
+
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:150
+#, 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:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:253
+#, c-format
+msgid "Aborting\n"
+msgstr "Εγκατάλειψη\n"
+
+#: unpack-trees.c:335
+msgid "Checking out files"
+msgstr ""
+
+#: unpack-trees.c:367
+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 ""
+
+#: 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 ""
+
+#: worktree.c:249 builtin/am.c:2094
+#, c-format
+msgid "failed to read '%s'"
+msgstr ""
+
+#: worktree.c:295
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:306
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:318
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: worktree.c:324
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#: worktree.c:332
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "δεν ήταν δυνατό το άνοιγμα του '%s' για ανάγνωση και εγγραφή"
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr ""
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr ""
+
+#: wt-status.c:155
+msgid "Unmerged paths:"
+msgstr "Μη συγχωνευμένες διαδρομές:"
+
+#: wt-status.c:182 wt-status.c:209
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+" (χρησιμοποιήστε \"git reset %s <αρχείο>...\" για να αποπροετοιμάσετε)"
+
+#: wt-status.c:184 wt-status.c:211
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+" (χρησιμοποιήστε \"git rm --cached <αρχείο>...\" για να αποπροετοιμάσετε)"
+
+#: wt-status.c:188
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+" (χρησιμοποιήστε \"git add <αρχείο>...\" έτσι ώστε να επισημάνετε την "
+"επίλυση)"
+
+#: wt-status.c:190 wt-status.c:194
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (χρησιμοποιήστε \"git add/rm <αρχείο>...\" έτσι ώστε να επισημάνετε την "
+"επίλυση)"
+
+#: wt-status.c:192
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+" (χρησιμοποιήστε \"git rm <αρχείο>...\" έτσι ώστε να επισημάνετε την "
+"επίλυση)"
+
+#: wt-status.c:203 wt-status.c:1046
+msgid "Changes to be committed:"
+msgstr "Αλλαγές προς υποβολή:"
+
+#: wt-status.c:221 wt-status.c:1055
+msgid "Changes not staged for commit:"
+msgstr "Αλλαγές που δεν έχουν προετοιμαστεί για υποβολή:"
+
+#: wt-status.c:225
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (χρησιμοποιήστε \"git add <αρχείο>...\" για να ενημερώσετε αυτά που θα "
+"υποβληθούν)"
+
+#: wt-status.c:227
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+" (χρησιμοποιήστε \"git add/rm <αρχείο>...\" για να ενημερώσετε αυτά που θα "
+"υποβληθούν)"
+
+#: wt-status.c:228
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (χρησιμοποιήστε \"git checkout -- <αρχείο>...\" για να απορρίψετε τις "
+"αλλαγές στο φάκελο εργασίας)"
+
+#: wt-status.c:230
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (να γίνει υποβολή ή απόρριψη του μη παρακολουθούμενου ή τροποποιημένου "
+"περιεχομένου στις υποενότητες)"
+
+#: wt-status.c:242
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+" (χρησιμοποιήστε \"git %s <αρχείο>...\" για να συμπεριληφθεί σε αυτά που θα "
+"υποβληθούν)"
+
+#: wt-status.c:257
+msgid "both deleted:"
+msgstr "διαγραφή και από τους δύο:"
+
+#: wt-status.c:259
+msgid "added by us:"
+msgstr "προσθήκη από εμάς:"
+
+#: wt-status.c:261
+msgid "deleted by them:"
+msgstr "διαγραφή από αυτούς:"
+
+#: wt-status.c:263
+msgid "added by them:"
+msgstr "προσθήκη από αυτούς:"
+
+#: wt-status.c:265
+msgid "deleted by us:"
+msgstr "διαγραφή από εμάς:"
+
+#: wt-status.c:267
+msgid "both added:"
+msgstr "προσθήκη και από τους δύο:"
+
+#: wt-status.c:269
+msgid "both modified:"
+msgstr "τροποποίηση και από τους δύο:"
+
+#: wt-status.c:279
+msgid "new file:"
+msgstr "νέο αρχείο:"
+
+#: wt-status.c:281
+msgid "copied:"
+msgstr "αντιγραφή:"
+
+#: wt-status.c:283
+msgid "deleted:"
+msgstr "διαγραφή:"
+
+#: wt-status.c:285
+msgid "modified:"
+msgstr "τροποποίηση:"
+
+#: wt-status.c:287
+msgid "renamed:"
+msgstr "μετονομασία:"
+
+#: wt-status.c:289
+msgid "typechange:"
+msgstr "αλλαγή τύπου:"
+
+#: wt-status.c:291
+msgid "unknown:"
+msgstr "άγνωστο:"
+
+#: wt-status.c:293
+msgid "unmerged:"
+msgstr "μη συγχωνευμένο:"
+
+#: wt-status.c:373
+msgid "new commits, "
+msgstr "νέες υποβολές, "
+
+#: wt-status.c:375
+msgid "modified content, "
+msgstr "τροποποιημένο περιεχόμενο, "
+
+#: wt-status.c:377
+msgid "untracked content, "
+msgstr "μη παρακολουθούμενο περιεχόμενο, "
+
+#: wt-status.c:884
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Η αποθήκευσή σας έχει τώρα %d στοιχείο"
+msgstr[1] "Η αποθήκευσή σας έχει τώρα %d στοιχεία"
+
+#: wt-status.c:916
+msgid "Submodules changed but not updated:"
+msgstr "Υποενότητες που άλλαξαν αλλά δεν ενημερώθηκαν:"
+
+#: wt-status.c:918
+msgid "Submodule changes to be committed:"
+msgstr "Αλλαγές σε υποενότητες προς υποβολή:"
+
+#: wt-status.c:1000
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Να μην τροποποιήσετε ή αφαιρέσετε την παραπάνω γραμμή.\n"
+"Οτιδήποτε κάτω από αυτήν θα αγνοηθεί."
+
+#: wt-status.c:1101
+msgid "You have unmerged paths."
+msgstr "Έχετε μη συγχωνευμένες διαδρομές."
+
+#: wt-status.c:1104
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (διορθώστε τις συγκρούσεις και τρέξτε \"git commit\")"
+
+#: wt-status.c:1106
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr ""
+" (χρησιμοποιήστε \"git merge --abort\" για να εγκαταλείψετε τη συγχώνευση)"
+
+#: wt-status.c:1110
+msgid "All conflicts fixed but you are still merging."
+msgstr "Επιλύθηκαν όλες οι συγκρούσεις αλλά ακόμα κάνετε συγχώνευση."
+
+#: wt-status.c:1113
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (χρησιμοποιήστε \"git commit\" για να ολοκληρώσετε τη συγχώνευση)"
+
+#: wt-status.c:1122
+msgid "You are in the middle of an am session."
+msgstr "Βρίσκεστε στη μέση μιας διεργασίας am."
+
+#: wt-status.c:1125
+msgid "The current patch is empty."
+msgstr "Η παρούσα διόρθωση είναι κενή."
+
+#: wt-status.c:1129
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (διορθώστε τις συγκρούσεις και τρέξτε \"git am --continue\")"
+
+#: wt-status.c:1131
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr ""
+" (χρησιμοποιήστε \"git am --skip\" για να προσπεράσετε αυτή τη διόρθωση)"
+
+#: wt-status.c:1133
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+" (χρησιμοποιήστε \"git am --abort\" για να αποκαταστήσετε τον αρχικό κλάδο)"
+
+#: wt-status.c:1264
+msgid "git-rebase-todo is missing."
+msgstr "Λείπει το git-rebase-todo."
+
+#: wt-status.c:1266
+msgid "No commands done."
+msgstr "Δεν ολοκληρώθηκε καμία εντολή."
+
+#: wt-status.c:1269
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1280
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (δείτε περισσότερα στο αρχείο %s)"
+
+#: wt-status.c:1285
+msgid "No commands remaining."
+msgstr "Δεν απομένει καμία εντολή."
+
+#: wt-status.c:1288
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Επόμενη εντολή προς εκτέλεση (%d εντολή απομένει):"
+msgstr[1] "Επόμενες εντολές προς εκτέλεση (%d εντολές απομένουν):"
+
+#: wt-status.c:1296
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+" (χρησιμοποιήστε \"git rebase --edit-todo\" για προβολή και επεξεργασία)"
+
+#: wt-status.c:1308
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Αυτή τη στιγμή κάνετε rebase τον κλάδο '%s' στο '%s'."
+
+#: wt-status.c:1313
+msgid "You are currently rebasing."
+msgstr "Αυτή τη στιγμή κάνετε rebase."
+
+#: wt-status.c:1326
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (διορθώστε τις συγκρούσεις και τρέξτε \"git rebase --continue\")"
+
+#: wt-status.c:1328
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr ""
+" (χρησιμοποιήστε \"git rebase --skip\" για να προσπεράσετε αυτή τη διόρθωση)"
+
+#: wt-status.c:1330
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+" (χρησιμοποιήστε \"git rebase --abort\" για να εξαγάγετε τον αρχικό κλάδο)"
+
+#: wt-status.c:1337
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (επιλύθηκαν όλες οι συγκρούσεις: τρέξτε \"git rebase --continue\")"
+
+#: wt-status.c:1341
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Αυτή τη στιγμή τεμαχίζετε μια υποβολή κατά τη διάρκεια rebase του κλάδου "
+"'%s' στο '%s'."
+
+#: wt-status.c:1346
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Αυτή τη στιγμή τεμαχίζετε μια υποβολή κατά τη διάρκεια ενός rebase."
+
+#: wt-status.c:1349
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Όταν ο φάκελος εργασίας σας θα είναι καθαρός, τρέξτε \"git rebase --"
+"continue\")"
+
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Αυτή τη στιγμή διορθώνετε μια υποβολή κατά τη διάρκεια rebase του κλάδου "
+"'%s' στο '%s'."
+
+#: wt-status.c:1358
+msgid "You are currently editing a commit during a rebase."
+msgstr "Αυτή τη στιγμή διορθώνετε μια υποβολή κατά τη διάρκεια ενός rebase."
+
+#: wt-status.c:1361
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+" (χρησιμοποιήστε \"git commit --amend\" για να τροποποιήσετε την τρέχουσα "
+"υποβολή)"
+
+#: wt-status.c:1363
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (χρησιμοποιήστε \"git rebase --continue\" όταν οι αλλαγές σας σας "
+"ικανοποιούν)"
+
+#: wt-status.c:1372
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Αυτή τη στιγμή κάνετε επιλεκτική διαλογή της υποβολής %s."
+
+#: wt-status.c:1377
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr ""
+" (διορθώστε τις συγκρούσεις και τρέξτε \"git cherry-pick --continue\")"
+
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (επιλύθηκαν όλες οι συγκρούσεις: τρέξτε \"git cherry-pick --continue\")"
+
+#: wt-status.c:1382
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+" (χρησιμοποιήστε \"git cherry-pick --abort\" για να ακυρώσετε την ενέργεια "
+"επιλεκτικής διαλογής)"
+
+#: wt-status.c:1390
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Αυτή τη στιγμή αναιρείτε την υποβολή %s."
+
+#: wt-status.c:1395
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (επιλύστε τις συγκρούσεις και τρέξτε \"git revert --continue\")"
+
+#: wt-status.c:1398
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (επιλύθηκαν όλες οι συγκρούσεις: τρέξτε \"git revert --continue\")"
+
+#: wt-status.c:1400
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+" (χρησιμοποιήστε \"git revert --abort\" για να εγκαταλείψετε τη διεργασία "
+"revert)"
+
+#: wt-status.c:1410
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Αυτή τη στιγμή διχοτομείτε, έγινε αρχή από τον κλάδο '%s'."
+
+#: wt-status.c:1414
+msgid "You are currently bisecting."
+msgstr "Αυτή τη στιγμή διχοτομείτε."
+
+#: wt-status.c:1417
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+" (χρησιμοποιήστε \"git bisect reset\" για να επιστρέψετε στον αρχικό κλάδο)"
+
+#: wt-status.c:1617
+msgid "On branch "
+msgstr "Στον κλάδο "
+
+#: wt-status.c:1624
+msgid "interactive rebase in progress; onto "
+msgstr "εκτελείται διαδραστικό rebase, πάνω στο "
+
+#: wt-status.c:1626
+msgid "rebase in progress; onto "
+msgstr "εκτελείται rebase, πάνω στο "
+
+#: wt-status.c:1631
+msgid "HEAD detached at "
+msgstr "Αποσυνδεδεμένο HEAD στο "
+
+#: wt-status.c:1633
+msgid "HEAD detached from "
+msgstr "Αποσυνδεδεμένο HEAD από το "
+
+#: wt-status.c:1636
+msgid "Not currently on any branch."
+msgstr "Δεν είστε αυτή τη στιγμή σε κανέναν κλάδο."
+
+#: wt-status.c:1653
+msgid "Initial commit"
+msgstr "Αρχική υποβολή"
+
+#: wt-status.c:1654
+msgid "No commits yet"
+msgstr "Δεν υπάρχουν ακόμα υποβολές"
+
+#: wt-status.c:1668
+msgid "Untracked files"
+msgstr "Μη παρακολουθούμενα αρχεία"
+
+#: wt-status.c:1670
+msgid "Ignored files"
+msgstr "Αρχεία που παραβλέπονται"
+
+#: wt-status.c:1674
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr ""
+"Η απαρίθμηση των μη παρακολουθούμενων αρχείων πήρε %.2f δευτερόλεπτα. Το "
+"'status -uno'\n"
+"μπορεί να την επιταχύνει, αλλά πρέπει να προσέξετε να μην ξεχάσετε να "
+"προσθέσετε\n"
+"εσείς τα νέα αρχεία (δείτε το 'git help status')."
+
+#: wt-status.c:1680
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Μη παρακολουθούμενα αρχεία που δεν έγινε παράθεσή τους%s"
+
+#: wt-status.c:1682
+msgid " (use -u option to show untracked files)"
+msgstr ""
+" (χρησιμοποιήστε την επιλογή -u για να γίνει προβολή των μη "
+"παρακολουθούμενων αρχείων)"
+
+#: wt-status.c:1688
+msgid "No changes"
+msgstr "Δεν υπάρχουν αλλαγές"
+
+#: wt-status.c:1693
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"δεν προστέθηκαν αλλαγές στην υποβολή (χρησιμοποιήστε \"git add\" και/ή \"git "
+"commit -a\")\n"
+
+#: wt-status.c:1696
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "δεν προστέθηκαν αλλαγές στην υποβολή\n"
+
+#: wt-status.c:1699
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"δεν προστέθηκε τίποτα στην υποβολή αλλά υπάρχουν μη παρακολουθούμενα αρχεία "
+"(χρησιμοποιήστε \"git add\" για να παρακολουθήσετε)\n"
+
+#: wt-status.c:1702
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"δεν προστέθηκε τίποτα στην υποβολή αλλά υπάρχουν μη παρακολουθούμενα αρχεία\n"
+
+#: wt-status.c:1705
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"δεν υπάρχει τίποτα προς υποβολή (δημιουργήστε/αντιγράψτε αρχεία και "
+"χρησιμοποιήστε \"git add\" για να παρακολουθήσετε)\n"
+
+#: wt-status.c:1708 wt-status.c:1713
+#, c-format
+msgid "nothing to commit\n"
+msgstr "δεν υπάρχει τίποτα προς υποβολή\n"
+
+#: wt-status.c:1711
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"δεν υπάρχει τίποτα προς υποβολή (χρησιμοποιήστε -u για προβολή των "
+"μηπαρακολουθούμενων αρχείων)\n"
+
+#: wt-status.c:1715
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "δεν υπάρχει τίποτα προς υποβολή, το δέντρο εργασίας είναι καθαρό\n"
+
+#: wt-status.c:1828
+msgid "No commits yet on "
+msgstr "Δεν υπάρχουν ακόμα υποβολές στο "
+
+#: wt-status.c:1832
+msgid "HEAD (no branch)"
+msgstr "HEAD (χωρίς κλάδο)"
+
+#: wt-status.c:1863
+msgid "different"
+msgstr "διαφορετικό"
+
+#: wt-status.c:1865 wt-status.c:1873
+msgid "behind "
+msgstr "πίσω "
+
+#: wt-status.c:1868 wt-status.c:1871
+msgid "ahead "
+msgstr "μπροστά "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2386
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "δεν είναι δυνατό να γίνει %s: Έχετε μη προετοιμασμένες αλλαγές."
+
+#: wt-status.c:2392
+msgid "additionally, your index contains uncommitted changes."
+msgstr "επιπρόσθετα, το ευρετήριό σας περιέχει μη υποβεβλημένες αλλαγές."
+
+#: wt-status.c:2394
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+"δεν είναι δυνατό να γίνει %s: Το ευρετήριό σας περιέχει μη υποβεβλημένες "
+"αλλαγές."
+
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<επιλογές>] [--] <περιγραφή διαδρομής>..."
+
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
+msgstr ""
+
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
+msgstr ""
+
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
+msgstr ""
+
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
+msgstr ""
+
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
+msgstr ""
+
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Δεν ήταν δυνατό το άνοιγμα του '%s' για εγγραφή."
+
+#: builtin/add.c:249
+msgid "Could not write patch"
+msgstr ""
+
+#: builtin/add.c:252
+msgid "editing patch failed"
+msgstr ""
+
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
+msgstr ""
+
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
+msgstr ""
+
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "δοκιμή"
+
+#: builtin/add.c:293
+msgid "interactive picking"
+msgstr ""
+
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
+msgid "select hunks interactively"
+msgstr "να γίνει διαδραστική επιλογή αλλαγών"
+
+#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr ""
+
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
+msgstr ""
+
+#: builtin/add.c:297
+msgid "update tracked files"
+msgstr ""
+
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
+msgstr ""
+
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
+msgstr ""
+
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
+msgstr ""
+
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+
+#: builtin/add.c:309 builtin/update-index.c:991
+msgid "override the executable bit of the listed files"
+msgstr ""
+
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr ""
+
+#: builtin/add.c:326
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Προσθέσατε ένα άλλο αποθετήριο git μέσα στο τρέχον αποθετήριο.\n"
+"Οι κλώνοι του εξώτερου αποθετηρίου δε θα περιέχουν τα περιεχόμενα του\n"
+"ενσωματωμένου αποθετηρίου και δεν θα γνωρίζουν πώς να το βρουν.\n"
+"Αν θέλατε να προσθέσετε μια υποενότητα submodule, χρησιμοποιήστε:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Αν προσθέσατε αυτή τη διαδρομή κατά λάθος, μπορείτε να την αφαιρέσετε από "
+"το\n"
+"ευρετήριο με:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Δείτε \"git help submodule\" για περισσότερες πληροφορίες."
+
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr ""
+
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr ""
+
+#: builtin/add.c:380
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:418
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+#: builtin/add.c:425
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:429
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr ""
+
+#: builtin/add.c:444
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr ""
+
+#: builtin/add.c:445
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr ""
+
+#: builtin/am.c:348
+msgid "could not parse author script"
+msgstr ""
+
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr ""
+
+#: builtin/am.c:473
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/am.c:510
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/am.c:536
+msgid "fseek failed"
+msgstr ""
+
+#: builtin/am.c:724
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr ""
+
+#: builtin/am.c:789
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: builtin/am.c:837
+msgid "invalid timestamp"
+msgstr ""
+
+#: builtin/am.c:842 builtin/am.c:854
+msgid "invalid Date line"
+msgstr ""
+
+#: builtin/am.c:849
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:942
+msgid "Patch format detection failed."
+msgstr ""
+
+#: builtin/am.c:947 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "απέτυχε η δημιουργία του φακέλου '%s'"
+
+#: builtin/am.c:952
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1082 builtin/commit.c:371
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1096
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Όταν έχετε επιλύσει αυτό το πρόβλημα, τρέξτε \"%s --continue\"."
+
+#: builtin/am.c:1097
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1098
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+
+#: builtin/am.c:1181
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1209
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1275
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr ""
+
+#: builtin/am.c:1297
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: builtin/am.c:1493
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Λείπουν τα αναγκαία blob από το αποθετήριο για να ακολουθηθεί η εναλλακτική "
+"τριπλής συγχώνευσης."
+
+#: builtin/am.c:1495
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: builtin/am.c:1514
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Επεξεργαστήκατε με το χέρι τη διόρθωσή σας;\n"
+"Δεν εφαρμόζεται στα blob που είναι καταγεγραμμένα στο ευρετήριό του."
+
+#: builtin/am.c:1520
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1546
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1578
+msgid "applying to an empty history"
+msgstr ""
+
+#: builtin/am.c:1624 builtin/am.c:1628
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr ""
+
+#: builtin/am.c:1644
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+
+#: builtin/am.c:1649
+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:1659
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Να γίνει εφαρμογή; [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+
+#: builtin/am.c:1709
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+
+#: builtin/am.c:1749 builtin/am.c:1817
+#, c-format
+msgid "Applying: %.*s"
+msgstr ""
+
+#: builtin/am.c:1766
+msgid "No changes -- Patch already applied."
+msgstr "Καθόλου αλλαγές -- Έχει γίνει ήδη εφαρμογή της διόρθωσης."
+
+#: builtin/am.c:1772
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr ""
+
+#: builtin/am.c:1776
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"Χρησιμοποιήστε 'git am --show-current-patch' για να δείτε τη διόρθωση που "
+"απέτυχε"
+
+#: builtin/am.c:1820
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"Καθόλου αλλαγές - ξεχάσατε να χρησιμοποιήσετε το 'git add';\n"
+"Αν δεν έχει απομείνει τίποτα για προετοιμασία, μάλλον κάτι άλλο έχει\n"
+"ήδη εισαγάγει τις ίδιες αλλαγές, μπορεί να θέλετε να προσπεράσετε αυτή τη "
+"διόρθωση."
+
+#: builtin/am.c:1827
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"Έχετε ακόμα μη συγχωνευμένες διαδρομές στο ευρετήριό σας.\n"
+"Θα πρέπει να προσθέσετε με 'git add' κάθε αρχείο που έχει επιλυμένες "
+"συγκρούσεις για να το επισημάνετε.\n"
+"Μπορείτε να τρέξετε `git rm` σε ένα αρχείο για να αποδεχθείτε για αυτό πως "
+"\"διαγράφηκε από αυτούς\"."
+
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Δεν ήταν δυνατή η ανάλυση του αντικειμένου '%s'."
+
+#: builtin/am.c:1986
+msgid "failed to clean index"
+msgstr ""
+
+#: builtin/am.c:2030
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Φαίνεται πως μετακινήσατε το HEAD από τη στιγμή της τελευταίας αποτυχίας "
+"'am'.\n"
+"Δε γίνεται γύρισμα προς τα πίσω στο ORIG_HEAD"
+
+#: builtin/am.c:2123
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr ""
+
+#: builtin/am.c:2159
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<επιλογές>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2160
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<επιλογές>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2166
+msgid "run interactively"
+msgstr ""
+
+#: builtin/am.c:2168
+msgid "historical option -- no-op"
+msgstr ""
+
+#: builtin/am.c:2170
+msgid "allow fall back on 3way merging if needed"
+msgstr ""
+
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
+msgstr ""
+
+#: builtin/am.c:2173
+msgid "add a Signed-off-by line to the commit message"
+msgstr ""
+
+#: builtin/am.c:2176
+msgid "recode into utf8 (default)"
+msgstr ""
+
+#: builtin/am.c:2178
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2180
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2182
+msgid "pass -m flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2184
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2187
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2190
+msgid "strip everything before a scissors line"
+msgstr ""
+
+#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
+#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/am.c:2219
+msgid "pass it through git-apply"
+msgstr ""
+
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266
+msgid "n"
+msgstr ""
+
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
+msgstr ""
+
+#: builtin/am.c:2216
+msgid "format the patch(es) are in"
+msgstr ""
+
+#: builtin/am.c:2222
+msgid "override error message when patch failure occurs"
+msgstr ""
+
+#: builtin/am.c:2224
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+
+#: builtin/am.c:2227
+msgid "synonyms for --continue"
+msgstr ""
+
+#: builtin/am.c:2230
+msgid "skip the current patch"
+msgstr ""
+
+#: builtin/am.c:2233
+msgid "restore the original branch and abort the patching operation."
+msgstr ""
+
+#: builtin/am.c:2236
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
+#: builtin/am.c:2239
+msgid "show the patch being applied."
+msgstr ""
+
+#: builtin/am.c:2243
+msgid "lie about committer date"
+msgstr ""
+
+#: builtin/am.c:2245
+msgid "use current timestamp for author date"
+msgstr ""
+
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402
+msgid "key-id"
+msgstr ""
+
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
+msgid "GPG-sign commits"
+msgstr ""
+
+#: builtin/am.c:2251
+msgid "(internal use for git-rebase)"
+msgstr ""
+
+#: builtin/am.c:2269
+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:2276
+msgid "failed to read the index"
+msgstr ""
+
+#: builtin/am.c:2291
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+
+#: builtin/am.c:2315
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: builtin/am.c:2321
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Δεν υφίσταται διεργασία επίλυσης, δε συνεχίζουμε."
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<επιλογές>] [<διόρθωση>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr ""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr ""
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: Απομακρυσμένος εξυπηρετητής χωρίς URL"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: αναμενόταν ACK/NAK, βρέθηκε πακέτο flush"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: σφάλμα πρωτοκόλλου επικοινωνίας"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: αναμενόταν flush"
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <λάθος όρος> <σωστός όρος>"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<υποβολή>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <κατάσταση> <έκδοση> <σωστός "
+"όρος> <λάθος όρος>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <εντολή> <σωστός όρος> "
+"<λάθος όρος>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <σωστός όρος> <λάθος όρος> [<όρος>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<όρος> --term-{new,bad}"
+"=<όρος>][--no-checkout] [<λάθος> [<σωστό>...]] [--] [<διαδρομές>...]"
+
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr ""
+
+#: 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 "δεν ήταν δυνατό το άνοιγμα του αρχείου BISECT_TERMS"
+
+#: 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:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Πρέπει να δώσετε τουλάχιστον ένα %s και %s έκδοση.\n"
+"Μπορείτε να χρησιμοποιήσετε \"git bisect %s\" και \"git bisect %s\" για αυτό."
+
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Χρειάζεται να αρχίσετε με \"git bisect start\".\n"
+"Έπειτα χρειάζεται να δώσετε τουλάχιστον ένα %s και %s έκδοση.\n"
+"Μπορείτε να χρησιμοποιήσετε \"git bisect %s\" και \"git bisect %s\" για αυτό."
+
+#: builtin/bisect--helper.c:321
+#, 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:329
+msgid "Are you sure [Y/n]? "
+msgstr "Επιβεβαιώνετε [Y/n]; "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr ""
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Οι παρόντες όροι σας είναι %s για την παλιά κατάσταση\n"
+"και %s για τη νέα κατάσταση.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
+msgstr ""
+
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
+msgstr ""
+
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<επιλογές>] [<επιλογές έκδ.>] [<έκδ.>] [--] <αρχείο>"
+
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:413
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
+msgstr ""
+
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
+msgstr ""
+
+#: builtin/blame.c:797
+msgid "Force progress reporting"
+msgstr ""
+
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
+msgstr ""
+
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
+msgstr ""
+
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
+msgstr ""
+
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
+msgstr "Προβολή μορφής εντολών porcelain με πληροφορίες υποβολής ανά γραμμή"
+
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
+msgstr ""
+
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:810
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
+msgstr ""
+
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr ""
+
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
+msgstr ""
+
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
+msgstr ""
+
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
+msgstr ""
+
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
+msgstr ""
+
+#: builtin/blame.c:824
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
+msgstr ""
+
+#: builtin/blame.c:875
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"το --progress δε γίνεται να χρησιμοποιηθεί με το --incremental ή με μορφές "
+"εντολών porcelain"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:926
+msgid "4 years, 11 months ago"
+msgstr "πριν από 4 χρόνια και 11 μήνες"
+
+#: builtin/blame.c:1018
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1064
+msgid "Blaming lines"
+msgstr ""
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<επιλογές>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<επιλογές>] [-l] [-f] <όνομα κλάδου> [<αρχικό σημείο>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<επιλογές>] [-r] (-d | -D) <όνομα κλάδου>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<επιλογές>] (-m | -M) [<παλιός κλάδος>] <νέος κλάδος>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<επιλογές>] (-c | -C) [<παλιός κλάδος>] <νέος κλάδος>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<επιλογές>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<επιλογές>] [-r | -a] [--format]"
+
+#: builtin/branch.c:151
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:155
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"δε γίνεται διαγραφή του κλάδου '%s' που δεν έχει συγχωνευτεί ακόμα με το\n"
+" '%s', παρόλο που έχει συγχωνευτεί με το HEAD."
+
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#: builtin/branch.c:173
+#, 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:186
+msgid "Update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr ""
+
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr ""
+
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:458
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:462
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:492
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#: builtin/branch.c:519
+msgid "Branch rename failed"
+msgstr ""
+
+#: builtin/branch.c:521
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:525
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:528
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:534
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:561
+#, 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:594
+msgid "Generic options"
+msgstr ""
+
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
+msgstr ""
+
+#: builtin/branch.c:597
+msgid "suppress informational messages"
+msgstr ""
+
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
+msgstr ""
+
+#: builtin/branch.c:600
+msgid "do not use"
+msgstr ""
+
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182
+msgid "upstream"
+msgstr "προς τα πάνω"
+
+#: builtin/branch.c:602
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
+msgstr ""
+
+#: builtin/branch.c:604
+msgid "use colored output"
+msgstr ""
+
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
+msgstr ""
+
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
+msgstr ""
+
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
+msgstr ""
+
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
+msgstr ""
+
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
+msgstr ""
+
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
+msgstr ""
+
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
+msgstr ""
+
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:622
+msgid "list branch names"
+msgstr ""
+
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
+msgstr ""
+
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
+msgstr ""
+
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
+msgstr ""
+
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
+msgstr ""
+
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
+msgstr ""
+
+#: builtin/branch.c:629
+msgid "list branches in columns"
+msgstr ""
+
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
+msgstr ""
+
+#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:416
+msgid "field name to sort on"
+msgstr ""
+
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:418
+msgid "object"
+msgstr "αντικείμενο"
+
+#: builtin/branch.c:634
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+
+#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr ""
+
+#: builtin/branch.c:660 builtin/clone.c:746
+msgid "HEAD not found below refs/heads!"
+msgstr "Το HEAD δε βρέθηκε κάτω από το refs/heads!"
+
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
+msgstr ""
+
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
+msgstr ""
+
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
+msgstr ""
+
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
+msgstr ""
+
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr ""
+
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Δεν υπάρχει κλάδος με όνομα '%s'."
+
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
+msgstr ""
+
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:773
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:776 builtin/branch.c:799
+#, c-format
+msgid "no such branch '%s'"
+msgstr "δεν υπάρχει ο κλάδος '%s'"
+
+#: builtin/branch.c:780
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr ""
+
+#: builtin/branch.c:793
+msgid "too many arguments to unset upstream"
+msgstr ""
+
+#: builtin/branch.c:797
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:803
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr ""
+
+#: builtin/branch.c:813
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/branch.c:816
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr ""
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: builtin/cat-file.c:593
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <τύπος> | --textconv | --filters) [--path=<διαδρομή>] <αντικείμενο>"
+
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "ο <τύπος> μπορεί να είναι ένας εκ των: blob, δέντρο, υποβολή, ετικέτα"
+
+#: builtin/cat-file.c:634
+msgid "show object type"
+msgstr ""
+
+#: builtin/cat-file.c:635
+msgid "show object size"
+msgstr ""
+
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
+msgstr ""
+
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
+msgstr ""
+
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
+msgstr "για αντικείμενα blob, τρέξτε textconv στο περιεχόμενο του αντικειμένου"
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
+msgstr "για αντικείμενα blob, τρέξτε φίλτρα στο περιεχόμενο του αντικειμένου"
+
+#: builtin/cat-file.c:643 git-submodule.sh:860
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
+msgstr ""
+
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <πεδίο>...] [--] <όνομα διαδρομής>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <πεδίο>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr ""
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "να γίνει χρήση του .gitattributes μόνο από το ευρετήριο"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr ""
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr ""
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496
+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:160
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr "το -z έχει νόημα μόνο με το --stdin"
+
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<επιλογές>] <επαφή>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr ""
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<επιλογές>] [--] [<αρχείο>...]"
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: 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:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:669
+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:32
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<επιλογές>] <κλάδος>"
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<επιλογές>] [<κλάδος>] -- <αρχείο>..."
+
+#: builtin/checkout.c:147 builtin/checkout.c:181
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "η διαδρομή '%s' δεν έχει τη δική μας έκδοση"
+
+#: builtin/checkout.c:149 builtin/checkout.c:183
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "η διαδρομή '%s' δεν έχει τη δική τους έκδοση"
+
+#: builtin/checkout.c:165
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "η διαδρομή '%s' δεν έχει όλες τις αναγκαίες εκδόσεις"
+
+#: builtin/checkout.c:210
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "η διαδρομή '%s' δεν έχει τις αναγκαίες εκδόσεις"
+
+#: builtin/checkout.c:228
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "διαδρομή '%s': δεν είναι δυνατή η συγχώνευση"
+
+#: builtin/checkout.c:244
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Δεν είναι δυνατή η προσθήκη αποτελέσματος συγχώνευσης για το '%s'"
+
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "το '%s' δε γίνεται να χρησιμοποιηθεί με την ενημέρωση διαδρομών"
+
+#: builtin/checkout.c:279 builtin/checkout.c:282
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "το '%s' δε γίνεται να χρησιμοποιηθεί με το %s"
+
+#: builtin/checkout.c:285
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "Δε γίνεται ενημέρωση διαδρομών και αλλαγή στον κλάδο '%s' ταυτόχρονα."
+
+#: builtin/checkout.c:354 builtin/checkout.c:361
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "δεν έχει γίνει συγχώνευση της διαδρομής '%s'"
+
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:402
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:645
+msgid "you need to resolve your current index first"
+msgstr "πρέπει να επιλύσετε το τρέχον σας ευρετήριο πρώτα"
+
+#: builtin/checkout.c:782
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Δεν είναι δυνατό το reflog για το '%s': %s\n"
+
+#: builtin/checkout.c:824
+msgid "HEAD is now at"
+msgstr "Το HEAD βρίσκεται τώρα στο"
+
+#: builtin/checkout.c:828 builtin/clone.c:699
+msgid "unable to update HEAD"
+msgstr "δεν ήταν δυνατό να ενημερωθεί το HEAD"
+
+#: builtin/checkout.c:832
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Επαναφορά του κλάδου '%s'\n"
+
+#: builtin/checkout.c:835
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Βρίσκεστε ήδη στο '%s'\n"
+
+#: builtin/checkout.c:839
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Αλλαγή και επαναφορά στον κλάδο '%s'\n"
+
+#: builtin/checkout.c:841 builtin/checkout.c:1212
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Αλλαγή σε νέο κλάδο '%s'\n"
+
+#: builtin/checkout.c:843
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Αλλαγή στον κλάδο '%s'\n"
+
+#: builtin/checkout.c:894
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... και %d ακόμα.\n"
+
+#: builtin/checkout.c:900
+#, 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:919
+#, 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:951
+msgid "internal error in revision walk"
+msgstr "εσωτερικό σφάλμα στο μονοπάτι εκδόσεων"
+
+#: builtin/checkout.c:955
+msgid "Previous HEAD position was"
+msgstr "Η προηγούμενη θέση του HEAD ήταν"
+
+#: builtin/checkout.c:983 builtin/checkout.c:1207
+msgid "You are on a branch yet to be born"
+msgstr "Βρίσκεστε σε κλάδο που δεν έχει ακόμα γεννηθεί"
+
+#: builtin/checkout.c:1104
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "αναμενόταν μόνο μία αναφορά, δόθηκαν %d."
+
+#: builtin/checkout.c:1140
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"Το '%s' θα μπορούσε να είναι είτε τοπικό αρχείο είτε κλάδος παρακολούθησης.\n"
+"Παρακαλώ χρησιμοποιήστε -- (και προαιρετικά --no-guess) για να αποσαφηνίσετε"
+
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
+#, c-format
+msgid "invalid reference: %s"
+msgstr "μη έγκυρη αναφορά: %s"
+
+#: builtin/checkout.c:1182
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "η αναφορά δεν είναι δέντρο: %s"
+
+#: builtin/checkout.c:1221
+msgid "paths cannot be used with switching branches"
+msgstr "δεν είναι δυνατή η χρήση διαδρομών με την αλλαγή κλάδων"
+
+#: builtin/checkout.c:1224 builtin/checkout.c:1228
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "δεν είναι δυνατή η χρήση του '%s' με την αλλαγή κλάδων"
+
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "δεν είναι δυνατή η χρήση του '%s' με το '%s'"
+
+#: builtin/checkout.c:1248
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Δεν είναι δυνατή η αλλαγή του κλάδου στο '%s' που δεν είναι υποβολή"
+
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491
+msgid "branch"
+msgstr "κλάδος"
+
+#: builtin/checkout.c:1282
+msgid "create and checkout a new branch"
+msgstr "να δημιουργηθεί και να εξαχθεί ένας νέος κλάδος"
+
+#: builtin/checkout.c:1284
+msgid "create/reset and checkout a branch"
+msgstr "να δημιουργηθεί/επαναφερθεί και να εξαχθεί ένας κλάδος"
+
+#: builtin/checkout.c:1285
+msgid "create reflog for new branch"
+msgstr "να δημιουργηθεί reflog για νέο κλάδο"
+
+#: builtin/checkout.c:1286 builtin/worktree.c:493
+msgid "detach HEAD at named commit"
+msgstr "να γίνει αποσύνδεση του HEAD στην κατονομασμένη υποβολή"
+
+#: builtin/checkout.c:1287
+msgid "set upstream info for new branch"
+msgstr "να οριστούν οι πληροφορίες του προς τα πάνω για τον νέο κλάδο"
+
+#: builtin/checkout.c:1289
+msgid "new-branch"
+msgstr "νέος κλάδος"
+
+#: builtin/checkout.c:1289
+msgid "new unparented branch"
+msgstr "νέος κλάδος χωρίς γονέα"
+
+#: builtin/checkout.c:1291
+msgid "checkout our version for unmerged files"
+msgstr "να γίνει εξαγωγή της δικής μας έκδοσης για τα μη συγχωνευμένα αρχεία"
+
+#: builtin/checkout.c:1294
+msgid "checkout their version for unmerged files"
+msgstr "να γίνει εξαγωγή της δικής τους έκδοσης για τα μη συγχωνευμένα αρχεία"
+
+#: builtin/checkout.c:1296
+msgid "force checkout (throw away local modifications)"
+msgstr "να γίνει αναγκαστική εξαγωγή (απόρριψη των τοπικών τροποποιήσεων)"
+
+#: builtin/checkout.c:1298
+msgid "perform a 3-way merge with the new branch"
+msgstr "να γίνει τριπλή συγχώνευση με τον νέο κλάδο"
+
+#: builtin/checkout.c:1300 builtin/merge.c:276
+msgid "update ignored files (default)"
+msgstr "να ενημερωθούν τα αρχεία που παραβλέπονται (προεπιλογή)"
+
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
+msgid "style"
+msgstr "μορφή"
+
+#: builtin/checkout.c:1303
+msgid "conflict style (merge or diff3)"
+msgstr "μορφή συγκρούσεων (merge ή diff3)"
+
+#: builtin/checkout.c:1306
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+"να μη γίνει περιορισμός των περιγραφών διαδρομών σε μόνο διάσπαρτα στοιχεία"
+
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr ""
+"να μη γίνει δεύτερη απόπειρα ερμηνείας 'git checkout <κλάδος που δεν "
+"υπάρχει>'"
+
+#: builtin/checkout.c:1310
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"να μη γίνει έλεγχος αν κάποιο άλλο δέντρο εργασίας κρατά το ref που δόθηκε"
+
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "να γίνει αναγκαστικά αναφορά της προόδου"
+
+#: builtin/checkout.c:1345
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "τα -b, -B και --orphan είναι αλληλοαποκλειόμενα"
+
+#: builtin/checkout.c:1362
+msgid "--track needs a branch name"
+msgstr "το --track χρειάζεται ένα όνομα κλάδου"
+
+#: builtin/checkout.c:1367
+msgid "missing branch name; try -b"
+msgstr "λείπει το όνομα κλάδου, δοκιμάστε -b"
+
+#: builtin/checkout.c:1404
+msgid "invalid path specification"
+msgstr "μη έγκυρη περιγραφή διαδρομής"
+
+#: builtin/checkout.c:1411
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+"το '%s' δεν είναι υποβολή και δε γίνεται να δημιουργηθεί κλάδος '%s' από αυτό"
+
+#: builtin/checkout.c:1415
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: το --detach δε δέχεται όρισμα διαδρομής '%s'"
+
+#: builtin/checkout.c:1419
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force και --merge είναι ασύμβατα όταν\n"
+"γίνεται εξαγωγή από το ευρετήριο."
+
+#: builtin/checkout.c:1439
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Το '%s' ταίριαξε με περισσότερους από έναν απομακρυσμένους "
+"παρακολουθούμενους κλάδους.\n"
+"Βρήκαμε %d απομακρυσμένους εξυπηρετητές με αναφορά που ταιριάζει. Οπότε "
+"έγινε εναλλακτικά\n"
+"απόπειρα ταύτισης του ορίσματος με διαδρομή, αλλά απέτυχε και αυτή!\n"
+"\n"
+"Αν θέλατε να εξαγάγετε έναν απομακρυσμένο παρακολουθούμενο κλάδο π.χ. στο "
+"'origin',\n"
+"μπορείτε να το κάνετε ορίζοντας ολογράφως το όνομα με την επιλογή --track:\n"
+"\n"
+" git checkout --track origin/<όνομα>\n"
+"\n"
+"Αν θα θέλατε οι εξαγωγές από ένα αμφίσημο <όνομα> να προτιμούν πάντα\n"
+"έναν απομακρυσμένο εξυπηρετητή, π.χ. το απομακρυσμένο 'origin', σκεφτείτε να "
+"ορίσετε\n"
+"checkout.defaultRemote=origin στις ρυθμίσεις σας."
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <μοτίβο>] [-x | -X] [--] "
+"<διαδρομές>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "Αφαίρεση του %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Θα αφαιρούσε το %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Προσπερνάται το αποθετήριο %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Θα προσπερνούσε το αποθετήριο %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
+msgstr ""
+"Βοήθεια:\n"
+"1 - επιλογή αριθμημένου στοιχείου\n"
+"foo - επιλογή στοιχείου με βάση μοναδικό πρόθεμα\n"
+" - (κενό) μη επιλογή κανενός\n"
+
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
+msgstr ""
+"Βοήθεια:\n"
+"1 - επιλογή ενός μόνο στοιχείου\n"
+"3-5 - επιλογή εύρους στοιχείων\n"
+"2-3,6-9 - επιλογή πολλαπλών ευρών στοιχείων\n"
+"foo - επιλογή στοιχείου με βάση μοναδικό πρόθεμα\n"
+"-... - αποεπιλογή των εξής στοιχείων\n"
+"* - επιλογή όλων των στοιχείων\n"
+" - (κενό) ολοκλήρωση επιλογής\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Ορίστε (%s);\n"
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:719
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr "Αντίο.\n"
+
+#: builtin/clean.c:793
+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:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
+msgstr ""
+
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
+msgstr ""
+
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:909
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:910
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:912
+msgid "remove whole directories"
+msgstr ""
+
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
+msgstr "μοτίβο"
+
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:917
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<επιλογές>] [--] <αποθετήριο> [<φάκελος>]"
+
+#: builtin/clone.c:89
+msgid "don't create a checkout"
+msgstr "να μη δημιουργηθεί εξαγωγή"
+
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
+msgid "create a bare repository"
+msgstr "να δημιουργηθεί ένα γυμνό αποθετήριο"
+
+#: builtin/clone.c:94
+msgid "create a mirror repository (implies bare)"
+msgstr "να δημιουργηθεί αποθετήριο αντίγραφο (εννοείται γυμνό)"
+
+#: builtin/clone.c:96
+msgid "to clone from a local repository"
+msgstr "για κλωνοποίηση από τοπικό αποθετήριο"
+
+#: builtin/clone.c:98
+msgid "don't use local hardlinks, always copy"
+msgstr "να μη γίνει χρήση τοπικών hardlinks, να γίνεται πάντα αντιγραφή"
+
+#: builtin/clone.c:100
+msgid "setup as shared repository"
+msgstr "αρχικοποίηση ως αποθετήριο κοινής χρήσης"
+
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "pathspec"
+msgstr "περιγραφή διαδρομής"
+
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "initialize submodules in the clone"
+msgstr "αρχικοποίηση υποενοτήτων μέσα στον κλώνο"
+
+#: builtin/clone.c:109
+msgid "number of submodules cloned in parallel"
+msgstr "αριθμός υποενοτήτων προς παράλληλη κλωνοποίηση"
+
+#: builtin/clone.c:110 builtin/init-db.c:478
+msgid "template-directory"
+msgstr "φάκελος προτύπων"
+
+#: builtin/clone.c:111 builtin/init-db.c:479
+msgid "directory from which templates will be used"
+msgstr "φάκελος από τον οποίο θα χρησιμοποιηθούνται πρότυπα"
+
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
+msgstr "αποθετήριο αναφοράς"
+
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
+msgstr "να γίνει χρήση του --reference μόνο κατά τη διάρκεια κλωνοποίησης"
+
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329
+msgid "name"
+msgstr "όνομα"
+
+#: builtin/clone.c:119
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+"να χρησιμοποιηθεί το <όνομα> αντί για 'origin' για την παρακολούθηση του "
+"προς τα πάνω"
+
+#: builtin/clone.c:121
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "να εξαχθεί ο <κλάδος> αντί για το HEAD του απομακρυσμένου"
+
+#: builtin/clone.c:123
+msgid "path to git-upload-pack on the remote"
+msgstr "διαδρομή για το git-upload-pack στον απομακρυσμένο εξυπηρετητή"
+
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218
+msgid "depth"
+msgstr "βάθος"
+
+#: builtin/clone.c:125
+msgid "create a shallow clone of that depth"
+msgstr "να δημιουργηθεί ρηχός κλώνος με αυτό το βάθος"
+
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
+msgstr "χρόνος"
+
+#: builtin/clone.c:127
+msgid "create a shallow clone since a specific time"
+msgstr "να δημιουργηθεί ρηχός κλώνος από κάποια συγκεκριμένη στιγμή και μετά"
+
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039
+msgid "revision"
+msgstr "έκδοση"
+
+#: builtin/clone.c:129 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "να γίνει εμβάθυνση του ιστορικού του ρηχού κλώνου, εξαιρώντας το rev"
+
+#: builtin/clone.c:131
+msgid "clone only one branch, HEAD or --branch"
+msgstr "να κλωνοποιηθεί μόνο ένας κλάδος, το HEAD ή --branch"
+
+#: builtin/clone.c:133
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+"να μην κλωνοποιηθεί καμία ετικέτα, και οι μελλοντικές ανακτήσεις να μην τις "
+"ακολουθούν"
+
+#: builtin/clone.c:135
+msgid "any cloned submodules will be shallow"
+msgstr "όλες οι κλωνοποιημένες υποενότητες θα είναι ρηχές"
+
+#: builtin/clone.c:136 builtin/init-db.c:487
+msgid "gitdir"
+msgstr "φάκελος git"
+
+#: builtin/clone.c:137 builtin/init-db.c:488
+msgid "separate git dir from working tree"
+msgstr "να γίνει διαχωρισμός του φακέλου git από το δέντρο εργασίας"
+
+#: builtin/clone.c:138
+msgid "key=value"
+msgstr "κλειδί=τιμή"
+
+#: builtin/clone.c:139
+msgid "set config inside the new repository"
+msgstr "να οριστούν ρυθμίσεις μέσα στο νέο αποθετήριο"
+
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr "χρήση μόνο διευθύνσεων IPv4"
+
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr "χρήση μόνο διευθύνσεων IPv6"
+
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Δεν ήταν δυνατό να μαντέψουμε το όνομα του φακέλου.\n"
+"Παρακαλώ δώστε έναν φάκελο στη γραμμή εντολών"
+
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "πληροφορία: Δεν ήταν δυνατό να προστεθεί εναλλακτική για το '%s': %s\n"
+
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
+msgstr "απέτυχε το άνοιγμα του '%s'"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "το %s υπάρχει ήδη και δεν είναι φάκελος"
+
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "απέτυχε το stat του %s\n"
+
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "απέτυχε η αφαίρεση δεσμού '%s'"
+
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "απέτυχε η δημιουργία του δεσμού '%s'"
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "απέτυχε η αντιγραφή του αρχείου στο '%s'"
+
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
+msgstr "ολοκληρώθηκε.\n"
+
+#: builtin/clone.c:493
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+"Η κλωνοποίηση πέτυχε, αλλά η εξαγωγή απέτυχε.\n"
+"Μπορείτε να επιθεωρήσετε τι εξήχθη με 'git status'\n"
+"και να προσπαθήσετε πάλι την εξαγωγή με 'git checkout -f HEAD'\n"
+
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Δεν ήταν δυνατό να βρεθεί ο απομακρυσμένος κλάδος %s προς κλωνοποίηση."
+
+#: builtin/clone.c:687
+#, c-format
+msgid "unable to update %s"
+msgstr "δεν ήταν δυνατό να ενημερωθεί το %s"
+
+#: builtin/clone.c:737
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"το απομακρυσμένο HEAD αναφέρεται σε ref που δεν υπάρχει, δεν είναι δυνατή η "
+"εξαγωγή.\n"
+
+#: builtin/clone.c:768
+msgid "unable to checkout working tree"
+msgstr "δεν είναι δυνατή η εξαγωγή του δέντρου εργασίας"
+
+#: builtin/clone.c:813
+msgid "unable to write parameters to config file"
+msgstr "δεν είναι δυνατή η εγγραφή παραμέτρων στο αρχείο ρυθμίσεων"
+
+#: builtin/clone.c:876
+msgid "cannot repack to clean up"
+msgstr "δεν είναι δυνατό το repack για καθαρισμό"
+
+#: builtin/clone.c:878
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+"δεν είναι δυνατή η αφαίρεση δεσμού από το προσωρινό αρχείο εναλλακτικών"
+
+#: builtin/clone.c:918 builtin/receive-pack.c:1941
+msgid "Too many arguments."
+msgstr "Υπερβολικά πολλά ορίσματα."
+
+#: builtin/clone.c:922
+msgid "You must specify a repository to clone."
+msgstr "Πρέπει να ορίσετε ένα αποθετήριο προς κλωνοποίηση."
+
+#: builtin/clone.c:935
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "οι επιλογές --bare και --origin %s δεν είναι συμβατές μεταξύ τους."
+
+#: builtin/clone.c:938
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "το --bare και το --separate-git-dir δεν είναι συμβατά μεταξύ τους."
+
+#: builtin/clone.c:951
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "το αποθετήριο '%s' δεν υπάρχει"
+
+#: builtin/clone.c:957 builtin/fetch.c:1608
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "το βάθος %s δεν είναι θετικός αριθμός"
+
+#: builtin/clone.c:967
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "η διαδρομή προορισμού '%s' υπάρχει ήδη και δεν είναι κενός φάκελος."
+
+#: builtin/clone.c:977
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "το δέντρο εργασίας '%s' υπάρχει ήδη."
+
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "δεν ήταν δυνατή η δημιουργία των αρχικών φακέλων του '%s'"
+
+#: builtin/clone.c:997
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "δεν ήταν δυνατή η δημιουργία του φακέλου δέντρου εργασίας '%s'"
+
+#: builtin/clone.c:1017
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Γίνεται κλωνοποίηση μέσα στο γυμνό αποθετήριο '%s'...\n"
+
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Γίνεται κλωνοποίηση μέσα στο '%s'...\n"
+
+#: builtin/clone.c:1043
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"το clone --recursive δεν είναι συμβατό με το --reference και το --reference-"
+"if-able ταυτόχρονα"
+
+#: builtin/clone.c:1104
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+"το --depth παραβλέπεται σε τοπικούς κλώνους, χρησιμοποιήστε το file:// αντί "
+"αυτού."
+
+#: builtin/clone.c:1106
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+"το --shallow-since παραβλέπεται σε τοπικούς κλώνους, χρησιμοποιήστε το "
+"file:// αντί αυτού."
+
+#: builtin/clone.c:1108
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"το --shallow-exclude παραβλέπεται σε τοπικούς κλώνους, χρησιμοποιήστε το "
+"file:// αντί αυτού."
+
+#: builtin/clone.c:1110
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+"το --filter παραβλέπεται σε τοπικούς κλώνους, χρησιμοποιήστε το file:// αντί "
+"αυτού."
+
+#: builtin/clone.c:1113
+msgid "source repository is shallow, ignoring --local"
+msgstr "το αποθετήριο πηγής είναι ρηχό, γίνεται παράβλεψη του --local"
+
+#: builtin/clone.c:1118
+msgid "--local is ignored"
+msgstr "γίνεται παράβλεψη του --local"
+
+#: builtin/clone.c:1192 builtin/clone.c:1200
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Ο απομακρυσμένος κλάδος %s δε βρέθηκε στο από πάνω %s"
+
+#: builtin/clone.c:1203
+msgid "You appear to have cloned an empty repository."
+msgstr "Φαίνεται πως κλωνοποιήσατε ένα κενό αποθετήριο."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<επιλογές>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<επιλογές>] [--] <περιγραφή διαδρομής>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<επιλογές>] [--] <περιγραφή διαδρομής>..."
+
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"Ζητήσατε να τροποποιήσετε την πιο πρόσφατη υποβολή, αλλά αυτό θα την άφηνε\n"
+"κενή. Μπορείτε να επαναλάβετε την εντολή σας με --allow-empty, ή να\n"
+"αφαιρέσετε την υποβολή εντελώς με \"git reset HEAD^\".\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+"Η προηγούμενη επιλεκτική διαλογή είναι τώρα κενή, πιθανώς λόγω επίλυσης "
+"συγκρούσεων.\n"
+"Αν θέλετε να την υποβάλετε πάραυτα, χρησιμοποιήστε:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "Ειδάλλως, παρακαλώ χρησιμοποιήστε 'git reset'\n"
+
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"Αν θέλετε να προσπεράσετε αυτή την υποβολή, χρησιμοποιήστε:\n"
+"\n"
+" git reset\n"
+"\n"
+"Έπειτα με \"git cherry-pick --continue\" θα συνεχίσετε την επιλεκτική "
+"διαλογή\n"
+"των υπόλοιπων υποβολών.\n"
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:359
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:462
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "η υποβολή '%s' δε διαθέτει επικεφαλίδα δημιουργού"
+
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "η υποβολή '%s' έχει εσφαλμένη γραμμή δημιουργού"
+
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:652
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:701 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:703
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:707
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:736 builtin/commit.c:744
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:741
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:795
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:813
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Φαίνεται πως μάλλον υποβάλλετε μια συγχώνευση.\n"
+"Αν αυτό δεν είναι σωστό, παρακαλώ αφαιρέστε το αρχείο\n"
+"\t%s\n"
+"και προσπαθήστε ξανά.\n"
+
+#: builtin/commit.c:818
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Φαίνεται πως μάλλον υποβάλλετε μια επιλεκτική διαλογή.\n"
+"Αν αυτό δεν είναι σωστό, παρακαλώ αφαιρέστε το αρχείο\n"
+"\t%s\n"
+"και προσπαθήστε ξανά.\n"
+
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Παρακαλώ εισάγετε το μήνυμα υποβολής για τις αλλαγές σας. Οι γραμμές που "
+"αρχίζουν\n"
+"με '%c' αγνοούνται, και με κενό μήνυμα εγκαταλείπετε την υποβολή.\n"
+
+#: builtin/commit.c:839
+#, 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 ""
+"Παρακαλώ εισάγετε το μήνυμα υποβολής για τις αλλαγές σας. Οι γραμμές που "
+"αρχίζουν\n"
+"με '%c' θα διατηρηθούν, μπορείτε να τις αφαιρέσετε μετά αν θέλετε.\n"
+"Με κενό μήνυμα εγκαταλείπετε την υποβολή.\n"
+
+#: builtin/commit.c:856
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sΔημιουργός: %.*s <%.*s>"
+
+#: builtin/commit.c:864
+#, c-format
+msgid "%sDate: %s"
+msgstr "%sΗμερομηνία: %s"
+
+#: builtin/commit.c:871
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sΥποβάλλων: %.*s <%.*s>"
+
+#: builtin/commit.c:889
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:956
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:970 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Παρακαλώ εισάγετε το μήνυμα χρησιμοποιώντας την επιλογή -m ή -F.\n"
+
+#: builtin/commit.c:1014
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' δεν είναι 'Όνομα <email>' και δεν ταιριάζει με κάποιον "
+"υπάρχοντα δημιουργό"
+
+#: builtin/commit.c:1028
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1042 builtin/commit.c:1279
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1080
+msgid "--long and -z are incompatible"
+msgstr "--long και -z είναι ασύμβατα μεταξύ τους"
+
+#: builtin/commit.c:1113
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Η χρήση των --reset-author και --author ταυτόχρονα δεν έχει νόημα"
+
+#: builtin/commit.c:1122
+msgid "You have nothing to amend."
+msgstr "Δεν έχετε τίποτα προς τροποποίηση."
+
+#: builtin/commit.c:1125
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Βρίσκεστε στη μέση μιας συγχώνευσης -- δεν είναι δυνατή η τροποποίηση."
+
+#: builtin/commit.c:1127
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+"Βρίσκεστε στη μέση μιας επιλεκτικής διαλογής -- δεν είναι δυνατή η "
+"τροποποίηση."
+
+#: builtin/commit.c:1130
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1140
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1142
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1150
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author μπορεί να χρησιμοποιηθεί μόνο με -C, -c ή --amend."
+
+#: builtin/commit.c:1167
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1169
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1183 builtin/tag.c:546
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1188
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1314 builtin/commit.c:1498
+msgid "show status concisely"
+msgstr ""
+
+#: builtin/commit.c:1316 builtin/commit.c:1500
+msgid "show branch information"
+msgstr ""
+
+#: builtin/commit.c:1318
+msgid "show stash information"
+msgstr ""
+
+#: builtin/commit.c:1320 builtin/commit.c:1502
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1322
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640
+msgid "machine-readable output"
+msgstr "έξοδος σε μηχανικά αναγνώσιμη μορφή"
+
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "show status in long format (default)"
+msgstr ""
+
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "terminate entries with NUL"
+msgstr ""
+
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118
+#: builtin/tag.c:400
+msgid "mode"
+msgstr ""
+
+#: builtin/commit.c:1331 builtin/commit.c:1512
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1335
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+
+#: builtin/commit.c:1337 parse-options.h:164
+msgid "when"
+msgstr ""
+
+#: builtin/commit.c:1338
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1340
+msgid "list untracked files in columns"
+msgstr ""
+
+#: builtin/commit.c:1341
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1343
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1363
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+
+#: builtin/commit.c:1468
+msgid "suppress summary after successful commit"
+msgstr ""
+
+#: builtin/commit.c:1469
+msgid "show diff in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1471
+msgid "Commit message options"
+msgstr "Επιλογές μηνύματος υποβολής"
+
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
+msgid "read message from file"
+msgstr ""
+
+#: builtin/commit.c:1473
+msgid "author"
+msgstr "δημιουργός"
+
+#: builtin/commit.c:1473
+msgid "override author for commit"
+msgstr ""
+
+#: builtin/commit.c:1474 builtin/gc.c:518
+msgid "date"
+msgstr ""
+
+#: builtin/commit.c:1474
+msgid "override date for commit"
+msgstr ""
+
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395
+msgid "message"
+msgstr ""
+
+#: builtin/commit.c:1475
+msgid "commit message"
+msgstr "μήνυμα υποβολής"
+
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92
+msgid "commit"
+msgstr "υποβολή"
+
+#: builtin/commit.c:1476
+msgid "reuse and edit message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1477
+msgid "reuse message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1478
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+
+#: builtin/commit.c:1479
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1480
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "η υποβολή έχει δημιουργό εμένα τώρα (χρησιμοποιείται με -C/-c/--amend)"
+
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107
+msgid "add Signed-off-by:"
+msgstr ""
+
+#: builtin/commit.c:1482
+msgid "use specified template file"
+msgstr ""
+
+#: builtin/commit.c:1483
+msgid "force edit of commit"
+msgstr ""
+
+#: builtin/commit.c:1484
+msgid "default"
+msgstr ""
+
+#: builtin/commit.c:1484 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: builtin/commit.c:1485
+msgid "include status in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115
+msgid "GPG sign commit"
+msgstr ""
+
+#: builtin/commit.c:1490
+msgid "Commit contents options"
+msgstr "Επιλογές περιεχομένων υποβολής"
+
+#: builtin/commit.c:1491
+msgid "commit all changed files"
+msgstr "να γίνει υποβολή όλων των αλλαγμένων αρχείων"
+
+#: builtin/commit.c:1492
+msgid "add specified files to index for commit"
+msgstr ""
+
+#: builtin/commit.c:1493
+msgid "interactively add files"
+msgstr ""
+
+#: builtin/commit.c:1494
+msgid "interactively add changes"
+msgstr ""
+
+#: builtin/commit.c:1495
+msgid "commit only specified files"
+msgstr "να γίνει υποβολή μόνο των δοθέντων αρχείων"
+
+#: builtin/commit.c:1496
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/commit.c:1497
+msgid "show what would be committed"
+msgstr ""
+
+#: builtin/commit.c:1510
+msgid "amend previous commit"
+msgstr "τροποποίηση της προηγούμενης υποβολής"
+
+#: builtin/commit.c:1511
+msgid "bypass post-rewrite hook"
+msgstr ""
+
+#: builtin/commit.c:1516
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1518
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1591
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1598
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1617
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1628
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Εγκατάλειψη της υποβολής λόγω κενού μηνύματος υποβολής.\n"
+
+#: builtin/commit.c:1633
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Εγκατάλειψη της υποβολής, δεν επεξεργαστήκατε το μήνυμα.\n"
+
+#: builtin/commit.c:1668
+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 reset HEAD\" to recover."
+msgstr ""
+"το αποθετήριο ενημερώθηκε, αλλά δεν ήταν δυνατό να γραφεί\n"
+"το αρχείο new_index. Ελέγξτε πως ο δίσκος δεν είναι γεμάτος και πως\n"
+"δεν υπάρχει υπέρβαση ορίου, και μετά κάντε \"git reset HEAD\" για ανάκτηση."
+
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <φάκελος αντικειμένων>]"
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr "git commit-graph read [--object-dir <φάκελος αντικειμένων>]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr "git commit-graph verify [--object-dir <φάκελος αντικειμένων>]"
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+"git commit-graph write [--object-dir <φάκελος αντικειμένων>] [--append] [--"
+"reachable|--stdin-packs|--stdin-commits]"
+
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1553
+msgid "dir"
+msgstr "φάκελος"
+
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
+#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+msgid "The object directory to store the graph"
+msgstr "Ο φάκελος αντικειμένων που θα αποθηκευτεί ο γράφος"
+
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<επιλογές>]"
+
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr "μόνο ένας τύπος κάθε φορά"
+
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr "Τοποθεσία αρχείου ρυθμίσεων"
+
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr "να γίνει χρήση του καθολικού αρχείου ρυθμίσεων"
+
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr "να γίνει χρήση του αρχείου ρυθμίσεων συστήματος"
+
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr "να γίνει χρήση του αρχείου ρυθμίσεων αποθετηρίου"
+
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr "να γίνει χρήση αρχείου ρυθμίσεων ανά δέντρο εργασίας"
+
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr "να γίνει χρήση του δοθέντος αρχείου ρυθμίσεων"
+
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr "αναγνωριστικό blob"
+
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr "ανάγνωση ρυθμίσεων από το δοθέν αντικείμενο blob"
+
+#: builtin/config.c:131
+msgid "Action"
+msgstr "Ενέργεια"
+
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:142
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:146
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:153
+msgid "Other"
+msgstr "Άλλο"
+
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"προβολή προέλευσης ρυθμίσεων (αρχείο, standard input, blob, γραμμή εντολών)"
+
+#: builtin/config.c:158
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:443
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
+msgstr "η εγγραφή blob ρυθμίσων δεν υποστηρίζεται"
+
+#: builtin/config.c:587
+#, 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:611
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
+msgstr "το --local μπορεί να χρησιμοποιηθεί μόνο μέσα σε αποθετήριο git"
+
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
+msgstr "το --blob μπορεί να χρησιμοποιηθεί μόνο μέσα σε αποθετήριο git"
+
+#: builtin/config.c:638
+msgid "$HOME not set"
+msgstr "Το $HOME δεν έχει οριστεί"
+
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:693
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:734
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
+msgstr "η διόρθωση blob δεν υποστηρίζεται"
+
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/config.c:773
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
+msgstr "δεν υπάρχει τέτοια ενότητα: %s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr ""
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<επιλογές>] [<υποβολή ή φαινομενική>...]"
+
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<επιλογές>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr ""
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr ""
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr ""
+
+#: builtin/describe.c:273
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "καμία ετικέτα δεν ταιριάζει ακριβώς με το '%s'"
+
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Καμία σχολιασμένη ετικέτα δεν περιγράφει το '%s'.\n"
+"Πάραυτα, υπήρχαν μη σχολιασμένες ετικέτες: δοκιμάστε το --tags."
+
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Καμία ετικέτα δεν περιγράφει το '%s'.\n"
+"Δοκιμάστε το --always, ή δημιουργήστε ετικέτες."
+
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:442
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:513 builtin/log.c:516
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Μη έγκυρο όνομα αντικειμένου %s"
+
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s δεν είναι ούτε υποβολή ούτε blob"
+
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
+msgstr ""
+
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
+msgstr ""
+
+#: builtin/describe.c:537
+msgid "use any ref"
+msgstr "να γίνει χρήση οποιουδήποτε ref"
+
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
+msgstr "να γίνει χρήση οποιασδήποτε ετικέτας, ακόμα και μη σχολιασμένης"
+
+#: builtin/describe.c:539
+msgid "always use long format"
+msgstr ""
+
+#: builtin/describe.c:540
+msgid "only follow first parent"
+msgstr ""
+
+#: builtin/describe.c:543
+msgid "only output exact matches"
+msgstr ""
+
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
+msgstr ""
+
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:551 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
+msgstr ""
+
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
+msgstr ""
+
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr ""
+
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/describe.c:656
+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:364
+msgid "Not a git repository"
+msgstr "Δεν είναι αποθετήριο git"
+
+#: builtin/diff.c:408
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:417
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "δόθηκαν περισσότερα από δύο blob: '%s'"
+
+#: builtin/diff.c:422
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/difftool.c:31
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<επιλογές>] [<υποβολή> [<υποβολή>]] [--] [<διαδρομή>...]"
+
+#: builtin/difftool.c:261
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:414
+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:740
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:747
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "δε δόθηκε <εντολή> για το --extcmd=<εντολή>"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [επιλογές παράθεσης εκδόσεων]"
+
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
+msgstr "Προσπέραση εξόδου των δεδομένων blob"
+
+#: builtin/fast-export.c:1102 builtin/log.c:1601
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr "Προβολή αρχικών αναγνωριστικών των blob/υποβολών"
+
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<επιλογές>] [<αποθετήριο> [<refspec>...]]"
+
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<επιλογές>] <ομάδα>"
+
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<επιλογές>] [(<αποθετήριο> | <ομάδα>)...]"
+
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<επιλογές>]"
+
+#: builtin/fetch.c:115 builtin/pull.c:195
+msgid "fetch from all remotes"
+msgstr "να γίνει ανάκτηση από όλους τους απομακρυσμένους εξυπηρετητές"
+
+#: builtin/fetch.c:117 builtin/pull.c:198
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ""
+
+#: builtin/fetch.c:119 builtin/pull.c:201
+msgid "path to upload pack on remote end"
+msgstr ""
+
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr ""
+
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
+msgstr "να γίνει ανάκτηση από πολλαπλούς απομακρυσμένους εξυπηρετητές"
+
+#: builtin/fetch.c:124 builtin/pull.c:205
+msgid "fetch all tags and associated objects"
+msgstr "να γίνει ανάκτηση όλων των ετικετών και σχετικών αντικειμένων"
+
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
+msgstr "να μη γίνει ανάκτηση όλων των ετικετών (--no-tags)"
+
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
+msgstr "αριθμός υποενοτήτων προς παράλληλη ανάκτηση"
+
+#: builtin/fetch.c:130 builtin/pull.c:208
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
+msgid "on-demand"
+msgstr ""
+
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
+msgstr "έλεγχος αναδρομικής ανάκτησης των υποενοτήτων"
+
+#: builtin/fetch.c:138 builtin/pull.c:216
+msgid "keep downloaded pack"
+msgstr ""
+
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
+msgstr ""
+
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:222
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+
+#: builtin/fetch.c:161 builtin/pull.c:225
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:162 builtin/pull.c:227
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:163 builtin/pull.c:228
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "για συγκεκριμένο εξυπηρετητή"
+
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "επιλογή να μεταδοθεί"
+
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "η ρύθμιση fetch.output περιέχει μη έγκυρη τιμή %s"
+
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+#: builtin/fetch.c:709
+msgid "[up to date]"
+msgstr "[πλήρως ενήμερο]"
+
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
+msgstr "[απορρίφθηκε]"
+
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
+msgstr ""
+
+#: builtin/fetch.c:733
+msgid "[tag update]"
+msgstr ""
+
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:760
+msgid "[new tag]"
+msgstr "[νέα ετικέτα]"
+
+#: builtin/fetch.c:763
+msgid "[new branch]"
+msgstr "[νέος κλάδος]"
+
+#: builtin/fetch.c:766
+msgid "[new ref]"
+msgstr "[νέο ref]"
+
+#: builtin/fetch.c:796
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
+msgstr ""
+
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr ""
+
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
+msgstr "Από το %.*s\n"
+
+#: builtin/fetch.c:970
+#, 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:1051
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (το %s θα μείνει εκκρεμές)"
+
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1084
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+"Αρνούμαι να κάνω ανάκτηση μέσα στον τρέχοντα κλάδο %s μη γυμνού αποθετηρίου"
+
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Ανάκτηση %s\n"
+
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Δεν ήταν δυνατή η ανάκτηση του %s"
+
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1506
+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:1543
+msgid "You need to specify a tag name."
+msgstr "Χρειάζεται να ορίσετε ένα όνομα ετικέτας."
+
+#: builtin/fetch.c:1592
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1594
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1599
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:1601
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1617
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:1619
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:1628
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+"Δεν υπάρχει τέτοιος απομακρυσμένος εξυπηρετητής ή απομακρυσμένη ομάδα: %s"
+
+#: builtin/fetch.c:1635
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1651
+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:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:680
+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:424
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "προσοχή στο %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:253
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:279
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:298
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:307
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:318
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:335
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:353
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:376
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:385
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:393
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:422
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:461
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:495
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:557
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:572
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:585
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:605
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:620
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:623
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:638
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:643 builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
+msgstr "μη έγκυρο %s"
+
+#: builtin/fsck.c:650
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:656
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:660
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:672
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:677
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:719
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:725
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:726
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:727
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:728
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:729
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:730
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:731
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:732
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:733
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:735
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:736 builtin/prune.c:110
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:737
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:797
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr "git gc [<επιλογές>]"
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/gc.c:477
+#, 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:519
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:545
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:576
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:578
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:579
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:619
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:672
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:29
+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:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "δεν υποστηρίζονται νήματα, παραβλέπεται το %s"
+
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
+msgstr ""
+
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
+msgstr ""
+
+#: builtin/grep.c:822
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:824
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:828
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:853
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:854
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:855
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:856
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:873
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
+msgstr ""
+
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:893
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:896
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:898
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:920
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:988
+msgid "no pattern given"
+msgstr ""
+
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "δεν ήταν δυνατή η ταύτιση της έκδοσης: %s"
+
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1066 builtin/pack-objects.c:3400
+msgid "no threads support, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "δόθηκε μη έγκυρος αριθμός νημάτων (%d)"
+
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
+
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+
+#: builtin/grep.c:1135
+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 "git hash-object --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "type"
+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:73
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:121
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#, c-format
+msgid "failed to exec '%s'"
+msgstr ""
+
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:430 builtin/help.c:441 git.c:323
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:444 git.c:347
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:473 builtin/help.c:503
+#, c-format
+msgid "usage: %s%s"
+msgstr "χρήση: %s%s"
+
+#: builtin/help.c:487
+msgid "'git help config' for more information"
+msgstr "'git help config' για περισσότερες πληροφορίες"
+
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "ασυμφωνία τύπου αντικειμένου στο %s"
+
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "δεν ελήφθη το αναμενόμενο αντικείμενο %s"
+
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "αντικείμενο %s: αναμενόταν τύπος %s, βρέθηκε %s"
+
+#: builtin/index-pack.c:249
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:259
+msgid "early EOF"
+msgstr "πρόωρο EOF"
+
+#: builtin/index-pack.c:260
+msgid "read error on input"
+msgstr "σφάλμα ανάγνωσης κατά την εισαγωγή"
+
+#: builtin/index-pack.c:272
+msgid "used more bytes than were available"
+msgstr "χρησιμοποίησε περισσότερα bytes από όσα ήταν διαθέσιμα"
+
+#: builtin/index-pack.c:279 builtin/pack-objects.c:599
+msgid "pack too large for current definition of off_t"
+msgstr "το πακέτο παραείναι μεγάλο για τον τρέχοντα ορισμό του off_t"
+
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr "το πακέτο υπερβαίνει το μέγιστο επιτρεπτό μέγεθος"
+
+#: builtin/index-pack.c:297 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "δεν ήταν δυνατή η δημιουργία του '%s'"
+
+#: builtin/index-pack.c:303
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "δεν ήταν δυνατό το άνοιγμα του αρχείου πακέτου '%s'"
+
+#: builtin/index-pack.c:317
+msgid "pack signature mismatch"
+msgstr "ασυμφωνία υπογραφής πακέτου"
+
+#: builtin/index-pack.c:319
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "δεν υποστηρίζεται η έκδοση %<PRIu32> του πακέτου"
+
+#: builtin/index-pack.c:337
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "το πακέτο έχει λάθος αντικείμενο στο σημείο %<PRIuMAX>: %s"
+
+#: builtin/index-pack.c:457
+#, c-format
+msgid "inflate returned %d"
+msgstr "η αποσυμπίεση επέστρεψε %d"
+
+#: builtin/index-pack.c:506
+msgid "offset value overflow for delta base object"
+msgstr "υπερχείλιση τιμής σημείου για το βασικό αντικείμενο delta"
+
+#: builtin/index-pack.c:514
+msgid "delta base offset is out of bound"
+msgstr "το σημείο της βάσης delta είναι εκτός ορίων"
+
+#: builtin/index-pack.c:522
+#, c-format
+msgid "unknown object type %d"
+msgstr "άγνωστος τύπος αντικειμένου %d"
+
+#: builtin/index-pack.c:553
+msgid "cannot pread pack file"
+msgstr "δεν είναι δυνατό να γίνει pread το αρχείο πακέτου"
+
+#: builtin/index-pack.c:555
+#, 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:581
+msgid "serious inflate inconsistency"
+msgstr "σοβαρή αντίφαση στην αποσυμπίεση"
+
+#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "ΒΡΕΘΗΚΕ ΣΥΓΚΡΟΥΣΗ SHA1 ΜΕ ΤΟ %s !"
+
+#: builtin/index-pack.c:729 builtin/pack-objects.c:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306
+#, c-format
+msgid "unable to read %s"
+msgstr "δεν ήταν δυνατή η ανάγνωση του %s"
+
+#: builtin/index-pack.c:792
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr ""
+"δεν είναι δυνατή η ανάγνωση των πληροφοριών του υπάρχοντος αντικειμένου %s"
+
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "δεν είναι δυνατή η ανάγνωση του υπάρχοντος αντικειμένου %s"
+
+#: builtin/index-pack.c:814
+#, c-format
+msgid "invalid blob object %s"
+msgstr "μη έγκυρο αντικείμενο blob %s"
+
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
+msgstr "σφάλμα fsck στο πακεταρισμένο αντικείμενο"
+
+#: builtin/index-pack.c:838
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Δεν είναι προσβάσιμα όλα τα αντικείμενα παιδιά του %s"
+
+#: builtin/index-pack.c:910 builtin/index-pack.c:941
+msgid "failed to apply delta"
+msgstr "απέτυχε η εφαρμογή του delta"
+
+#: builtin/index-pack.c:1109
+msgid "Receiving objects"
+msgstr "Λήψη αντικειμένων"
+
+#: builtin/index-pack.c:1109
+msgid "Indexing objects"
+msgstr "Προσθήκη σε ευρετήριο αντικειμένων"
+
+#: builtin/index-pack.c:1143
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "το πακέτο είναι κατεστραμμένο (ασυμφωνία SHA1)"
+
+#: builtin/index-pack.c:1148
+msgid "cannot fstat packfile"
+msgstr "δεν είναι δυνατό το fstat του αρχείου πακέτου"
+
+#: builtin/index-pack.c:1151
+msgid "pack has junk at the end"
+msgstr "το πακέτο έχει σκουπίδια στο τέλος του"
+
+#: builtin/index-pack.c:1163
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "ασύλληπτο μπέρδεμα στο parse_pack_objects()"
+
+#: builtin/index-pack.c:1186
+msgid "Resolving deltas"
+msgstr "Επίλυση delta"
+
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "δεν είναι δυνατή η δημιουργία νήματος: %s"
+
+#: builtin/index-pack.c:1237
+msgid "confusion beyond insanity"
+msgstr "ασύλληπτο μπέρδεμα"
+
+#: builtin/index-pack.c:1243
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "ολοκληρώθηκε με %d τοπικό αντικείμενο"
+msgstr[1] "ολοκληρώθηκε με %d τοπικά αντικείμενα"
+
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+"Μη αναμενόμενο τελικό άθροισμα ελέγχου για το %s (κατεστραμμένος δίσκος;)"
+
+#: builtin/index-pack.c:1259
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "το πακέτο έχει %d ανεπίλυτο delta"
+msgstr[1] "το πακέτο έχει %d ανεπίλυτα delta"
+
+#: builtin/index-pack.c:1283
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "δεν είναι δυνατό να αποσυμπιστεί το συνημμένο αντικείμενο (%d)"
+
+#: builtin/index-pack.c:1360
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "το τοπικό αντικείμενο %s είναι κατεστραμμένο"
+
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "το όνομα του αρχείου πακέτου '%s' δεν τελειώνει σε '.pack'"
+
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "δεν είναι δυνατή η εγγραφή %s αρχείου '%s'"
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "δεν είναι δυνατό το κλείσιμο του εγγεγραμμένου %s αρχείου '%s'"
+
+#: builtin/index-pack.c:1431
+msgid "error while closing pack file"
+msgstr "σφάλμα κατά το κλείσιμο του αρχείου πακέτου"
+
+#: builtin/index-pack.c:1445
+msgid "cannot store pack file"
+msgstr "δεν είναι δυνατή η αποθήκευση του αρχείου πακέτου"
+
+#: builtin/index-pack.c:1453
+msgid "cannot store index file"
+msgstr "δεν είναι δυνατή η αποθήκευση του αρχείου ευρετηρίου"
+
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "λάθος pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1565
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Δεν είναι δυνατό το άνοιγμα του υπάρχοντος αρχείου πακέτου '%s'"
+
+#: builtin/index-pack.c:1567
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+"Δεν είναι δυνατό το άνοιγμα του υπάρχοντος αρχείου ευρετηρίου πακέτου για "
+"'%s'"
+
+#: builtin/index-pack.c:1615
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1622
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1659
+msgid "Cannot come back to cwd"
+msgstr "Δεν είναι δυνατή η επιστροφή στον τρέχοντα φάκελο εργασίας"
+
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#, c-format
+msgid "bad %s"
+msgstr "λάθος %s"
+
+#: builtin/index-pack.c:1747
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "το --fix-thin δε γίνεται να χρησιμοποιηθεί χωρίς το --stdin"
+
+#: builtin/index-pack.c:1749
+msgid "--stdin requires a git repository"
+msgstr "το --stdin απαιτεί ένα αποθετήριο git"
+
+#: builtin/index-pack.c:1755
+msgid "--verify with no packfile name given"
+msgstr "δόθηκε --verify χωρίς όνομα αρχείου πακέτου"
+
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr "σφάλμα fsck στα αντικείμενα του πακέτου"
+
+#: 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:329
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:332
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:349 builtin/init-db.c:352
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:406
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:411
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:460
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<φάκελος προτύπου>] [--"
+"shared[=<δικαιώματα>]] [<φάκελος>]"
+
+#: builtin/init-db.c:483
+msgid "permissions"
+msgstr "δικαιώματα"
+
+#: builtin/init-db.c:484
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:518 builtin/init-db.c:523
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:527
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:548
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:576
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr "ενέργεια αν υπάρχει ήδη υποσημείωση"
+
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr "ενέργεια αν δεν υπάρχει υποσημείωση"
+
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<επιλογές>] [<εύρος εκδόσεων>] [[--] <διαδρομή>...]"
+
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:100
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:163
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:164
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:165
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:167
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:170
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:173
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:271
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:525
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:540 builtin/log.c:634
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:659
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:780
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:881
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:897
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:914
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:924
+msgid "Not a range."
+msgstr "Δεν είναι εύρος."
+
+#: builtin/log.c:1047
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1132
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1159
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1217
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1339
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1343
+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:1363
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1374
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1378
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1431
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1483
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1528
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1531
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1535
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1537
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1539
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1540
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1541
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1545
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1547
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1550
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1553
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1556
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1559
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1563
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1565
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1568
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1569
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1570 builtin/log.c:1572
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1570
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1572
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1574
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1575
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1579 builtin/log.c:1582
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1580
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1583
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1587
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1590
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1592
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1594
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1595
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1597
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1598
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1599
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1602
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1604
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1679
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1694
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1696
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1704
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1706
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1708
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1740
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1742
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1829
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1833
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1834
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1840
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1844
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1853
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1864
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1900
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1944
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2003
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<προς τα πάνω> [<head> [<όριο>]]]"
+
+#: builtin/log.c:2057
+#, 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:1111
+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:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+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:53
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:55
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:112
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:132
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:178
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:179
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:184
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:235 builtin/pull.c:144
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:238 builtin/pull.c:147
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:239 builtin/pull.c:150
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:241 builtin/pull.c:153
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:244 builtin/pull.c:159
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:246 builtin/pull.c:162
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:248 builtin/pull.c:165
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:249
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:171
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/pull.c:174
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:257 builtin/pull.c:179
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:183
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:261
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:268
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:270
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:272 builtin/pull.c:190
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:278
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:303
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:308
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:313
+#, c-format
+msgid "not a valid object: %s"
+msgstr "δεν είναι έγκυρο αντικείμενο: %s"
+
+#: builtin/merge.c:335 builtin/merge.c:352
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:382
+msgid " (nothing to squash)"
+msgstr " (τίποτα προς σύμπτυξη)"
+
+#: builtin/merge.c:393
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:443
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:494
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:581
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:702
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:716
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:731
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:783
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:792
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"Δε γίνεται υποβολή της συγχώνευσης, χρησιμοποιήστε 'git commit' για να "
+"ολοκληρώσετε τη συγχώνευση.\n"
+
+#: builtin/merge.c:798
+#, c-format
+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"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:834
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:853
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Εξαιρετικά.\n"
+
+#: builtin/merge.c:906
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:945
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:947
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:949
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:954
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1011
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1114
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1148
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1251
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1255
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1267
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1271
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1287
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Δεν έχετε ολοκληρώσει τη συγχώνευσή σας (Υπάρχει το MERGE_HEAD).\n"
+"Παρακαλώ, υποβάλετε τις αλλαγές σας πριν συγχωνεύσετε."
+
+#: builtin/merge.c:1294
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Δεν έχετε ολοκληρώσει την επιλεκτική διαλογή σας (Υπάρχει το "
+"CHERRY_PICK_HEAD).\n"
+"Παρακαλώ, υποβάλετε τις αλλαγές σας πριν συγχωνεύσετε."
+
+#: builtin/merge.c:1297
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+"Δεν έχετε ολοκληρώσει την επιλεκτική διαλογή σας (Υπάρχει το "
+"CHERRY_PICK_HEAD)."
+
+#: builtin/merge.c:1306
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Δε μπορείτε να συνδυάσετε το --squash με το --no-ff."
+
+#: builtin/merge.c:1314
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1331
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1333
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1338
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1340
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1422
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1431
+msgid "Already up to date."
+msgstr "Ήδη πλήρως ενήμερο."
+
+#: builtin/merge.c:1441
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1483
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1490
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1515
+msgid "Already up to date. Yeeah!"
+msgstr "Ήδη πλήρως ενήμερο. Ναιιι!"
+
+#: builtin/merge.c:1521
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1544 builtin/merge.c:1623
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1548
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1614
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1616
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1625
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1637
+#, 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:46
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "δεν ήταν δυνατή η ταύτιση του ref '%s'"
+
+#: builtin/merge-recursive.c:78
+#, 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:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:48
+#, c-format
+msgid "unrecognized verb: %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:717 builtin/repack.c:513
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:413
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:421
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:428
+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 "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: 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:513
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "δεν ήταν δυνατό το άνοιγμα ή η ανάγνωση του '%s'"
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "απέτυχε η ταύτιση του '%s' με κάποιο έγκυρο ref."
+
+#: 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 ""
+"δεν ήταν δυνατή η ανάγνωση δεδομένων σημειώσεων από μη blob αντικείμενο '%s'."
+
+#: 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 "απέτυχε η ταύτιση του NOTES_MERGE_REF"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"επιλύστε τις συγκρούσεις σημειώσεων χρησιμοποιώντας την επιλεγμένη "
+"στρατηγική (manual/ours/theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: 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: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:108 builtin/worktree.c:165
+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
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:51
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:423
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:434
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:565
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:776
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:789
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:793
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:797
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:808
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:836
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:849
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:911 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:964
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1158
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1586
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1595
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1864
+msgid "Counting objects"
+msgstr "Καταμέτρηση αντικειμένων"
+
+#: builtin/pack-objects.c:1994
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2009
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2119
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2445
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2577
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2664
+msgid "Compressing objects"
+msgstr "Συμπίεση αντικειμένων"
+
+#: builtin/pack-objects.c:2670
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2751
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2757
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2855
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2945
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3030
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3122
+#, c-format
+msgid "not a rev '%s'"
+msgstr "δεν είναι έκδοση η '%s'"
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3150
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3203
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3207
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3237
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3239
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3241
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3245
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3246
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3251
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3253
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3255
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3257
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3259
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3261
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3263
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3265
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3267
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3269
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3271
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3273
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3287
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3289
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3291
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3293
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3298
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3300
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3302
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3306
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3308
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3310
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3312
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3315
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3320
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3345
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3350
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3404
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3406
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3414
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3420
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3479
+msgid "Enumerating objects"
+msgstr "Απαρίθμηση αντικειμένων"
+
+#: builtin/pack-objects.c:3498
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+"Συνολικά %<PRIu32> (delta %<PRIu32>), επαναχρησιμοποιημένα %<PRIu32> (delta "
+"%<PRIu32>)"
+
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+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:109
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:112
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:114
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:128
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:61 builtin/pull.c:63
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:83
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:134
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:138
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:141
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:177
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:193
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:203
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:211
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:306
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:422
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:424
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:425
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:428
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"Ζητήσατε να ενσωματώσετε από το απομακρυσμένο '%s', αλλά δε δώσατε\n"
+"κάποιον κλάδο. Αφού αυτό δεν είναι το προεπιλεγμένο απομακρυσμένο\n"
+"για τον τρέχοντά σας κλάδο, πρέπει να δώσετε έναν κλάδο στη γραμμή εντολών."
+
+#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "Δε βρίσκεστε αυτή τη στιγμή σε κάποιον κλάδο."
+
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:438 builtin/pull.c:453
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<απομακρυσμένο>"
+
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:457 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:462
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Οι ρυθμίσεις σας ορίζουν να γίνει συγχώνευση με το ref '%s'\n"
+"από τον απομακρυσμένο εξυπηρετητή, αλλά δεν έχει γίνει ανάκτηση τέτοιου ref."
+
+#: builtin/pull.c:566
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:844
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:892
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "η επιλογή --[no-]autostash ισχύει μόνο με το --rebase."
+
+#: builtin/pull.c:900
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:904
+msgid "pull with rebase"
+msgstr "ενσωμάτωση με rebase"
+
+#: builtin/pull.c:905
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:930
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:936
+#, 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:951
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:955
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:962
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<επιλογές>] [<αποθετήριο> [<refspec>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "συντομογραφία ετικέτας χωρίς <ετικέτα>"
+
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr "το --delete δέχεται μόνο απλά ονόματα ref προορισμού"
+
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Για να διαλέξετε οποιαδήποτε από τις δύο επιλογές μόνιμα, δείτε το push."
+"default στο 'git help config'."
+
+#: builtin/push.c:170
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
+msgstr ""
+"Ο προς τα πάνω κλάδος του τρέχοντος κλάδου σας δεν ταιριάζει με\n"
+"το όνομα του τρέχοντος κλάδου σας. Για να δημοσιεύσετε στον κλάδο προς τα "
+"πάνω\n"
+"στον απομακρυσμένο εξυπηρετητή, χρησιμοποιήστε\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"Για να δημοσιεύσετε στον κλάδο με το ίδιο όνομα στον απομακρυσμένο "
+"εξυπηρετητή, χρησιμοποιήστε\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:185
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"Δε βρίσκεστε αυτή τη στιγμή σε κάποιον κλάδο.\n"
+"Για να δημοσιεύσετε το ιστορικό που οδηγεί στην τρέχουσα κατάσταση\n"
+"(αποσυνδεδεμένου HEAD) τώρα, χρησιμοποιήστε\n"
+"\n"
+" git push %s HEAD:<όνομα-του-απομακρυσμένου-κλάδου>\n"
+
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+"Ο τρέχων κλάδος %s δεν έχει προς τα πάνω κλάδο.\n"
+"Για να δημοσιεύσετε τον τρέχοντα κλάδο και να ορίσετε τον απομακρυσμένο ως "
+"προς τα πάνω του, χρησιμοποιήστε\n"
+"\n"
+" git push --set-upstream %s %s\n"
+
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+"Ο τρέχων κλάδος %s έχει πολλαπλούς προς τα πάνω κλάδους, αρνούμαι να "
+"δημοσιεύσω."
+
+#: builtin/push.c:210
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"Δημοσιεύετε στο απομακρυσμένο '%s', που δεν είναι το προς τα πάνω του\n"
+"τρέχοντός σας κλάδου '%s', χωρίς να μου πείτε τι να δημοσιεύσω\n"
+"και ποιον απομακρυσμένο κλάδο να ενημερώσω."
+
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Δεν προσδιορίσατε refspecs προς δημοσίευση, και το προεπιλεγμένο push."
+"default είναι τίποτα: \"nothing\"."
+
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Απορρίφθηκαν οι ενημερώσεις επειδή η άκρη του τρέχοντος κλάδου είναι πίσω "
+"από\n"
+"το απομακρυσμένο αντίστοιχό του. Ενσωματώστε τις απομακρυσμένες αλλαγές (π."
+"χ.\n"
+"'git pull ...') πριν δημοσιεύσετε ξανά.\n"
+"Δείτε τη 'Σημείωση για ταχείες προωθήσεις' στο 'git push --help' για "
+"λεπτομέρειες."
+
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Απορρίφθηκαν οι ενημερώσεις επειδή η άκρη ενός κλάδου που δημοσιεύτηκε είναι "
+"πίσω από\n"
+"το απομακρυσμένο αντίστοιχό του. Εξάγετε αυτόν τον κλάδο και ενσωματώστε τις "
+"απομακρυσμένες αλλαγές\n"
+"(π.χ. 'git pull ...') πριν δημοσιεύσετε ξανά.\n"
+"Δείτε τη 'Σημείωση για ταχείες προωθήσεις' στο 'git push --help' για "
+"λεπτομέρειες."
+
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Απορρίφθηκαν οι ενημερώσεις επειδή ο απομακρυσμένος εξυπηρετητής περιέχει "
+"έργο που\n"
+"δε διαθέτετε τοπικά. Αυτό προκαλείται συνήθως όταν ένα άλλο αποθετήριο έχει "
+"δημοσιεύσει\n"
+"στο ίδιο ref. Μπορεί να θέλετε να ενσωματώσετε πρώτα τις απομακρυσμένες "
+"αλλαγές\n"
+"(π.χ. 'git pull ...') πριν δημοσιεύσετε ξανά.\n"
+"Δείτε τη 'Σημείωση για ταχείες προωθήσεις' στο 'git push --help' για "
+"λεπτομέρειες."
+
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+"Απορρίφθηκαν οι ενημερώσεις επειδή η ετικέτα υπάρχει ήδη στον απομακρυσμένο "
+"εξυπηρετητή."
+
+#: builtin/push.c:298
+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 ""
+"Δε μπορείτε να ενημερώσετε ένα απομακρυσμένο ref που δείχνει σε αντικείμενο "
+"που δεν είναι υποβολή,\n"
+"ή να ενημερώσετε ένα απομακρυσμένο ref για να το κάνετε να δείχνει σε "
+"αντικείμενο που δεν είναι υποβολή,\n"
+"χωρίς να χρησιμοποιήσετε την επιλογή εξανάγκασης '--force'.\n"
+
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Δημοσίευση στο %s\n"
+
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "απέτυχε η δημοσίευση κάποιων ref στο '%s'"
+
+#: builtin/push.c:398
+#, c-format
+msgid "bad repository '%s'"
+msgstr "λάθος αποθετήριο '%s'"
+
+#: builtin/push.c:399
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+"Δεν έχει ρυθμιστεί προορισμός δημοσίευσης.\n"
+"Ορίστε το URL από τη γραμμή εντολών ή ρυθμίστε ένα απομακρυσμένο αποθετήριο "
+"χρησιμοποιώντας\n"
+"\n"
+" git remote add <όνομα> <url>\n"
+"\n"
+"και έπειτα δημοσιεύστε χρησιμοποιώντας το όνομα του απομακρυσμένου\n"
+"\n"
+" git push <όνομα>\n"
+
+#: builtin/push.c:554
+msgid "repository"
+msgstr "αποθετήριο"
+
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "να γίνει δημοσίευση όλων των ref"
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "να γίνει αντιγραφή όλων των ref"
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr "να γίνει διαγραφή των ref"
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+"να γίνει δημοσίευση των ετικετών (δε γίνεται να χρησιμοποιηθεί με το --all ή "
+"το --mirror)"
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "να γίνουν αναγκαστικά ενημερώσεις"
+
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr "<refname>:<expect>"
+
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr "να απαιτηθεί η παλιά τιμή του ref να είναι η εξής"
+
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr "έλεγχος αναδρομικής δημοσίευσης των υποενοτήτων"
+
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "να γίνει χρήση λεπτού πακέτου"
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "λήψη προγράμματος πακέτου"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "να οριστεί το προς τα πάνω για το git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "να γίνει κλάδεμα των τοπικά διεγραμμένων ref"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "να γίνει παράκαμψη του αγκίστρου προ δημοσίευσης"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "να γίνει δημοσίευση των ετικετών που λείπουν αλλά είναι σχετικές"
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "να υπογραφεί με GPG η δημοσίευση"
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "να ζητηθεί ατομική συναλλαγή στην απομακρυσμένη πλευρά"
+
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "το --delete δεν είναι συμβατό με τα --all, --mirror και --tags"
+
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr "το --delete δεν έχει νόημα χωρίς κανένα ref"
+
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr "το --all και το --tags δεν είναι συμβατά μεταξύ τους"
+
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr "το --all δε γίνεται να συνδυαστεί με refspec"
+
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr "το --mirror και το --tags δεν είναι συμβατά μεταξύ τους"
+
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr "το --mirror δε γίνεται να συνδυαστεί με refspec"
+
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr "το --all και το --mirror δεν είναι συμβατά μεταξύ τους"
+
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr "οι επιλογές δημοσίευσης δεν πρέπει να έχουν χαρακτήρες newline"
+
+#: 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:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:90
+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/rebase.c:30
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:34
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:121 builtin/rebase.c:1437
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:173
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:188
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:213
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:289
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:307
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:522
+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 ""
+"Επιλύστε όλες τις συγκρούσεις χειροκίνητα, επισημάνετέ τις ως επιλυμένες με\n"
+"\"git add/rm <συγκρουόμενα αρχεία>\", έπειτα τρέξτε \"git rebase --continue"
+"\".\n"
+"Ειδάλλως μπορείτε να προσπεράσετε αυτή την υποβολή: τρέξτε \"git rebase --"
+"skip\".\n"
+"Για να εγκαταλείψετε και να επιστρέψετε στην κατάσταση πριν από το \"git "
+"rebase\", τρέξτε \"git rebase --abort\"."
+
+#: builtin/rebase.c:603
+#, 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:948
+#, 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:964
+#, 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:994
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:998
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1040
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1042
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1044
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1047
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1050
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1053
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1063 builtin/rebase.c:1065
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1067 builtin/rebase.c:1070
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1072
+msgid "continue"
+msgstr "συνέχεια"
+
+#: builtin/rebase.c:1075
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1077
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1080
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1081
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1084
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1087
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1091
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1095
+msgid "try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1099
+msgid "allow rerere to update index with resolved conflict"
+msgstr ""
+
+#: builtin/rebase.c:1102
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1104
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1110
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1112
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1116
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1119
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1122
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1124
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1126 builtin/revert.c:112
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1127
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1130
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1149
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Πρέπει να επεξεργαστείτε όλες τις συγκρούσεις συγχώνευσης και μετά\n"
+"να τις επισημάνετε ως επιλυμένες χρησιμοποιώντας git add"
+
+#: builtin/rebase.c:1257
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1276
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1287 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "δεν ήταν δυνατή η αφαίρεση του '%s'"
+
+#: builtin/rebase.c:1313
+#, 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:1334
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1375
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1397
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1502
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1508
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1526
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1533
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1558
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid "No such ref: %s"
+msgstr "Δεν υπάρχει ref: %s"
+
+#: builtin/rebase.c:1578
+msgid "Could not resolve HEAD to a revision"
+msgstr "Δεν ήταν δυνατή η ταύτιση του HEAD με κάποια έκδοση"
+
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1622
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1628
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1631
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1634
+msgid "could not reset --hard"
+msgstr "δεν ήταν δυνατή η --hard επαναφορά"
+
+#: builtin/rebase.c:1635 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "Το HEAD τώρα βρίσκεται στο %s"
+
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1678
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1691
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1704
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1714
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1729
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1732
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1757
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+"Πρώτα, γίνεται γύρισμα προς τα πίσω του head για να γίνει επανάληψη της "
+"δουλειάς σας πάνω σε αυτό...\n"
+
+#: builtin/rebase.c:1765
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1774
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:25
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:52
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:58
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:102
+#, c-format
+msgid "could not open %s"
+msgstr "δεν ήταν δυνατό το άνοιγμα του %s"
+
+#: builtin/rebase--interactive.c:115
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:131
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:157
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "continue rebase"
+msgstr "συνέχεια; rebase"
+
+#: builtin/rebase--interactive.c:162
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:165
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:176
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:180
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:183
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "switch-to"
+msgstr "αλλαγή σε"
+
+#: builtin/rebase--interactive.c:193
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:224
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:230
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:830
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"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:850
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\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:1929
+msgid "quiet"
+msgstr "σιωπηλά"
+
+#: builtin/receive-pack.c:1943
+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:567 builtin/reflog.c:572
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "δεν είναι reflog: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Δεν υπάρχει τέτοιος απομακρυσμένος εξυπηρετητής: '%s'"
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:666
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:802
+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] ""
+"Σημείωση: Ένας κλάδος εκτός της ιεραρχίας refs/remotes/ hierarchy δεν "
+"αφαιρέθηκε,\n"
+"για να τον διαγράψετε, χρησιμοποιήστε:"
+msgstr[1] ""
+"Σημείωση: Κάποιοι κλάδοι εκτός της ιεραρχίας refs/remotes/ hierarchy δεν "
+"αφαιρέθηκαν,\n"
+"για να τους διαγράψετε, χρησιμοποιήστε:"
+
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " νέο (η επόμενη ανάκτηση θα αποθηκεύσει μέσα στο remotes/%s)"
+
+#: builtin/remote.c:920
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:924
+msgid " ???"
+msgstr " ;;;"
+
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1032
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1035
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1039
+msgid "up to date"
+msgstr "πλήρως ενήμερο"
+
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1045
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
+msgstr " URL ανάκτησης: %s"
+
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr "(κανένα URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
+#, c-format
+msgid " Push URL: %s"
+msgstr " URL δημοσίευσης: %s"
+
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1195
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " Απομακρυσμένος κλάδος:%s"
+msgstr[1] " Απομακρυσμένοι κλάδοι:%s"
+
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1207
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1215
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1221
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Δεν είναι έγκυρο ref: %s"
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr " το %s θα μείνει εκκρεμές!"
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [θα κλάδευε το] %s"
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [κλαδεμένο] %s"
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Δεν υπάρχει τέτοιος απομακρυσμένος εξυπηρετητής '%s'"
+
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Δε βρέθηκε τέτοιο URL: %s"
+
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr ""
+
+#: builtin/repack.c:27
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:411
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:310
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:328
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:420
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:481
+#, 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:529
+#, 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:58 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "απέτυχε η ταύτιση του '%s' με κάποιο έγκυρο ref"
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:174
+#, 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:225
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "μη έγκυρο όνομα αντικειμένου: '%s'"
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "το νέο αντικείμενο είναι ίδιο με το παλιό: '%s'"
+
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:471
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "η νέα υποβολή είναι ίδια με την παλιά: '%s'"
+
+#: builtin/replace.c:515
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:536
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:537
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:538
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:539
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:540
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:541
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:543
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:544
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:557
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:565
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:605
+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 ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<υποβολή>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<δέντρο ή φαινομενικό>] [--] <διαδρομές>..."
+
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<δέντρο ή φαινομενικό>] [--] [<διαδρομές>...]"
+
+#: builtin/reset.c:40
+msgid "mixed"
+msgstr "mixed"
+
+#: builtin/reset.c:40
+msgid "soft"
+msgstr "soft"
+
+#: builtin/reset.c:40
+msgid "hard"
+msgstr "hard"
+
+#: builtin/reset.c:40
+msgid "merge"
+msgstr "συγχώνευση"
+
+#: builtin/reset.c:40
+msgid "keep"
+msgstr "διατήρηση"
+
+#: builtin/reset.c:81
+msgid "You do not have a valid HEAD."
+msgstr "Δεν έχετε έγκυρο HEAD."
+
+#: builtin/reset.c:83
+msgid "Failed to find tree of HEAD."
+msgstr "Δεν ήταν δυνατό να βρεθεί το δέντρο του HEAD."
+
+#: builtin/reset.c:89
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Δεν ήταν δυνατό να βρεθεί το δέντρο του %s."
+
+#: builtin/reset.c:193
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Δεν είναι δυνατό να γίνει επαναφορά %s στη μέση μιας συγχώνευσης."
+
+#: builtin/reset.c:293
+msgid "be quiet, only report errors"
+msgstr "σιωπηλή λειτουργία, αναφορά μόνο σφαλμάτων"
+
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
+msgstr "επαναφορά HEAD και ευρετηρίου"
+
+#: builtin/reset.c:296
+msgid "reset only HEAD"
+msgstr "επαναφορά μόνο HEAD"
+
+#: builtin/reset.c:298 builtin/reset.c:300
+msgid "reset HEAD, index and working tree"
+msgstr "επαναφορά HEAD, ευρετηρίου και δέντρου εργασίας"
+
+#: builtin/reset.c:302
+msgid "reset HEAD but keep local changes"
+msgstr "επαναφορά HEAD αλλά διατήρηση τοπικών αλλαγών"
+
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"καταγραφή μόνο του γεγονότος ότι οι αφαιρεθείσες διαδρομές θα προστεθούν "
+"αργότερα"
+
+#: builtin/reset.c:326
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Απέτυχε η ταύτιση του '%s' με κάποια έγκυρη έκδοση."
+
+#: builtin/reset.c:334
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Απέτυχε η ταύτιση του '%s' με κάποιο έγκυρο δέντρο."
+
+#: builtin/reset.c:343
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "το --patch είναι ασύμβατο με --{hard,mixed,soft}"
+
+#: builtin/reset.c:352
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"το --mixed με διαδρομές έχει καταργηθεί, χρησιμοποιήστε αντί αυτού 'git "
+"reset -- <διαδρομές>'."
+
+#: builtin/reset.c:354
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Δεν είναι δυνατή η επαναφορά %s με διαδρομές."
+
+#: builtin/reset.c:364
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "η επαναφορά %s δεν επιτρέπεται σε γυμνό αποθετήριο"
+
+#: builtin/reset.c:368
+msgid "-N can only be used with --mixed"
+msgstr "το -N μπορεί να χρησιμοποιηθεί μόνο με το --mixed"
+
+#: builtin/reset.c:388
+msgid "Unstaged changes after reset:"
+msgstr "Μη προετοιμασμένες αλλαγές μετά την επαναφορά:"
+
+#: builtin/reset.c:391
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+"\n"
+"Η απαρίθμηση μη προετοιμασμένων αλλαγών μετά την επαναφορά πήρε %.2f "
+"δευτερόλεπτα. Μπορείτε να\n"
+"χρησιμοποιήσετε το '--quiet' για να το αποφύγετε αυτό. Αλλάξτε την επιλογή "
+"ρύθμισης reset.quiet σε true\n"
+"για να το κάνετε προεπιλεγμένο.\n"
+
+#: builtin/reset.c:401
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Δεν ήταν δυνατή η επαναφορά του αρχείου ευρετηρίου στην έκδοση '%s'."
+
+#: builtin/reset.c:405
+msgid "Could not write new index file."
+msgstr "Δεν ήταν δυνατή η εγγραφή του νέου αρχείου ευρετηρίου."
+
+#: builtin/rev-list.c:406
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:464
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:467
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:508
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:511
+msgid "cannot combine --use-bitmap-index with object filtering"
+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 "git revert <υποεντολή>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<επιλογές>] <υποβολή ή φαινομενική>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <υποεντολή>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: builtin/revert.c:101
+msgid "end revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:102
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:105
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:108
+msgid "parent-number"
+msgstr ""
+
+#: builtin/revert.c:109
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:111
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:113
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:122
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:124
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:126
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:220
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:233
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<επιλογές>] [--] <αρχείο>..."
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(χρησιμοποιήστε το -f για να εξαναγκάσετε την αφαίρεση)"
+
+#: builtin/rm.c:216
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] ""
+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:242
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:307
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:346
+#, 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/serve.c:7
+msgid "git serve [<options>]"
+msgstr ""
+
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+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 "git log --pretty=short | git shortlog [<επιλογές>]"
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+
+#: 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:549
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
+msgstr ""
+
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:657
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
+msgstr "δε δόθηκαν κλάδοι, και το HEAD δεν είναι έγκυρο"
+
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:742
+#, 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:746
+#, c-format
+msgid "no such ref %s"
+msgstr "δεν υπάρχει ref %s"
+
+#: builtin/show-branch.c:830
+#, 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:834
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:837
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
+#: builtin/show-ref.c:11
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
+msgstr ""
+
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
+msgstr ""
+
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr ""
+
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:546
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:562
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:596
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:664
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:668
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:678
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:685
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:707
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:823
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "δεν ήταν δυνατή η ταύτιση του HEAD ref μέσα στην υποενότητα '%s'"
+
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "απέτυχε η αναδρομή μέσα στην υποενότητα '%s'"
+
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: builtin/submodule--helper.c:875
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:876
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:905
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:969
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:975
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1000
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1108
+#, 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:1120
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1128
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1130
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1141
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1157
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1340
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1347
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1370
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:1373
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:1376
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:1384
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1392
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:1423
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1437
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1574
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:1604
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1633
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1777
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:1788
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:1854
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:1858
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:1864
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:1867
+msgid "parallel jobs"
+msgstr ""
+
+#: builtin/submodule--helper.c:1869
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+
+#: builtin/submodule--helper.c:1870
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1877
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1890
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:1938
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2094
+msgid "recurse into submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2161
+msgid "git submodule--helper config name [value]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2162
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:2235
+#, 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>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <αναγνωριστικό κλειδί>] [-f] [-m <μήνυμα> | -F "
+"<αρχείο>] <όνομα ετικέτας> [<head>]"
+
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <όνομα ετικέτας>..."
+
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<αριθ.>]] [--contains <υποβολή>] [--no-contains <υποβολή>] [--"
+"points-at <αντικείμενο>]\n"
+"\t\t[--format=<μορφή>] [--[no-]merged [<υποβολή>]] [<μοτίβο>...]"
+
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<μορφή>] <όνομα ετικέτας>..."
+
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:133
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+
+#: builtin/tag.c:137
+#, 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:191
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:193
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/tag.c:218
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:267
+msgid "no tag message?"
+msgstr "δεν υπάρχει μήνυμα ετικέτας;"
+
+#: builtin/tag.c:274
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:385
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:389
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:390
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:392
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:396
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:398
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:407
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:408
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:419
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:523
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:534
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:565
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:221
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:962
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:965
+msgid "refresh: ignore submodules"
+msgstr ""
+
+#: builtin/update-index.c:968
+msgid "do not ignore new files"
+msgstr ""
+
+#: builtin/update-index.c:970
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:972
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:974
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:977
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:981
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:985
+msgid "<mode>,<object>,<path>"
+msgstr ""
+
+#: builtin/update-index.c:986
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:995
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:998
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:1001
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1004
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:1007
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:1009
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:1011
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:1013
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:1017
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:1021
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:1025
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:1029
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:1032
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:1034
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(για εντολές porcelain) ξέχνα τις σωσμένες μη επιλυμένες συγκρούσεις"
+
+#: builtin/update-index.c:1038
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-index.c:1040
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1042
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1044
+msgid "test if the filesystem supports untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1046
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
+#: builtin/update-index.c:1048
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1050
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1052
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1055
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: builtin/update-index.c:1156
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+
+#: builtin/update-index.c:1165
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1176
+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:1180
+msgid "Untracked cache disabled"
+msgstr ""
+
+#: builtin/update-index.c:1188
+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:1192
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
+
+#: builtin/update-index.c:1200
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1204
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1207
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1211
+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 "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr ""
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: 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:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
+
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
+msgstr ""
+
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+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:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:61 builtin/worktree.c:888
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr ""
+
+#: builtin/worktree.c:86
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr ""
+
+#: builtin/worktree.c:91 builtin/worktree.c:100
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr ""
+
+#: builtin/worktree.c:110
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:118
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr ""
+
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, 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:310
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/worktree.c:429 builtin/worktree.c:435
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:431
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:440
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:446
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr ""
+
+#: builtin/worktree.c:487
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+
+#: builtin/worktree.c:490
+msgid "create a new branch"
+msgstr ""
+
+#: builtin/worktree.c:492
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:494
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:495
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:498
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:501
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:509
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:570
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:670
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:684 builtin/worktree.c:717
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:689
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:691
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:719
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:760
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:768
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:791 builtin/worktree.c:918
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:796
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:802
+#, c-format
+msgid "target '%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:810
+#, 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:812
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:815
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:820
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:868
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:872
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:877
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:900
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:923
+#, 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:925
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:928
+#, 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 ""
+
+#: 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 "η υποβολή %s δεν είναι σημειωμένη ως προσβάσιμη"
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <διαδρομή>] [-c <όνομα>=<τιμή>]\n"
+" [--exec-path[=<διαδρομή>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<διαδρομή>] [--work-tree=<διαδρομή>] [--"
+"namespace=<όνομα>]\n"
+" <εντολή> [<ορίσματα>]"
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+
+#: git.c:174
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:188
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:202
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:216
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:238
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:276
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:301
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:437
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:439
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:441
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:720
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:770
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"χρήση: %s\n"
+"\n"
+
+#: git.c:803
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:815
+#, 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:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1959
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+
+#: remote-curl.c:455
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+
+#: parse-options.h:154
+msgid "expiry-date"
+msgstr ""
+
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:259
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:261
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:267
+msgid "use <n> digits to display SHA-1s"
+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 ""
+"Συγκρίνει το περιεχόμενο και τη λειτουργία των blob που βρέθηκαν μέσω δύο "
+"αντικειμένων δέντρων"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr ""
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Εξαγωγέας δεδομένων Git"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr ""
+
+#: 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 ""
+"Υπολογισμός αναγνωριστικού αντικειμένου και προαιρετικά δημιουργία blob από "
+"ένα αρχείο"
+
+#: 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 "Revert some existing commits"
+msgstr ""
+
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
+msgstr ""
+
+#: command-list.h:158
+msgid "Pick out and massage parameters"
+msgstr ""
+
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
+msgstr ""
+
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
+
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
+
+#: command-list.h:163
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h:164
+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h:165
+msgid "Show branches and their commits"
+msgstr ""
+
+#: command-list.h:166
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h:167
+msgid "List references in a local repository"
+msgstr ""
+
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
+msgstr ""
+
+#: command-list.h:169
+msgid "Common Git shell script setup code"
+msgstr ""
+
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
+msgstr ""
+
+#: command-list.h:171
+msgid "Add file contents to the staging area"
+msgstr ""
+
+#: command-list.h:172
+msgid "Show the working tree status"
+msgstr ""
+
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
+msgstr ""
+
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
+msgstr ""
+
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
+
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
+msgstr ""
+
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Δημιουργεί προσωρινό αρχείο με τα περιεχόμενα ενός blob"
+
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
+msgstr ""
+
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
+msgstr ""
+
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+
+#: command-list.h:183
+msgid "Send archive back to git-archive"
+msgstr ""
+
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h:185
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
+msgstr ""
+
+#: command-list.h:187
+msgid "Validate packed Git archive files"
+msgstr ""
+
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
+msgstr ""
+
+#: command-list.h:191
+msgid "Manage multiple working trees"
+msgstr ""
+
+#: command-list.h:192
+msgid "Create a tree object from the current index"
+msgstr ""
+
+#: command-list.h:193
+msgid "Defining attributes per path"
+msgstr ""
+
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
+msgstr "Διεπαφή γραμμής εντολών Git και συμβάσεις"
+
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
+msgstr "Ένα μάθημα του πυρήνα του Git για προγραμματιστές"
+
+#: command-list.h:196
+msgid "Git for CVS users"
+msgstr ""
+
+#: command-list.h:197
+msgid "Tweaking diff output"
+msgstr ""
+
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr ""
+
+#: command-list.h:199
+msgid "A Git Glossary"
+msgstr "Ένα Γλωσσάρι του Git"
+
+#: command-list.h:200
+msgid "Hooks used by Git"
+msgstr ""
+
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
+msgstr ""
+
+#: command-list.h:202
+msgid "Defining submodule properties"
+msgstr ""
+
+#: command-list.h:203
+msgid "Git namespaces"
+msgstr "Ονόματα xώρων Git"
+
+#: command-list.h:204
+msgid "Git Repository Layout"
+msgstr ""
+
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
+msgstr ""
+
+#: list-objects-filter-options.h:63
+msgid "args"
+msgstr "ορίσματα"
+
+#: list-objects-filter-options.h:64
+msgid "object filtering"
+msgstr ""
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "Χρειάζεται να αρχίσετε με \"git bisect start\""
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr ""
+
+#: 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 $TERM_BAD' δέχεται μόνο ένα όρισμα."
+
+#: 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 "Ήδη πλήρως ενήμερο με το $pretty_name"
+
+#: 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-rebase.sh:445
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr ""
+
+#: git-legacy-rebase.sh:471
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: git-legacy-rebase.sh:578
+#, sh-format
+msgid "invalid upstream '$upstream_name'"
+msgstr ""
+
+#: git-legacy-rebase.sh:602
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr ""
+
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr ""
+
+#: git-legacy-rebase.sh:614
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr ""
+
+#: git-legacy-rebase.sh:640
+#, sh-format
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr ""
+
+#: git-legacy-rebase.sh:678
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr ""
+
+#: git-legacy-rebase.sh:707
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr ""
+
+#: git-legacy-rebase.sh:717
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr ""
+
+#: git-legacy-rebase.sh:731
+#, sh-format
+msgid "Changes to $onto:"
+msgstr ""
+
+#: git-legacy-rebase.sh:733
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr ""
+
+#: git-legacy-rebase.sh:743
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr ""
+
+#: git-legacy-rebase.sh:757
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+"Πρώτα, γίνεται γύρισμα προς τα πίσω του head για να γίνει επανάληψη της "
+"δουλειάς σας πάνω σε αυτό..."
+
+#: git-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+
+#: git-stash.sh:125
+msgid "You do not have the initial commit yet"
+msgstr "Δεν έχετε ακόμα την αρχική υποβολή"
+
+#: git-stash.sh:140
+msgid "Cannot save the current index state"
+msgstr ""
+
+#: git-stash.sh:155
+msgid "Cannot save the untracked files"
+msgstr ""
+
+#: git-stash.sh:175 git-stash.sh:188
+msgid "Cannot save the current worktree state"
+msgstr ""
+
+#: git-stash.sh:192
+msgid "No changes selected"
+msgstr "Δεν επιλέχτηκε καμία αλλαγή"
+
+#: git-stash.sh:195
+msgid "Cannot remove temporary index (can't happen)"
+msgstr ""
+
+#: git-stash.sh:208
+msgid "Cannot record working tree state"
+msgstr ""
+
+#: git-stash.sh:246
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr ""
+
+#: git-stash.sh:298
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr ""
+
+#: git-stash.sh:312
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
+#: git-stash.sh:320
+msgid "No local changes to save"
+msgstr ""
+
+#: git-stash.sh:325
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: git-stash.sh:329
+msgid "Cannot save the current status"
+msgstr ""
+
+#: git-stash.sh:330
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr ""
+
+#: git-stash.sh:359
+msgid "Cannot remove worktree changes"
+msgstr ""
+
+#: git-stash.sh:507
+#, sh-format
+msgid "unknown option: $opt"
+msgstr ""
+
+#: git-stash.sh:520
+msgid "No stash entries found."
+msgstr ""
+
+#: git-stash.sh:527
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr ""
+
+#: git-stash.sh:542
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr ""
+
+#: git-stash.sh:570
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr ""
+
+#: git-stash.sh:581
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr ""
+
+#: git-stash.sh:589
+msgid "unable to refresh index"
+msgstr ""
+
+#: git-stash.sh:593
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: git-stash.sh:601
+msgid "Conflicts in index. Try without --index."
+msgstr "Συγκρούσεις στο ευρετήριο. Δοκιμάστε χωρίς το --index."
+
+#: git-stash.sh:603
+msgid "Could not save index tree"
+msgstr ""
+
+#: git-stash.sh:612
+msgid "Could not restore untracked files from stash entry"
+msgstr ""
+
+#: git-stash.sh:637
+msgid "Cannot unstage modified files"
+msgstr ""
+
+#: git-stash.sh:652
+msgid "Index was not unstashed."
+msgstr ""
+
+#: git-stash.sh:666
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+
+#: git-stash.sh:675
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr ""
+
+#: git-stash.sh:676
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr ""
+
+#: git-stash.sh:684
+msgid "No branch name specified"
+msgstr "Δε δόθηκε όνομα κλάδου"
+
+#: git-stash.sh:763
+msgid "(To restore them type \"git stash apply\")"
+msgstr ""
+
+#: git-submodule.sh:198
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+
+#: git-submodule.sh:208
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr ""
+
+#: git-submodule.sh:227
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr ""
+
+#: git-submodule.sh:230
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr ""
+
+#: git-submodule.sh:236
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
+msgstr ""
+
+#: git-submodule.sh:259
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr ""
+
+#: git-submodule.sh:261
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr ""
+
+#: git-submodule.sh:269
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+
+#: git-submodule.sh:271
+#, 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:277
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr ""
+
+#: git-submodule.sh:289
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:294
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:303
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:563
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:573
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:578
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:596
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:602
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+
+#: git-submodule.sh:609
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:610
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:614
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:615
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:620
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:621
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:626
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:627
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr ""
+
+#: git-submodule.sh:658
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:754
+msgid "The --cached option cannot be used with the --files option"
+msgstr ""
+
+#: git-submodule.sh:806
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr ""
+
+#: git-submodule.sh:826
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr ""
+
+#: git-submodule.sh:829
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr ""
+
+#: git-submodule.sh:832
+#, 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:136
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:152
+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:215
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Μπορείτε να τροποποιήσετε την υποβολή τώρα, με\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Όταν οι αλλαγές σας σας ικανοποιούν, τρέξτε\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:240
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:279
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:309
+msgid "Cannot write current commit's replacement sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:394
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:403
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:412
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:417
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:428
+#, 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:437
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:440
+msgid "This is a combination of 2 commits."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:556
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Δεν ήταν δυνατή η τροποποίηση της υποβολής μετά από την επιτυχή διαλογή του "
+"$sha1... $rest\n"
+"Κατά πάσα πιθανότητα οφείλεται σε κενό μήνυμα υποβολής, ή απέτυχε το "
+"άγκιστρο προ υποβολής.\n"
+"Αν απέτυχε το άγκιστρο προ υποβολής, μπορεί να χρειαστεί να επιλύσετε το "
+"θέμα πριν να\n"
+"μπορέσετε να αναδιατυπώσετε την υποβολή."
+
+#: git-rebase--preserve-merges.sh:571
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:586
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:628
+#, sh-format
+msgid "Executing: $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:636
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:638
+msgid "and made changes to the index and/or the working tree"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:640
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Μπορείτε να διορθώσετε το πρόβλημα, και μετά να τρέξετε\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--preserve-merges.sh:653
+#, 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:664
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:665
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:700
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:757
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:762
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Έχετε προετοιμασμένες αλλαγές στο δέντρο εργασίας σας.\n"
+"Αν αυτές οι αλλαγές πρέπει να \n"
+"συμπτυχθούν μέσα στην προηγούμενη υποβολή, τρέξτε:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Αν πρέπει να πάνε σε νέα υποβολή, τρέξτε:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"Και στις δύο περιπτώσεις, μόλις τελειώσετε, συνεχίστε με:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--preserve-merges.sh:779
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:784
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"Έχετε μη συγχωνευμένες αλλαγές στο δέντρο εργασίας σας. Παρακαλώ υποβάλετέ "
+"τις\n"
+"πρώτα και μετά τρέξτε 'git rebase --continue' πάλι."
+
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+msgid "Could not commit staged changes."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:888
+#, 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:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
+msgstr ""
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "χρήση: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr ""
+
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr ""
+
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Επιπρόσθετα, το ευρετήριό σας περιέχει μη υποβεβλημένες αλλαγές."
+
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+"Χρειάζεται να τρέξετε αυτή την εντολή από το ψηλότερο επίπεδο του δέντρου "
+"εργασίας."
+
+#: git-sh-setup.sh:377
+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:196
+#, perl-format
+msgid "%12s %12s %s"
+msgstr ""
+
+#: git-add--interactive.perl:197
+msgid "staged"
+msgstr ""
+
+#: git-add--interactive.perl:197
+msgid "unstaged"
+msgstr ""
+
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
+msgid "binary"
+msgstr ""
+
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
+msgid "nothing"
+msgstr ""
+
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
+msgid "unchanged"
+msgstr ""
+
+#: git-add--interactive.perl:609
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:612
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:615
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:618
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:627
+msgid "Update"
+msgstr ""
+
+#: git-add--interactive.perl:639
+msgid "Revert"
+msgstr ""
+
+#: git-add--interactive.perl:662
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "σημείωση: το %s δεν παρακολουθείται τώρα.\n"
+
+#: git-add--interactive.perl:673
+msgid "Add untracked"
+msgstr ""
+
+#: git-add--interactive.perl:679
+msgid "No untracked files.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1033
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+
+#: git-add--interactive.perl:1036
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+
+#: git-add--interactive.perl:1039
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+
+#: git-add--interactive.perl:1085
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1086
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1092
+#, 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 ""
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1100
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr ""
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1213
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Η επεξεργασμένη αλλαγή σας δεν εφαρμόζεται. Να γίνει επεξεργασία πάλι (με \"n"
+"\" απορρίπτεται!) [y/n];"
+
+#: git-add--interactive.perl:1222
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - προετοιμασία αυτής της αλλαγής\n"
+"n - όχι προετοιμασία αυτής της αλλαγής\n"
+"q - έξοδος, όχι προετοιμασία αυτής της αλλαγής ή καμίας από όσες απομένουν\n"
+"a - προετοιμασία αυτής της αλλαγής και όλων των επόμενων αλλαγών στο αρχείο\n"
+"d - όχι προετοιμασία αυτής της αλλαγής ή καμίας από τις επόμενες αλλαγές στο "
+"αρχείο"
+
+#: git-add--interactive.perl:1228
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - αποθήκευση αυτής της αλλαγής\n"
+"n - όχι αποθήκευση αυτής της αλλαγής\n"
+"q - έξοδος, όχι αποθήκευση αυτής της αλλαγής ή καμίας από όσες απομένουν\n"
+"a - αποθήκευση αυτής της αλλαγής και όλων των επόμενων αλλαγών στο αρχείο\n"
+"d - όχι αποθήκευση αυτής της αλλαγής ή καμίας από τις επόμενες αλλαγές στο "
+"αρχείο"
+
+#: git-add--interactive.perl:1234
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - αποπροετοιμασία αυτής της αλλαγής\n"
+"n - όχι αποπροετοιμασία αυτής της αλλαγής\n"
+"q - έξοδος, όχι αποπροετοιμασία αυτής της αλλαγής ή καμίας από όσες "
+"απομένουν\n"
+"a - αποπροετοιμασία αυτής της αλλαγής και όλων των επόμενων αλλαγών στο "
+"αρχείο\n"
+"d - όχι αποπροετοιμασία αυτής της αλλαγής ή καμίας από τις επόμενες αλλαγές "
+"στο αρχείο"
+
+#: git-add--interactive.perl:1240
+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:1246
+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:1252
+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:1258
+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:1273
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - επιλογή αλλαγής για να πάτε\n"
+"/ - αναζήτηση για αλλαγή που ταιριάζει με τη δοθείσα κανονική έκφραση\n"
+"j - όχι απόφαση για αυτή την αλλαγή, δες την επόμενη αλλαγή χωρίς απόφαση\n"
+"J - όχι απόφαση για αυτή την αλλαγή, δες την επόμενη αλλαγή\n"
+"k - όχι απόφαση για αυτή την αλλαγή, δες την προηγούμενη αλλαγή χωρίς "
+"απόφαση\n"
+"K - όχι απόφαση για αυτή την αλλαγή, δες την προηγούμενη αλλαγή\n"
+"s - τεμάχισε την τρέχουσα αλλαγή σε μικρότερες αλλαγές\n"
+"e - χειροκίνητη επεξεργασία της παρούσας αλλαγής\n"
+"? - προβολή βοήθειας\n"
+
+#: git-add--interactive.perl:1304
+msgid "The selected hunks do not apply to the index!\n"
+msgstr ""
+
+#: git-add--interactive.perl:1305
+msgid "Apply them to the worktree anyway? "
+msgstr "Να γίνει πάραυτα εφαρμογή τους στο δέντρο εργασίας; "
+
+#: git-add--interactive.perl:1308
+msgid "Nothing was applied.\n"
+msgstr "Δεν εφαρμόστηκε τίποτα.\n"
+
+#: git-add--interactive.perl:1319
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1328
+msgid "Only binary files changed.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1330
+msgid "No changes.\n"
+msgstr "Δεν υπάρχουν αλλαγές.\n"
+
+#: git-add--interactive.perl:1338
+msgid "Patch update"
+msgstr ""
+
+#: git-add--interactive.perl:1390
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1391
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1392
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1395
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1396
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1397
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1400
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1401
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1402
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1405
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr ""
+"Να γίνει εφαρμογή της αλλαγής λειτουργίας στο ευρετήριο [y,n,q,a,d%s,?]; "
+
+#: git-add--interactive.perl:1406
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1407
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1410
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1411
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1412
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1415
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1416
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1417
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1420
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Να γίνει εφαρμογή της αλλαγής λειτουργίας στο ευρετήριο και το δέντρο "
+"εργασίας [y,n,q,a,d%s,?]; "
+
+#: git-add--interactive.perl:1421
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1422
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
+msgstr ""
+
+#: git-add--interactive.perl:1529
+msgid "go to which hunk (<ret> to see more)? "
+msgstr ""
+
+#: git-add--interactive.perl:1531
+msgid "go to which hunk? "
+msgstr ""
+
+#: git-add--interactive.perl:1540
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr ""
+
+#: git-add--interactive.perl:1545
+#, 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:1571
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1575
+msgid "search for regex? "
+msgstr ""
+
+#: git-add--interactive.perl:1588
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1598
+msgid "No hunk matches the given pattern\n"
+msgstr ""
+
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+msgid "No previous hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+msgid "No next hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1650
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1706
+msgid "Review diff"
+msgstr ""
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1725
+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:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+msgid "missing --"
+msgstr ""
+
+#: git-add--interactive.perl:1763
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#, 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:219 git-send-email.perl:225
+msgid "the editor exited uncleanly, aborting everything"
+msgstr ""
+
+#: git-send-email.perl:302
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+
+#: git-send-email.perl:307
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr ""
+
+#: git-send-email.perl:326
+msgid "--dump-aliases incompatible with other options\n"
+msgstr ""
+
+#: git-send-email.perl:395 git-send-email.perl:650
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr ""
+
+#: git-send-email.perl:398
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+
+#: git-send-email.perl:468
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:497
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:525
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:527
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:529
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:534
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr ""
+
+#: git-send-email.perl:616
+#, 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:637
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr ""
+
+#: git-send-email.perl:661
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+
+#: git-send-email.perl:672
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+
+#: git-send-email.perl:685
+#, perl-format
+msgid "No subject line in %s?"
+msgstr ""
+
+#: git-send-email.perl:695
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr ""
+
+#: git-send-email.perl:706
+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:730
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr ""
+
+#: git-send-email.perl:747
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr ""
+
+#: git-send-email.perl:790
+msgid "Summary email is empty, skipping it\n"
+msgstr ""
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:825
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Επιβεβαιώνετε πως θέλετε να χρησιμοποιήσετε <%s> [y/N]? "
+
+#: git-send-email.perl:880
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+
+#: git-send-email.perl:885
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr ""
+
+#: git-send-email.perl:893
+#, 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:912
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr ""
+
+#: git-send-email.perl:930
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr ""
+
+#: git-send-email.perl:942
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+
+#: git-send-email.perl:1000 git-send-email.perl:1008
+#, 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:1012
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+
+#: git-send-email.perl:1329
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr ""
+
+#: git-send-email.perl:1412
+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:1427
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "Να γίνει αποστολή αυτού του email; ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+
+#: git-send-email.perl:1430
+msgid "Send this email reply required"
+msgstr ""
+
+#: git-send-email.perl:1458
+msgid "The required SMTP server is not properly defined."
+msgstr ""
+
+#: git-send-email.perl:1505
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr ""
+
+#: git-send-email.perl:1510 git-send-email.perl:1514
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "Το STARTTLS απέτυχε! %s"
+
+#: git-send-email.perl:1523
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+
+#: git-send-email.perl:1541
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr ""
+
+#: git-send-email.perl:1544
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1544
+#, perl-format
+msgid "Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1546
+msgid "Dry-OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1546
+msgid "OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1558
+msgid "Result: "
+msgstr "Αποτέλεσμα: "
+
+#: git-send-email.perl:1561
+msgid "Result: OK\n"
+msgstr "Αποτέλεσμα: OK\n"
+
+#: git-send-email.perl:1579
+#, perl-format
+msgid "can't open file %s"
+msgstr "δεν ήταν δυνατό να ανοιχτεί το αρχείο %s"
+
+#: git-send-email.perl:1626 git-send-email.perl:1646
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1632
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1685
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1720
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1831
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr ""
+
+#: git-send-email.perl:1838
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1842
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr ""
+
+#: git-send-email.perl:1872
+msgid "cannot send message as 7bit"
+msgstr ""
+
+#: git-send-email.perl:1880
+msgid "invalid transfer encoding"
+msgstr ""
+
+#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr ""
+
+#: git-send-email.perl:1924
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr ""
+
+#: git-send-email.perl:1941
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr ""
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1945
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 204bf9e..87c77ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-01 23:16-0500\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-10 12:55-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@ -16,40 +16,40 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No es posible %s porque tienes archivos sin fusionar."
-#: advice.c:170
+#: advice.c:180
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -57,144 +57,166 @@
"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
"como sea apropiado, para marcar la resolución y realizar un commit."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
-"Nota: actualizando el árbol de trabajo '%s'.\n"
+"Nota: cambiando a '%s'.\n"
"\n"
"Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n"
-"cambios experimentales y confirmarlos, y puedes descartar cualquier\n"
+"cambios experimentales y hacer commits, y puedes descartar cualquier\n"
"commit que hayas hecho en este estado sin impactar a tu rama realizando\n"
"otro checkout.\n"
"\n"
"Si quieres crear una nueva rama para mantener los commits que has creado,\n"
-"puedes hacerlo (ahora o después) usando -b con el comando checkout. "
+"puedes hacerlo (ahora o después) usando -c con el comando checkout. "
"Ejemplo:\n"
"\n"
-" git checkout -b <nombre-de-nueva-rama>\n"
+" git switch -c <nombre-de-nueva-rama>\n"
+"\n"
+"O deshacer la operación con:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Apaga este aviso mediante la variable de config advice.detachedHead en "
+"false\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "cmdline termina en \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "comillas incompletas"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opción de espacios en blanco no reconocida '%s'"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject y --3way no se pueden utilizar juntas."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached y --3way no se pueden utilizar juntas."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way está fuera de un repositorio"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index está fuera de un repositorio"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached está fuera de un repositorio"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec devolvió %d para la entrada: %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
"no se puede encontrar el nombre del archivo en el parche en la línea %d"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en "
"lalínea %d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en "
"lalínea %d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en "
"lalínea %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "modo inválido en la línea %d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "header inconsistente en las líneas %d y %d"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: línea inesperada: %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de parche sin header en la línea %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -209,83 +231,83 @@
"los headers de git diff carecen de información de los nombres de los "
"archivos %d cuando los eliminan de la ruta principal componentes (línea %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"el header de git diff carece de información del nombre del archivo (línea %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "el nuevo archivo depende de contenidos viejos"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "el archivo eliminado todavía tiene contenido"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "parche corrupto en la línea %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nuevo archivo %s depende en contenidos viejos"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "el archivo borrado %s todavía tiene contenido"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** peligro: el archivo %s está vacío pero no es borrado"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "parche binario corrupto en la línea %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "parche binario no reconocido en la línea %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "parche que solo contiene basura en la línea %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "no es posible leer el enlace simbólico %s"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "no es posible abrir o leer %s"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "comienzo inválido de línea: '%c'"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -294,23 +316,23 @@
"mientras se busca:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "data perdida en parche binario para '%s'"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -318,288 +340,289 @@
"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
"actuales."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "la postimagen necesaria %s para '%s' no se puede leer"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el parche binario no aplica para '%s'"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
"obtuvo %s)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el parche falló: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "leyendo de '%s' tras un enlace simbólico"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "la ruta %s ha sido renombrada/suprimida"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existe en el índice"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el índice"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"el repositorio carece del blob necesario para regresar en un merge de tres-"
"vías."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retrocediendo en un merge de tres-vías...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no se pueden leer los contenidos actuales de '%s'"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Falló el merge en retroceso de tres-vías...\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Parche aplicado a '%s' con conflictos.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Parche aplicado a '%s' limpiamente\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "parche de remoción deja contenidos en el archivo"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo incorrecto"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "ruta inválida '%s'"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el índice"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' está tras un enlace simbólico"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta información del sha1 o es inútil para el submódulo %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta información sha1 o es inútil (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry falló para la ruta '%s'"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo añadir %s al índice temporal"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un índice temporal para %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede eliminar %s del índice"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submódulo %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible establecer el archivo recién creado '%s'"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no es posible crear una copia de seguridad para el archivo recién creado %s"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "falló escribir para '%s'"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "error interno"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Hunk #%d rechazado."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "no es posible leer el archivo índice"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco aplastado"
msgstr[1] "%d errores de espacios en blanco aplastados"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línea agrega errores de espacios en blanco."
msgstr[1] "%d líneas agregan errores de espacios en blanco."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -608,147 +631,146 @@
msgstr[1] ""
"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "ruta"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "num"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche es aplicable al índice actual"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca los nuevos archivos con `git add --intent-to-add`"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el árbol de trabajo"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toca fuera del área de trabajo"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "intentar merge de tres-vías si el parche no aplica"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir un índice temporal basado en la información del índice incrustado"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "acción"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detectar líneas nuevas o modificadas que contienen errores de espacios en "
"blanco"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "no espera al menos una línea del contexto"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
"archivo"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de líneas en los headers del hunk"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "raíz"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
@@ -771,99 +793,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <comando>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "no existe el ref: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nombre de objeto no válido: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "no es un objeto tree: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "directorio de trabajo actual no rastreado"
+
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "formato del archivo"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "prefijo"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en el archivo"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "carpeta"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escribe el archivo en esta carpeta"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "leer .gitattributes en el directorio de trabajo"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "reportar archivos archivados por stderr"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "solo guardar"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
-msgstr "comprimir mas rápido"
+msgstr "comprimir más rápido"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "comprimir mejor"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "repo"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "comando"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archivo remoto"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opción inesperada --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Opción --exec solo puede ser utilizada con --remote"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opción inesperada --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de carpeta desconocido '%s'"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soportado para formato '%s': -%d"
@@ -883,16 +924,16 @@
msgid "cannot read %s"
msgstr "no se puede leer %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "no se puede comenzar filtro '%s'"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "incapaz de redirigir descriptor"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "filtro '%s' reportó un error"
@@ -907,7 +948,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "error al desinflar (%d)"
@@ -917,12 +958,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
-msgstr "%.*s no es un nombre de atributo valido"
+msgstr "%.*s no es un nombre de atributo válido"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s no permitido: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -935,17 +981,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Revisa las comillas en el archivo '%s': %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "¡No podemos biseccionar más!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
-msgstr "No es un nombre de commit valido %s"
+msgstr "No es un nombre de commit válido %s"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -954,7 +1000,7 @@
"La base de fisión %s está mal.\n"
"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -963,7 +1009,7 @@
"La base de fisión %s es nueva.\n"
"Esta propiedad ha cambiado entre %s y [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -972,7 +1018,7 @@
"La base de fisión %s es %s.\n"
"Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -981,9 +1027,9 @@
msgstr ""
"Algunas %s revisiones no son ancestros de la revisión %s.\n"
"git bisect no puede trabajar bien en este caso.\n"
-"Tal vez confundió la revisión %s y %s?\n"
+"Tal vez confundiste la revisión %s y %s?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -994,22 +1040,22 @@
"Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
"Vamos a continuar de todas maneras."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Biseccionando: una base de fisión debe ser probada\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "una %s revisión es necesaria"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
@@ -1049,45 +1095,45 @@
msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents y --reverse no se mezclan bien."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "no se puede usar --contents con el nombre de objeto commit final"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "falló la configuración del camino de revisión"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
"del primer padre"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "no hay una ruta %s en %s"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no se puede leer el blob %s para la ruta %s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1100,97 +1146,97 @@
"la infamación del rastreo remoto invocando\n"
"\"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "La rama %s no se configura como su propio upstream."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
"por rebase."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
"rebase."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
"rebase."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "No es posible escribir la configuración de la rama upstream"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No rastreando: información ambigua para la referencia %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
-msgstr "'%s' no es un nombre valido de rama."
+msgstr "'%s' no es un nombre válido de rama."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una rama llamada '%s' ya existe."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "No se puede forzar la actualización de la rama actual."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No se puede configurar el rastreo de información; el punto de partida '%s' "
"no es una rama."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la rama de upstream solicitada '%s' no existe"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1211,27 +1257,27 @@
"\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
"el push."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
-msgstr "Nombre de objeto no valido: '%s'."
+msgstr "Nombre de objeto no válido: '%s'."
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nombre de objeto ambiguo: '%s'."
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "Punto de rama no valido: '%s'."
+msgstr "Punto de rama no válido: '%s'."
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ya ha sido marcado en '%s'"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD del árbol de trabajo %s no está actualizada"
@@ -1246,70 +1292,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositorio le falta estos commits prerrequisito:"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "se necesita un repositorio para verificar un bundle"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El bundle contiene esta referencia:"
msgstr[1] "El bundle contiene estas %d referencias:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "El bundle registra una historia completa."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El bundle requiere esta referencia:"
msgstr[1] "El bundle requiere estas %d referencias:"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "incapaz de duplicar bundle descriptor"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "No se pudo crear los pack-objetcts"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects murió"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list murió"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Rechazando crear un bundle vacío."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "no se puede crear '%s'"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack murió"
@@ -1318,9 +1368,8 @@
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "no se puede analizar %s"
@@ -1330,7 +1379,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s no es un commit!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1350,128 +1399,292 @@
"Apapa este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "El Commit %s tiene una buena firma GPG por %s\n"
-#: commit.c:1378
+#: commit.c:1390
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 ""
"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
-"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
"variable de configuración i18n.commitencoding para la codificación que usa "
-"su proyecto.\n"
+"tu proyecto.\n"
-#: commit-graph.c:108
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "archivo commit-graph es muy pequeño"
+
+#: commit-graph.c:192
#, c-format
-msgid "graph file %s is too small"
-msgstr "archivo graph %s es muy pequeño"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "firma %X en commit-graph no concuerda con firma %X"
-#: commit-graph.c:115
+#: commit-graph.c:199
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "firma de graph %X no concuerda con firma %X"
+msgid "commit-graph version %X does not match version %X"
+msgstr "versión de commit-graph %X no concuerda con versión %X"
-#: commit-graph.c:122
+#: commit-graph.c:206
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "versión de graph %X no concuerda con versión %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
-#: commit-graph.c:129
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
+"incompleto"
+
+#: commit-graph.c:240
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "versión de hash %X no concuerda con versión %X"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-#: commit-graph.c:153
+#: commit-graph.c:283
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "offset del chunk impropio %08x%08x"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
-#: commit-graph.c:189
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph no tiene una chunk base de graphs"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "cadena commit-graph no concuerda"
+
+#: commit-graph.c:404
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "id de chunk %08x parece tener múltiples tiempos"
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
-#: commit-graph.c:308
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "no es posible encontrar los archivos commit-graph"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Anotando commits en commit graph"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expandiendo commits alcanzables en commit graph"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Limpiando marcas de commits en commit graph"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Encontrando commits para commit graph"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Encontrando commits para commit graph en %d pack"
+msgstr[1] "Encontrando commits para commit graph en %d packs"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Encontrando commits para commit graph de %d ref"
+msgstr[1] "Encontrando commits para commit graph de %d refs"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "demasiados commits para escribir el gráfico"
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Contando commits distintos en commit graph"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Encontrando esquinas extra en commit graph"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "falló al escribir el número correcto de ids de base graph"
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Escribiendo commit graph en %d paso"
+msgstr[1] "Escribiendo commit graph en %d pasos"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "no se pudo abrir la cadena de archivos commit-graph"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "no se pudo renombrar el archivo base commit-graph"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "falló al renombrar el archivo temporal commit-graph"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Escaneando commits fusionados"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de commit duplicado inesperado %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Fusionando commit-graph"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "demasiados commits para escribir el gráfico"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "falló al analizar commit %s para commit-graph"
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"falló al analizar el commit %s de la base de datos de objetos para commit-"
+"graph"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "lista padre de commit-graph para commit %s es muy larga"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "padre de commit-graph para %s es %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "lista padre de commit-graph para commit %s termina antes"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"commit-graph ha generado número cero para %s, pero no-cero para los demás"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"commit-graph tiene generación no-cero para %s, pero cero para los demás"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "generación commit-graph para commit %s es %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1486,300 +1699,300 @@
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"la configuración relativa incluye condicionales que deben venir de archivos"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala línea de config %d en el blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala línea de config %d en el archivo %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala línea de config %d en la entrada standard"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "mala línea de config %d en el submódulo-blob %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "mala línea de config %d en la línea de comando %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numérica '%s' para '%s': %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falló al expandir el directorio de usuario en: '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' para '%s' no es una marca de tiempo válida"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "largo de abreviatura fuera de rango: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar debería tener solo un caracter"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz de cargar configuración de objeto blob '%s'"
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no se posible resolver configuración de blob '%s'"
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
-msgstr "Invalido %s: '%s'"
+msgstr "Inválido %s: '%s'"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
"defecto"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "no es posible hacer mmap '%s'"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "sección de nombre inválida: %s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
@@ -1797,7 +2010,7 @@
msgstr ""
"No se pudo leer del repositorio remoto.\n"
"\n"
-"Por favor asegúrese que tiene los permisos de acceso correctos\n"
+"Por favor asegúrate que tienes los permisos de acceso correctos\n"
"y que el repositorio existe."
#: connect.c:81
@@ -1832,50 +2045,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "el repositorio en el otro final no puede ser superficial"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "error remoto: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "paquete inválido"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "error de protocolo: '%s' inesperado"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "respuesta de referencias ls-refs inválida: %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "flush esperado tras listado de refs"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' no es soportado"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no es posible configurar SO_KEEPALIVE en el socket"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "Revisando %s... "
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no se puede revisar %s (puerto %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1884,7 +2092,7 @@
"hecho.\n"
"Conectando a %s (puerto %s) ... "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1894,53 +2102,53 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "hecho."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no es posible revisar %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "puerto desconocido %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "hostname extraño '%s' bloqueado"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "puerto extraño '%s' bloqueado"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "no se puede comenzar proxy %s"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "variante 'simple' de ssh no soporta -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "variante 'simple' de ssh no soporta -6"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "variante ssh 'simple' no soporta configurar puerto"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "ruta extraña '%s' bloqueada"
@@ -1949,33 +2157,33 @@
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "crlf_action %d ilegal"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF será reemplazado por LF en %s"
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -1984,12 +2192,12 @@
"CRLF será remplazado por LF en %s.\n"
"El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF será reemplazado por CRLF en %s"
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -1998,12 +2206,12 @@
"LF será reemplazado por CRLF en %s.\n"
"El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM está prohibido en '%s' si es codificado como %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -2012,12 +2220,12 @@
"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "
"working-tree-encoding."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM es requerido en '%s' si es codificado como %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2026,37 +2234,37 @@
"Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
"UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "falló al codificar '%s' de %s a %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "no se pueden alimentar de input a los filtros externos '%s'"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "filtro externo '%s' falló %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "lectura de filtro externo '%s' falló"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falló"
@@ -2092,53 +2300,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s: filtro smudge %s falló"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "en el futuro"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "hace %<PRIuMAX> segundo"
msgstr[1] "hace %<PRIuMAX> segundos"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "hace %<PRIuMAX> minuto"
msgstr[1] "hace %<PRIuMAX> minutos"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "hace %<PRIuMAX> hora"
msgstr[1] "hace %<PRIuMAX> horas"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "hace %<PRIuMAX> día"
msgstr[1] "hace %<PRIuMAX> días"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "hace %<PRIuMAX> semana"
msgstr[1] "hace %<PRIuMAX> semanas"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "hace %<PRIuMAX> mes"
msgstr[1] "hace %<PRIuMAX> meses"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2146,40 +2354,40 @@
msgstr[1] "%<PRIuMAX> años"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, y %<PRIuMAX> mes atrás"
msgstr[1] "%s, y %<PRIuMAX> meses atrás"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "hace %<PRIuMAX> año"
msgstr[1] "hace %<PRIuMAX> años"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Propagando marcas isla"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "mal objeto árbol %s"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "falló al cargar isla de regex para '%s': %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d islas marcadas, listo.\n"
@@ -2193,22 +2401,29 @@
msgid "Performing inexact rename detection"
msgstr "Realizando una detección de cambios de nombre inexacta"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "opción '%s' requiere un valor"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opciones>] <path> <path>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"No es un repositorio git. Use --no-index para comparar dos paths fuera del "
+"árbol de trabajo"
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falló al analizar dirstat porcentaje de corte '%s'\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " parámetro '%s' de dirstat desconocido\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2216,26 +2431,31 @@
"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
"'dimmed_zebra', 'plain'"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "ignorando modo desconocido color-moved-ws '%s'"
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
"modos de espacios en blanco"
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2244,24 +2464,35 @@
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor --stat inválido: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numérico"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2270,64 +2501,559 @@
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Falló al analizar parámetro de opción --submodule: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconocido luego de ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "no se puede resolver '%s'"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s espera forma <n>/<m>"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s esperaba un char, se obtuvo '%s'"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "mal argumento --color-moved: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "modo inválido '%s' en --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
+"\"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argumento inválido para %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "falló al analizar parámetro de opción --submodule: '%s'"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "mal argumento --word-diff: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Opciones de formato de salida para diff"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "generar parche"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "suprimir salida de diff"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "genera diffs con <n> líneas de contexto"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "genera el diff en formato raw"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "sinónimo para '-p --stat'"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "sinónimo para '-p --stat'"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "--stat amigable para máquina"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "mostrar solo la última línea para --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"muestra la distribución de cantidades de cambios relativa para cada "
+"subdirectorio"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinónimo para --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinonimo para --dirstat=archivos,param1,param2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"advierte si cambios introducen conflictos de markers o errores de espacios "
+"en blanco"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"resumen condensado de creaciones, cambios de nombres y cambios de modos"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "mostrar solo nombres de archivos cambiados"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "mostrar solo nombres y estados de archivos cambiados"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "generar diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<ancho>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "genera diffstat con un ancho dado"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "genera diffstat con un nombre de ancho dado"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "genera diffstat con un ancho de graph dado"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<cantidad>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "genera diffstat con líneas limitadas"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "genera un resumen compacto de diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "muestra un diff binario que puede ser aplicado"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
+"\""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "mostrar diff colorido"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<tipo>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
+"'new' del diff"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
+"o --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<prefijo>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "mostrar el prefijo de destino en lugar de \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "anteponer un prefijo adicional a cada línea mostrada"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "no mostrar ningún prefijo de fuente o destino"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"muestra el contexto entre hunks de diff hasta el número especificado de "
+"líneas"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<char>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especifica el char para indicar un contexto en lugar de ' '"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Opciones de diff rename"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "detectar renombrados"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "omite la preimage para borrados"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "detectar copias"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "usa archivos no modificados como fuente para encontrar copias"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "deshabilita detección de renombres"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "usa blobs vacíos como fuente de renombre"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "continua listando el historial de un archivo más allá de renombres"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"previene detección de renombre/copias si el número de objetivos para "
+"renombres/copias excede el límite dado"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Opciones de algoritmos de diff"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "produce el diff más pequeño posible"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorar espacios en blanco cuando comparando líneas"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorar cambios en la cantidad de líneas en blanco"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorar cambios en espacios en blanco en EOL"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignora carrier-return al final de la línea"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora cambios cuyas líneas son todas en blanco"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera un diff usando algoritmo \"patience diff\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera un diff usando algoritmo \"histogram diff\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algoritmo>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "escoge un algoritmo para diff"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<texto>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera un diff usando algoritmo \"anchored diff\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<modo>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "usa <regex> para decidir que palabra es"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "líneas movidas de código están coloreadas diferente"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "como espacios en blanco son ignorados en --color-moved"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Otras opciones de diff"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
+"paths relativos"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "tratar todos los archivos como texto"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "cambia dos inputs, invierte el diff"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "deshabilita todo el output del programa"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "permite la ejecución de un diff helper externo"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"ejecuta filtros de conversión de texto externos cuando comparando binarios"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<cuando>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorar cambios a submódulos en la generación de diff"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<formato>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "especifica como son mostradas las diferencias en submódulos"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "ocultar entradas 'git add -N' del index"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "trata entradas 'git add -N' como reales en el index"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<string>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"busca por diferencias que cambien el número de ocurrencias para el string "
+"especificado"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"busca por diferencias que cambien el número de ocurrencias para el regex "
+"especificado"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostrar todos los cambios en el changeset con -S o -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "controlar el orden en el que los archivos aparecen en la salida"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<id-objeto>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"busca por diferencias que cambien el número de ocurrencias para el objeto "
+"especificado"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "selecciona archivos por tipo de diff"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<archivo>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Output a un archivo específico"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber muchos archivos."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"tal vez quiera configurar la variable %s para por lo menos %d y volver a "
+"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
"intentar el comando."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "falló al conseguir la información y nombre del kernel"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
@@ -2341,7 +3067,7 @@
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo establecer el archivo '%s'"
@@ -2356,7 +3082,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "no se pudo configurar GIT_DIR a '%s'"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "demasiados argumentos para correr %s"
@@ -2369,248 +3095,237 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista poco profunda esperada"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+"git fetch-pack: se esperaba un flush packet luego de la lista superficial"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "no se puede escribir al remoto"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea poco profunda inválida: %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "listo"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "error de protocolo: paquete de header erróneo"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede quitar %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "El servidor no soporta clientes superficiales"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "El servidor soporta ulti_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "El servidor soporta no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "El servidor soporta multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "El servidor soporta side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "El servidor soporta side-band"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "El servidor soporta allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "El servidor soporta allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "El servidor soporta ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "El servidor soporta filtro"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor soporta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "El servidor no soporta clientes superficiales"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shalow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shalow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "El servidor soporta filtro"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "no se puede escribir request al remoto"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "error leyendo sección header '%s'"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr "linea de confirmación inesperada: '%s'"
+msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "error procesando acks: %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "espere que el packfile sea mandado luego del 'listo'"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "error procesando información superficial: %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error procesando refs deseadas: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg falló al firmar la data"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
@@ -2620,18 +3335,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora color inválido '%.*s' en log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "falló al marcar '%s'"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
@@ -2688,41 +3403,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Comandos de bajo nivel / Auxiliares internos"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "comandos disponibles de git en '%s'"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "comando de listado de tipos no soportado '%s'"
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Las guías comunes de Git son:"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Comandos externos"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Aliases de comando"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2731,31 +3446,31 @@
"'%s' parece ser un comando de git, pero no hemos\n"
"podido ejecutarlo. Tal vez git-%s se ha roto?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuando asumiendo que quisiste decir '%s'."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2764,21 +3479,21 @@
"The most similar commands are"
msgstr[0] ""
"\n"
-"El comando mas similar es"
+"El comando más similar es"
msgstr[1] ""
"\n"
-"Los comandos mas similares son"
+"Los comandos más similares son"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git versión [<opciones>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2792,7 +3507,7 @@
"\n"
"¿Quisiste decir alguno de estos?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2818,48 +3533,72 @@
"Omite --global para configurar tu identidad solo en este repositorio.\n"
"\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "no se entrego ningún email y la detección automática está desactivada"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "no se entrego ningún nombre y la detección automática está desactivada"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "no se puede tener un nombre vacío (para <%s>)"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "no se puede cargar árbol raíz para commit %s"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "solo 'tree:0' es soportado"
+msgid "expected 'tree:<depth>'"
+msgstr "se esperaba 'tree:<depth>'"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "soporte para filtros sparse:path ha sido discontinuado"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtro -spec inválido '%s'"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "no se puede cambiar un clon parcial remoto promisor"
@@ -2892,12 +3631,13 @@
msgid "failed to read the cache"
msgstr "falló al leer la cache"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(commit erróneo)\n"
@@ -2906,100 +3646,100 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "error construyendo árboles"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falló al crear la ruta '%s'%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": tal vez un conflicto D/F?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "rehusando perder el archivo rastreado en '%s'"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no se puede leer el objeto %s '%s'"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "se esperaba blob para %s '%s'"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "falló al abrir '%s': %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falló al crear el enlace simbólico '%s': %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se que hacer con %06o %s '%s'"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Falló al fusionar el submódulo %s (no revisado)"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rápido en submódulo %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3016,33 +3756,33 @@
"\n"
"el cual aceptará esta sugerencia.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Falló al ejecutar la fusión interna"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "No es posible agregar %s a la base de datos"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-fusionando %s"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
"cambio."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3051,7 +3791,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
"en el árbol."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3060,7 +3800,7 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3069,7 +3809,7 @@
"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
"dejada en el árbol, en %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3078,32 +3818,44 @@
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol en %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "renombrar"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Rehusando perder el archivo sucio en %s"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
+"interponiendo."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s es un directorio en %s agregando como %s más bien"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3112,30 +3864,18 @@
"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
"%s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Renombrando %s a %s y %s a %s más bien"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
-"interponiendo."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3146,7 +3886,7 @@
"colocar %s porque el directorio %s fue renombrado a otros múltiples "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3156,7 +3896,7 @@
"existente en %s se interpone con el cambio de nombres implícito, poniendo "
"la(s) siguiente(s) ruta(s) aquí: %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3165,7 +3905,7 @@
"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3174,7 +3914,7 @@
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3183,37 +3923,21 @@
"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
"renombrado."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Agregar %s fusionado"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Agregando más bien como %s"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "modificado"
@@ -3221,50 +3945,97 @@
msgid "content"
msgstr "contenido"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Agregando más bien como %s"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Path actualizado: %s agregado en %s dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: merge-recursive.c:3182
+#, 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 ""
+"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
+"que fue renombrado en %s, sugerimos que debería ser movido a %s."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
+"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
+"movido a %s."
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
"%s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3274,154 +4045,179 @@
"merge:\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "¡Ya está actualizado!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "archivo multi-pack-index %s es muy pequeño"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versión %d de multi-pack-index no reconocida"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "versión de hash %u no concuerda"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "offset inválido del conjunto (muy grande)"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"terminando multi-pack-index porque el id del conjunto aparece antes de lo "
"esperado"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index le falta el conjunto pack-name requerido"
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "error preparando packfile de multi-pack-index"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió pack-file %s caer"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Buscando por packfiles referidos"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Verificando orden de OID en MIDX"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Ordenando objetos por packfile"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "no se pudo empezar los pack-objetcts"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "no se pudo finalizar pack-objetcts"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3437,7 +4233,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "no es posible unir hilo lazy_name: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3449,23 +4245,23 @@
"confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "
"nota de fusión."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No has terminado tus notas de fusión (%s existe)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"No se puede realizar commit, notas del árbol no inicializadas o no "
"referenciadas"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Valor erróneo para notes.rewriteMode: '%s'"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
@@ -3474,7 +4270,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Valor erróneo para %s: '%s'"
@@ -3484,47 +4280,102 @@
msgid "invalid object type \"%s\""
msgstr "tipo de objeto \"%s\" inválido"
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "objeto %s es un %s, no un %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "el objeto %s tiene un id de tipo desconocido %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "incapaz de analizar objeto: %s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "sha1 no concuerda %s"
+msgid "hash mismatch %s"
+msgstr "hash no concuerda %s"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset más allá del índice de fin de paquete para %s (índice truncado?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requiere un valor"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s es incompatible con %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : incompatible con otra cosa"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no toma valores"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no está disponible"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "¿quisiste decir `--%s` (con dos guiones)?"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opción `%s' desconocida"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "switch desconocido `%c'"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opción desconocida en string no ascii: `%s'"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -3532,59 +4383,74 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opción `%s' espera un valor numérico"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "fecha de expiración mal formada: '%s'"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "nombre de objeto mal formado '%s'"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "No se pudo hacer que %s fuera escribible por el grupo"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Carácter de escape '\\' no permitido como último carácter en el valor attr"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Solo una especificación 'attr' es permitida."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "especificación attr no puede estar vacía"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "nombre de atributo %s inválido"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3592,128 +4458,186 @@
"la configuración global de 'literal' para patrones de ruta es incompatible "
"con las demás configuraciones globales de patrones de ruta"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "parámetro no válido para el prefijo 'magic pathspec'"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Magic pathspec inválido '%.*s' en '%s'"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Falta ')' al final del magic pathspec en '%s'"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Magic pathspec '%c' no implementado en '%s'"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' y 'glob' son incompatibles"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: '%s' está fuera del repositorio"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (nemotécnico: '%c')"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magic pathspec no soportado por este comando: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "no es posible escribir flush packet"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "no es posible escribir delim packet"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "limpieza de escritura de paquetes falló"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "error de protocolo: línea imposiblemente larga"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "escritura de paquetes con formato falló"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "escritura de paquetes falló"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "el remoto se colgó de manera inesperada"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocolo: mal largo de línea %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Refrescando index"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "no es posible crear lstat hilado: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "no se pudo leer output de `log`"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no se puede analizar git header '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "falló al generar diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "no se pudo leer el log para '%s'"
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "no se puede crear un blob vacío en la base de datos de objetos"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: solo puede agregar archivos regulares, symbolic links o git-directories"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' no tiene un commit checked out"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "no es posible indexar archivo '%s'"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "no es posible agregar '%s' al index"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "incapaz de correr stat en '%s'"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' parece ser un directorio y un archivo a la vez"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Refrescar index"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3722,7 +4646,7 @@
"index.version configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3731,60 +4655,150 @@
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "mala firma 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "mala versión del índice %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "mala firma sha1 del archivo index"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "index usa %.4s extensiones, cosa que no entendemos"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorando extensión %.4s"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "formato de index desconocido 0x%08x"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "entradas en stage desordenadas en index"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "múltiples entradas extrañas para archivo fusionado '%s'"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entradas de stage desordenadas para '%s'"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "archivo índice corrompido"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no es posible crear hilo load_cache_entries: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no es posible unir hilo load_cache_entires: %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: falló al abrir el archivo index"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: no se puede hacer stat del index abierto"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: archivo index más pequeño de lo esperado"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: no se pudo mapear el archivo index"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no es posible crear hilo load_index_extensions: %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no es posible unir hilo load_index_extensions: %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "no se pudo refrescar el index compartido '%s'"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "no se pudo arreglar bits de permisos en '%s'"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: no se puede eliminar a stage #0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3826,7 +4840,14 @@
"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
"abajo.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase %s en %s (%d comando)"
+msgstr[1] "Rebase %s en %s (%d comandos)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3834,7 +4855,7 @@
"\n"
"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3842,7 +4863,7 @@
"\n"
"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3851,12 +4872,12 @@
"\n"
msgstr ""
"\n"
-"Esta editando el archivo TODO de un rebase interactivo.\n"
-"Para continuar el rebase después de editar, ejecute:\n"
+"Estás editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase después de editar, ejecuta:\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3866,125 +4887,156 @@
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Tenga en cuenta que los commits vacíos están comentados"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
+msgid "could not write '%s'"
+msgstr "no se pudo escribir '%s'"
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "no se pudo copiar '%s' a '%s'."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
+"Commits botados (empezando con el más nuevo):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "
+"commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"advertencias.\n"
+"Los posibles comportamientos son: ignore,warn,error.\n"
+"\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s no apunta a ningún objeto válido!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorando referencia rota %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no se pudo abrir '%s' para escritura: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "no se pudo leer la referencia '%s'"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "ref '%s' ya existe"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "ID de objecto inesperado cuando se escribía '%s'"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "no se pudo escribir en '%s'"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "no se pudo abrir '%s' para escritura"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID de objecto inesperado cuando se borraba '%s'"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "log de ref %s tiene un vacío tras %s"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "log de ref %s finalizado inesperadamente en %s"
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "log de %s está vacío"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "rehusando actualizar ref con mal nombre '%s'"
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref falló para ref '%s': %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; no se puede crear '%s'"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "no se pudo eliminar la referencia %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no se pudo eliminar la referencia %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "no se pudo eliminar la referencia: %s"
@@ -3994,350 +5046,485 @@
msgid "invalid refspec '%s'"
msgstr "refspec inválido: '%s'"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "desaparecido"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "adelante %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "detrás %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "delante %d, detrás %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento: %s no reconocido %%(%s)"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no toma ningún argumento"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) no toma argumentos"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "%%(objectsize) no reconocido argumento: %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) no toma argumentos"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no toma ningún argumento"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "%%(trailers) desconocidos, argumento: %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %s no reconocido %%(contents)"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positivo esperado objectname:short=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argumento: %s no reconocido %%(objectname)"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento: %s no reconocido %%(if)"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre mal formado de campo: %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
-msgstr "formato: átomo %%(then) usado mas de una vez"
+msgstr "formato: átomo %%(then) usado más de una vez"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) usado después de %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
-msgstr "formato: átomo %%(else) usado mas de una vez"
+msgstr "formato: átomo %%(else) usado más de una vez"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(no hay rama, rebasando %s)"
+msgid "no branch, rebasing %s"
+msgstr "no hay rama, rebasando %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(no hay rama, comenzando biseccón en %s)"
+msgid "no branch, bisect started on %s"
+msgstr "no hay rama, comenzando biseccón en %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD desacoplado en %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "sin rama"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD desacoplado de %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(sin rama)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "opción `%s' es incompatible con --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "opción `%s' es incompatible con --no-merged"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opción '%s' debe apuntar a un commit"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "config remote shorthand no puede comenzar con '/': %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "más de un receivepack dado, usando el primero"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "más de un uploadpack dado, usando el primero"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No se pueden traer ambos %s y %s a %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s por lo general hace seguimiento a %s, no a %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hace seguimiento tanto a %s como a %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Error interno"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "llave '%s' de patrón no tuvo '*'"
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "valor '%s' del patrón no tiene '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refsoec %s: no concuerda con ninguno"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "src refspec %s concuerda con más de uno"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"El destino que provees no es un full refname (i.e.,\n"
+"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
+"\n"
+"- Buscando un ref que concuerde con '%s' en el lado remoto.\n"
+"- Revisando si el <src> es usado en el push('%s')\n"
+" es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n"
+" refs/{heads,tags}/ correspondiente al lado remoto.\n"
+"\n"
+"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
+"full ref."
+
+#: remote.c:1040
+#, 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 ""
+"La parte <src> del refspec es un objeto commit.\n"
+"¿Quisiste crear un branch nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1045
+#, 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 ""
+"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'?"
+
+#: remote.c:1050
+#, 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 ""
+"La parte <src> del refspec es un objeto tree.\n"
+"¿Quisiste crear un tag nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1055
+#, 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 ""
+"La parte <src> del refspec es un objeto blob.\n"
+"¿Quisiste crear un tag nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s no puede ser resolver a un branch"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "no es posible borrar '%s': ref remoto no existe"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s concuerda con más de uno"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s recibe de más de un src"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD no apunta a ninguna rama"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "no existe tal rama: '%s'"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "no se ha configurado upstream para la rama '%s'"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la rama '%s' no tiene remoto para enviar"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "refspecs del push para '%s' no incluyen '%s'"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no tiene destino (push.default es 'nada')"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no se puede resolver push 'simple' para un destino único"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "no se puedo encontrar ref remota %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorando ref graciosa '%s' localmente"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Tu rama está actualizada con '%s'.\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (usa \"%s\" para detalles)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (usa \"git push\" para publicar tus commits locales)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4347,11 +5534,11 @@
msgstr[1] ""
"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (usa \"git pull\" para actualizar tu rama local)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4366,10 +5553,15 @@
"Tu rama y '%s' han divergido,\n"
"y tienen %d y %d commits diferentes cada una respectivamente.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "no se puede leer el nombre de objeto '%s'"
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4393,11 +5585,6 @@
msgid "unable to write rerere record"
msgstr "incapaz de escribir entrada rerere"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "no se pudo escribir '%s'"
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4448,8 +5635,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Resolución precargada para '%s'"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
@@ -4483,29 +5670,33 @@
msgid "unable to open rr-cache directory"
msgstr "no es posible abrir directorio rr-cache"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent es incompatible con --bisect"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "falló al abrir /dev/null"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "no es posible crear hilo async: %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4515,30 +5706,30 @@
"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
"false`."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "desempaquetado remoto falló: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta --signed push"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4546,42 +5737,47 @@
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed )"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómicos (--atomic)"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mensaje de commit inválido, modo cleanup '%s'"
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no se pudo eliminar'%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revertir"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4589,7 +5785,7 @@
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4599,110 +5795,115 @@
"con 'git add <rutas>' o 'git rm <rutas>'\n"
"y haz un commit del resultado con 'git commit'"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "no se pudo leer '%s'"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo cleanup inválido %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de la caché"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote para '%s'"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "formato de fecha inválido '%s' en '%s'"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4732,15 +5933,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "escribiendo commit raíz"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4767,7 +5968,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4791,299 +5992,348 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no es un commit!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "línea principal especificada pero el commit %s no es una fusión."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "no se puede obtener el mensaje de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta los argumentos: '%s'"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para para %s"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "no se puede analizar '%.*s'"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando cherry-pick en progreso"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "cancelando revert en progreso"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un cherry-pick o revert ya está en progreso"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "revert ya está en progreso"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "cherry-pick ya está en progreso"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
+msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "no hay revert en progreso"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "ningún cherry-pick en progreso"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "falló al escribir el commit"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "no hay nada que saltar"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"¿ya has hecho el commit?\n"
+"intenta \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "no se puede actualizar %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5094,35 +6344,35 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"Puede enmendar el commit ahora, con\n"
+"Puedes enmendar el commit ahora, con\n"
"\n"
"\tgit commit --amend %s\n"
"\n"
-"Una vez que esté satisfecho con los cambios, ejecute\n"
+"Una vez que estés satisfecho con los cambios, ejecuta\n"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "no se pudo leer índice"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5137,11 +6387,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5158,76 +6408,76 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "falló al encontrar árbol de %s"
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "no se pudo escribir índice"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no se pudo intentar fusionar '%.*s'"
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5239,31 +6489,31 @@
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
"momento.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s no es OID válido"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no se puede desacoplar HEAD"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5284,48 +6534,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "no se puede leer orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "no se puede leer 'onto'"
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se puede actualizar HEAD a %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5336,116 +6586,60 @@
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se puede eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: error preparando revisiones"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista de pendientes inutilizable: '%s'"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
-"Commits botados (empezando con el mas nuevo):\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "
-"commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
-"advertencias.\n"
-"Los posibles comportamientos son: ignore,warn,error.\n"
-"\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git "
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
"rebase --continue'.\n"
"O se puede abortar el rebase con 'git rebase --abort'.\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase %s en %s (%d comando)"
-msgstr[1] "Rebase %s en %s (%d comandos)"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no se pudo copiar '%s' a '%s'."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "no se pudo transformar lista de pendientes"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
@@ -5454,7 +6648,7 @@
msgid "'%s' is outside repository"
msgstr "'%s' está fuera del repositorio"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5464,7 +6658,7 @@
"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
"localmente."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5476,12 +6670,12 @@
"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "opción '%s' debe venir antes de argumentos no opcionales"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5492,94 +6686,94 @@
"Use '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
"no es posible configurar el directorio de trabajo usando una configuración "
"inválida"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "esta operación debe ser realizada en un árbol de trabajo"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Se esperaba versión de git repo <= %d, encontrada %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "se encontró extensión de repositorio desconocida:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "error abriendo '%s'"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "muy grande para ser un archivo .git: '%s'"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "error leyendo %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato gitfile inválido: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "no hay ruta en gitfile: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "no es un repositorio git: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' muy grande"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "no es un repositorio git: '%s'"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no se puede aplicar chdir a '%s'"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "no se puede volver a cwd"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-"no es un repositorio git (ni ninguno de los directorios superiores): %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "falló al determinar '%*s%s%s'"
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Incapaz de leer el directorio de trabajo actual"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "no se puede cambiar a '%s'"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+"no es un repositorio git (ni ninguno de los directorios superiores): %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5590,7 +6784,7 @@
"Parando en el límite del sistema de archivos "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5599,287 +6793,292 @@
"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "falló al abrir /dev/null o dup"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "falló setsid"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz de normalizar directorio de objeto: %s"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "no es posible hacer fdopen en lockfile alternos"
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "no es posible leer archivos alternos"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "no es posible mover archivos alternos en el lugar"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "ruta '%s' no existe"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repositorio de referencia '%s' como un checkout vinculado no es soportado "
"todavía."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositorio de referencia '%s' no es un repositorio local."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repositorio de referencia '%s' es superficial (shallow)"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap falló"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "archivo de objeto %s está vacío"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto perdido corrupto '%s'"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "basura al final del objeto perdido '%s'"
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "tipo de objeto inválido"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "no es posible desempacar header %s con --allow-unknown-type"
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "incapaz de desempaquetar header %s"
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "no es posible analizar header %s con --allow-unknown-type"
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "incapaz de analizar header %s"
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "falló al leer objeto %s"
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "reemplazo %s no encontrado para %s"
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto perdido %s (guardado en %s) está corrompido"
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paquete de objeto %s (guardado en %s) está corrompido"
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+msgid "unable to write file %s"
+msgstr "no es posible escribir archivo %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "falló de escritura"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "error cerrando el archivo sha1"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "error cerrando el archivo de objeto suelto"
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"permisos insuficientes para agregar un objeto a la base de datos del "
"repositorio %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "no es posible crear un archivo temporal"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "incapaz de escribir archivo sha1"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "no es posible escribir el archivo de objeto suelto"
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd en objeto %s falló (%d)"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confundido por fuente de data de objetos inestable para %s"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "no se puede leer sha1_file para %s"
+msgid "cannot read object for %s"
+msgstr "no se pudo leer el objeto para %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "commit corrupto"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "tag corrupto"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "error leyendo al indexar %s"
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "lectura corta al indexar %s"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falló al insertar en la base de datos"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo de archivo no soportado"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s no es objeto válido"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "sha1 no concuerda para %s (se esperaba %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash no concuerda para %s (se esperaba %s)"
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "no es posible hacer mmap a %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz de desempaquetar header de %s"
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz de analizar header de %s"
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "SHA1 %s corto es ambiguo"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Los candidatos son:"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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"
@@ -5889,77 +7088,139 @@
"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
"tal vez sean creadas por error. Por ejemplo,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
"favor\n"
-"examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
+"examina estas refs y tal vez bórralas. Silencia este mensaje \n"
"ejecutando \"git config advice.objectNameWarning false\""
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bytes/s"
+msgstr[1] "%u bytes/s"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "No se pudo eliminar la entrada %s de .gitmodules"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "falló realizar stage a los .gitmodules actualizados"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "en el submódulo no poblado '%s'"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Falló al resolver HEAD como un ref valido."
+msgstr "Falló al resolver HEAD como un ref válido."
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "no pudo acceder al submódulo '%s'"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' no reconocido como un repositorio git"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submódulo '%s' tiene un índice corrupto"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' no pudo ser actualizado."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -5967,12 +7228,12 @@
"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
"soportado"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5983,16 +7244,16 @@
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "no pudo recursar en el submódulo '%s'"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
@@ -6002,23 +7263,23 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "ignorando submódulo sospechoso: %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "no se permiten valores negativos para submodule.fetchjobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
"comando: %s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "valor inválido para %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No se pudo actualizar la entrada %s de .gitmodules"
@@ -6053,7 +7314,7 @@
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "no se pudo definir %s"
@@ -6092,29 +7353,37 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción inválida '%s'"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ver protocol.version en 'git help config' para más información"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "no se pudo analizar valor de configuración transport.color.*"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "soporte para protocolo v2 no implementado todavía"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconocido para configuración '%s': %s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporte '%s' no permitido"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ya no es soportado"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6123,7 +7392,7 @@
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6150,37 +7419,32 @@
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Abortando."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "operación no soportada por protocolo"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "línea inválida mientras se analizaban refs alternas: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "escritura total al helper remoto falló"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "no es posible encontrar helper remoto para '%s'"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr "no se puede duplicar output de fd del helper"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6189,99 +7453,99 @@
"capacidad mandatoria desconocida %s; este helper remoto probablemente "
"necesita una nueva versión de Git"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "este helper remoto debería implementar capacidad refspec"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s dijo inesperadamente: '%s'"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s también bloqueó %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "no se pudo ejecutar fast-import"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "respuesta para conectar desconocida: %s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "configurando servicio de ruta remota no soportado por el protocolo"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "ruta de servicio remoto inválida"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "no se puede conectar al subservicio %s"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "se esperaba ok/error, helper dijo '%s'"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportó estado inesperado de %s"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s no soporta dry-run"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s no soporta --signed"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s no soporta --signed=if-asked"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6290,47 +7554,47 @@
"No hay refs comunes y ninguno especificado; no se hace nada.\n"
"Tal vez deberías especificar un branch como 'master'.\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "leer(%s) falló"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "escribir(%s) falló"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "no se puede iniciar el hilo para copiar data: %s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
@@ -6346,11 +7610,11 @@
msgid "empty filename in tree entry"
msgstr "nombre de archivo vacío en la entrada de árbol"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "archivo de árbol muy corto"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6361,7 +7625,7 @@
"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
"ramas."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6371,7 +7635,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6381,7 +7645,7 @@
"fusionar:\n"
"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6391,7 +7655,7 @@
"merge:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6400,7 +7664,7 @@
"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6409,7 +7673,7 @@
"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6419,7 +7683,7 @@
"seguimiento en ellos:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6429,7 +7693,7 @@
"eliminados al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6439,7 +7703,7 @@
"eliminadosal actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6449,7 +7713,7 @@
"eliminados al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6459,7 +7723,7 @@
"eliminadosal fusionar:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6469,7 +7733,7 @@
"eliminados al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6479,7 +7743,7 @@
"eliminados al ejecutar %s:\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6490,7 +7754,7 @@
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6501,7 +7765,7 @@
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6511,7 +7775,7 @@
"sobrescritos al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6521,7 +7785,7 @@
"sobrescritos al fusionar:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6531,7 +7795,7 @@
"sobrescritos al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6541,12 +7805,12 @@
"eliminadospor %s:\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6556,7 +7820,7 @@
"actualizadas:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6567,7 +7831,7 @@
"actualización sparse checkout:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6578,7 +7842,7 @@
"actualización sparse checkout:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6587,16 +7851,16 @@
"No se puede actualizar le submódulo:\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Abortando\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Revisando archivos"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Actualizando archivos"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6635,35 +7899,35 @@
msgid "invalid '..' path segment"
msgstr "segmento de ruta '..' inválido"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
"trabajo"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' no es un archivo .git, código de error %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' no apunta de vuelta a '%s'"
@@ -6682,159 +7946,166 @@
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Rutas no fusionadas:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --staged <archivo>...\" para sacar del área de stage)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área "
+"de stage)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (usa \"git add <archivo>...\" para marcar una resolución)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
"resolución)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (usa \"git rm <file>...\" para marcar la resolución)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Cambios a ser confirmados:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Cambios no rastreados para el commit:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
"commit)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
+" (usa \"git restore <archivo>...\" para descartar los cambios en el "
"directorio de trabajo)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (confirmar o descartar el contenido sin seguimiento o modificado en los "
"sub-módulos)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "ambos borrados:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "agregado por nosotros:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "borrados por ellos:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "agregado por ellos:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "borrado por nosotros:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "ambos agregados:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "ambos modificados:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "nuevo archivo:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "copiado:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "borrado:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "modificado:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "renombrado:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "cambio de tipo:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "desconocido:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "des-fusionado:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "nuevos commits, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "contenido modificado, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contenido no rastreado, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Tu stash actualmente tiene %d entrada"
msgstr[1] "Tu stash actualmente tiene %d entradas"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
-msgstr "Submodulos cambiados pero no actualizados:"
+msgstr "Submódulos cambiados pero no actualizados:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
-msgstr "Submodulos cambiados listos para realizar commit:"
+msgstr "Submódulos cambiados listos para realizar commit:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6842,107 +8113,118 @@
"No modifique o borre la línea de encima.\n"
"Todo lo que este por abajo será eliminado."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
+"Puedes usar '--no-ahead-behind' para evitar esto.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Tienes rutas no fusionadas."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregla los conflictos y corre \"git commit\""
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (usa \"git merge --abort\" para abortar la fusion)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Todos los conflictos resueltos pero sigues fusionando."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" para concluir la fusión)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Estás en medio de una sesión am."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "El parche actual está vacío."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregla los conflictos y luego corre \"git am --continue\""
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (usa \"git am --skip\" para saltar este parche)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo no está presente."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "No se realizaron los comandos."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "El último comando realizado (%d comando realizado):"
msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
-msgstr " (ver mas en el archivo %s)"
+msgstr " (ver más en el archivo %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
-msgstr "No quedan mas comandos."
+msgstr "No quedan más comandos."
-#: wt-status.c:1284
+#: 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] "Siguiente comando a realizar (%d comando restante):"
msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Estás aplicando un rebase."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" para omitir este parche)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -6950,128 +8232,136 @@
"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Estás dividiendo un commit durante un rebase."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
"continue\")"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Estás editando un commit durante un rebase."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
"cambios)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick en progreso actualmente."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Estás realizando un cherry-picking en el commit %s."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Revierte el estado en progreso actual."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (ejecuta \"git revert --continue\" para continuar)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" para volver a la rama original)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD desacoplada en "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD desacoplada de "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7079,34 +8369,34 @@
"new files yourself (see 'git help status')."
msgstr ""
"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
-"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
-"nuevos archivos usted mismo (vea 'git help status')."
+"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
+"nuevos archivos tú mismo (vea 'git help status')."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7115,192 +8405,192 @@
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
"presentes\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
"hacerles seguimiento)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "diferente"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "detrás "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "falló la actualización de carpetas"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "eliminar '%s'\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "No se pudo leer el índice"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No se pudo abrir '%s' para escritura."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "No se puede escribir el parche"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "falló la edición del parche"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "No se pudo definir '%s'"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Parche vacío. Abortado."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "No se pudo aplicar '%s'"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "dry run ( ejecución en seco)"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "editar diff actual y aplicar"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "permitir agregar caso contrario ignorar archivos"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "actualizado las carpetas rastreadas"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "grabar solo el hecho de que la ruta será agregada después"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "no agregar, solo actualizar el índice"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "sobrescribir el bit ejecutable de los archivos listados"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "avisar cuando se agrega un repositorio incrustado"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7320,163 +8610,163 @@
"Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
"Clones del repositorio exterior no tendrán el contenido del \n"
"repositorio embebido y no sabrán como obtenerla.\n"
-"Si quería agregar un submódulo, use:\n"
+"Si querías agregar un submódulo, usa:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
-"Si se agrego esta ruta por error, puede eliminar desde el índice \n"
+"Si se agrego esta ruta por error, puedes eliminar desde el índice \n"
"usando:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Vea \"git help submodule\" para mas información."
+"Vea \"git help submodule\" para más información."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "agregando repositorio embebido: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
-msgstr "Use -f si realmente quiere agregarlos.\n"
+msgstr "Usa -f si realmente quieres agregarlos.\n"
#: builtin/add.c:379
msgid "adding files failed"
msgstr "falló al agregar archivos"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A y -u son mutuamente incompatibles"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nada especificado, nada agregado.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Tal vez quiso decir 'git add .'?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "no se pudo analizar el script del autor"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' fue borrado por el hook de applypatch-msg"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línea mal formada: '%s'."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falló al copiar notas de '%s' a '%s'"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "fall de fseek"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "no se pudo analizar el parche '%s'"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Solo un parche StGIT puede ser aplicado de una vez"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "timestamp inválido"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "línea Date inválida"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "offset de zona horaria inválido"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Falló al dividir parches."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "no es posible escribir en el archivo índice"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
+msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
"\"."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Parche mandado con formato=flowed; espacios al final de las líneas tal vez "
"desaparezcan."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "El parche está vacío."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "sangría no válida: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
"3-vías."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Usando la información del índice para reconstruir un árbol base..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7484,28 +8774,24 @@
"Editaste el parche a mano?\n"
"No aplica a blobs guardados en su índice."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Falló al fusionar en los cambios."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "aplicando a un historial vacío"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
@@ -7513,34 +8799,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- parche ya aplicado."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7550,30 +8837,30 @@
"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
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 ""
-"Todavía tiene rutas sin fusionar en su índice.\n"
-"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
+"Todavía tienes rutas sin fusionar en tu índice.\n"
+"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
"como tal.\n"
-"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
-"él."
+"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
+"en él."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7581,144 +8868,144 @@
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3-vías si es necesario"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "formatear el parche(s)"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "restaurar la rama original y abortar la operación de parchado."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "abortar la operación de parchado pero mantener HEAD donde está."
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "muestra el parche siendo aplicado."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "Commits con firma GPG"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7726,16 +9013,16 @@
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
"será removida. Por favor no la use más."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7744,10 +9031,14 @@
"Directorio extraviado %s encontrado.\n"
"Use \"git am --abort\" para borrarlo."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "modo interactivo requiere parches en la línea de comando"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opciones>] [<parche>...]"
@@ -7765,221 +9056,452 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Remote sin URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: error de protocolo"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: se esperaba un flush"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<commit>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> "
+"<mal_term>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> "
+"<mal_term>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new,"
+"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' no es un término válido"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no se puede usar el comando nativo '%s' como un término"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no se puede cambiar el significado del término '%s'"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "por favor use dos términos diferentes"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "no se pudo abrir el archivo BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "No estamos bisecando.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' no es un commit válido"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
+"<commit>'."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Mal argumento bisect_write: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "no se puede obtener el oid de la rev '%s'"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "no se pudo abrir el archivo '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Tienes que dar al menos un %s y un %s revision.\n"
+"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Tienes que comenzar por \"git bisect start\".\n"
+"Después tienes que entregar al menos un %s y una revision %s.\n"
+"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "haciendo bisect solo con un commit %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "¿Estás seguro [Y/n]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "no hay términos definidos"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Tus términos actuales son %s para el estado viejo\n"
+"y %s para el estado nuevo.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argumento inválido %s para 'git bisect terms'.\n"
+"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opción desconocida: '%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' no parece ser una revisión válida"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "mal HEAD - Necesito un HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "no se bisecará en un árbol con cg-seek"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "mal HEAD - ref simbólico extraño"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "ref inválido: '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "realiza 'git bisect next'"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escribe los términos a .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "limpiar el estado de bisección"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "revisar por revs esperados"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "reiniciar el estado de bisect"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "escribir el estado de bisect en BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "revisar y configurar los terms en el estado de bisect"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "revisar si existen términos malos o buenos"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "imprimir los terms del bisect"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "comenzar la sesión de bisect"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "no hay log para BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms requiere dos argumentos"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no requiere argumentos"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset requiere un commit o ningún argumento"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write requiere entre 4 o 5 argumentos"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--bisect-clean-state no requiere argumentos"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check requiere 2 o 3 argumentos"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms requiere 0 o 1 argumentos"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> están documentadas en git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "esperando un color: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "tiene que terminar con un color"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color inválido '%s' en color.blame.repeatedLines"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valor inválido para blame.coloring"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "no se pudo encontrar revision %s para ignorar"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "No tratar commits raíces como extremos (Default: off)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Mostrar estadísticas de costo de trabajo"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Forzar el reporte de progreso"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Mostrar la puntuación de salida de las entradas de blame"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Mostrar nombre original del archivo (Default: auto)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar número de línea original (Default: off)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar en un formato diseñado para consumo de máquina"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar en formato porcelana con información de commit por línea"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar timestamp en formato raw (Default: off)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Suprimir nombre del autor y timestamp (Default: off)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar en cambio el email del autor (Default: off)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignorar <rev> durante el blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorar revisiones de <archivo>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
-msgstr "colorear metadata redundante de lineas previas de manera diferente"
+msgstr "colorear metadata redundante de líneas previas de manera diferente"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
-msgstr "colorear lineas por edad"
+msgstr "colorear líneas por edad"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usar un heurístico experimental para mejorar los diffs"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Ocupo más ciclos para encontrar mejoras resultados"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usar contenido de <archivo> como imagen final"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "puntaje"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Encontrar copias de líneas entre y a través de archivos"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Encontrar movimientos de líneas entre y a través de archivos"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
@@ -7991,18 +9513,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "archivo %s tiene solo %lu línea"
msgstr[1] "archivo %s tiene solo %lu líneas"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Blaming a líneas"
@@ -8034,7 +9556,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opciones>] [-r | -a] [--formato]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8043,7 +9565,7 @@
"borrando la rama '%s' que ha sido fusionada en\n"
" '%s', pero aún no ha sido fusionada a HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8052,130 +9574,139 @@
"no borrando rama '%s' que todavía no ha sido fusionada \n"
"\ta '%s', aunque se fusione con HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No se pudo encontrar el objeto commit para '%s'"
-#: builtin/branch.c:173
+#: 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 ""
"La rama '%s' no ha sido fusionada completamente.\n"
-"Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
+"Si estás seguro de querer borrarla, ejecuta 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Falló de actualización de config-file"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "no se puede usar-a con -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "No se pudo revisar el objeto commit para HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "rama de rastreo remoto '%s' no encontrada."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "rama '%s' no encontrada."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error al eliminar la rama de rastreo remota '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error al eliminar la rama '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s)..\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no es posible analizar el string de formato"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "no se pudo resolver HEAD"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) apunta fuera de refs/heads/"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama inválido: '%s'"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Copiado de rama fallido"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Copia creada de la rama malnombrada '%s'"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La rama está renombrada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La rama está copiada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8186,186 +9717,180 @@
"%s\n"
"Las líneas que comiencen con '%c' serán removidas.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opciones genéricas"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "suprimir mensajes informativos"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Desconfigurando la info de upstream"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de traqueo remoto"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contienen el commit"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contienen el commit"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "borrar rama (incluso si no está fusionada)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copiar una rama y su reflog"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copiar una rama, incluso si el objetivo existe"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "muestra el nombre de branch actual"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea el reflog de la rama"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "edita la descripción de la rama"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "fuerza la creación,movimiento/renombrado,borrado"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "muestra solo ramas que han sido fusionadas"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "muestra solo ramas que no han sido fusionadas"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "muestra las ramas en columnas"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "clave"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "nombre del campo por el cuál ordenar"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "objeto"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "imprimir sólo las ramas del objeto"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filtrado son case-insensitive"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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 "formato para usar para el output"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no encontrado abajo de refs/heads!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "no se puede editar la descripción de más de una rama"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay commits en la rama '%s'."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de copiado"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombrado"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -8373,37 +9898,40 @@
"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene información de upstream"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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 ""
-"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
+"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n"
+"¿Quisiste usar: -a|-r --list <patrón>?"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8424,7 +9952,7 @@
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8432,7 +9960,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8440,133 +9968,133 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "solo se puede especificar una opción batch"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "use una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar info y content de los objetos alimentados por standard input"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "no ordenar el output de --batch-all-objects"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "reportar todos los atributos configurados en el archivo"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "use .gitattributes solo desde el índice"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "leer nombres de archivos de stdin"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un carácter NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "mostrar rutas de entrada que no concuerdan"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "ignorar el índice cuando se revise"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "no se puede especificar los nombres de rutas con --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z sólo tiene sentido con --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "ruta no especificada"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet solo es válido con un nombre de ruta único"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "no se puede tener ambos --quiet y --verbose"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching sólo es válida con --verbose"
@@ -8587,56 +10115,56 @@
msgid "no contacts specified"
msgstr "contactos no especificados"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "stage tiene que estar entre 1 y 3 o all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "revisar todos los archivos en el índice"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "forzar sobreescritura de los archivos existentes"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"no hay advertencias para los archivos existentes y los archivos no están en "
"el índice"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "no revisar archivos nuevos"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "actualizar información de estado en el archivo índice"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "leer lista de rutas desde standard input"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "escribir el contenido en un archivo temporal"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "string"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "cuando cree archivos, anteponer <string>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "copiar los archivos del stage nombrado"
@@ -8648,105 +10176,164 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opciones>] [<rama>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "ruta '%s' no tiene nuestra versión"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "ruta '%s' no tiene su versión"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "ruta '%s' no tiene todas las versiones necesarias"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ruta '%s' no tiene versiones necesarias"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "ruta '%s': no se puede fusionar"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Incapaz de agregar resultados de fusión a '%s'"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Recreado %d conflicto de merge"
+msgstr[1] "Recreados %d conflictos de merge"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Actualizada %d ruta para %s"
+msgstr[1] "Actualizadas %d rutas para %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Actualizada %d ruta desde el index"
+msgstr[1] "Actualizadas %d rutas desde el index"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no puede ser usada con rutas actualizadas"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no puede ser usado con %s"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "ni '%s' o '%s' están especificados"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' o '%s' no puede ser usado con %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
-msgstr "necesita resolver su índice actual primero"
+msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"cambios en el área de stage en el siguiente archivo pueden ser perdidos: %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8759,17 +10346,17 @@
"\n"
"%s\n"
msgstr[0] ""
-"Peligro: está saliendo %d commit atrás, no está conectado\n"
+"Peligro: estás saliendo %d commit atrás, no está conectado\n"
"a ninguna rama:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Peligro: está saliendo %d commits atrás, no está conectado\n"
+"Peligro: estás saliendo %d commits atrás, no está conectado\n"
"a ninguna rama:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8784,172 +10371,249 @@
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"Si quiere conservarlo creando una nueva rama, este es un buen momento\n"
+"Si quieres conservarlo creando una nueva rama, este es un buen momento\n"
"para hacerlo:\n"
"\n"
" git branch <nuevo-nombre-de-rama> %s\n"
"\n"
msgstr[1] ""
-"Si quiere conservarlos creando una nueva rama, este es un buen momento\n"
+"Si quieres conservarlos creando una nueva rama, este es un buen momento\n"
"para hacerlo:\n"
"\n"
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "error interno en camino de revisión"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "solo una referencia esperada"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
+"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n árbol: %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "se esperaba un branch, se obtuvo tag '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "se espera una rama, se obtuvo una rama remota '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "se esperaba branch, se obuto '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "se espera una rama, se obtuvo commit '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un merge\n"
+"Considera \"git merge --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch en medio de una sesión de am\n"
+"Considera \"git am --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un rebase\n"
+"Considera \"git rebase --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un cherry-pick\n"
+"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un revert\n"
+"Considera \"git revert --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "estás cambiando ramas durante un bisect"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' no puede tomar <punto de partida>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "rama"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "crear y hacer checkout a una nueva rama"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "crear/reiniciar y hacer checkout a una rama"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "crear un reflog para una nueva rama"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "desacoplar HEAD en el commit nombrado"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "configurar info de upstream para una rama nueva"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "nueva-rama"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "nueva rama no emparentada"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "hacer checkout a su versión para los archivos sin fusionar"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "forzar el checkout (descartar modificaciones locales)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "realizar una fusión de tres vías con la rama nueva"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "actualizar archivos ignorados (default)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "estilo"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "conflicto de estilos (merge o diff3)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "no limitar pathspecs a dispersar entradas solamente"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "forzar el reporte de progreso"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "realizar una fusión de tres vías con la rama nueva"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "estilo"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "conflicto de estilos (merge o diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "desacoplar HEAD en el commit nombrado"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "configurar info de upstream para una rama nueva"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "forzar el checkout (descartar modificaciones locales)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "nueva-rama"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "nueva rama no emparentada"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "actualizar archivos ignorados (default)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "hacer checkout a su versión para los archivos sin fusionar"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "no limitar pathspecs a dispersar entradas solamente"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p y --overlay son mutuamente exclusivas"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "falta nombre de rama; prueba -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "no se pudo resolver %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "debes especificar path(s) para restaurar"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -8957,7 +10621,7 @@
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -8987,38 +10651,105 @@
"de nombre <nombre> remota, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "rama"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crear y hacer checkout a una nueva rama"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crear/reiniciar y hacer checkout a una rama"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crear un reflog para una nueva rama"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "usar modo overlay (default)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "crear y hacer switch a una nueva rama"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "crear/reiniciar y hacer switch a una rama"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "descartar modificaciones locales"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "de qué árbol hacer el checkout"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "restaurar el index"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "restaurar el árbol de trabajo (default)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorar entradas no fusionadas"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "usar modo overlay"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Borrando %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Sera borrado %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Saltando repositorio %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Se saltara repositorio %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "falló al borrar %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "no se pudo lstat %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9031,7 +10762,7 @@
"foo - selecciona un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9052,38 +10783,38 @@
"* - escoger todos los objetos\n"
" - (vacío) terminar selección\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Ahh (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Input ignora los patrones >> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Seleccionar objetos para borrar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Borrar %s [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9101,64 +10832,64 @@
"help - esta ventana\n"
"? - ayuda para selección de opciones"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Ahora que"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Se eliminará el siguiente objeto:"
msgstr[1] "Se eliminarán los siguientes objetos:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
-msgstr "No hay mas archivos para limpiar, saliendo."
+msgstr "No hay más archivos para limpiar, saliendo."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "no imprimir nombres de archivos borrados"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "forzar"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "limpieza interactiva"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "borrar directorios completos"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "agregar <patrón> para ignorar reglas"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "borrar archivos ignorados, también"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x y -X no pueden ser usadas juntas"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9166,7 +10897,7 @@
"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9174,146 +10905,160 @@
"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "no crear checkout"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crear un repositorio vacío"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crear un repositorio espejo (implica vacío)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "clonar de un repositorio local"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "no usar hardlinks, siempre copiar"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "nombre"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profundidad"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "tiempo"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "llave=valor"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "especifico-de-servidor"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "opción para trasmitir"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9321,146 +11066,146 @@
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "falló al abrir '%s'"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "falló al analizar %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "falló al iterar sobre '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Clonado exitoso, pero falló el checkout.\n"
-"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
-"y volver a intentarlo con 'git checkout -f HEAD'\n"
+"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
+"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9468,36 +11213,36 @@
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@ -9533,25 +11278,93 @@
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <padre>)...] [-S[<keyid>]] [(-m <mensaje>)...] [(-F "
+"<archivo>)...] <árbol>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "padre duplicado %s ignorado"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "no es un nombre de objeto válido %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: falló al abrir '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: falló al leer '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: falló al cerrar '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "padre"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "id del objeto commit padre"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "mensaje"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "mensaje del commit"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "leer mensaje de commit desde un archivo"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "Firmar commit con GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "tiene que dar exactamente un árbol"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: falló al leer"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
-#: builtin/commit.c:50
+#: 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 ""
-"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n"
+"Has solicitado un amend en tu commit más reciente, pero hacerlo lo \n"
"vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n"
"el commit completamente con \"git reset HEAD^\".\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9561,86 +11374,92 @@
msgstr ""
"El cherry-pick anterior ahora está vacío, posiblemente por un conflicto de "
"resolución.\n"
-"Si desea realizar un commit de todas maneras, use:\n"
+"Si deseas realizar un commit de todas maneras, usa:\n"
"\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Caso contrario, por favor usa 'git reset'\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Si quiere saltar este commit, use:\n"
+"y luego usa:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
-"para los commits restantes.\n"
+"para resumir el cherry-pick con los commits faltantes.\n"
+"Si deseas saltar el commit, usa:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "falló al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el cache principal del árbol"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "no es posible escribir archivo new_index"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusión."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no se puede realizar un commit parcial durante un cherry-pick."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "no se puede leer el índice"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una línea de autor mal formada"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9648,38 +11467,38 @@
"no es posible seleccionar un carácter de comentario que no es usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9694,7 +11513,7 @@
"\t%s\n"
"y vuelve a intentar.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9704,178 +11523,174 @@
"and try again.\n"
msgstr ""
"\n"
-"Parece que puede estar haciendo un commit a un cherry-pick.\n"
-"Si esto no es correcto, por favor elimine el archivo\n"
+"Parece que puedes estar haciendo un commit a un cherry-pick.\n"
+"Si esto no es correcto, por favor elimina el archivo\n"
"\t%s\n"
-"y vuelva a intentar.\n"
+"y vuelve a intentar.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que "
"comiencen\n"
"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que "
"comiencen\n"
"con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
"autor existente"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo ignorado inválido '%s'"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de los archivos no rastreados '%s'"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "La opción -m no puede ser combinada con -c/-C/-F."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "No hay rutas con --include/--only no tiene sentido."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Modo cleanup inválido %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Rutas con -a no tiene sentido."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "output formato-maquina"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
"(Predeterminado: all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -9883,11 +11698,11 @@
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -9895,252 +11710,251 @@
"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
"(Default: all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinación de argumentos de archivos ignorados y no rastreados no soportada"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "suprime summary tras un commit exitoso"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "sobrescribe el autor del commit"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "sobrescribe la fecha del commit"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "mensaje"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "mensaje del commit"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit especifico"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit especifico"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensaje de formato autosquash para arreglar el commit especificado"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar el mensaje de formato autosquash para realizar squash al commit "
"especificado"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "agregar Signed-off-by: (firmado por)"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "default"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "cómo quitar espacios y #comentarios de mensajes"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "Firmar commit con GPG"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "sólo confirmar archivos específicos"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "gancho bypass post reescritura"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok al grabar un cambio vacío"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok al grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando commit debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; no se ha editado el mensaje\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
"new_index. Verifique que el disco no este lleno y la quota no ha\n"
-"sido superada, y luego \"git reset HEAD\" para recuperar."
+"sido superada, y luego \"git restore --sateged :/\" para recuperar."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append][--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "dir"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "El directorio de objetos para guardar el gráfico"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "si el commit-graph está cortado, solo verifica la punta del archivo"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "No se pudo abrir commit-graph '%s'"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "comenzar caminata en todas las refs"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "escanear paquete de índices por stdin por commits"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "comenzar a caminar a los commits listados por stdin"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "inclye todos los commits que ya están en el archivo commit-graph"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir escribir un archivo commit-graph incremental"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "máximo número de commits en un commit-graph sin base cortada"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "radio máximo entre dos niveles de corte de commit-graph"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
@@ -10148,7 +11962,7 @@
msgid "git config [<options>]"
msgstr "git config [<opciones>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argumento --type no reconocido, %s"
@@ -10254,7 +12068,7 @@
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "al valor se ha dado este tipo"
@@ -10298,7 +12112,7 @@
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valor"
@@ -10306,48 +12120,48 @@
msgid "with --get, use default value when missing entry"
msgstr "con --get, usa el valor por defecto cuando falta una entrada"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "número de argumentos inválidos, deberían ser %d"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "número de argumentos inválidos, deberían ser de %d a %d"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "patrón de llave inválido: %s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "falló al formatear el valor por defecto de configuración: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "no se analizar color '%s'"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "no es posible analizar el valor por defecto de color"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "no en un directorio git"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "escribir en stdin no está soportado"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "escribir blobs de configuración no está soportado"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10362,23 +12176,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "solo un archivo de configuración a la vez"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local solo puedo ser usado dentro de un repositorio"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob solo puede ser usado dentro de un repositorio"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME no está configurado"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10390,52 +12204,52 @@
"\"\n"
"en \"git help worktree\" para más detalles"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color y tipo de variable incoherente"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "solo una acción a la vez"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only solo es aplicable para --list o --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default solo es aplicable para --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "no se puede leer el archivo de configuración '%s'"
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "error al procesar archivo(s) de configuración"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "editar stdin no está soportado"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "editar blobs no está soportado"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "no se puede crear el archivo de configuración %s"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10444,7 +12258,7 @@
"no se puede sobrescribir múltiples valores con un único valor\n"
"\tUse una regexp, --add o --replace-all para cambiar %s."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "no existe la sección: %s"
@@ -10457,57 +12271,57 @@
msgid "print sizes in human readable format"
msgstr "mostrar tamaños en formato legible para humano"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opciones>] [<commit-ish>...]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opciones>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "head"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "ligero"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "anotado"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "tag anotado %s no disponible"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "tag anotado %s no tiene nombre embebido"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "tag '%s' es realmente '%s' aquí"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "no hay tag que concuerde exactamente con '%s'"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "búsqueda finalizada a las %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10516,7 +12330,7 @@
"No hay tags anotados que puedan describir '%s'.\n"
"Sin embargo, hubieron tags no anotados: intente --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10525,12 +12339,12 @@
"Ningún tag puede describit '%s'.\n"
"Intente --always, o cree algunos tags."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits cruzados\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10539,118 +12353,118 @@
"se encontró más de %i tags; se mostró %i más reciente\n"
"fin de la búsqueda en %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "describe %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "Nombre de objeto %s no válido"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s no es un commit ni un blob"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "encontrar el tag que viene después del commit"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "hacer debug a la estrategia de búsqueda en stderr"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "use cualquier ref"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "use cualquier tag, incluso los no anotados"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "siempre usar formato largo"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "solo seguir el primer patrón"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "solo mostrar concordancias exactas"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "considerar <n> tags más recientes (default:10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "solo considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "no considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "mostrar el objeto commit abreviado como fallback"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long es incompatible con --abbrev=0"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "No se encontraron nombres, no se puede describir nada."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty es incompatible con commit-ismos"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken es incompatible con commit-ismos"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': no es un archivo regular o un enlace simbólico"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opción inválida: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "más de dos blobs entregados: '%s'"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
@@ -10659,27 +12473,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "falló: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10687,54 +12501,54 @@
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
-msgstr "tal vez desee limpiar o recuperar estos."
+msgstr "tal vez desees limpiar o recuperar estos."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use `diff.guitool` en lugar de `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "herramienta"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10742,161 +12556,219 @@
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "pasado a `diff`"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool requiere un árbol de trabajo o --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dirty-diff es incompatible con --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipo"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "default para git_env_*(...) es hacer fallback en"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "ser silencioso solo usar valor git_env_*() como código de salida"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Volcar marcas a este archivo"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importar marcas de este archivo"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Use el feature done para terminar el stream"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Saltar el output de data blob"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Padres de la referencia que no estan en fast-export stream por id de objeto"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Mostrar ids de objetos originales para blobs/commits"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opciones>] <grupo>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opciones>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "extraer de todos los remotos"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "ruta para cargar el paquete al final del remoto"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "forzar sobrescritura de referencia local"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "extraer de múltiples remotos"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "extraer todos los tags y objetos asociados"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "no extraer todos los tags (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos extraídos en paralelo"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"limpiar tags locales que no se encuentran en el remoto y eliminar tags "
"cambiados"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "en demanda"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controlar extracción recursiva de submódulos"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "mantener el paquete descargado"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permitir actualizar la ref HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "historia profunda de un clon superficial"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "historia profunda de un repositorio superficial basado en tiempo"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "convertir a un repositorio completo"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteponer esto a salida de la ruta del submódulo"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -10904,107 +12776,129 @@
"default para extracción recursiva de submódulos (menor prioridad que "
"archivos de configuración)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "aceptar refs que actualicen .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "especificar extracción de refmap"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "especifico-de-servidor"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "opción para trasmitir"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "ejecutar 'gc --auto' tras el fetch"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "verificar updates forzados en todos los branch actualizados"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "No se puedo encontrar ref remota HEAD"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "no se posible actualizar el ref local"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "podría golpear tag existente"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "avance lento"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Fetch normalmente incida qué branches han tenido un update forzado,\n"
+"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--"
+"show-forced-updates'\n"
+"o ejecute 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, 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 ""
+"Tomó %.2f segundos validar los updates forzados. Puedes usar\n"
+"'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates "
+"false'\n"
+"para evitar esta validación.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11013,56 +12907,58 @@
"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
" 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se pondrá colgado)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha colgado)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-"--filter solo puede ser usado con el remoto configurado en core.partialClone"
+"--filter solo puede ser usado con el remoto configurado en extensions."
+"partialClone"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11070,43 +12966,51 @@
"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
-msgstr "Tiene que especificar un nombre de tag."
+msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter solo puede ser usado con el remoto configurado en extensions."
+"partialClone"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11169,90 +13073,273 @@
msgid "show only <n> matched refs"
msgstr "mostrar solo <n> refs encontradas"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respetar el formato de colores"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "mostrar solo refs que apunten al objeto dado"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "mostrar solo refs que son fusionadas"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "mostrar solo refs que no son fusionadas"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "mostrar solo refs que contienen el commit"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "mostrar solo refs que no contienen el commit"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "desconocido"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "error en %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "peligro en %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "link roto de %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "tipo de objeto equivocado en link"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"link roto de %7s %s\n"
+" a %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "faltan %s %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "inalcanzable %s %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "actualizando %s %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "no se pudo crear lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no se pudo finalizar '%s'"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Revisando %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Verificando conectividad (%d objetos)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Revisando %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "links rotos"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "raíz %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "tag %s %s (%s) en %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objecto corrupto o faltante"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: referencia inválida %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Revisando reflog %s->%s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: puntero sha1 inválido %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: no es un commit"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "aviso: No hay referencias por defecto"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objeto corrupto o no encontrado: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: no se puede analizar objeto: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "mal sha1 de archivo: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Revisando directorio de objetos"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Revisando link %s"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s apunta a algo extraño (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: HEAD desacoplado apunta a nada"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "aviso: %s apunta a un branch no nacido (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Revisando el cache tree"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: puntero inválido sha1 en cache-tree"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "non-tree en cache-tree"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "mostrar objetos ilegibles"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "mostrar objetos colgados"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "revisar solo conectividad"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgados en .git/lost-found"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "mostrar progreso"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verboso para objetos alcanzables"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Revisando objetos"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: objeto faltante"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<opciones>]"
@@ -11262,17 +13349,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Falló el fstat %s: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "falló al analizar '%s' valor '%s'"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no se pudo definir '%s'"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11287,54 +13379,54 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "limpiar objetos no referenciados"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "ser más exhaustivo (aumentar runtime)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "habilitar modo auto-gc"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "falló al analizar valor %s de gc.logexpirity"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "falló al analizar valor %s de prune expiry"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Auto empaquetado del repositorio en segundo plano para un performance "
"óptimo.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vea \"git help gc\" para limpieza manual.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11342,23 +13434,23 @@
"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
"es así)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
"eliminarlos."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falló al crear el hilo: %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "número inválido de hilos especificado (%d) para %s"
@@ -11367,266 +13459,266 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "encontrar en contenidos no manejados por git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados via '.gitignore'"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerdan"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings arreglados"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primer coincidencia"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "mostrar solo partes que concuerdan de una línea"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
"archivo"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr ""
"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "mostrar árbol analizado para la expresión grep"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "no se ha entregado patrón"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no se posible resolver revisión: %s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opción no soportada con --recurse-submodules"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached y árboles han sido entregados"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11634,38 +13726,34 @@
"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
"[--] <archivo>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "tipo"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipo de objeto"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "escribir el objeto en la base de datos de objetos"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "leer el objeto de stdin"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "guardar el archivo como es sin filtros"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"solo realizar un hash a cualquier basura random para crear un objeto "
"corrupto para hacer debugging de Gti"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "procesar el archivo como si fuera de esta ruta"
@@ -11705,30 +13793,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato help no reconocido '%s'"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Falló al iniciar emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Falló al analizar la versión de emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "falló al ejecutar '%s'"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11737,7 +13825,7 @@
"'%s': ruta para el visualizador del manual no soportada.\n"
"Por favor considere usar 'man.<herramienta.cmd'."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11746,327 +13834,317 @@
"'%s': comando no soportado para man viewer.\n"
"Por favor considere usar 'man.<herramienta>.path."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de man desconocido."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "ningún visualizador de manual proceso la petición"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "ningún visor de info manejo la petición"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mal alias.%s string: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "'git help config' para más información"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "leer error en input"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la definición actual de off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no se puede abrir el archivo de paquete '%s'"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "inflate devolvió %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "no se puede propagar el paquete"
-#: builtin/index-pack.c:555
+#: 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] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "error de fsck en el objeto empaquetado"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "%s inválido"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tail checksum para %s inesperada (corrupción de disco?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir %s en el archivo '%s'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar escrito %s en archivo '%s'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "error mientras se cierra el archivo paquete"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "no se puede guardar el archivo paquete"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el índice del archivo paquete para '%s'"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
@@ -12110,42 +14188,42 @@
msgid "not copying templates from '%s': %s"
msgstr "no se copian templates de '%s': %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "no es posible manejar el tipo de archivo %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "no se puede mover %s a %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s ya existe"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Reinicializado el repositorio Git existente en %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Inicializado repositorio Git vacío en %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12153,26 +14231,26 @@
"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
"shared[=<permisos>]] [<directorio>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"especifica que el repositorio de git será compartido entre varios usuarios"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "no se pude crear directorio %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "no se puede aplicar chdir a %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12181,12 +14259,12 @@
"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
"dir=<directorio>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No se puede acceder al árbol de trabajo '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12194,461 +14272,453 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<valor>])...] [<archivo>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "editar archivos en el lugar"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "cortar trailers vacíos"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "donde colocar el nuevo trailer"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "acción if trailer ya existe"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "acción si falta el trailer"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "mostrar solo los trailers"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "no aplicar reglas de configuración"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "juntar valores con espacios en blanco contiguos"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "configurar opciones de análisis"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "no tratar --- especialmente"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "trailer"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "trailer(s) para agregar"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer con --only-input no tiene sentido"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "no se entregó archivo de entrada para edición en lugar"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<opciones>] <objeto>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opción --decorate inválida: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "suprimir salida de diff"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "mostrar fuente"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Usar archivo de mapa de mail"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "solo decorar refs que concuerden con <patrón>"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "no decorar refs que concuerden con <patrón>"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "opciones de decorado"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Salida final: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: mal archivo"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
-msgstr "No se pudo leer objeto %s"
+msgid "could not read object %s"
+msgstr "no se pudo leer objeto %s"
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
-msgstr "Tipo desconocido: %d"
+msgid "unknown type: %d"
+msgstr "tipo desconocido: %d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "formate.headers. sin valor"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "nombre del directorio de salida es muy largo"
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "No se puede abrir archivo patch %s"
+msgid "cannot open patch file %s"
+msgstr "no se puede abrir archivo patch %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "Exactamente un rango necesario."
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "necesita exactamente un rango"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "No es un rango."
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "no es un rango"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "Letras de portada necesita formato email"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "letras de portada necesita formato email"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "falló al crear los archivos cover-letter"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "insano in-reply-to: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
-msgstr "Dos directorios de salida?"
+#: builtin/log.c:1244
+msgid "two output directories?"
+msgstr "dos directorios de salida?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit desconocido %s"
+msgid "unknown commit %s"
+msgstr "commit desconocido %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Falló al resolver '%s' como una ref válida."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "falló al resolver '%s' como ref válida"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "No se pudo encontrar una base de fusión."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "no se pudo encontrar una base de fusión exacta"
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Falló al conseguir upstream, si quiere grabar un commit base de manera "
+"falló al conseguir upstream, si quieres grabar un commit base de manera "
"automática,\n"
-"por favor use git branch --set-upstream-to para rastrear una rama remota.\n"
-"O puede especificar un commit base mediante --base=<id-commit-base> "
-"manualmente."
+"por favor usa git branch --set-upstream-to para rastrear una rama remota.\n"
+"O puedes especificar un commit base mediante --base=<id-commit-base> "
+"manualmente"
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
-msgstr "Falló al encontrar una base de fusión exacta"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
+msgstr "falló al encontrar una base de fusión exacta"
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "el commit base debe ser el ancestro de la lista de revisión"
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "el commit base no debe estar en la lista de revisión"
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "no se puede obtener id de patch"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "falló al inferir rangos range-diff"
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "use [PATCH n/m] incluso con un único parche"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "use [PATCH] incluso con múltiples parches"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "mostrar parches en standard out"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "generar letra de cover"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr ""
"usar una secuencia simple de números para salida de nombres de archivos"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "use <sfx> en lugar de '.patch'"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "marcar las series como Nth re-roll"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Use [RFC PATCH] en lugar de [PATCH]"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Use [<prefijo>] en lugar de [PATCH]"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "guardar archivos resultantes en <dir>"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "no cortar/agregar [PATCH]"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "no mostrar diffs binarios"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "salida como hash de todos-ceros en la cabecera From"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "no incluya un parche que coincida con un commit en upstream"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "mostrar formato de parche en lugar del default (parche + stat)"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Mensajeando"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "cabezal"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "agregar cabecera email"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "email"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "agregar cabecera To:"
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "agregar cabecera Cc:"
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"configurar dirección From a <ident> ( o identidad de committer si está "
"ausente)"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "id de mensaje"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "hacer primer mail una respuesta a <id de mensaje>"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "límite"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "adjuntar el parche"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "poner el parche en línea"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "agregar una firma"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr ""
"agregar información de árbol de requisitos previos a la serie de parches"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "agregar una firma de un archivo"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "no mostrar los nombres de archivos de los parches"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "mostrar medidor de progreso mientras se generan los parches"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "porcentaje por el cual la creación es pesada"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "línea de identificación inválida: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n y -k son mutuamente exclusivas"
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only no tiene sentido"
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status no tiene sentido"
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check no tiene sentido"
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "salida standard, o directorio, cual?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "No se pudo crear el directorio '%s'"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiere --cover-letter o un parche único"
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiere --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiere --cover-letter o parche único"
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff contra v%d:"
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no se puede leer la firma del archivo '%s'"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Generando parches"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
-msgstr "Falló al crear los archivos de salida"
+#: builtin/log.c:1975
+msgid "failed to create output files"
+msgstr "falló al crear los archivos de salida"
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -12656,111 +14726,111 @@
"No se pudo encontrar una rama remota rastreada, por favor especifique "
"<upstream> manualmente.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "identifique el estado del archivo con tags"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "mostrar archivos en caché en la salida (default)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr ""
"mostrar contenido de nombres de objetos en el área de stage en la salida"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'directorios otros'"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "excluir patrones leídos de <archivo>"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"leer patrones de exclusión de manera adicional por directorio en <archivo>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "hacer la salida relativa al directorio principal del proyecto"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "árbol-ismo"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> "
"presentes"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "mostrar data de debug"
@@ -12778,7 +14848,7 @@
msgid "do not print remote URL"
msgstr "no mostrar el URL remoto"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "ejecutar"
@@ -12802,11 +14872,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr "tomar url.<base>.insteadOf en cuenta"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
@@ -12852,366 +14922,391 @@
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "cambiar `m' requiere un valor"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opción `%s' requiere un valor"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
"fusión"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crear un commit único en lugar de hacer una fusión"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "permitir fast-forwars (default)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar que el commit nombrado tiene una firma GPG válida"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort pero deja el índice y el árbol de trabajo solos"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verificar el hook commit-msg"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (nada para hacer squash)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no apunta a ningún commit"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opción desconocida para merge-recursive: -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribir %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "No se puedo leer de '%s'"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No se realiza commit de la fusión; use 'git commit' para completar la "
"fusión.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
"esta fusión,\n"
"especialmente si esto fusiona un upstream actualizado en una rama de "
"tópico.\n"
"\n"
-"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
-"el commit.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Un mensaje vacío aborta el commit.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
+" el commit.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Fusión automática falló; arregle los conflictos y luego realice un commit "
"con el resultado.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Por defecto, no hay un upstream definido para la rama actual."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hay rama de rastreo remoto para %s de %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor erróneo '%s' en el entorno '%s'"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit no espera argumentos"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"No ha concluido la fusión (existe MERGE_HEAD).\n"
-"Por favor, realice un commit con los cambios antes de fusionar."
+"No has concluido la fusión (existe MERGE_HEAD).\n"
+"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
-"Por favor, realice un commit con los cambios antes de fusionar."
+"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
+"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
+msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "No se puede combinar --squash con --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Ya está actualizado."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nop.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "No es posible hacer fast-forward, abortando."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Usando el %s para preparar resolución a mano.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13297,33 +15392,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "configurar labels para archivo1/orig-archivo/archivo2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "opción %s desconocida"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "no se pudo analizar el objeto '%s'"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "no manejando nada distinto a fusiones de dos heads."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "no se pudo resolver ref '%s'"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Fusionando %s con %s\n"
@@ -13336,7 +15431,7 @@
msgid "input is NUL terminated"
msgstr "input es terminada con NUL"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "permitir objetos faltantes"
@@ -13344,158 +15439,174 @@
msgid "allow creation of more than one tree"
msgstr "permitir la creación de más de un árbol"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<tamaño>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"durante el repack, recolectar los pack-files de tamaño menor en un batch que "
+"es más grande que este tamaño"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "muchos argumentos"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verbo no reconocido: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "opción --batch-size es solo para el subcomando 'repack'"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<opciones>] <fuente>... <destino>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Directorio %s está en el índice y no hay submódulo?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
"para proceder"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s está en el índice"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "forzar mover/renombrar incluso si el objetivo existe"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "saltar errores de mover/renombrar"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' no es un directorio"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "mala fuente"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "no se pude mover un directorio en sí mismo"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "no se puede mover un directorio dentro de un archivo"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "directorio de fuente está vacío"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "no se encuentra bajo control de versión"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "destino existe"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "sobrescribiendo '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "No se puede sobrescribir"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "múltiples fuentes para el mismo objetivo"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "el directorio de destino no existe"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, fuente=%s, destino=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrando '%s' falló"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opciones>] <commit>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opciones>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opciones>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "imprimir sólo nombres (sin SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "sólo usar tags para nombrar commits"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "solo usar refs que concuerden con <patrón>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorar refs que concuerden con <patrón>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "listar todos los commits alcanzables desde todas las referencias"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "leer desde stdin"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nombres `undefined` (predeterminado)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "desreferenciar tags en la entrada (uso interno)"
@@ -13644,14 +15755,14 @@
msgid "the note contents have been left in %s"
msgstr "los contenidos de nota han sido dejados en %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 "falló al resolver '%s' como ref válida."
@@ -13684,38 +15795,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "demasiados parámetros"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "no se encontraron notas para objeto %s."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "contenidos de la nota como cadena"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "contenidos de la nota en un archivo"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "reutilizar y editar el objeto de nota especificada"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "reutilizar el objeto de nota especificado"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "permitir almacenar nota vacía"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "reemplazar notas existentes"
@@ -13728,29 +15839,29 @@
"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
"'-f' para sobrescribir las notas existentes"
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Sobrescribiendo notas existentes para objeto %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Removiendo nota para objeto %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "leer objetos desde stdin"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "muy pocos parámetros"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13759,12 +15870,12 @@
"No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
"Use '-f' para sobrescribir las notes existentes"
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13773,52 +15884,52 @@
"Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "falló al borrar ref NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "falló al resolver NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "falló al finalizar las notas de fusión"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estrategia de fusión de notas %s desconocida"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Opciones generales"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Opciones de fusión"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -13826,47 +15937,47 @@
"resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Realizando commit a las notas no fusionadas"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"finalizar fusión de notas realizando un commit de las notas no fusionadas"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Abortando notas de resolución de fusión"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "abortar notas de fusión"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "debe especificar una ref de notas a fusionar"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "--strategy/-s desconocida: %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "una fusión de notas en %s ya está en progreso en %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "falló al guardar un link para el ref de notas actual (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13877,177 +15988,182 @@
"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falló al resolver '%s' como una ref válida."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "El objeto %s no tiene notas\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "intentar eliminar una nota no existente no es un error"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "reportar notas recortadas"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "referencia-de-notas"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
"objetos>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
"de-objetos>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mal paquete de objeto CRC para %s"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "objeto empaquetado corrupto para %s"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo encontrado para objeto %s"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objetos ordenados, esperados %<PRIu32>"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "packfile es inválido: %s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "no es posible abrir packfile para reusar: %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "no es posible buscar en los packfile reusados"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "no es posible leer de packfile reusado"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
"empaquetados"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow de offset en la base de delta en paquete para %s"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "outbound de offset en la base de delta para %s"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "no se pudo obtener el tamaño de %s"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -14056,7 +16172,7 @@
"se espseraba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -14065,251 +16181,259 @@
"se esperaba ID de objeto, se obtuvo basuta:\n"
"%s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto perdido en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "incapaz de forzar un objeto perdido"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "usar el algoritmo sparse reachability"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "escribir un índice de bitmap si es posible"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no puede ser usado para construir un paquete para "
"transferencia"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no puede ser usado para construir un paquete indexable"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar--filter sin --stdout"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opciones>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "empaquetar todo"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "recortar refs perdidos (default)"
@@ -14325,82 +16449,82 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "reportar objetos recortados"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "expirar objetos más viejos a <tiempo>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "no se puede recortar en un repositorio de objetos-preciosos"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor inválido para %s: %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "control de fetch recursivo en submódulos"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opciones relacionadas a fusión"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opciones relacionadas a fetch"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "forzar sobrescritura de la rama local"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "número de submódulos que realizan pull en paralelo"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido para pull.ff: %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hay candidatos para fusionar entre las refs que has bajado con fetch."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14409,7 +16533,7 @@
"tiene\n"
"concordancia en el final remoto."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14420,44 +16544,44 @@
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en la rama."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Por favor especifica a qué rama quieres rebasar."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Por favor especifica a qué rama quieres fusionar."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Ver git-pull(1) para detalles."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si deseas configurar el rastreo de información para esta rama, puedes "
"hacerlo con:"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14466,32 +16590,32 @@
"Tu configuración especifica fusionar con la ref '%s'\n"
"de tu remoto, pero no se pudo hacer fetch a esa ref."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "no es posible acceder al commit %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "La opción --[no-]autostash sólo es válida con --rebase."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nata con cambios agregados al índice."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14502,7 +16626,7 @@
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14519,15 +16643,15 @@
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -14545,7 +16669,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete solo acepta como objetivos nombres de ref planos"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14554,7 +16678,7 @@
"Para elegir si la opción es permanente, mira push.default en 'git help "
"config'."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14579,7 +16703,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14594,7 +16718,7 @@
"\n"
"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14608,29 +16732,29 @@
"\n"
"\tgit push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, 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 ""
-"Está haciendo un push al remoto '%s', el cual no es el upstream de\n"
-"su rama actual '%s', sin decirme qué poner en el push\n"
+"Estás haciendo un push al remoto '%s', el cual no es el upstream de\n"
+"la rama actual '%s', sin decirme qué poner en el push\n"
"para actualizar en qué rama de remoto."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14640,9 +16764,9 @@
"Actualizaciones fueron rechazadas porque la punta de tu rama actual está\n"
"detrás de su contraparte remota. Integra los cambios remotos (es decir\n"
"'git pull ...') antes de hacer push de nuevo.\n"
-"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
+"Mira 'Note about fast-forwards' en 'git push --help' para más detalles."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14655,7 +16779,7 @@
"(ejem. 'git pull ...') antes de volver a hacer push.\n"
"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14669,37 +16793,37 @@
"remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
-#: builtin/push.c:296
+#: builtin/push.c:298
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 ""
-"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
+"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n"
"sin usar la opción '--force'.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Haciendo push a %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "falló el push de algunas referencias a '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "mal repositorio '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14721,104 +16845,104 @@
"\n"
" git push <nombre>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "repositorio"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "realizar push a todas las refs"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "realizar mirror a todas las refs"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "borrar refs"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "forzar actualizaciones"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<refname>:<expect>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "requiere haber valor viejo de ref en este valor"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "controlar push recursivo de submódulos"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "recibir programa de paquete"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "configurar upstream para git pulll/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "recortando refs removidas localmente"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "hacer un bypass al hook pre-push"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "realizar push de tags faltantes pero relevantes"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "Firmar con GPG el push"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "solicitar transacción atómica en el lado remoto"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete es incompatible con --all, --mirror y --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no tiene sentido sin ninguna referencia"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all y --tags son incompatibles"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all no puede ser combinada con refspecs"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror y --tags son incompatibles"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no puede ser combinado con refspecs"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all y --mirror son incompatibles"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "opciones de push no pueden tener caracteres de línea nueva"
@@ -14844,20 +16968,20 @@
msgid "use simple diff colors"
msgstr "usar colores simples de diff"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "no .. en rango: '%s'"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "argumento único de formato debe ser un rango simétrico"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "se necesitan dos rangos de commits"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -14868,71 +16992,75 @@
"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
"ismo2> [<árbol-ismo3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "escribir índice resultante en <archivo>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "solo vaciar el índice"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Fusionando"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "realizar un merge en adición a una lectura"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "fusión en 3-vías en presencia de adiciones y remociones"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "igual que -m, pero descarta entradas sin fusionar"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<subdirectorio>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "lea el árbol en el índice bajo <subdirectorio>/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "permitir sobrescritura de archivos explícitamente ignorados"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "no revisar el árbol de trabajo tras fusionar"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "no actualizar el índice o el árbol de trabajo"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "saltar aplicado de filtro de sparse checkout"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "debug de árboles-desempacados"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "suprimir mensajes de feedback"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
@@ -14940,47 +17068,226 @@
"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista de pendientes inutilizable: '%s'"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "no se pudo escribir '%s'."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "¿Sin HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "no se pudo crear archivo temporal %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "no se pudo marcar como interactivo"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "no se pudo generar lista de pendientes"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "un commit base tiene que ser provisto con --upstream o --onto"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<opciones>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "mantener commits vacíos"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "rebasando commits de fusión"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "mantener puntos originales de la rama de sus primos"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "mover commits que comienzan con squash!/fixup!"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "firmar commits"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "mostrar un diffstat de lo que cambió en upstream"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "continuar rebase"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "saltar commit"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "editar la lista de pendientes"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "mostrar el parche actual"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "ids de commits cortos en la lista de pendientes"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "expandir ids de commits en la lista de pendientes"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "revisar la lista de pendientes"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "reorganizar líneas fixup/squash"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "insertar comando exec en la lista de pendientes"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "hacia"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "restringir revision"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "squash hacia"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "el commit de upstream"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "head-name"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "nombre de head"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "estrategia de rebase"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "strategy-opts"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "opciones de estrategia"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "cambiar a"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "la rama o commit para hacer checkout"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "hacia-nombre"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "hacia nombre"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "cmd"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "el comando para ejecutar"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reprogramar automaticamente cualquier `exec` que falle"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requiere un rebase interactivo"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "no se pudo conseguir 'onto': '%s'"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválido: '%s'"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "No se pudo leer '%s'"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "No se puede guardar %s"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "no se pudo determinar revisión HEAD"
+
+#: builtin/rebase.c:950 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"
@@ -14991,15 +17298,30 @@
"Resuelva todos los conflictos manualmente ya sea con \n"
"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
"\".\n"
-"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n"
-"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
+"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n"
+"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git encontró un error mientras preparaba los parches para replicar\n"
+"esas revisiones:\n"
+"\n"
+" %s\n"
+"\n"
+"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -15016,7 +17338,7 @@
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15029,149 +17351,158 @@
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "comandos exec no pueden contener newlines"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "comando exec vacío"
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase hacia rama dada en lugar de upstream"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso implica --no-stat"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "mostrar un diffstat de lo que cambió en upstream"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "pasado a 'git am'"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "pasado a 'git-apply'"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "aborta y revisa la rama original"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "aborta pero mantiene HEAD donde está"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "muestra el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "permitir al usuario editar la lista de commits para rebasar"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "intentar recrear merges en lugar de ignorarlos"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "permitir rerere actualizar index con conflictos resueltos"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "preservar commits vacíos durante el rebase"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "ejecutar automáticamente stash/stash pop antes y después"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "agregar líneas exec tras cada acommit de la lista editable"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase commits con mensajes vacíos"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "intentar fusiones por rebase en lugar de saltarlas"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "use 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "no se pudo ejecutar %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"el soporte para rebase.useBuiltin ha sido removido!\n"
+"Vea su entrada en 'git help config' para detalles."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "No hay rebase en progreso?"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15179,21 +17510,16 @@
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
-msgstr "No se puede regresar a %s"
+msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "no se pudo eliminar'%s'"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15206,352 +17532,184 @@
"valuable there.\n"
msgstr ""
"Parece que ya hay un directorio %s, y\n"
-"me pregunto si está en medio de otro rebase. Si ese es el \n"
-"caso, por favor intente\n"
+"me pregunto si estás en medio de otro rebase. Si ese es el \n"
+"caso, por favor intenta\n"
"\t%s\n"
"Si no es el caso, por favor\n"
"\t%s\n"
-"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
+"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec requiere --exec o --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-"error: no se puede combinar opciones interactivas (--interactive, --exec, --"
-"rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
-"opciones (%s)"
+"no se pueden combinar opciones de am con opciones interactivas o de merge"
-#: builtin/rebase.c:1231
-#, c-format
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"error: no se puede combinar opciones de merge (--merge, --strategy, --"
-"strategy-option) con opciones de am (%s)"
+"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
+"exec'"
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "error: no se puede combinar '--preserve-merges' con '--rebase-merges'"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "error: no se puede combinar '--rebase-merges' con '--strategy-option'"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "no se puede combinar '--rebase-merges' con '--strategy'"
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "error: no se puede combinar '--rebase-merges' con '--strategy'"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no existe la rama/commit: '%s'"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
-msgstr "no se pudo resolver HEAD a una revisión"
+msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "No se puede ejecutar autostash"
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Respuesta de stash inesperada: '%s'"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No se pudo crear el directorio para '%s'"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autostash creado: %s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "no se pudo reset --hard"
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Rama actual %s está actualizada, rebase forzado.\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
"de ésta...\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rápido de %s a %s.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "no se pudo crear archivo temporal %s"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "no se pudo marcar como interactivo"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "no se pudo abrir %s"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "no se pudo generar lista de pendientes"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opciones>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "mantener commits vacíos"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "permitir commits con mensajes vacíos"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "rebasando commits de fusión"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "mantener puntos originales de la rama de sus primos"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mover commits que comienzan con squash!/fixup!"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "firmar commits"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "continuar rebase"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "saltar commit"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "editar la lista de pendientes"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "mostrar el parche actual"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "ids de commits cortos en la lista de pendientes"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "expandir ids de commits en la lista de pendientes"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "revisar la lista de pendientes"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "reorganizar líneas fixup/squash"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "insertar comando exec en la lista de pendientes"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "hacia"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "restringir revision"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "squash hacia"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "el commit de upstream"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "nombre de head"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "estrategia de rebase"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "opciones de estrategia"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "cambiar a"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "la rama o commit para hacer checkout"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "hacia-nombre"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "hacia nombre"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "el comando para ejecutar"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "un commit base tiene que ser provisto con --upstream o --onto"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15574,17 +17732,17 @@
"arreglar\n"
"el árbol de trabajo con HEAD.\n"
"\n"
-"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n"
+"Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n"
"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
-"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n"
-"se haya organizado para actualizar su árbol de trabajo para que coincida con "
+"su rama actual; Sin embargo, esto no se recomienda a menos que tú\n"
+"te hayas organizado para actualizar su árbol de trabajo para que coincida con "
"lo que\n"
-"enviará con el push de otra manera.\n"
+"enviarás con el push de otra manera.\n"
"\n"
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
-"configure 'receive.denyCurrentBranch' a 'refuse'."
+"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15603,21 +17761,76 @@
"en el repositorio remoto para permitir borrar la rama actual.\n"
"con o sin mensaje de advertencia.\n"
"\n"
-"Para suprimir este mensaje, puede configurarlo en 'refuse'."
+"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog existe <ref>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' no es una marca de tiempo válida"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Marcando objectos alcanzables..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s apunta a ningún lado!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "no reflog especificado para borrar"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "no es una reflog: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "no reflog para '%s'"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "formato inválido: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -16140,97 +18353,134 @@
"Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"no se puede finalizar pack-objects para reempaquetar objetos promisores"
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y pierde objetos inaccesibles"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "aproxime"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "con -a, re empaquetar objetos inalcanzables"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usado para la compresión delta"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
"entradas"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "re-empaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Nada nuevo para empaquetar."
+
+#: builtin/repack.c:478
+#, 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 ""
+"WARNING: Algunos packs en uso han sido renombrados\n"
+"WARNING: agregando el prefijo old- a sus nombres,para\n"
+"WARNING: reemplazarlos con la nueva versión del\n"
+"WARNING: archivo. Pero la operación falló, y el intento\n"
+"WARNING: de renombrarlos a sus nombres originales\n"
+"WARNING: también falló.\n"
+"WARNING: Por favor renombralos en %s manualmente:\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "falló al eliminar'%s'"
@@ -16259,12 +18509,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "falló al resolver '%s' como ref válida"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16273,27 +18518,27 @@
"formato de reemplazo inválido '%s'\n"
"formatos válidos son 'short', 'medium' y 'long'"
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "rama de reemplazo '%s' no encontrada"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Borradas replace refs '%s'"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' no es un nombre de ref válido"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "ref de reemplazo '%s' ya existe"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16304,76 +18549,81 @@
"'%s' puntos para un objeto reemplazado de tipo '%s'\n"
"mientras '%s' puntos para un reemplazo de tipo de objeto '%s'."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "no se pudo abrir %s para escritura"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file reportó un fallo"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "no se pudo abrir %s para lectura"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "no es posible generar mktree"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "no es posible leer de mktree"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree reportó un error"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree no devolvió un nombre de objeto"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "incapaz de correr fstat %s"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "incapaz de escribir el objeto en la base de datos"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "nombre de objeto no válido: '%s'"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "no es obtener tipo de objeto para %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "edición de archivo de objeto falló"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "nuevo objeto es igual al antiguo: '%s'"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "no se pudo analizar %s como un commit"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mal mergetag en commit '%s'"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "mergetag mal formado en commit '%s'"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16382,31 +18632,31 @@
"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
"en lugar de --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "el commit original '%s' tiene una firma gpg"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "la firma será removida en el commit de reemplazo!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "no se pudo escribir el commit de reemplazo: '%s'"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft para '%s' innecesario"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "nuevo commit es le mismo que el antiguo: '%s'"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16415,71 +18665,71 @@
"no se pudo convertir el siguiente graft(s):\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "listar replace refs"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "borrar replace refs"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "editar objeto existente"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "cambiar un padre de commit"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "convertir archivo graft existente"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "reemplazar el ref si este existe"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "no se puede imprimir contenidos para --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "usar este formato"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "--format no puede ser usado cuando no se hace listing"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "-f solo tiene sentido cuando se escribe un reemplazo"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw solo tiene sentido con --edit"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d necesita al menos un argumento"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "mal número de argumentos"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e necesita exactamente un argumento"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g necesita al menos un argumento"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file no toma argumentos"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "solo se puede dar un patrón con -l"
@@ -16495,126 +18745,127 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "'git rerere forget' sin rutas está deprecado"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "no es posible generar diff para '%s'"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "mezclado"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "suave"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "duro"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "fusionar"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el HEAD del árbol."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No se puede realziar un reset %s en medio de una fusión."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e index"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "reiniciar HEAD, índice y árbol de trabajo"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
"grabar solo el hecho de que las rutas removidas serán agregadas después"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Falló al resolver '%s' como una revisión válida."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Falló al resolver '%s' como un árbol válido."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No se puede hacer un reset %s con rutas."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset no está permitido en un repositorio vacío"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N sólo puede ser usada con --mixed"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16628,53 +18879,53 @@
"usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n"
"para volverlo en el default.\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No se puede reiniciar el índice a la revisión '%s'."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "no se puede combinar --exclude-promisor-objects y --missing"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "filtrado de objetos requiere --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valor disperso inválido: '%s'"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list no soporta mostrar notas"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "mantener el `--` pasado como un arg"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "detener análisis tras el primer argumento que no es opción"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "salida en formulario largo de atasco"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16705,72 +18956,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subcomando>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "opción `%s' espera un valor numérico mayor a cero"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s no puede ser usado con %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "finalizar secuencia revert o cherry-pick"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "resumir secuencia revert o cherry-pick"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "cancelar secuencia revert o cherry-pick"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "saltar el commit actual y continuar"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "no realizar commit de forma automática"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "editar el mensaje de commit"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "número-de-padre"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "seleccionar el padre principal"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "estrategia de fusión"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opción para estrategia de fusión"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "adjuntar el nombre del commit"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "preservar commits iniciales vacíos"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opciones>] [--] <archivo>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -16784,7 +19044,7 @@
"los siguientes archivos tienen contenido diferente a los mismos\n"
"y a HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -16792,13 +19052,13 @@
"\n"
"(usa -f para forzar su eliminación)"
-#: builtin/rm.c:215
+#: 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] "el siguiente archivo tiene cambios en stage en el índice:"
msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -16806,44 +19066,44 @@
"\n"
"(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "el siguiente archivo tiene modificaciones locales:"
msgstr[1] "los siguientes archivos tienen modificaciones locales:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "no listar archivos eliminado"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "solo eliminar del índice"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "sobrescribir el check de actualizado"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "permitir eliminar de forma recursiva"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "salir con estado cero incluso si nada coincide"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
"para proceder"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "no removiendo '%s' de manera recursiva sin -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no es posible eliminar %s"
@@ -16876,18 +19136,6 @@
msgid "print status from remote helper"
msgstr "mostrar status del remote helper"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<opciones>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "sale después de un intercambio petición/respuesta único"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "salir inmediatamente tras anunciar capacidades"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
@@ -16920,7 +19168,7 @@
msgid "Linewrap output"
msgstr "Salida de línea"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "demasiados argumentos dados fuera del repositorio"
@@ -16947,119 +19195,119 @@
msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "no hay refs que concuerden con %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "mostrar ramas locales y de rastreo remoto"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "mostrar ramas de rastreo remoto"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "color '*!+-' correspondiendo a la rama"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar <n> commits más tras encontrar el ancestro común"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinónimo de más=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "suprimir strings de nombre"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "incluir la rama actual"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "nombrar commits con sus nombres de objeto"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mostrar bases de fusión posibles"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "mostrar refs inalcanzables por ningún otro ref"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "mostrar commits en orden topológico"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "mostrar solo commits que no están en la primera rama"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "mostrar fusiones alcanzables solo por una punta"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "no se dieron ramas, y el HEAD no es válido"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "opción --reflog necesita un nombre de rama"
-#: builtin/show-branch.c:742
+#: 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] "solo %d entrada puede ser mostrada a la vez."
msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "no existe el ref %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no se puede manejar más de %d rev."
msgstr[1] "no se puede manejar más de %d revs."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' no es una ref válida."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -17067,42 +19315,268 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patrón>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "solo mostrar tags (puede ser combinado con heads)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "solo mostrar heads (puede ser combinado con tags)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "tags de deferencia en IDs de objeto"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "solo mostrar hash SHA1 usando <n> dígitos"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "no mostrar resultados en stdout (útil con --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que no están en el repositorio local"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opciones>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opciones>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <nombre-rama> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
+" [--] [<pathspec>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<mensaje>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' no es un commit estilo stash"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Se especificaron demasiadas revisiones: %s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "No se encontraron entradas de stash."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s no es una referencia válida"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear con parámetros no está implementado"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "no se puede aplicar un stash en medio de un merge"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "no se pudo generar diff %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "conflictos en índice. Intente sin --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "no se puede guardar el índice del árbol"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "no se pueden restaurar archivos no rastreados de la entrada stash"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Fusionando %s con %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "El índice no fue sacado de stash."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "intento de recrear el index"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Botado %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: No se pudo borrar entrada stash"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' no es una referencia stash"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "No se especificó el nombre de la rama"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "No se puede actualizar %s con %s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "mensaje de stash"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" requiere un argumento <commit>"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Sin cambios seleccionados"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Aún no tienes un commit inicial"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "No se puede guardar el estado actual del índice"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "No se pueden guardar los archivos no rastreados"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "No se puede guardar el estado actual del árbol de trabajo"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "No se puede grabar el estado del árbol de trabajo"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Olvidaste 'git add'?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "No hay cambios locales para guardar"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "No se puede inicializar stash"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "No se puede guardar el estado actual"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Directorio de trabajo guardado y estado de índice %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "No se pueden eliminar cambios del árbol de trabajo"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "mantener index"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "stash en modo patch"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "modo tranquilo"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "incluir archivos sin seguimiento en stash"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "incluir archivos ignorados"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "no se pudo ejecutar %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17111,49 +19585,49 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"saltar y borrar todas las líneas que comienzan con un carácter de comentario"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "anteponer carácter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "subomdule--helper print-default-remote no toma argumentos"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrando '%s'\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17162,7 +19636,7 @@
"run_command devolvió estado no-cero para %s\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17173,19 +19647,19 @@
"anidados de %s\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Suprime la salida al inicializar cada comando de submódulo"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Recursar en submódulos anidados"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <ruta>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17194,57 +19668,57 @@
"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
"su propio upstream autoritativo."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Suprime la salida para inicializar un submódulo"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<ruta>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<opciones>] [<path>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falló al recursar en el submódulo '%s'"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Suprimir output del estado del submódulo"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -17252,56 +19726,56 @@
"Usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "recursar en submódulos anidados"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url del submódulo para '%s'\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "error al actualizar el remoto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Suprime la salida del url del submódulo que se sincroniza"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, 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 ""
"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
-"rf' si realmente quiere eliminarlo incluyendo todo en su historia)"
+"rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17310,81 +19784,81 @@
"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
"'-f' para descartarlas"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directorio '%s' limpiado\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no se pudo crear directorio vacío de submódulo %s"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-"Remover arboles de trabajo de submódulos incluso si contienen cambios locales"
+"Remover árboles de trabajo de submódulos incluso si contienen cambios locales"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Quitar todos los submódulos"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "forzar el proceso de clonado"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17393,142 +19867,150 @@
"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
"<ruta>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'"
+msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-"Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'"
+"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
-msgstr "Tal vez quiere usar 'update --init'?"
+msgstr "Tal vez quieres usar 'update --init'?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "ruta hacia el árbol de trabajo"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncado al número especificado de revisión"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "trabajos paralelos"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación superficial"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonado"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-"Rama de submódulo (%s) configurada para heredar rama del superproyecto, "
-"pero el superproyecto no está en ninguna rama"
+"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
+"el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no se pudo conseguir un handle para el submódulo '%s'"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<ruta>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "revisar is es seguro escribir el archivo .gitmodules"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config name <valor>"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "desconfigura la opción en elarchivo .gitmodules"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nombre> [<valor>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nombre>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' no es un comando submodule--helper valido"
+msgstr "'%s' no es un comando submodule--helper válido"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -17560,17 +20042,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
-"<nombre-de-tag> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n"
+"\t\t<nombre-tag> [<head>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nombre-de-tag>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17580,21 +20062,21 @@
"points-at <objeto>]\n"
"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' no encontrado."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' eliminada (era %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17607,7 +20089,7 @@
" %s\n"
"Las líneas que comienzan con '%c' serán ignoradas.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17622,146 +20104,159 @@
"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
"ti mismo si quieres hacerlo.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "incapaz de firmar tag"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "incapaz de escribir el archivo de tag"
-#: builtin/tag.c:218
+#: 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 ""
+"Has creado un tag anidado. El objeto referido por el nuevo tag ya\n"
+"es un tag. Si quisiste hacer el tag al objeto que apunta, usa:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "¿Sin mensaje de tag?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "El mensaje del tag ha sido dejado en %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de tag"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contienen el commit"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contienen el commit"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "sólo imprimir las tags que están fusionadas"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "sólo imprimir las tags que no están fusionadas"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "sólo imprimir tags de el objeto"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en modo lista"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "sólo se permite una de las opciones, -m ó -F."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "demasiados parámetros"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de tag válido."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -17770,203 +20265,203 @@
msgid "Unpacking objects"
msgstr "Desempaquetando objetos"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "falló al crear directorio %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "falló al crear el archivo %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "falló al eliminar el archivo %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "falló al eliminar directorio %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Probando mtime en '%s' "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"info de estado del directorio no cambia tras agregar un nuevo directorio"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "info de estado del directorio cambia tras actualizar un archivo"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"info de estado del directorio cambia tras agregar un archivo dentro del "
"subdirectorio"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "info de estado del directorio no cambia tras borrar un archivo"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "info de estado del directorio no cambia tras borrar un directorio"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opciones>] [--] [<archivo>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
"continuar refresh (Actualización) incluso cuando el índice necesita "
"actualización"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "refresh: ignora submódulos"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "no ignorar archivos nuevos"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "permitir que archivos remplacen directorios y vice-versa"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "avisar de archivos faltando en el árbol de trabajo"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "refresh información de estado"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, pero ignora configuración assume-unchanged"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<ruta>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "agregar la entrada especificada al índice"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "marcar archivos como \"not changing\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "limpiar bit assumed-unchanged"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "marcar archivos como \"index-only\""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "limpiar bit skip-worktree"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"agregar solo al índice; no agregar contenido a la base de datos de objetos"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos"
+msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "leer la lista de rutas para ser actualizada desde standard input"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "agregar entradas de standard input al índice"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repoblar stages #2 y #3 para las rutas listadas"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "solo actualizar entradas que difieren de HEAD"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignorar archivos faltantes en el árbol de trabajo"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "reportar acciones por standard output"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "escribir índice en este formato"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "activar o desactivar índice dividido"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "habilitar o deshabilitar caché no rastreado"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "probar si el filesystem soporta caché no rastreado"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "habilitar caché no rastreado sin probar el filesystem"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "escribir el índice incluso si no está marcado como cambiado"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "activar o desactivar monitor de sistema de archivos"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "marcar archivos como válidos para fsmonitor"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "limpia el bit de validación fsmonitor"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -17974,7 +20469,7 @@
"core.splitIndex está configurado en false; remuévelo o cámbialo, si "
"realmente quieres habilitar el índice partido"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -17982,7 +20477,7 @@
"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
"quieres deshabilitar el índice partido"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -17990,11 +20485,11 @@
"core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
"realmente quieres deshabilitar el chaché no rastreado"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Caché no rastreado deshabilitado"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -18002,29 +20497,29 @@
"core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
"realmente quieres habilitar el caché no rastreado"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Caché no rastreado habilitado para '%s'"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor no está configurado; actívalo si realmente quieres habilitar "
"fsmonitor"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor activado"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar "
"el fsmonitor"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor desactivado"
@@ -18070,6 +20565,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opciones>] <directorio>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "sale después de un intercambio petición/respuesta único"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "salir inmediatamente tras el anuncio inicial de ref"
@@ -18082,15 +20581,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "imprimir contenido del commit"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "muestra la salida de status gpg en formato raw"
@@ -18106,63 +20605,63 @@
msgid "show statistics only"
msgstr "solo mostrar estadísticas"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "imprimir contenido del tag"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opciones>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opciones>] <ruta>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> <nueva-ruta>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opciones>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opciones>] <worktree>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "falló al borrar '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Removiendo el worktrees/%s: no es un directorio válido"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18171,36 +20670,36 @@
"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
"bytes, %<PRIuMAX> leídos)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "reporta árboles de trabajo recortados"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "expirar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "no es posible volver a agregar el árbol '%s'"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18210,7 +20709,7 @@
"usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
"limpiar"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18224,119 +20723,119 @@
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
"trabajo"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no se pudo descubrir el nombre de destino de '%s'"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "el objetivo '%s' ya existe"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18345,7 +20844,7 @@
"no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18353,36 +20852,36 @@
"no se puede mover un árbol de trabajo bloqueado;\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' está sucio, use --force para borrarlo"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18391,7 +20890,7 @@
"no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18399,28 +20898,28 @@
"no se pueden eliminar árbol de trabajo bloqueado;\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<prefijo>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "escribir objeto de árbol para un subdirectorio <prefijo>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "sólo útil para depurar"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18428,13 +20927,13 @@
"\n"
"\tchmod 0700 %s"
msgstr ""
-"Los permisos en su directorio de socket son demasiado flojos; otros\n"
-"usuarios pueden leer sus credenciales almacenadas en caché. Considere "
+"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
"ejecutar:\n"
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "mostrar mensajes de debug en stderr"
@@ -18447,6 +20946,14 @@
msgid "too many commits marked reachable"
msgstr "demasiados commits marcados como alcanzables"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opciones>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "salir inmediatamente tras anunciar capacidades"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18467,101 +20974,155 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
-"para leer sobre un subcomando o concepto específico."
+"para leer sobre un subcomando o concepto específico.\n"
+"Mira 'git help git' para una vista general del sistema."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no se entregó directorio para --git-dir\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no se entregó namespace para --namespace\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no se entregó directorio para --work-tree\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "no se entregó prefijo para --super-prefix\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera un string de configuración\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "no se entregó directorio para -C\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "opción %s desconocida\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "al expandir el alias '%s':'%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"alias '%s' cambia las variables de entorno.\n"
+"Puedes usar '!git' en el alias para hacer esto"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vacío para %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursivo: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "error de escritura en standard output"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "error desconocido de escritura en standard output"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "cierre falló en standard output"
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "no se puede manejar %s como un builtin"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"uso: %s\n"
+"\n"
+"\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "falló al ejecutar comando '%s': %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegación de control no es soportada con cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
"SSL"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18572,39 +21133,172 @@
" preguntaba por: %s\n"
" redireccionamiento: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "quoting inválido en valor de push-option: '%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
+"packet"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "respuesta de servidor inválida; se obtuvo '%s'"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "repositorio '%s' no encontrado"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Autenticación falló para '%s'"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "no es posible acceder '%s':%s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "redirigiendo a %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "no debería tener EOF cuando no es gentil en EOF"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC falló; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "no se puede manejar pushes tan grandes"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "no se puede desinflar el request; zlib deflate error %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "no se puede desinflar el request; zlib end error %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "dump http transport no soporta capacidades superficiales"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "fetch falló."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "no se puede hacer fetch por sha1 sobre smart http"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http transport no soporta %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push falló"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: error leyendo command stream de git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: fetch intentado sin un repositorio local"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: comando '%s' desconocido de git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "args"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "filtrado de objeto"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "fecha de expiración"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
-msgstr "ser mas verboso"
+msgstr "ser más verboso"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
-msgstr "ser mas discreto"
+msgstr "ser más discreto"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> dígitos para mostrar SHA-1s"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "cómo quitar espacios y #comentarios de mensajes"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "clave"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "nombre del campo por el cuál ordenar"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualizar el índice con la resolución de conflictos reutilizada si es "
+"posible"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Agrega contenido de carpetas al índice"
@@ -18865,8 +21559,8 @@
msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
-msgstr "agregar o analizar información estructurada en mensajes de commit"
+msgid "Add or parse structured information in commit messages"
+msgstr "Agregar o analizar información estructurada en mensajes de commit"
#: command-list.h:114
msgid "The Git repository browser"
@@ -18898,7 +21592,7 @@
#: command-list.h:121
msgid "Join two or more development histories together"
-msgstr "Junta dos o mas historiales de desarrollo juntos"
+msgstr "Junta dos o más historiales de desarrollo juntos"
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
@@ -19041,228 +21735,230 @@
msgstr "Reinicia el HEAD actual a un estado especifico"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Restaurar archivos de árboles de trabajo"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Revierte algunos commits existentes"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronológico inverso"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Seleccionar y masajear los parámetros"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Borra archivos del árbol de trabajo y del índice"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Envía una colección de parches como e-mails"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Empujar objetos por protocolo Git a otro repositorio"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Resumir la salida 'git log'"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Muestra varios tipos de objetos"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Mostrar ramas y sus commits"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Mostrar el índice de archivo empaquetado"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Listar referencias en el repositorio local"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "El código de configuración i18n de Git para scripts de shell"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Código de configuración de script de shell común de Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr ""
"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
"maneras"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Agrega contenidos de un archivo al área de staging"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Muestra el estado del árbol de trabajo"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Eliminar el espacio en blanco innecesario"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Inicializa, actualiza o inspecciona submódulos"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operación bidireccional entre un repositorio Subversion y Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Cambiar branches"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Lee, modifica y borra referencias simbólicas"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Crea un archivo temporal con contenidos de un blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objetos de un archivo empaquetado"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Actualiza el archivo de información auxiliar para ayudar a los servidores "
"dumb"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Enviar archivo a git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Enviar objetos empaquetados a git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Mostrar una variable lógica de Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Verificar firma GPG de commits"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valida archivos Git empaquetados"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG de etiquetas"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Muestra logs con las diferencias que cada commit introduce"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples árboles de trabajo"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Crea un objeto árbol del índice actual"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definiendo atributos por ruta"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Interfaz y convenciones de línea de comandos de Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Un tutorial básico de Git para desarrolladores"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git para usuarios CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Afinar la salida de diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunto mínimo útil de comandos diarios de Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un Glosario de Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Hooks utilizados por Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submódulo"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
-msgstr "namespaces de Git"
+msgstr "Namespaces de Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposición del repositorio Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial de introducción a Git: parte dos"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Un tutorial de introducción para Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"actualizar el índice con la resolución de conflictos reutilizada si es "
-"posible"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Debes iniciar con \"git bisect start\""
@@ -19274,133 +21970,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "¿Quieres que lo haga por ti [Y/n]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opción no reconocida: '$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' no parece ser una revisión válida"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Mal HEAD - Necesito un HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "no se bisecará en un árbol con cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Mal HEAD - ref simbólico extraño"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Mal argumento bisect_write: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Mala entrada rev: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Mala entrada rev: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Mala entrada rev: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Peligro: bisecando solo con un $TERM_BAD commit."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "¿Estás seguro [Y/n]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Tiene que dar al menos un $bad_syn y un $good_syn revision.\n"
-"(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Tiene que comenzar por \"git bisect start\".\n"
-"Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n"
-"(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "No estamos bisecando."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' no es un commit válido"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"No se pudo revisar el HEAD original '$branch'.\n"
-"Intente 'git bisect reset <commit>'."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Ningún logfile proporcionado"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no se puede leer $file para reproducir"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? ¿De qué estás hablando?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "bisect falló: no se proveyó comando."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "ejecutando $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19409,11 +22021,11 @@
"bisect falló:\n"
"código de salida $res de '$command' es <0 o >=128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "bisect no puede seguir continuando"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19422,36 +22034,20 @@
"bisect falló:\n"
"'bisect_state $state' salió con código de error $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "bisect exitoso"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "no hay términos definidos"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"argumento inválido $arg para 'git bisect terms'.\n"
-"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-"
-"new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "No estamos bisecando."
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por "
+"Error: Tus cambios locales de los siguientes archivos serán sobrescritos por "
"la fusión"
#: git-merge-octopus.sh:61
@@ -19486,265 +22082,115 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Fusión simple no funcionó, intentando fusión automática."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "No se puede regresar a $head_name"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Parece que ya hay un directorio $state_dir_base, y\n"
-"me pregunto si está en medio de otro rebase. Si ese es el \n"
-"caso, por favor intente\n"
-"\t$cmd_live_rebase\n"
-"Si no es el caso, por favor\n"
-"\t$cmd_clear_stale_rebase\n"
-"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
-"algo de valor ahí."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'"
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "upstream inválido '$upstream_name'"
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: hay más de una base de fusión"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: no hay base de fusión"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "No apunta a un commit válido: $onto_name"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "fatal: no existe la rama/commit: '$branch_name'"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Autostash creado: $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "La rama actual $branch_name está actualizada."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Rama actual $branch_name está actualizada, rebase forzado."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Cambios hacia $onto:"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Cambios desde $mb a $onto:"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
-"de ésta..."
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Avance rápido de $branch_name a $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear con parámetros no está implementado"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Aún no tienes un commit inicial"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "No se puede guardar el estado actual del índice"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "No se pueden guardar los archivos no rastreados"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "No se puede guardar el estado actual del árbol de trabajo"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Sin cambios seleccionados"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "No se puede eliminar el índice temporal (no puede suceder)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "No se puede grabar el estado del árbol de trabajo"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No se puede actualizar $ref_stash con $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "error: opción desconocida para 'stash pus': $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "No hay cambios locales para guardar"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "No se puede inicializar stash"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "No se puede guardar el estado actual"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "No se pueden eliminar cambios del árbol de trabajo"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "opción desconocida: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "No se encontraron entradas de stash."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Se especificaron demasiadas revisiones: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no es una referencia válida"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no es un commit estilo stash"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no es una referencia stash"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "incapaz de refrescar el índice"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No se puede aplicar un stash en medio de una fusión"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Conflictos en índice. Intente sin --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "No se puede guardar el índice del árbol"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "No se puede sacar de stage archivos modificados"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "El índice no fue sacado de stash."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Botado ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No se pudo borrar entrada stash"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "No se especificó el nombre de la rama"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para restaurarlos, escribe \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
"trabajo"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ya existe en el índice"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' no tiene un commit checked out"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -19755,24 +22201,24 @@
"$sm_path\n"
"Usa -f si en verdad quieres agregarlo."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Agregando el repositorio existente en '$sm_path' al índice"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ya existe y no es un repositorio git válido"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Se encontró localmente un directorio git para '$sm_name' con el(los) "
"remoto(s):"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -19784,44 +22230,44 @@
msgstr ""
"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
" $realrepo\n"
-"use la opción '--force'. Si el directorio git local no es el repositorio "
+"usa la opción '--force'. Si el directorio git local no es el repositorio "
"correcto\n"
-"o no está seguro de lo que esto significa, escoja otro nombre con la opción "
+"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
"'--name'."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No es posible hacer checkout al submódulo '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falló al agregar el submódulo '$sm_path'"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falló al registrar el submódulo '$sm_path'"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No se pudo encontrar la revisión actual en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -19830,12 +22276,16 @@
"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
"de submódulo '$sm_path'"
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
+"intentando hacer un fetch directo $sha1:"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -19844,75 +22294,75 @@
"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
"Fetch directo del commit falló."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falló la ejecución de '$command $sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "La opción --cached no puede ser usada con la opción --files"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo $mod_dst inesperado"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Advertencia: $display_name no contiene el commit $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Advertencia: $display_name no contiene el commit $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -19923,12 +22373,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "Véase git-${cmd}(1) para más detalles."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Autostash aplicado."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No se puede almacenar $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Rebasando ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -19968,7 +22427,7 @@
"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
"abajo.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -19979,91 +22438,91 @@
"\n"
"\tgit rebase --continue"
msgstr ""
-"Puede enmendar el commit ahora, con\n"
+"Puedes enmendar el commit ahora, con\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
-"Una vez que esté satisfecho con los cambios, ejecute\n"
+"Una vez que estés satisfecho con los cambios, ejecuta\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no es un commit que pueda ser cogido"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nombre de commit inválido: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "No se puede escribir el remplazo sha1 del commit actual"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rápido a $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No se puede realizar avance rápido a $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No se puede mover HEAD a $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Rehusando a ejecutar squash en fusión: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error rehaciendo fusión $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "No se pudo coger $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Este es el mensaje del commit #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El mensaje del commit #${n} será ignorado:"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Esta es una combinación de $count commit."
msgstr[1] "Esta es la combinación de $count commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No se puede escribir $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Esto es una combinación de 2 commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "No se puede aplicar $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20076,35 +22535,35 @@
"$rest\n"
"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
"commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el "
+"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
"problema antes\n"
"de que sea capaz de reformular el commit."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Detenido en $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No se puede '$squash_style' sin un commit previo"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Ejecutando: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ejecución fallida: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20115,7 +22574,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20126,29 +22585,29 @@
msgstr ""
"La ejecución tuvo éxito: $rest\n"
"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
-"Realice un commit o stash con los cambios y, a continuación, ejecute\n"
+"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Comando desconocido: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "$head_name rebasado y actualizado satisfactoriamente."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20165,26 +22624,26 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"Tiene cambios en el área de stage de su árbol de trabajo.\n"
+"Tienes cambios en el área de stage de tu árbol de trabajo.\n"
"Si estos cambios están destinados a \n"
-"ser aplastados en el commit previo, ejecute:\n"
+"ser aplastados en el commit previo, ejecuta:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
-"Si estos están destinados a ir en un nuevo commit, ejecute:\n"
+"Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"En ambos casos, cuando termine, continue con:\n"
+"En ambos casos, cuando termines, continue con:\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Error tratando de encontrar la identidad del autor para remediar el commit"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20192,40 +22651,40 @@
"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "No se pudo realizar el commit con los cambios en el área de stage."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "No se pudo ejecutar el editor"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "¿Sin HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No se pudo crear $state_dir temporalmente"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "No se pudo marcar como interactivo"
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Rebase $shortrevisions en $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "No se puede inicializar los commits reescritos"
@@ -20234,146 +22693,146 @@
msgid "usage: $dashless $USAGE"
msgstr "uso: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
"No se puede aplicar rebase: Tienes cambios que no están en el área de stage."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"No se puede reescribir las ramas: Tienes cambios que no están en el área de "
"stage."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"No se puede aplicar pull con rebase: Tienes cambios que no están en el área "
"de stage."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No se puede $action: Tienes cambios que no están en el área de stage."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"No se puede hacer rebase: Tu índice contiene cambios que no están en un "
"commit."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"No se puede hacer pull con rebase: Tu índice contiene cambios que no están "
"en un commit."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No se puede $action: El índice contiene cambios sin confirmar."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
"trabajo."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Incapaz de determinar la ruta absoluta del directorio git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "rastreado"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "no rastreado"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binario"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "nada"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "sin cambios"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "agregada %d ruta\n"
msgstr[1] "agregadas %d rutas\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualizada %d ruta\n"
msgstr[1] "actualizadas %d rutas\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertida %d ruta\n"
msgstr[1] "revertidas %d rutas\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "touch hecho a %d ruta\n"
msgstr[1] "touch hecho a %d rutas\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Actualizar"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Revertir"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Agregar no rastreados"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "No hay archivos sin rastrear.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20381,7 +22840,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para el área de stage."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20389,7 +22848,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para aplicar stash."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20397,7 +22856,8 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para sacar del área de stage."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20405,7 +22865,8 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
"inmediatamente para aplicar."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20413,16 +22874,16 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
"inmediatamente para descarte."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20436,17 +22897,17 @@
"Lineas comenzando con %s serán removidas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-"Si esto no aplica de manera limpia, se le da la oportunidad de \n"
+"Si esto no aplica de manera limpia, se te da la oportunidad de \n"
"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
"la edición es abortada y el hunk queda sin cambios.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "falló al abrir el archivo de edición del hunk para lectura: %s"
@@ -20457,13 +22918,13 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20478,7 +22939,7 @@
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20492,7 +22953,7 @@
"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20507,7 +22968,7 @@
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20521,7 +22982,7 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunko ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20535,7 +22996,7 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20549,7 +23010,7 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20563,7 +23024,21 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar este hunk al índice y al árbol de trabajo\n"
+"n - no aplicar este hunk al índice y al árbol de trabajo\n"
+"q - quit; no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20581,217 +23056,232 @@
"J - dejar este hunk por definir, ver siguiente hunk\n"
"k - dejar este hunk por definir, ver hunk previo por definir\n"
"K - dejar este hunk por definir, ver hunk previo\n"
-"s - dividir el hunk actual en hunks mas pequeños\n"
+"s - dividir el hunk actual en hunks más pequeños\n"
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Los hunks seleccionados no aplican al índice!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Aplicarlos al árbol de trabajo de todas maneras? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Nada fue aplicado.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorando lo no fusionado: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Actualización del parche"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "No hay más pedazos para el ir\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
-msgstr "a que hunk ir (<enter> para ver mas)? "
+msgstr "a que hunk ir (<enter> para ver más)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "a que hunk ir? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Numero inválido: '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lo siento, solo %d hunk disponible.\n"
msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "No hay más pedazos para buscar\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "buscar para regexp? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp para la búsqueda mal formado %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "No hay hunks que concuerden con el patrón entregado.\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "No el anterior hunk\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "No el siguiente hunk\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Perdón, no se puede dividir este pedazo\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Cortar en %d hunk.\n"
msgstr[1] "Cortar en %d hunks.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Perdón, no se puede editar este pedazo\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Revisión de diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -20811,18 +23301,19 @@
"add untracked - agrega contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "modo --patch desconocido: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, se esperaba --"
@@ -20835,31 +23326,31 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "el editor se cerro inapropiadamente, abortando todo"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contiene una versión intermedia del correo que se estaba generando.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contiene el email generado.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases no es compatible con otras opciones.\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -20867,37 +23358,37 @@
"`batch-size` y `relogin` deben ser especificados juntos (via la línea de "
"comando o por opción de configuración)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Campo --suppress-cc desconocido: '%s'\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Configuración --confirm desconocida: '%s'\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "peligro: `:include:` no soportado: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "advertencia: línea sendmail no reconocida: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -20912,12 +23403,12 @@
" * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
" * Agregando la opción --format-patch si se quiere decir un rango.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Falló al abrir directorio %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -20926,7 +23417,7 @@
"fatal: %s: %s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -20936,17 +23427,17 @@
"No se especificaron parches!\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "No hay línea de subject en %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Falló al abrir para escritura %s: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -20956,31 +23447,31 @@
msgstr ""
"Lineas que comienzan en \"GIT:\" serán removidas.\n"
"Considere incluir un diffstat global o una tabla de contenidos\n"
-"para el parche que está escribiendo.\n"
+"para el parche que estás escribiendo.\n"
"\n"
-"Limpiar el contenido de body si usted no desea mandar un resumen.\n"
+"Limpiar el contenido de body si no deseas mandar un resumen.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Falló al abrir %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Falló al abrir %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Archivo de resumen está vacío, saltando al siguiente\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Esta seguro de que desea usar <%s> [y/N]? "
+msgstr "Estás seguro de que deseas usar <%s> [y/N]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -20988,11 +23479,11 @@
"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Que codificación de 8bit debería declarar [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21005,39 +23496,39 @@
"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
"deseas mandar.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "A quien se deben mandar los correos (si existe)?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' se expande a si mismo\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si "
"existe alguno)? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr "error: no es posible extraer una dirección valida de %s\n"
+msgstr "error: no es posible extraer una dirección válida de %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Ruta CA \"%s\" no existe"
-#: git-send-email.perl:1412
+#: 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"
@@ -21057,7 +23548,7 @@
" Este comportamiento is controlado por el valor de configuración "
"sendemail.confirm.\n"
"\n"
-" Para mas información, ejecuta 'git send-email --help'.\n"
+" Para más información, ejecuta 'git send-email --help'.\n"
" Para mantener el comportamiento actual, pero evitar este mensaje,\n"
" ejecuta 'git config --global sendemail.confirm auto'.\n"
"\n"
@@ -21065,143 +23556,344 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Necesitas mandar esta respuesta de email"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP no esta definido adecuadamente."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no soporta STARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Falló STARTTLS! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
"smtp-debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Falló al enviar %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Dry-Sent %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Log dice:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Log dice:\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultado: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falló al cerrar el pipe para '%s'"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codificación de transferencia inválida"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "no es posible abrir %s: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
+msgstr "%s: el parche contiene una línea con más de 998 caracteres"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Realmente deseas mandar %s?[y|N]: "
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "El servidor soporta ulti_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "El servidor soporta no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "El servidor soporta multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "El servidor soporta side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "El servidor soporta side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "El servidor soporta allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "El servidor soporta allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "El servidor soporta ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD desacoplado en %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD desacoplado de %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Revisando archivos"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "falló al abrir '%s'"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "falló al analizar %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Si quiere saltar este commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
+#~ "para los commits restantes.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verbo no reconocido: %s"
+
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "versión de hash %X no concuerda con versión %X"
+
+#~ msgid "option '%s' requires a value"
+#~ msgstr "opción '%s' requiere un valor"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "no se pudo transformar lista de pendientes"
+
+#~ msgid "default"
+#~ msgstr "default"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "No se pudo crear el directorio '%s'"
+
+#~ msgid "allow rerere to update index with resolved conflict"
+#~ msgstr "permitir rerere actualizar index con conflictos resueltos"
+
+#~ msgid "could not open %s"
+#~ msgstr "no se pudo abrir %s"
+
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "No se puede regresar a $head_name"
+
+#~ msgid ""
+#~ "It seems that there is already a $state_dir_base directory, and\n"
+#~ "I wonder if you are in the middle of another rebase. If that is the\n"
+#~ "case, please try\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "If that is not the case, please\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "and run me again. I am stopping in case you still have something\n"
+#~ "valuable there."
+#~ msgstr ""
+#~ "Parece que ya hay un directorio $state_dir_base, y\n"
+#~ "me pregunto si está en medio de otro rebase. Si ese es el \n"
+#~ "caso, por favor intente\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "Si no es el caso, por favor\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
+#~ "algo de valor ahí."
+
+#~ msgid ""
+#~ "fatal: cannot combine am options with either interactive or merge options"
+#~ msgstr ""
+#~ "fatal: no se puede combinar opciones am con opciones interactivas o de "
+#~ "merge"
+
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'"
+
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr ""
+#~ "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr ""
+#~ "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'"
+
+#~ msgid "invalid upstream '$upstream_name'"
+#~ msgstr "upstream inválido '$upstream_name'"
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: hay más de una base de fusión"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: no hay base de fusión"
+
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "No apunta a un commit válido: $onto_name"
+
+#~ msgid "fatal: no such branch/commit '$branch_name'"
+#~ msgstr "fatal: no existe la rama/commit: '$branch_name'"
+
+#~ msgid "Created autostash: $stash_abbrev"
+#~ msgstr "Autostash creado: $stash_abbrev"
+
+#~ msgid "Current branch $branch_name is up to date."
+#~ msgstr "La rama actual $branch_name está actualizada."
+
+#~ msgid "Current branch $branch_name is up to date, rebase forced."
+#~ msgstr "Rama actual $branch_name está actualizada, rebase forzado."
+
+#~ msgid "Changes to $onto:"
+#~ msgstr "Cambios hacia $onto:"
+
+#~ msgid "Changes from $mb to $onto:"
+#~ msgstr "Cambios desde $mb a $onto:"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "Avance rápido de $branch_name a $onto_name."
+
+#~ msgid "First, rewinding head to replay your work on top of it..."
+#~ msgstr ""
+#~ "En primer lugar, rebobinando HEAD para después reproducir tus cambios "
+#~ "encima de ésta..."
+
+#~ msgid "ignoring unknown color-moved-ws mode '%s'"
+#~ msgstr "ignorando modo desconocido color-moved-ws '%s'"
+
+#~ msgid "only 'tree:0' is supported"
+#~ msgstr "solo 'tree:0' es soportado"
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Renombrando %s a %s y %s a %s más bien"
+
+#~ msgid "Adding merged %s"
+#~ msgstr "Agregar %s fusionado"
+
+#~ msgid "Internal error"
+#~ msgstr "Error interno"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr "línea principal especificada pero el commit %s no es una fusión."
+
+#~ msgid "unable to write sha1 filename %s"
+#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+
+#~ msgid "cannot read sha1_file for %s"
+#~ msgstr "no se puede leer sha1_file para %s"
+
+#~ msgid ""
+#~ "error: cannot combine interactive options (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
+#~ "options (%s)"
+#~ msgstr ""
+#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, "
+#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
+#~ "opciones (%s)"
+
+#~ msgid ""
+#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
+#~ "option) with am options (%s)"
+#~ msgstr ""
+#~ "error: no se puede combinar opciones de merge (--merge, --strategy, --"
+#~ "strategy-option) con opciones de am (%s)"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "opción no reconocida: '$arg'"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "'$invalid' no es un commit válido"
+
#~ msgid "could not parse '%s' (looking for '%s')"
#~ msgstr "no se pudo configurar '%s' (buscando '%s')"
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "mal citado en %s valor en '%s'"
-
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
-
#~ msgid "deprecated synonym for --create-reflog"
#~ msgstr "sinónimo deprecado para --create-reflog"
@@ -21223,12 +23915,6 @@
#~ msgid "cannot remove a locked working tree"
#~ msgstr "no se puede eliminar árbol de trabajo encerrado"
-#~ msgid "Applied autostash."
-#~ msgstr "Autostash aplicado."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "No se puede almacenar $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
@@ -21293,7 +23979,7 @@
#~ msgstr "Error en el objeto"
#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
+#~ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo EOF"
#~ msgid "invalid filter-spec expression '%s'"
#~ msgstr "expresión filter-spec inválida '%s'"
@@ -21323,9 +24009,6 @@
#~ msgid "could not truncate '%s'"
#~ msgstr "no se pudo truncar '%s'"
-#~ msgid "could not finish '%s'"
-#~ msgstr "no se pudo finalizar '%s'"
-
#~ msgid "could not close %s"
#~ msgstr "no se pudo cerrar %s"
@@ -21338,9 +24021,6 @@
#~ msgid "Don't know how to clone %s"
#~ msgstr "No se sabe como clonar %s"
-#~ msgid "show ignored files"
-#~ msgstr "mostrar archivos ignorados"
-
#~ msgid "Don't know how to fetch from %s"
#~ msgstr "No se sabe como extraer de %s"
@@ -21379,9 +24059,6 @@
#~ msgid "basename"
#~ msgstr "nombre base"
-#~ msgid "prepend parent project's basename to output"
-#~ msgstr "anteponer el nombre base del proyecto padre a la salida"
-
#~ msgid ""
#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
#~ " - $line"
diff --git a/po/fr.po b/po/fr.po
index a2008b6..55c7db6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
# French translations for Git.
-# Copyright (C) 2018 Jean-Noël Avila <jn.avila@free.fr>
+# Copyright (C) 2019 Jean-Noël Avila <jn.avila@free.fr>
# This file is distributed under the same license as the Git package.
-# Jean-Noël Avila <jn.avila@free.fr>, 2018.
+# Jean-Noël Avila <jn.avila@free.fr>, 2013-2019.
# Sébastien Helleu <flashcode@flashtux.org>, 2013.
#
# French translations of common Git words used in this file:
@@ -30,6 +30,7 @@
# to deflate | compresser
# email | courriel
# entry | élément
+# fanout | dispersion
# fast-forward | avance rapide
# fast-forwarded | mis à jour en avance rapide
# to fetch | rapatrier
@@ -74,47 +75,48 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-02 10:24+0100\n"
-"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-10 18:17+0200\n"
+"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
+"X-Generator: Poedit 2.2.3\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
-#: advice.c:170
+#: advice.c:180
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."
@@ -122,147 +124,168 @@
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
-"Note : extraction de '%s'.\n"
+"Note : basculement sur '%s'.\n"
"\n"
"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "
"modifications\n"
-"expérimentales et les valider. Il vous suffit de faire une autre extraction "
+"expérimentales et les valider. Il vous suffit de faire un autre basculement "
"pour\n"
"abandonner les commits que vous faites dans cet état sans impacter les "
"autres branches\n"
"\n"
"Si vous voulez créer une nouvelle branche pour conserver les commits que "
"vous créez,\n"
-"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme "
-"ceci :\n"
+"il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n"
"\n"
-" git checkout -b <nom-de-la-nouvelle-branche>\n"
+" git switch -c <nom-de-la-nouvelle-branche>\n"
+"\n"
+"Ou annuler cette opération avec :\n"
+"\n"
+" git switch -\n"
+"\n"
+"Désactivez ce conseil en renseignant la variable de configuration advice."
+"detachedHead à false\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "cmdline se termine par \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "citation non fermée"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "option d'espace non reconnue '%s'"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode invalide dans la ligne %d : %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "lignes d'entête inconsistantes %d et %d"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -277,83 +300,83 @@
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -362,463 +385,463 @@
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
"inverse"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retour à une fusion à 3 points…\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
-msgstr "Echec du retour à une fusion à 3 points…\n"
+msgstr "Échec du retour à une fusion à 3 points…\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "chemin"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "num"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
+msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "action"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "racine"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
@@ -841,99 +864,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "référence inexistante : %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nom d'objet invalide : %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "objet arbre invalide : %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "l'arbre de travail actuel est non-suivi"
+
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "préfixe"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fichier"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "dépôt"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "commande"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
@@ -953,16 +995,16 @@
msgid "cannot read %s"
msgstr "impossible de lire %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "impossible de démarrer le filtre '%s'"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "impossible de rediriger un descripteur"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "le filtre '%s' a retourné une erreur"
@@ -977,7 +1019,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
@@ -987,12 +1029,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s n'est pas un nom valide d'attribut"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s non permis : %s : %d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1005,17 +1052,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1024,7 +1071,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1033,7 +1080,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1042,7 +1089,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1053,7 +1100,7 @@
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1065,22 +1112,22 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
@@ -1120,46 +1167,46 @@
msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents et --reverse ne font pas bon ménage."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
"premier parent"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "pas de chemin %s dans %s"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossible de lire le blob %s pour le chemin %s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1170,99 +1217,99 @@
"\n"
"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
"l'information de suivi distant en invoquant\n"
-"\"git branch --setup-upstream-to=%s%s%s\"."
+"\"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "La branche %s ne peut pas être sa propre branche amont."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
"en rebasant."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
"'%s'."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
"rebasant."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
"rebasant."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
"rebasant."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Échec de l'écriture de la configuration de branche amont"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Pas de suivi : information ambiguë pour la référence %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' n'est pas un nom de branche valide."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Une branche nommée '%s' existe déjà."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
"pas une branche."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1282,27 +1329,27 @@
"sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
"pour paramétrer le suivi distant en même temps que vous poussez."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -1317,70 +1364,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "la vérification d'un colis requiert un dépôt"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Le colis contient cette référence :"
msgstr[1] "Le colis contient ces %d références :"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "impossible de dupliquer le descripteur de liasse"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
@@ -1389,9 +1440,8 @@
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -1401,7 +1451,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1421,27 +1471,27 @@
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1453,97 +1503,277 @@
"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
"projet.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "le fichier de graphe %s est trop petit"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "le graphe de commit est trop petit"
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "la signature de graphe %X ne correspond pas à la signature %X"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+"la signature du graphe de commit %X ne correspond pas à la signature %X"
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "la version %X du graphe ne correspond pas à la version %X"
+msgid "commit-graph version %X does not match version %X"
+msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "la version %X du condensé ne correspond pas à la version %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
+"version %X"
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"entrée de table de consultation de morceaux de graphe de commite manquante ; "
+"le fichier est peut être incomplet"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "décalage de bloc %08x%08x inadéquat"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "l'id de bloc %08x apparaît des multiples fois"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois"
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "le graphe de commit n'a pas de section de graphes de base"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la chaîne de graphe de commit ne correspond pas"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "impossible de trouver tous les fichiers du graphe de commit"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Annotation des commits dans un graphe de commit"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Lecture des commits connus dans un graphe de commit"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expansion des commits joignables dans un graphe de commit"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Suppression les marques de commit dans le graphe de commits"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Calcul des chiffres de génération du graphe de commits"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Recherche de commits pour un graphe de commits"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
+msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "erreur à l'ajout du packet %s"
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "erreur à l'ouverture de l'index pour %s"
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "le graphe de commits ne peut pas écrire %d commits"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"
+msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "trop de commits pour écrire un graphe"
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Comptage des commits distincts dans un graphe de commit"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "impossible de créer les répertoires de premier niveau de %s"
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Écriture le graphe de commits en %d passe"
+msgstr[1] "Écriture le graphe de commits en %d passes"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "impossible d'ouvrir le fichier de graphe de commit"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "échec du renommage du fichier de graphe de commits"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossible de renommer le fichier temporaire de graphe de commits"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Analyse des commits de fusion"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de commit %s dupliqué inattendu"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "fusion du graphe de commits"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "le graphe de commits ne peut pas écrire %d commits"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "trop de commits pour écrire un graphe"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"le graphe de commit a une somme de contrôle incorrecte et est "
"vraisemblablement corrompu"
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
+"%u != %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Verification des commits dans le graphe de commits"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
+"graphe de commit"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
+"%s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+"la liste des parents du graphe de commit pour le commit %s est trop longue"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "le parent du graphe de commit pour %s est %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
+"non-nul ailleurs"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
+"mais nul ailleurs"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "la génération du graphe de commit pour le commit %s est %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"la date de validation pour le commit %s dans le graphe de commit est "
+"%<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1558,313 +1788,313 @@
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "hors plage"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la référence '%s' ne pointe pas sur un blob"
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
"défaut"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
"100"
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
-msgstr "impossible d réaliser un map de '%s'"
+msgstr "impossible de réaliser un map de '%s'"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
@@ -1917,50 +2147,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "le dépôt distant ne peut pas être superficiel"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "erreur distante : %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "paquet invalide"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "erreur de protocole : '%s' attendu"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "réponse à ls-ref invalide : %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "vidage attendu après le listage de références"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "le protocole '%s' n'est pas supporté"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "Recherche de %s… "
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "impossible de rechercher %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1969,7 +2194,7 @@
"fait.\n"
"Connexion à %s (port %s)… "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1979,54 +2204,54 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "fait."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "impossible de rechercher %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "port inconnu %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "nom d'hôte étrange '%s' bloqué"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "port étrange '%s' bloqué"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "impossible de démarrer un proxy %s"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
"d'URL valide"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "la variante ssh 'simple' ne supporte pas -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "la variante ssh 'simple' ne supporte pas -6"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "chemin étrange '%s' bloqué"
@@ -2035,33 +2260,33 @@
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "crlf_action illégal %d"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "Les CRLF seraient remplacés par des LF dans %s"
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -2070,12 +2295,12 @@
"Les CRLF seront remplacés par des LF dans %s.\n"
"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "Les LF seraient remplacés par des CRLF dans %s"
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -2084,12 +2309,12 @@
"Les LF seront remplacés par des CRLF dans %s.\n"
"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -2098,12 +2323,12 @@
"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "
"utiliser UTF-%s comme encodage d'arbre de travail."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2113,39 +2338,39 @@
"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "
"de travail."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "échec de l'encodage de '%s' de %s vers %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "
"contenu"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "impossible de forker pour lancer le filtre externe '%s'"
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "impossible de fournir l'entrée au filtre externe '%s'"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "le filtre externe '%s' a échoué %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "la lecture depuis le filtre externe '%s' a échoué"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "le filtre externe '%s' a échoué"
@@ -2181,53 +2406,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s : le filtre smudge '%s' a échoué"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "dans le futur"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "il y a %<PRIuMAX> seconde"
msgstr[1] "il y a %<PRIuMAX> secondes"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "il y a %<PRIuMAX> minute"
msgstr[1] "il y a %<PRIuMAX> minutes"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "il y a %<PRIuMAX> heure"
msgstr[1] "il y a %<PRIuMAX> heures"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "il y a %<PRIuMAX> jour"
msgstr[1] "il y a %<PRIuMAX> jours"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "il y a %<PRIuMAX> semaine"
msgstr[1] "il y a %<PRIuMAX> semaines"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "il y a %<PRIuMAX> mois"
msgstr[1] "il y a %<PRIuMAX> mois"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2235,42 +2460,42 @@
msgstr[1] "%<PRIuMAX> ans"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "il y a %s et %<PRIuMAX> mois"
msgstr[1] "il y a %s et %<PRIuMAX> mois"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "il y a %<PRIuMAX> an"
msgstr[1] "il y a %<PRIuMAX> ans"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Propagation des marques d'îlots"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "objet arbre invalide %s"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "impossible de charger la regex île pour '%s' : %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"l'expression rationnelle depuis la configuration a trop de groupes de "
"capture (max=%d)"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Marquage de %d îlots, fait.\n"
@@ -2284,23 +2509,30 @@
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "le commutateur '%s' a besoin d'une valeur"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<options>] <chemin> <chemin>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
+"arbre de travail"
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2308,26 +2540,31 @@
"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
"'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "mode color-moved-ws inconnu '%s' ignoré"
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
"d'autres modes d'espace"
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2336,24 +2573,35 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valeur invalide de --stat : %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s attend une valeur numérique"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2362,24 +2610,533 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valeur inconnue après ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossible de résoudre '%s'"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "forme <n>/<m> attendue par %s"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "caractère attendu par %s, '%s' trouvé"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "mauvais argument --color-moved : %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode invalide '%s' dans --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
+"\"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argument invalide pour %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "mauvais argument pour --word-diff : %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Options de format de sortie de diff"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "générer la rustine"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "supprimer la sortie des différences"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "générer les diffs avec <n> lignes de contexte"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "générer le diff en format brut"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "synonyme de '-p --raw'"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "synonyme de '-p --stat'"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "--stat pour traitement automatique"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "afficher seulement la dernière ligne de --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"afficher la distribution des quantités de modifications relatives pour "
+"chaque sous-répertoire"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "synonyme pour --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonyme pour --dirstat=files,param1,param2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"avertir si les modifications introduisent des marqueurs de conflit ou des "
+"erreurs d'espace"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"résumé succinct tel que les créations, les renommages et les modifications "
+"de mode"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "n'afficher que les noms de fichiers modifiés"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "n'afficher que les noms et les status des fichiers modifiés"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "générer un diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<largeur>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "générer un diffstat avec la largeur indiquée"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "génerer un diffstat avec la largeur de nom indiquée"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "génerer un diffstat avec la largeur de graphe indiquée"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<compte>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "générer un diffstat avec des lignes limitées"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "générer une résumé compact dans le diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "produire un diff binaire qui peut être appliqué"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"afficher les noms complets des objets pre- et post-image sur les lignes "
+"\"index\""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "afficher un diff coloré"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<sorte>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
+"'nouveau' dans le diff"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
+"champs dans --raw ou --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<préfixe>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"afficher le contexte entre les sections à concurrence du nombre de ligne "
+"indiqué"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<caractère>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Options de renommage de diff"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"casser les modifications d'une réécrire complète en paires de suppression et "
+"création"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "détecter les renommages"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "supprimer la pré-image pour les suppressions"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "détecter les copies"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr ""
+"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "désactiver la détection de renommage"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "utiliser des blobs vides comme source de renommage"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
+"copie excède la limite indiquée"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Options de l'algorithme de diff"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "produire le diff le plus petit possible"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorer les espaces lors de la comparaison de ligne"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorer des modifications du nombre d'espaces"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorer des modifications d'espace en fin de ligne"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignore le retour chariot en fin de ligne"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorer les modifications dont les lignes sont vides"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"heuristique qui déplace les limites de sections de diff pour faciliter la "
+"lecture"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+"générer un diff en utilisant l'algorithme de différence \"histogramme\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algorithme>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "choisir un algorithme de différence"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<texte>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"afficher des différences par mot, en utilisant <mode> pour délimiter les "
+"mots modifiés"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "utiliser <regex> pour décider ce qu'est un mot"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "les lignes déplacées sont colorées différemment"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "comment les espaces sont ignorés dans --color-moved"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Autres options diff"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
+"afficher les chemins relatifs"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "traiter les fichiers comme texte"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "échanger les entrées, inverser le diff"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "désactiver tous les affichages du programme"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "autoriser l'exécution d'un assistant externe de diff"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"lancer les filtres externes de conversion en texte lors de la comparaison de "
+"fichiers binaires"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<quand>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+"ignorer les modifications dans les sous-modules lors de la génération de diff"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "spécifier comment les différences dans les sous-modules sont affichées"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "masquer les entrées 'git add -N' de l'index"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<chaîne>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la "
+"chaîne spécifiée"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la regex "
+"spécifiée"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
+"afficher toutes les modifications dans l'ensemble de modifications avec -S "
+"ou -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<id-objet>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
+"indiqué"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "sélectionner les fichiers par types de diff"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<fichier>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Sortie vers un fichier spécifié"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -2387,41 +3144,41 @@
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "fichier d'index corrompu dans le dépôt %s"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
@@ -2437,7 +3194,7 @@
msgid "Filtering content"
msgstr "Filtrage du contenu"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
@@ -2452,7 +3209,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "impossible de régler GIT_DIR à '%s'"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
@@ -2463,250 +3220,239 @@
#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack : list courte attendue"
+msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+"git fetch-pack : paquet de vidage attendu après une liste superficielle"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "impossible d'écrire sur un distant"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fait"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Le serveur ne supporte les clients superficiels"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Le serveur supporte multi_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "Le serveur support no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Le serveur supporte multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Le serveur supporte side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Le serveru supporte side-band"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Le serveur supporte allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Le serveur supporte ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "Le serveur supporte filter"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Le serveur supporte %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Le serveur ne supporte les clients superficiels"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte les requêtes superficielles"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Le serveur supporte filter"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "impossible d'écrire la requête sur le distant"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
@@ -2716,18 +3462,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
@@ -2785,43 +3531,43 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Commandes bas niveau / Assistants internes"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "type de liste de commandes non supporté '%s'"
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Les guides Git populaires sont :"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
"Référez-vous à 'git help <commande>' pour des informations sur une sous-"
"commande spécifique"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Commandes externes"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Alias de commande"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2830,33 +3576,33 @@
"'%s' semble être une commande git, mais elle n'a pas pu\n"
"être exécutée. Peut-être git-%s est-elle cassée ?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ahem. Votre système n'indique aucune commande Git."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuons en supposant que vous avez voulu dire '%s'."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2870,16 +3616,16 @@
"\n"
"Les commandes les plus ressemblantes sont"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2893,7 +3639,7 @@
"\n"
"Vouliez-vous dire un de ceux-là ?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2919,48 +3665,74 @@
"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
"\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "aucun courriel fourni et l'auto-détection est désactivée"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "aucun nom fourni et l'auto-détection est désactivée"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identifiant vide (pour <%s>) non permis"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossible de charger l'arbre racine pour le commit %s"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "impossible de combiner des spécificateurs multiples de filtre"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "seul 'tree:0' est supporté"
+msgid "expected 'tree:<depth>'"
+msgstr "attendu : 'tree:<profondeur>'"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse : le support des filtres de chemin a été abandonné"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "spécificateur de filtre invalide '%s'"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "impossible de modifier le prometteur distant de clone partiel"
@@ -2979,7 +3751,7 @@
"\n"
"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
-"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n"
+"que tous les processus sont terminés et réessayez. Si l'échec persiste,\n"
"un processus git peut avoir planté :\n"
"supprimez le fichier manuellement pour poursuivre."
@@ -2992,12 +3764,13 @@
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
@@ -3006,102 +3779,102 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Échec de la fusion du sous-module %s (non extrait)"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Échec de fusion du sous-module %s (commits non présents)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
"base de fusion)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avance rapide du sous-module %s au commit suivant :"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rapide du sous-module %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3118,33 +3891,33 @@
"\n"
"qui acceptera cette suggestion.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
"place."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3153,7 +3926,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3162,7 +3935,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3171,7 +3944,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3180,31 +3953,41 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Refus de perdre le fichier modifié %s"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3213,28 +3996,18 @@
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Renommage de %s en %s et de %s en %s à la place"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3245,7 +4018,7 @@
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3254,7 +4027,7 @@
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3263,7 +4036,7 @@
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3272,7 +4045,7 @@
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3281,37 +4054,21 @@
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
"renommé."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Ajout de %s fusionné"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Ajout plutôt comme %s"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "modifié"
@@ -3319,49 +4076,97 @@
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Ajout plutôt comme %s"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
+"en %s ; déplacé dans %s."
+
+#: merge-recursive.c:3182
+#, 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 ""
+"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui "
+"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
+"vers %s."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
+"renommé en %s ; déplacé dans %s."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
+"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
+"être déplacé vers %s."
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3371,128 +4176,137 @@
"fusion :\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-"la signature de d'index multi-paquet 0x%08x ne correspond pas à la signature "
+"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "la version %u du condensé ne correspond pas"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "décalage de section invalide (trop grand)"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"identifiant de terminaison de tronçon d'index multi-paquet terminant "
"apparaît plus tôt qu'attendu"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "index multi-paquet manque de tronçon de recherche OID"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "index multi-paquet manque de tronçon de décalage d'objet"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Recherche de fichiers paquets référencés"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -3500,29 +4314,45 @@
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Vérification de l'ordre des OID dans MIDX"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Classement des objets par fichier paquet"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr "décalage d'objet incorrecte pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
+msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
+
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "Impossible de démarrer le groupement d'objets"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "Impossible de finir le groupement d'objets"
#: name-hash.c:532
#, c-format
@@ -3539,7 +4369,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "impossible de joindre le fil lazy_name : %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3550,21 +4380,21 @@
"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
@@ -3573,7 +4403,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
@@ -3583,46 +4413,101 @@
msgid "invalid object type \"%s\""
msgstr "type d'objet invalide \"%s\""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "l'objet %s est de type %s, pas de type %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "l'objet %s a un id de type inconnu %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "incohérence de sha1 %s"
+msgid "hash mismatch %s"
+msgstr "incohérence de hachage %s"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s a besoin d'une valeur"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s est incompatible avec %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s est incompatible avec toute autre option"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s n'accepte aucune valeur"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s n'est pas disponible"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "option inconnue « %s »"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "bascule inconnue « %c »"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "option non-ascii inconnue dans la chaîne : '%s'"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -3630,61 +4515,76 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias pour --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'option '%s' attend une valeur numérique"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "date d'expiration malformée : '%s'"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
"valeur d'attribut"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Une seule spécification 'attr:' est autorisée."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "un spécificateur d'attribut ne peut pas être vide"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "nom d'attribut invalide %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
"incompatibles"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3692,132 +4592,191 @@
"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
"tous les autres réglages globaux de spécificateur de chemin"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s : '%s' est hors du dépôt"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "impossible d'écrire le paquet de vidage"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "impossible d'écrire le paquet de délimitation"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "échec de l'écriture du vidage de paquet"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "erreur de protocole : ligne impossiblement trop longue"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "échec de l'écriture d'un paquet avec format"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "
"d'un paquet"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "échec de l'écriture d'un paquet"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "erreur de lecture"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "L'hôte distant a fermé la connexion de manière inattendue"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "erreur de protocole : mauvaise longueur de ligne %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "erreur distante : %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Rafraîchissement de l'index"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "impossible de créer le lstat en fil : %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "impossible d'analyser l'entête git '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossible d'analyser le journal pour '%s'"
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
+"répertoires git"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' n'a pas de commit extrait"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "indexation du fichier '%s' impossible"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "impossible d'ajouter '%s' à l'index"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "fstat de '%s' impossible"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' existe à la fois comme un fichier et un répertoire"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Rafraîchir l'index"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3826,7 +4785,7 @@
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3835,60 +4794,150 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "signature incorrecte 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "mauvaise version d'index %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "mauvaise signature sha1 d'index"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "extension %.4s ignorée"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "format d'entrée d'index inconnu 0x%08x"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "entrées de préparation non ordonnées dans l'index"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entrées de préparation non ordonnées pour '%s'"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "impossible de créer le fil load_cache_entries : %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "impossible de joindre le fil load_cach_entries : %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s : l'ouverture du fichier d'index a échoué"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s : impossible de faire un stat sur l'index ouvert"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s : fichier d'index plus petit qu'attendu"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s : impossible de mapper le fichier d'index"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "impossible de créer le fil load_index_extensions : %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "impossible de joindre le fil load_index_extensions : %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "impossible de rafraîchir l'index partagé '%s'"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "index cassé, %s attendu dans %s, %s obtenu"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "impossible de régler les bits de droit de '%s'"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s : impossible de revenir à l'étape 0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3919,7 +4968,7 @@
" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"
" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --"
-"contine')\n"
+"continue')\n"
" d, drop <commit> = supprimer le commit\n"
" l, label <label> = étiqueter la HEAD courante avec un nom\n"
" t, reset <label> = réinitialiser HEAD à label\n"
@@ -3930,7 +4979,14 @@
"\n"
"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebasage de %s sur %s (%d commande)"
+msgstr[1] "Rebasage de %s sur %s (%d commandes)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3939,7 +4995,7 @@
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3947,7 +5003,7 @@
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3962,7 +5018,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3972,125 +5028,156 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
+msgid "could not write '%s'"
+msgstr "impossible d'écrire '%s'"
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "impossible de copier '%s' vers '%s'."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error.\n"
+"\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s ne pointe pas sur un objet valide!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "symref pendant %s ignoré"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "impossible d'ouvrir '%s' en écriture : %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "impossible de lire la réf '%s'"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "la référence '%s' existe déjà"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "id d'objet inattendu pendant l'écriture de '%s'"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "id d'objet inattendu pendant la suppression de '%s'"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "le journal pour la réf %s contient un trou après %s"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "le journal pour la réf %s est vide"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
@@ -4101,352 +5188,492 @@
msgstr "spécificateur de réference invalide : '%s'"
# à priori on parle d'une branche ici
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "disparue"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "en avance de %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "en retard de %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) n'accepte pas d'argument"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "argument %%(objectsize) non reconnu : %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) n'accepte pas d'argument"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valeur positive attendue objectname:short=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-"pas un dépôt git, mais le champ '%.*s' nécessite l'accès au données d'objet"
+"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(aucune branche, rebasage de %s)"
+msgid "no branch, rebasing %s"
+msgstr "aucune branche, rebasage de %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "aucune branche, rebasage de la HEAD détachée %s"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(aucune branche, bisect a démarré sur %s)"
+msgid "no branch, bisect started on %s"
+msgstr "aucune branche, bisect a démarré sur %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD détachée sur %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "aucune branche"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD détachée depuis %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(aucune branche)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
-msgstr "echec de parse_object_buffer sur %s pour %s"
+msgstr "échec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "l'option « %s » est incompatible avec --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "l'option « %s » est incompatible avec --no-merged"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "l'option '%s' doit pointer sur un commit"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "plus d'un receivepack fournis, utilisation du premier"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "plus d'un uploadpack fournis, utilisation du premier"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Erreur interne"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "la clé '%s' du modèle n'a pas de '*'"
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "la valeur '%s' du modèle n'a pas de '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr ""
+"le spécificateur de référence source %s ne correspond à aucune référence"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr ""
+"le spécificateur de référence source %s correspond à plus d'une référence"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"La destination que vous avez fournie n'est pas un nom de référence complète\n"
+"(c'est-à-dire commençant par \"ref/\"). Essai d'approximation par :\n"
+"\n"
+"- Recherche d'une référence qui correspond à '%s' sur le serveur distant.\n"
+"- Vérification si la <source> en cours de poussée ('%s')\n"
+" est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n"
+" refs/{heads,tags}/ correspondant du côté distant.\n"
+"\n"
+"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
+"totalement qualifiée."
+
+#: remote.c:1040
+#, 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 ""
+"la partie <source> du spécificateur de référence est un objet commit.\n"
+"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
+"'%s:refs/heads/%s' ?"
+
+#: remote.c:1045
+#, 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 ""
+"la partie <source> du spécificateur de référence est un objet étiquette.\n"
+"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#: remote.c:1050
+#, 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 ""
+"la partie <source> du spécificateur de référence est un objet arbre.\n"
+"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#: remote.c:1055
+#, 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 ""
+"la partie <source> du spécificateur de référence est un objet blob.\n"
+"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
+"'%s:refs/tags/%s' ?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "'%s' ne peut pas être résolue comme une branche"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "suppression d '%s' impossible : la référence distante n'existe pas"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
+"références"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "impossible de trouver la référence distante %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Référence bizarre '%s' ignorée localement"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Votre branche et '%s' font référence à des commits différents.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (utilisez \"%s\" pour plus de détails)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4458,11 +5685,11 @@
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4477,11 +5704,16 @@
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "impossible d'analyser le nom attendu d'objet '%s'"
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4505,11 +5737,6 @@
msgid "unable to write rerere record"
msgstr "impossible d'écrire l'enregistrement rerere"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "impossible d'écrire '%s'"
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4560,8 +5787,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
@@ -4595,29 +5822,33 @@
msgid "unable to open rr-cache directory"
msgstr "impossible d'ouvrir le répertoire rr-cache"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "impossible de créer un fil asynchrone : %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4627,31 +5858,31 @@
"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
"false`."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
"distant"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "le dépaquetage a échoué : %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4659,42 +5890,47 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de nettoyage invalide de message de validation '%s'"
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "Impossible de supprimer '%s'"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossible de supprimer '%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revert"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4702,7 +5938,7 @@
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4712,110 +5948,115 @@
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode de nettoyage invalide %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Impossible de décoter la valeur de '%s'"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "format de date invalide '%s' dans '%s'"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4844,15 +6085,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "écriture du commit racine"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4871,7 +6112,8 @@
"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
-"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"
+"instructions dans votre éditeur pour éditer votre fichier de "
+"configuration :\n"
"\n"
" git config --global --edit\n"
"\n"
@@ -4880,7 +6122,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4906,302 +6148,349 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-"une branche principale a été spécifiée mais le commit %s n'est pas une "
-"fusion."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossible d'obtenir un message de validation pour %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "impossible d'analyser '%.*s'"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "annulation d'un picorage en cours"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "annulation d'un retour en cours"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un picorage ou un retour est déjà en cours"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "un retour est déjà en cours"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "un picorage est déjà en cours"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "Pas de retour en cours ?"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "aucun picorage en cours"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "échec du saut de commit"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "il n'y a rien à sauter"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Avez-vous déjà validé ?\n"
+"essayez \"git %s -continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5220,27 +6509,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "impossible d'appliquer %s... %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5255,11 +6544,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5276,77 +6565,77 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "impossible de trouver l'arbre de %s"
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "impossible d'écrire l'index"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5357,31 +6646,31 @@
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "extraction de %s impossible"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s n'est pas un OID valide"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "arrêt à HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5402,48 +6691,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5453,82 +6742,42 @@
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "liste à faire inutilisable : '%s'"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Attention : certains commits ont pu être accidentellement supprimés.\n"
-"Commits supprimés (du plus jeune au plus vieux) :\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
-"commit.\n"
-"\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
-"d'avertissements.\n"
-"Les comportements disponibles sont : ignore, warn, error.\n"
-"\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5538,31 +6787,15 @@
"rebase --continue'.\n"
"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebasage de %s sur %s (%d commande)"
-msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "impossible de copier '%s' vers '%s'."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "impossible de générer la liste à-faire"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
@@ -5571,7 +6804,7 @@
msgid "'%s' is outside repository"
msgstr "'%s' est hors du dépôt"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5581,7 +6814,7 @@
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5592,14 +6825,14 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
"l'option '%s' doit être présente avant les arguments qui ne sont pas des "
"options"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5610,93 +6843,93 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
"impossible de mettre en place le répertoire de travail en utilisant une "
"configuration invalide"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "Cette opération doit être effectuée dans un arbre de travail"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "erreur à l'ouverture de '%s'"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "trop gros pour être une fichier .git : '%s'"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "erreur à la lecture de %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format de fichier git invalide : %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "aucun chemin dans le fichier git : %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "ce n'est pas un dépôt git : %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' trop gros"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "ce n'est pas un dépôt git : '%s'"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "impossible de revenir au répertoire de travail courant"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "échec du stat de '%*s%s%s'"
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "impossible de modifier en '%s'"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5708,7 +6941,7 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas défini)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5718,298 +6951,302 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "échec de l'ouverture ou au dup de /dev/null"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "échec du setsid"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossible de normaliser le répertoire d'objet : %s"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "lecture du fichier d'alternatives impossible"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "impossible de déplacer le nouveau fichier d'alternative"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "échec de mmap"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "type d'objet invalide"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "impossible de dépaqueter l'entête %s"
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "impossible d'analyser l'entête %s"
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "impossible d'écrire le fichier sha1 %s"
+msgid "unable to write file %s"
+msgstr "impossible d'écrire le fichier %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "erreur en fermeture du fichier sha1"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "impossible d'écrire le fichier sha1"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "impossible de lire le fichier sha1 pour %s"
+msgid "cannot read object for %s"
+msgstr "impossible de lire l'objet pour %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "commit corrompu"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "incohérence de sha1 pour %s (%s attendu)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "incohérence de hachage pour %s (%s attendu)"
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "le SHA1 court %s est ambigu"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Les candidats sont :"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Git ne crée normalement jamais de référence qui se termine par 40 caractères "
-"hexa\n"
-"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
-"peuvent être créées par erreur. Par exemple,\n"
+"Git ne crée normalement jamais de référence qui se termine par 40\n"
+"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
+"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
"est créée.\n"
@@ -6017,72 +7254,134 @@
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u Gio"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u Gio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u Mio"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u Mio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u Kio"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u Kio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u octet"
+msgstr[1] "%u octets"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u octet/s"
+msgstr[1] "%u octets/s"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
# ici %s est un chemin
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dans le sous-module '%s' non populé"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "Impossible d'accéder au sous-module '%s'"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "le sous-module '%s' n'a pas pu être mis à jour."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -6090,12 +7389,12 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -6106,16 +7405,16 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -6125,23 +7424,23 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "nom de sous-module suspicieux %s ignoré"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"'%s' ignoré et qui peut être interprété comme une option de ligne de "
"commande : %s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
@@ -6176,7 +7475,7 @@
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
@@ -6215,38 +7514,46 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "voir protocol.version dans 'git help config' pour plus d'information"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "les options de serveur exigent une version 2 ou supérieure"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "impossible d'analyser la configuration transport.color.*"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "le support du protocole v2 n'est pas encore implanté"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valeur inconnue pour la config '%s' : %s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' non permis"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync n'est plus supporté"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-"Les chemins suivant de sous-module contiennent des modifications\n"
+"Les chemins suivants de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6273,38 +7580,33 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Abandon."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
-msgstr "echec de la poussée de tout les sous-modules nécessaires"
+msgstr "échec de la poussée de tous les sous-modules nécessaires"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "échec de l'écriture totale sur l'assistant distant"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "Impossible de trouver un assistant distant pour '%s'"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6313,103 +7615,103 @@
"capacité obligatoire inconnue %s ; cet assistant distant requiert "
"probablement une une nouvelle version de Git"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "cet assistant distant devrait supporter la capacité refspec"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s a dit de manière inattendue : '%s'"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s a aussi verrouillé %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "impossible de lancer fast-import"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "erreur au lancement de fast-import"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "impossible de lire la réf %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "réponse inconnue à connect : %s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
"la spécification du chemin de service distant n'est pas supportée par le "
"protocole"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "chemin de service distant invalide"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
-msgstr "impossible de se connecter as sous-service %s"
+msgstr "impossible de se connecter au sous-service %s"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "ok/error attendu, l'assistant a dit '%s'"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "l'assistant %s ne gère pas dry-run"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "l'assistant %s ne gère pas --signed"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "l'assistant %s ne gère pas --signed=if-asked"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "l'assistant %s ne gère pas 'push-option'"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'assistant %s ne gère pas push ; un spécificateur de référence est "
"nécessaire"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'assistant %s ne gère pas 'force'"
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "impossible de lancer fast-export"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "erreur au lancement de fast-export"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6418,47 +7720,47 @@
"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
"Vous devriez peut-être spécifier une branche telle que 'master'.\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "réponse malformée dans le liste de réfs : %s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "échec de read(%s)"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "échec de write(%s)"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "échec du fil d'exécution %s"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "échec de jonction du fil d'exécution %s : %s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "échec du processus %s pour l'attente"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "échec du processus %s"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "impossible de démarrer le fil d'exécution pour copier les données"
@@ -6474,11 +7776,11 @@
msgid "empty filename in tree entry"
msgstr "nom de fichier vide dans une entrée de l'arbre"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6489,7 +7791,7 @@
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6499,7 +7801,7 @@
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6509,7 +7811,7 @@
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6519,7 +7821,7 @@
"fusion :\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6528,7 +7830,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6537,7 +7839,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6547,7 +7849,7 @@
"contenus :\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6557,7 +7859,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6566,7 +7868,7 @@
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6576,7 +7878,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6585,7 +7887,7 @@
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6595,7 +7897,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6604,7 +7906,7 @@
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6615,7 +7917,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6625,7 +7927,7 @@
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6635,7 +7937,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6644,7 +7946,7 @@
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6654,7 +7956,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6663,12 +7965,12 @@
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6678,7 +7980,7 @@
"pas à jour :\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6689,7 +7991,7 @@
"jour par l'extraction creuse :\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6700,7 +8002,7 @@
"à jour par extraction creuse :\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6709,16 +8011,16 @@
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Extraction des fichiers"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Mise à jour des fichiers"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6757,35 +8059,35 @@
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
"de travail"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
@@ -6804,158 +8106,164 @@
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (utilisez \"git restore --staged <fichier>...\" pour désindexer)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (utilisez \"git restore --source=%s --staged <fichier>...\" pour "
+"désindexer)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
-"dans la copie de travail)"
+" (utilisez \"git restore <fichier>...\" pour annuler les modifications dans "
+"le répertoire de travail)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Votre remisage contient actuellement %d entrée"
msgstr[1] "Votre remisage contient actuellement %d entrées"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6963,107 +8271,119 @@
"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard "
+"de la branche.\n"
+"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1284
+#: 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] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -7071,128 +8391,136 @@
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
"modifications)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Picorage en cours."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (lancez \"git cherry-pick --continue\" pour continuer)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Rétablissement en cours."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (lancez \"git revert --continue\" pour continuer)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7204,32 +8532,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7238,195 +8566,195 @@
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "différent"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7457,12 +8785,12 @@
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
@@ -7471,140 +8799,140 @@
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
-msgstr "impossible d'analyser le script author"
+msgstr "impossible d'analyser l'auteur du script"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
"être perdus."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Le patch actuel est vide."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7612,29 +8940,24 @@
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"impossible d'être interactif sans entrée standard connectée à un terminal."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -7642,35 +8965,36 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7681,7 +9005,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7694,17 +9018,17 @@
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7712,145 +9036,145 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<options>] (--continue | --quit | --abort)"
+msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "abandonne l'opération de patch mais garde HEAD où il est."
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "afficher le patch en cours d'application."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7858,17 +9182,17 @@
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7877,12 +9201,16 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
"reprise."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "le mode interactif requiert des rustines sur la ligne de commande"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
@@ -7900,228 +9228,462 @@
msgid "git archive: Remote with no URL"
msgstr "git archive : Dépôt distant sans URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive : vidage attendu"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect --helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<commit>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <état> <révision> <terme-pour-"
+"bon> <terme-pour-mauvais>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> "
+"<terme-pour-mauvais>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> "
+"[<term>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<terme> --term-{new,bad}"
+"=<terme>][--no-checkout] [<mauvais> [<bon>...]] [--] [<chemins>...]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' n'est pas un terme valide"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "impossible d'utiliser la commande incluse '%s' comme terme"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "impossible de modifier la signification du terme '%s'"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "veuillez utiliser deux termes différents"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "impossible d'ouvrir le fichier BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Pas de bissection en cours.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' n'est pas un commit valide"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"Échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
+"<commit>'."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Mauvais argument pour bisect_write : %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "impossible d'obtenir l'oid de la révision '%s'"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "impossible d'ouvrir le fichier '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s"
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Vous devez me donner au moins une révision %s et une révision %s.\n"
+"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Vous devez démarrer avec \"git bisect start\".\n"
+"Puis vous devez me donner au moins une révision %s et une révision %s.\n"
+"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "Attention : bissection avec seulement une validation %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Confirmez-vous [Y/n] ? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "aucun terme défini"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Vos termes actuels sont %s pour l'état ancien\n"
+"et %s pour le nouvel état.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argument invalide %s pour 'git bisect terms'.\n"
+"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
+"new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "option non reconnue : %s"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' ne semble être une révision valide"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "refus de bissecter sur un arbre 'cg-seeked'"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "mauvaise HEAD - référence symbolique douteuse"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "réference invalide : '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "effectuer 'git bisect next'"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "écrire les termes dans .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "vérifier l'état de la bissection"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "vérifier si des révisions sont attendues"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "réinitialiser l'état de la bissection"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "écrire l'état de la bissection dans BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "vérifier et régler les termes dans un état de la bissection"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "vérifier si les termes bons ou mauvais existent"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "afficher les termes de bissection"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "démarrer une session de bissection"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "pas de journal pour BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms exige deux arguments"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state ne supporte aucun argument"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms exige 3 arguments"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check exige 2 ou 3 arguments"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms exige 0 ou 1 argument"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "couleur attendue : %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "doit finir avec une couleur"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valeur invalide pour blame.coloring"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "référence à ignorer %s introuvable"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rév"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignore <rev> pendant le blâme"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorer les révisions listées dans <fichier>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
"colorer différemment les métadonnées redondantes avec la ligne précédente"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "colorier les lignes par âge"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "score"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -8135,18 +9697,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
@@ -8180,7 +9742,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8189,7 +9751,7 @@
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8198,12 +9760,12 @@
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8212,116 +9774,125 @@
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "impossible de résoudre HEAD"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) pointe hors de refs/heads/"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8332,186 +9903,180 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "afficher le nom de la branche courante"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "clé"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "nom du champ servant à trier"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "objet"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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 "format à utiliser pour la sortie"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -8519,37 +10084,41 @@
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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 ""
-"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
+"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de "
+"branche.\n"
+"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8570,7 +10139,7 @@
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8578,7 +10147,7 @@
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8586,136 +10155,136 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "une seule option de traitement ne peut être spécifiée à la fois"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "ne pas ordonner la sortie de --batch-all-objects"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "afficher tous les attributs associés au fichier"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "afficher les chemins en entrée qui ne correspondent pas"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "ignorer l'index pendant la vérification"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "impossible de spécifier les chemins avec --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z n'a de sens qu'avec l'option --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "aucun chemin spécifié"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet n'est valide qu'avec un seul chemin"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "impossible d'avoir --quiet et --verbose"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching n'est valide qu'avec --verbose"
@@ -8736,56 +10305,56 @@
msgid "no contacts specified"
msgstr "aucun contact spécifié"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "stage doit valoir entre 1 et 3, ou all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"pas d'avertissement pour les fichiers existants et les fichiers absents de "
"l'index"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "chaîne"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
@@ -8797,107 +10366,167 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<options>] <branche>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d conflit du fusion recréé"
+msgstr[1] "%d conflits du fusion recréés"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d chemin mis à jour depuis %s"
+msgstr[1] "%d chemins mis à jour depuis %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d chemin mis à jour depuis l'index"
+msgstr[1] "%d chemins mis à jour depuis l'index"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "ni '%s', ni '%s' spécifié"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"impossible de continuer avec des modifications indexées dans les fichiers "
+"suivants :\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"les modifications indexées dans les fichiers suivants seraient perdues : %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8920,7 +10549,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8949,162 +10578,239 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "une seule référence attendue"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' pourrait être un fichier local ou un branche de suivi.\n"
+"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "branche attendue, mais étiquette '%s' reçue"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "une branche est attendue, mais '%s' a été reçue"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "une branche est attendue, mais un commit '%s' a été reçu"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant une fusion\n"
+"Envisagez \"git merge --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant une session am\n"
+"Envisagez \"git am --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un rebasage\n"
+"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un picorage\n"
+"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un retour\n"
+"Envisagez \"git revert --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "Vous basculez de branche en cours de bissection"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' n'accepte pas <point-de-départ>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "branche"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "créer et extraire une nouvelle branche"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "créer/réinitialiser et extraire une branche"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "créer un reflog pour une nouvelle branche"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "détacher la HEAD au commit nommé"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "nouvelle branche"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "nouvelle branche sans parent"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "extraire notre version pour les fichiers non fusionnés"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "extraire leur version pour les fichiers non fusionnés"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "mettre à jour les fichiers ignorés (par défaut)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "style"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (merge (fusion) ou diff3)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-"ne pas vérifier si une autre copie de travail contient le référence fournie"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "style"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "style de conflit (merge (fusion) ou diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "détacher la HEAD au commit nommé"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "forcer l'extraction (laisser tomber les modifications locales)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "nouvelle branche"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "nouvelle branche sans parent"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "mettre à jour les fichiers ignorés (par défaut)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"ne pas vérifier si une autre copie de travail contient le référence fournie"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "extraire notre version pour les fichiers non fusionnés"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "extraire leur version pour les fichiers non fusionnés"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p et --overlay sont mutuellement exclusifs"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "impossible de résoudre %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "Vous devez spécifier un ou des chemins à restaurer"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -9112,7 +10818,7 @@
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -9141,38 +10847,106 @@
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branche"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "créer et extraire une nouvelle branche"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "créer/réinitialiser et extraire une branche"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "créer un reflog pour une nouvelle branche"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "utiliser le mode de superposition (défaut)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "créer et basculer sur une nouvelle branche"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "créer/réinitialiser et basculer sur une branche"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "interpréter 'git switch <branche-inexistante>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "laisser tomber les modifications locales"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "de quel <arbre-esque> faire l'extraction"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "restaurer l'index"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "restaurer l'arbre de travail (par défaut)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorer les entrées non-fusionnées"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "utiliser le mode de superposition"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Suppression de %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Supprimerait %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Ignore le dépôt %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Ignorerait le dépôt %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "lstat de %s impossible\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9185,7 +10959,7 @@
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9206,38 +10980,38 @@
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9255,64 +11029,64 @@
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9320,7 +11094,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9328,149 +11102,164 @@
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "nom"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "heure"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "spécifique au serveur"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "option à transmettre"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+"tous les sous-modules clonés utiliseront leur branche de suivi à distance"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9478,148 +11267,148 @@
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "échec à l'ouverture de '%s'"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "échec du stat de %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "échec du démarrage un itérateur sur '%s'"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
-msgstr "échec lors de l'unlink de '%s'"
+msgstr "échec pour délier '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "échec de l'itération sur '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Le clone a réussi, mais l'extraction a échoué.\n"
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
-"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
+"et réessayer avec 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
-msgstr "impossible de unlinker le fichier temporaire alternates"
+msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9627,41 +11416,41 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
"\"."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
"\"file://\"."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -9697,15 +11486,83 @@
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F "
+"<fichier>)...] <arbre>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "le parent dupliqué %s est ignoré"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "nom d'objet invalide %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree : échec à l'ouverture de '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree : échec de la lecture de '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree : échec de la fermeture de '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "parent"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "id d'un objet commit parent"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "message"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "message de validation"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "lire le message de validation depuis un fichier"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "signer la validation avec GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "exactement un arbre obligatoire"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree : échec de la lecture"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:50
+#: 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"
@@ -9716,7 +11573,7 @@
"vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
"supprimer complètement le commit avec \"git reset HEAD^\".\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9731,81 +11588,87 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Sinon, veuillez utiliser 'git reset'\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Si vous souhaitez sauter ce commit, utilisez :\n"
+"utilisez ensuite :\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Puis \"git cherry-pick --continue\" continuera le picorage \n"
-"des commits restants.\n"
+"pour continuer le picorage des commits restants.\n"
+"Si vous souhaitez sauter ce commit, utilisez :\n"
+"\n"
+" git cherry-pick --skipped\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9813,38 +11676,38 @@
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9859,7 +11722,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9874,7 +11737,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9884,7 +11747,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9895,152 +11758,148 @@
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Mode de nettoyage invalide %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -10048,11 +11907,11 @@
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -10060,255 +11919,256 @@
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr ""
"détecter les renommages, en spécifiant optionnellement le facteur de "
"similarité"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "date"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "message"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "message de validation"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"utiliser un message au format autosquash pour compresser le commit spécifié"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "défaut"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "comment éliminer les espaces et les commentaires # du message"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "signer la validation avec GPG"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation dû à un message de validation vide.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"le dépôt a été mis à jour, mais impossible d'écrire le fichier\n"
"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
-"n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."
+"n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <options de division>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "répertoire"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Le répertoire d'objet où stocker le graphe"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "impossible d'ouvrir le graphe de commit '%s'"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "commencer le parcours à toutes les réfs"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "commencer le parcours aux commits listés sur stdin"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"inclure tous les commits déjà présents dans le fichier de graphe de commits"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"le nombre maximum de commits dans un graphe de commit divisé pas de base"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
@@ -10316,7 +12176,7 @@
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argument --type non reconnu, %s"
@@ -10422,7 +12282,7 @@
msgid "Type"
msgstr "Type"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "ce type est assigné à la valeur"
@@ -10468,7 +12328,7 @@
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valeur"
@@ -10476,48 +12336,48 @@
msgid "with --get, use default value when missing entry"
msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "mauvais nombre d'arguments, devrait être %d"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "mauvais nombre d'arguments, devrait être entre %d et %d"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "motif de clé invalide : %s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "échec du formatage de la valeur de config par défaut : %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "impossible d'analyser la couleur '%s'"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "pas dans un répertoire git"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "l'écriture sur stdin n'est pas supportée"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "l'écriture de blob de configuration n'est pas supportée<"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10532,23 +12392,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "un seul fichier de configuration à la fois"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME n'est pas défini"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10559,19 +12419,19 @@
"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
"détails"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color et le type de la variable sont incohérents"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "une seule action à la fois"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -10579,33 +12439,33 @@
"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
"list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default n'est applicable qu'avec --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "lecture du fichier de configuration '%s' impossible"
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "erreur lors du traitement de fichier(s) de configuration"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "l'édition de stdin n'est pas supportée"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "l'édition de blobs n'est pas supportée"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10614,7 +12474,7 @@
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "section inexistante : %s"
@@ -10627,59 +12487,59 @@
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<options>] <commit ou apparenté>*"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<options>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "tête"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "léger"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annoté"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
"describe\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10688,7 +12548,7 @@
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10697,12 +12557,12 @@
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10712,120 +12572,120 @@
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "décrire %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s n'est ni un commit ni un blob"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken est incompatible avec les commits ou assimilés"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
@@ -10834,27 +12694,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "échec : %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "Impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10862,53 +12722,53 @@
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "outil"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10916,164 +12776,229 @@
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"non-nul"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "passé à `diff`"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool exige un arbre de travail ou --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff est incompatible avec --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "type"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de "
+"sortie"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"l'option `--default` attend une valeur entier long non signé avec `--"
+"type=ulong`, pas `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"sélectionner la gestion des messages de validation dans un encodage "
+"alternatif"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"les parents références qui ne sont pas dans le flux d'export rapide par id "
+"d'objet"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Afficher les ids d'objet originaux des blobs/commits"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
"encombrent les étiquettes modifiées"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -11081,109 +13006,129 @@
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "spécifique au serveur"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "option à transmettre"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "lancer 'gc --auto' après la récupération"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
+"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
+"'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
+"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n"
+"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11192,57 +13137,58 @@
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
-msgstr ""
-"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans core."
+"--filter can only be used with the remote configured in extensions."
"partialClone"
+msgstr ""
+"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
+"extensions.partialClone"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11250,45 +13196,53 @@
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
"sens"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
+"extensions.partialClone"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11321,7 +13275,7 @@
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
-msgstr "git for-each-ref [--point-at <objet>]"
+msgstr "git for-each-ref [--points-at <objet>]"
#: builtin/for-each-ref.c:12
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
@@ -11351,91 +13305,274 @@
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "afficher seulement les références qui ne sont pas fusionnées"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "inconnu"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "erreur dans l'objet %s %s : %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "avertissement dans l'objet %s %s : %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "lien cassé dans l'objet %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "type d'objet inconnu dans le lien"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"lien cassé depuis %7s %s\n"
+" vers %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "objet %s manquant %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "objet %s inatteignable %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "objet %s fantôme %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "impossible de créer le fichier lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "impossible de finir '%s'"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Vérification de l'objet %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Vérification de la connectivité (%d objets)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Vérification de l'objet %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "liens cassés"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "racine %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "étiquetage de l'objet %s %s (%s) dans %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s : objet corrompu ou manquant"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s : entrée %s de journal de références invalide"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Vérification du journal de réferences %s-> %s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s : pointeur de sha1 invalide %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "l'objet %s n'est pas un commit"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "Note : pas de référence par défaut"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s : objet corrompu ou manquant : %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s : impossible d'analyser : %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "mauvais fichier de sha1 : %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Vérification du répertoire d'objet"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Vérification du lien %s"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "%s invalide"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s pointe sur quelque chose bizarre (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s : la HEAD détachée ne pointe sur rien"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "note : %s pointe sur une branche non-née (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Vérification de l'arbre cache"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "non-arbre dans l'arbre de cache"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Vérification des objets"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s : objet manquant"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
@@ -11445,17 +13582,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "échec de l'analyse de '%s' valeur '%s'"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11471,56 +13613,56 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "impossible d'analyser gc.logexpiry %s"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11528,23 +13670,23 @@
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -11553,270 +13695,270 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
-msgstr "l'option '%c' attend un valeur numérique"
+msgstr "l'option '%c' attend une valeur numérique"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "afficher le numéro de colonne de la première correspondance"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "n'afficher que les parties correspondantes d'une ligne"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "option de combinaison invalide, ignore --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "option non supportée avec --recurse-submodules"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11824,38 +13966,34 @@
"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
"[--] <fichier>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "type"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
@@ -11895,30 +14033,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "échec de démarrage d'emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11927,7 +14065,7 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11936,328 +14074,318 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Mauvais chaîne alias.%s : %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "'git help config' pour plus d'information"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:555
+#: 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] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "erreur de fsck dans l'objet empaqueté"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "%s invalide"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossible d'écrire le fichier %s '%s'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "impossible de fermer le fichier %s écrit '%s'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "erreur de fsck dans les objets paquets"
@@ -12269,12 +14397,12 @@
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
-msgstr "impossible d'ouvrir (opendir) '%s'"
+msgstr "impossible d'ouvrir le répertoire '%s'"
#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
-msgstr "impossible de readlink '%s'"
+msgstr "impossible de lire le lien '%s'"
#: builtin/init-db.c:80
#, c-format
@@ -12301,42 +14429,42 @@
msgid "not copying templates from '%s': %s"
msgstr "pas de copie des modèles depuis '%s' : %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Dépôt Git vide initialisé dans %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12344,25 +14472,25 @@
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12371,12 +14499,12 @@
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12384,468 +14512,460 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "éditer les fichiers sur place"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "éliminer les lignes de fin vides"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "où placer les nouvelles lignes terminales"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "action si les lignes terminales existent déjà"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "action si les lignes terminales manquent"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "éliminer les lignes terminales vides"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "ne pas appliquer les règles de la configuration"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "joindre les valeurs continuées avec des caractères blancs"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "paramètres d'analyse"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "ne pas traiter spécialement ---"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "ligne(s) de fin à ajouter"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer n'a aucune signification avec --only-input"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "supprimer la sortie des différences"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "décorer seulement les références correspondant à <motif>"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "ne pas décorer les références correspondant à <motif>"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
-msgstr "Impossible de lire l'objet %s"
+msgid "could not read object %s"
+msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
-msgstr "Type inconnu : %d"
+msgid "unknown type: %d"
+msgstr "type inconnu : %d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Impossible d'ouvrir le fichier correctif %s"
+msgid "cannot open patch file %s"
+msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "Exactement une plage nécessaire."
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "exactement une plage nécessaire"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "Ceci n'est pas une plage."
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "La lettre de motivation doit être au format courriel"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "échec de création du fichier de lettre de motivation"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
-msgstr "Deux répertoires de sortie ?"
+#: builtin/log.c:1244
+msgid "two output directories?"
+msgstr "deux répertoires de sortie ?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit inconnu %s"
+msgid "unknown commit %s"
+msgstr "commit inconnu %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Impossible de résoudre '%s' comme une référence valide."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "échec à résoudre '%s' comme une référence valide"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "Impossible de trouver la base de fusion exacte."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de "
+"impossible de récupérer l'amont, si vous voulez enregistrer le commit de "
"base automatiquement,\n"
"veuillez utiliser git branch --set-upstream-to pour suivre une branche "
-"distante\n"
-"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
-"manuellement."
+"distante.\n"
+"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
+"manuellement"
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
-msgstr "Impossible de trouver la base de fusion exacte"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
+msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "échec d'inférence d'intervalles de différence d'intervalles"
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr ""
"afficher la barre de progression durant la phase de génération des patchs"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "rév"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <rév> dans la première page ou une "
"rustine"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <refspec> dans la première page ou "
"une rustine"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "pourcentage par lequel la création est pondérée"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n et -k sont mutuellement exclusifs"
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Impossible de créer le répertoire '%s'"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiert --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
-msgstr "Échec de création des fichiers en sortie"
+#: builtin/log.c:1975
+msgid "failed to create output files"
+msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -12853,110 +14973,110 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -12974,7 +15094,7 @@
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exécutable"
@@ -12998,13 +15118,13 @@
msgid "take url.<base>.insteadOf into account"
msgstr "prendre en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
"trouvée"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
@@ -13051,265 +15171,286 @@
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "le commutateur '%s' a besoin d'une valeur"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "vérifier le crochet commit-msg"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Veuillez entrer un message de validation pour expliquer en quoi cette fusion "
"est\n"
"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une "
"branche de sujet.\n"
"\n"
+
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Un message vide abandonne la validation.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit n'accepte pas d'argument"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13317,7 +15458,7 @@
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13325,94 +15466,98 @@
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13498,33 +15643,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "option inconnue %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "impossible de gérer plus de %d base. %s ignoré."
msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "impossible de résoudre la référence '%s'"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Fusion de %s avec %s\n"
@@ -13537,7 +15682,7 @@
msgid "input is NUL terminated"
msgstr "l'entrée se termine par NUL"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "autoriser les objets manquants"
@@ -13545,161 +15690,177 @@
msgid "allow creation of more than one tree"
msgstr "autoriser la création de plus d'un arbre"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<taille>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"répertoire objet contenant un ensemble de paires de fichiers paquet et "
"d'index de paquet"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
+"dans un lot plus grand que cette taille"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "trop d'arguments"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verbe non reconnu : %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "sous-commande non reconnue : %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<options>] <source>... <destination>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s est dans l'index"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "forcer le déplacement/renommage même si la cible existe"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorer les références correspondant à <motif>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -13846,14 +16007,14 @@
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 "impossible de résoudre '%s' comme une référence valide."
@@ -13886,38 +16047,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "trop de paramètres"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
@@ -13930,30 +16091,30 @@
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13962,12 +16123,12 @@
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13976,52 +16137,52 @@
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -14029,47 +16190,47 @@
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -14077,181 +16238,186 @@
"abort'.\n"
msgstr ""
"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et "
-"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
-"avec 'git notes merge --abort'.\n"
+"validez le résultat avec 'git notes merges --commit', ou abandonnez la "
+"fusion avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Impossible de résoudre '%s' comme une référence valide."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mauvais CRC d'objet empaqueté pour %s"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "objet empaqueté corrompu pour %s"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta récursif détecté pour l'objet %s"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objets commandés, %<PRIu32> attendus"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "le fichier packet est invalide : %s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "ouverture du fichier paquet pour réutilisation impossible : %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "lecture du fichier de paquet réutilisé impossible"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "dépassement de décalage de base de delta pour %s"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "décalage de base de delta est hors limite pour %s"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "impossible de récupérer la taille de %s"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "impossible d'analyser l'entête d'objet de %s"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "l'objet %s ne peut être lu"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -14260,7 +16426,7 @@
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -14269,258 +16435,266 @@
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "valeur invalide pour --missing"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "l'objet libre à %s n'a pas pu être examiné"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
-"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
+"utiliser des fils lors de la recherche pour une meilleure correspondance des "
"deltas"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "utiliser l'algorithme de joignabilité creuse"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "écrire un index de bitmap si possible"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
"transférer"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "la taille limite minimale d'un paquet est 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<options>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "empaqueter tout"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "éliminer les références perdues (défaut)"
@@ -14536,69 +16710,69 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valeur invalide pour %s : %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14606,14 +16780,14 @@
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
"venez de récupérer."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
"vous venez de récupérer."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14621,7 +16795,7 @@
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14633,44 +16807,44 @@
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14680,34 +16854,34 @@
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14718,7 +16892,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14735,15 +16909,15 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -14761,7 +16935,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14770,7 +16944,7 @@
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14795,7 +16969,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14810,7 +16984,7 @@
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14824,13 +16998,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14841,14 +17015,14 @@
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14863,7 +17037,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14878,7 +17052,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14896,13 +17070,13 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14914,22 +17088,22 @@
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14951,105 +17125,105 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<nom-de-ref>:<attendu>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr ""
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
@@ -15077,20 +17251,20 @@
msgid "use simple diff colors"
msgstr "utiliser des couleurs de diff simples"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "pas de .. dans la plage : '%s'"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "un format d'argument unique doit être une plage symétrique"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "plage entre deux commits requise"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -15101,71 +17275,75 @@
"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté "
"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "écrire l'index résultant dans <fichier>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "juste vider l'index"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Fusion"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "effectuer une fusion en plus d'une lecture"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "fusion à 3 points en présence d'ajouts et suppressions"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "comme -m, mais annule les éléments non fusionnés"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<sous-répertoire>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "ne pas vérifier la copie de travail après la fusion"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "ne pas mettre à jour l'index ou la copie de travail"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "sauter l'application du filtre d'extraction creuse"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "supprimer les messages d'information de suivi"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
@@ -15173,48 +17351,227 @@
"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] "
"[<branche>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root "
"[<branche>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "liste à faire inutilisable : '%s'"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "impossible d'écrire '%s'."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "pas de HEAD ?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "impossible de créer un fichier temporaire %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "impossible de marquer comme interactif"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "impossible de générer la liste à-faire"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "un commit de base doit être fourni avec --upstream ou --onto"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<options>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "garder les validations vides"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "autoriser les validations avec des messages vides"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "rebaser les commits de fusion"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "conserver les points de branchement de cousins originaux"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "déplacer les commits qui commencent par squash!/fixup!"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "signer les commits"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "afficher un diffstat de ce qui a changé en amont"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "continuer le rebasage"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "sauter le commit"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "éditer la liste à-faire"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "afficher le patch courant"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "raccourcir les identifiants de commits dans la liste à-faire"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "étendre les identifiants de commit dans la liste à-faire"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "vérifier la liste à-faire"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "réarranger les lignes fixup/squash"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "insérer les commandes exec dans la liste à-faire"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "sur"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "restreindre la révision"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "écraser-sur"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "écraser sur"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "le commit amont"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "nom du head"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "nom du head"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "stratégie de rebasage"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "options de stratégie"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "options de stratégie"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "switch-to"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "la branche ou le commit à extraire"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "sur-le-nom"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "sur le nom"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "cmd"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "la commande à lancer"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "re-planifier automatiquement tout `exec` qui échoue"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requiert un rebasage interactif"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossible d'accéder 'onto' : '%s'"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head invalide : '%s'"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "Impossible de lire '%s'"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "Impossible de stocker %s"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "impossible de déterminer la révision HEAD"
+
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15228,11 +17585,26 @@
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "impossible de déterminer la révision HEAD"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git a rencontré une erreur lors de la préparation des correctifs\n"
+"pour rejouer ces révisions : \n"
+"\n"
+" %s\n"
+"\n"
+"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -15249,7 +17621,7 @@
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15263,150 +17635,160 @@
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "commande exec vide"
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "rebaser sur la branche %s au lieu de la branche amont"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "afficher un diffstat de ce qui a changé en amont"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passé à 'git am'"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git-apply"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "éditer la liste à faire lors d'un rebasage interactif"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "afficher le patch en cours d'application ou de fusion"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "essayer de recréer les fusions au lieu de les ignorer"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "permettre à rerere à mettre à jour l'index avec des conflits résolus"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "préserver les validations vides pendant le rebasage"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "déplace les commits qui commencent par squash!/fixup! sous -i"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "remiser et réappliquer automatiquement avant et après"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "ajouter les lignes exec après chaque commit de la liste éditable"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "essayer de rebaser les fusions au lieu de les garder"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "utiliser la stratégie de fusion indiquée"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "passer les arguments jusqu'à la stratégie de fusion"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "rebaser tous les objets inatteignables depuis les racines"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "impossible d'exécuter %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"les support de rebase.useBuiltin a été supprimé !\n"
+"Voir son entrée dans 'git help config' pour plus de détails."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la "
+"place."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15414,21 +17796,16 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "Impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "Impossible de revenir à %s"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "impossible de supprimer '%s'"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15450,346 +17827,176 @@
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "mode inconnu : %s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
-msgstr "--stratégie requiert --merge ou --interactive"
+msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1226
-#, c-format
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+"impossible de combiner les options am avec l'options interactive ou merge"
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"erreur: impossible de combiner des options interactive (--interactive, --"
-"exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) "
-"avec les options am (%s)"
+"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-"
+"failed-exec'"
-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr ""
-"erreur : impossible de combiner les options de fusion (--merge, --strategy, "
-"--strategy-option) avec les options am (%s)"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'"
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-"erreur : impossible de combiner '--preserve-merges' avec '--rebase-merges'"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "impossible de combiner '--rebase-merges' avec '--strategy'"
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-"erreur : impossible de combiner '--rebase-merges' avec '--strategy-option'"
-
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "erreur : impossible de combiner '--rebase-merges' avec '--strategy'"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': exactement une base de fusion nécessaire"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "ne pointe pas sur une validation valide : '%s'"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal : pas de branche ou commit '%s'"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Impossible de résoudre le commit HEAD vers un révision"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "réponse de remisage inattendue : '%s'"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossible de créer le répertoire pour '%s'"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autoremisage créé : %s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "impossible de réinitialiser --hard"
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "Impossible de basculer vers %s"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branche courante %s est à jour.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branche courante %s est à jour, rebasage forcé.\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
"dessus...\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rapide de %s sur %s.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "pas de HEAD ?"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "impossible de créer un fichier temporaire %s"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "impossible de marquer comme interactif"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "impossible d'ouvrir %s"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "impossible de générer la liste à-faire"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<options>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "garder les validations vides"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "autoriser les validations avec des messages vides"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "rebaser les commits de fusion"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "conserver les points de branchement de cousins originaux"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "déplacer les commits qui commencent par squash!/fixup!"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "signer les commits"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "continuer le rebasage"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "sauter le commit"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "éditer la liste à-faire"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "afficher le patch courant"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "raccourcir les identifiants de commits dans la liste à-faire"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "étendre les identifiants de commit dans la liste à-faire"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "vérifier la liste à-faire"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "réarranger les lignes fixup/squash"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "insérer les commandes exec dans la liste à-faire"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "sur"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "restreindre la révision"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "écraser-sur"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "écraser sur"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "le commit amont"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "nom du head"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "nom du head"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "stratégie de rebasage"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "options de stratégie"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "options de stratégie"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "la branche ou le commit à extraire"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "sur-le-nom"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "sur le nom"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "la commande à lancer"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "un commit de base doit être fourni avec --upstream ou --onto"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15819,7 +18026,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15839,19 +18046,74 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<réferences>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<références>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <référence>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Marquage des objets inaccessibles..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s ne pointe nulle part !"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "pas de journal de références à supprimer spécifié"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "'%s' n'est pas un journal de références"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "pas de journal de références pour '%s'"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "format de référence invalide : %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -15909,7 +18171,7 @@
#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
-msgstr "git remote set-url --delete <nom> <URL>"
+msgstr "git remote set-url --delete <nom> <url>"
#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
@@ -16383,96 +18645,136 @@
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
+"les objects de paquet."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"impossible de terminer pack-objects pour ré-empaqueter les objets de "
+"prometteur"
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Rien de neuf à empaqueter."
+
+#: builtin/repack.c:478
+#, 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 ""
+"ALERTE : certains paquets utilisés ont été renommés\n"
+"ALERTE : en les préfixant par old-, de manière à\n"
+"ALERTE : les remplacer par une nouvelle version de\n"
+"ALERTE : fichier. Mais l'opération a échoué et la\n"
+"ALERTE : tentative de renommage en sens inverse a\n"
+"ALERTE : aussi échoué.\n"
+"ALERTE : Veuillez les renommer manuellement dans %s :\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
@@ -16501,12 +18803,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<motif>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "échec à résoudre '%s' comme une référence valide"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16515,27 +18812,27 @@
"format de remplacement invalide '%s'\n"
"les formats valides sont 'short', 'medium' et 'long'"
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "réf de remplacement '%s' non trouvée"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Référence de remplacement '%s' supprimée"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' n'est pas un nom valide de référence"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "la référence de remplacement '%s' existe déjà"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16546,76 +18843,81 @@
"'%s' pointe sur un objet remplacé de type '%s' tandis que\n"
"'%s' pointe sur un objet remplaçant de type '%s'."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "impossible d'ouvrir %s en écriture"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file a retourné un échec"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "impossible d'ouvrir %s en écriture"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "impossible de lire depui mktree"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree a échoué"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree n'a pas retourné de nom d'objet"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "fstat de %s impossible"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "impossible d'écrire l'objet dans la base de données"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "nom d'objet invalide : '%s'"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "impossible d'obtenir le type de l'objet pour %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "échec de l'édition du fichier d'objet"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "le nouvel objet est identique à l'ancien : '%s'"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "impossible d'analyser %s comme commit"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16624,31 +18926,31 @@
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "le commit original '%s' contient une signature GPG"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft pour '%s' non nécessaire"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "le nouveau commit est identique à l'ancien : '%s'"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16657,71 +18959,71 @@
"impossible de convertir la(les) greffe(s) suivante(s) :\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "Modifier les parents d'un commit"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "convertir le fichier de greffe existant"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "utiliser ce format"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "--format ne peut pas être utilisé sans lister"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "-f n'a de sens qu'en écrivant un remplacement"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw n'a de sens qu'avec l'option --edit"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d requiert au moins un argument"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "mauvais nombre d'arguments"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e requiert un seul argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g requiert au moins un argument"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file ne supporte aucun argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "-l n'accepte qu'un motifs"
@@ -16738,128 +19040,129 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "'git rerere forget' sans chemin est obsolète"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "échec de la génération de diff pour '%s'"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "merge"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
"tard"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16868,59 +19171,59 @@
"to make this the default.\n"
msgstr ""
"\n"
-"Les modifications non-indexées on pris %.2f secondes à énumerer après "
+"Les modifications non-indexées ont pris %.2f secondes à énumérer après "
"reset.\n"
"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre "
"de\n"
"config reset.quiet à true pour avoir ce comportement en permanence.\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "le filtrage d'objet exige --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valeur invalide de 'sparse' '%s'"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16951,72 +19254,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <sous-commande>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "l'option '%s' attend un nombre supérieur à zéro"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s : %s ne peut pas être utilisé avec %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "mettre fin au retour ou picorage"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "reprendre le retour ou picorage"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "annuler le retour ou picorage"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "sauter le commit courant et continuer"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "ne pas valider automatiquement"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "éditer le message de validation"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "numéro-de-parent"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "sélectionner le parent principal"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "stratégie de fusion"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<options>] [--] <fichier>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -17030,7 +19342,7 @@
"les fichiers suivants ont du contenu indexé différent\n"
"du fichier et de HEAD :"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -17038,13 +19350,13 @@
"\n"
"(utilisez -f pour forcer la suppression)"
-#: builtin/rm.c:215
+#: 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] "le fichier suivant a des changements indexés :"
msgstr[1] "les fichiers suivants ont des changements indexés :"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -17052,44 +19364,44 @@
"\n"
"(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "le fichier suivant a des modifications locales :"
msgstr[1] "les fichiers suivants ont des modifications locales :"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
@@ -17123,18 +19435,6 @@
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<options>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "quitter après un unique échange requête/réponse"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "sortir immédiatement après l'annonce des capacités"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]"
@@ -17169,7 +19469,7 @@
msgid "Linewrap output"
msgstr "Couper les lignes"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "trop d'arguments fournis hors d'un dépôt"
@@ -17196,122 +19496,122 @@
msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "aucune référence correspond à %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "afficher <n> validations de plus après l'ancêtre commun"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "afficher les références inaccessibles depuis toute autre référence"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr ""
"afficher seulement les validations qui ne sont pas sur la première branche"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
"base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog requiert un nom de branche"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "impossible de gérer plus de %d révision."
msgstr[1] "impossible de gérer plus de %d révisions."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -17319,47 +19619,275 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<motif>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "afficher seulement les têtes (peut être combiné avec tags)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"vérification de référence plus stricte, nécessite un chemin de référence "
"exact"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "afficher la référence HEAD, même si elle serait filtrée"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "déréférencer les étiquettes en IDs d'objet"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
"local"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<options>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<options>] [<remise>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<remise>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <nom-de-branche> [<remise>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<spécificateur-de-chemin>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' n'est pas une validation de type remisage"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Trop de révisions spécifiées : %s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Aucune entrée de remisage trouvée."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s n'est pas une référence valide"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear avec des paramètres n'est pas implémenté"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "impossible d'appliquer un remisage en cours de fusion"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "impossible de générer %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "conflits dans l'index. Essayez sans --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "impossible de sauvegarder l'arbre d'index"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Fusion de %s avec %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "L'index n'a pas été sorti de remise."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "tentative de recréer l'index"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s supprimé (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s : Impossible de supprimer l'élément de stash"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' n'est pas une référence de remisage"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Aucune branche spécifiée"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Impossible de mettre à jour %s avec %s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "message pour le remisage"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" exige un argument <commit>"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Aucun changement sélectionné"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Vous n'avez pas encore la validation initiale"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Impossible de sauver l'état courant de l'index"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Impossible de sauver les fichiers non-suivis"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Impossible de sauver l'état courant de la copie de travail"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Impossible d'enregistrer l'état de la copie de travail"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Vous avez sûrement oublié 'git add' ?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Pas de modifications locales à sauver"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Impossible d'initialiser le remisage"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Impossible de sauver l'état courant"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Impossible de supprimer les changements de la copie de travail"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "conserver l'index"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "remiser une mode rustine"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "mode silencieux"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "inclure les fichiers non suivis dans la remise"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "inclure les fichiers ignorés"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "impossible d'exécuter %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17368,50 +19896,50 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
"sauter et supprimer toutes les lignes commençant par le caractère de "
"commentaire"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote n'accepte aucun argument"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Entrée dans '%s'\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17420,7 +19948,7 @@
"run_command a retourné un statut non-nul pour %s\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17431,20 +19959,20 @@
"modules inclus de %s\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <chemin>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17453,60 +19981,60 @@
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<chemin>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<options>] [<chemin>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "supprimer la sortie d'état du sous-module"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -17514,48 +20042,48 @@
"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
"du sous-module"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr ""
"Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17565,7 +20093,7 @@
"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17574,84 +20102,84 @@
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossible de créer le répertoire vide du sous-module %s"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17659,94 +20187,94 @@
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17755,43 +20283,51 @@
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<chemin>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config name [valeur]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "désactiver la configuration dans le fichier .gitmodules"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config name [<valeur>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nom>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-"veuillez vous assurer que le fichier .gitmodules dans l'arbre de travail"
+"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -17827,17 +20363,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
-"étiquette> [<head>]"
+"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <fichier>]\n"
+"\t\t<nom-étiquette> [<head>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nométiquette>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17847,21 +20383,21 @@
"points-at <objet>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17874,7 +20410,7 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17889,147 +20425,162 @@
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:218
+#: 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 ""
+"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle "
+"étiquette\n"
+"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, "
+"utilisez :\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "l'option --points-at est autorisée seulement en mode liste"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -18038,210 +20589,210 @@
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "échec de la création du répertoire %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "échec de la création du fichier %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "échec de la suppression du fichier %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "échec de la suppression du répertoire %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
"l'information de stat du répertoire change après mise à jour d'un fichier"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
"un sous-répertoire"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"fichier<"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"répertoire"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "tester si le système de fichier supporte le cache de non-suivis"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "activer le cache de non-suivis sans tester le système de fichier"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "écrire l'index même s'il n'est pas marqué comme modifié"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr ""
"activer ou désactiver la surveillance du système de fichier (fsmonitor)"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "marquer les fichiers comme valides pour fsmonitor"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "effacer le bit de validité fsmonitor"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -18249,7 +20800,7 @@
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer l'index coupé"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -18257,7 +20808,7 @@
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver l'index coupé"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -18265,11 +20816,11 @@
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -18277,29 +20828,29 @@
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer le cache des fichiers non-suivis"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "
"activer la surveillance du système de fichiers"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor activé"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver la surveillance du système de fichiers"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor désactivé"
@@ -18345,6 +20896,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "quitter après un unique échange requête/réponse"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
@@ -18359,15 +20914,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "afficher le contenu du commit"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "afficher les messages bruts de gpg"
@@ -18383,64 +20938,64 @@
msgid "show statistics only"
msgstr "afficher seulement les statistiques"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<options>] <chemin> [<commit>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<options>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<options>] <arbre-de-travail>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "échec de la suppression de '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
+"Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18449,37 +21004,37 @@
"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
"attendus, %<PRIuMAX> octets lus)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "impossible de ré-ajouter l'arbre de travail '%s'"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18489,7 +21044,7 @@
"utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
"pour corriger"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18503,124 +21058,124 @@
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
"précédemment sur %s)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "essayer de nommer la nouvelle branche comme la branche amont"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"les arbres de travail contenant des sous-modules ne peuvent pas être "
"déplacés ou supprimés"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "la cible '%s' existe déjà"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18630,7 +21185,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18638,37 +21193,37 @@
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' est sale, utilisez --force pour le supprimer"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "impossible de lancer 'git status' sur '%s', code %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18678,7 +21233,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18686,29 +21241,29 @@
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
"la validation a échoué, impossible de supprimer l'arbre de travail : %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<préfixe>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18721,7 +21276,7 @@
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
@@ -18734,6 +21289,14 @@
msgid "too many commits marked reachable"
msgstr "trop de commits marqués joignables"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<options>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "sortir immédiatement après l'annonce des capacités"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18755,103 +21318,155 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n"
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
-"pour en lire plus à propos d'une commande spécifique ou d'un concept."
+"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
+"Voir 'git help git' pour un survol du système."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "aucun répertoire fourni pour --git-dir\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "aucun répertoire fourni pour --work-tree\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "aucun préfixe fourni pour --super-prefix\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c requiert une chaîne de configuration\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "aucun répertoire fourni pour -C\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "option inconnue : %s\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "lors de l'expansion de l'alias '%s' : '%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"l'alias '%s' modifie les variables d'environnement.\n"
+"Vous pouvez utiliser '!git' dans l'alias pour le faire"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vide pour %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursif : %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "échec d'écriture sur la sortie standard"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "échec inconnu d'écriture sur la sortie standard"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "échec de fermeture de la sortie standard"
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "impossible d'utiliser %s comme une fonction intégrée"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"usage : %s\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "échec au lancement de la commande '%s' : %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans "
"dorsale SSL"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18862,39 +21477,170 @@
" demandé : %s\n"
" redirection : %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "citation invalide dans la valeur push-option : '%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "réponse du serveur invalide ; '%s' reçu"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "dépôt '%s' non trouvé"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Échec d'authentification pour '%s'"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "impossible d'accéder à '%s' : %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "redirection vers %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"impossible de rembobiner le données post rpc - essayer d'augmenter http."
+"postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "échec RPC ; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "impossible de gérer des poussées aussi grosses"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "le protocole http idiot ne supporte la capacité superficielle"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "échec du récupération."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "impossible de récupérer par sha1 sur http intelligent"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "le transport http ne supporte pas %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "échec de git-http-push"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl : récupération tentée sans dépôt local"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl : commande inconnue '%s' depuis git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "args"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "filtrage d'objet"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "date-d'expiration"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "comment éliminer les espaces et les commentaires # du message"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "clé"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "nom du champ servant à trier"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"met à jour l'index avec les résolutions de conflit réutilisées si possible"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Ajouter le contenu de fichiers dans l'index"
@@ -19160,9 +21906,9 @@
msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
-"ajouter ou analyser l'information structurée dans les messages de validation"
+"Ajouter ou analyser l'information structurée dans les messages de validation"
#: command-list.h:114
msgid "The Git repository browser"
@@ -19342,226 +22088,229 @@
msgstr "Réinitialiser la HEAD courante à l'état spécifié"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "restaurer les fichiers l'arbre de travail"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Inverser des commits existants"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Analyser et préparer les paramètres"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Supprimer des fichiers de la copie de travail et de l'index"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Envoyer un ensemble de patchs comme courriels"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "shell de login restreint pour un accès SSH vers Git seulement"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Résumer la sortie de 'git log'"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Afficher différents types d'objets"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Afficher les branches et leurs commits"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Afficher l'index de l'archive empaquetée"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Lister les références du dépôt local"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Le code d'initialisation i18n pour les scripts shell"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Le code d'initialisation commun aux scripts shell Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Remiser les modifications d'un répertoire de travail sale"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Ajouter le contenu de fichiers à l'index"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Retirer les espaces inutiles"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Basculer de branche"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Lire, modifier et supprimer les références symboliques"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Créer un fichier temporaire avec le contenu d'un blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Dépaqueter les objets depuis une archive empaquetée"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
"idiots"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Renvoyer une archive dans git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Afficher un variable logique de Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Vérifier la signature GPG de commits"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valider des fichiers d'archive Git empaquetés"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Vérifier la signature GPG d'étiquettes"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interface web de Git"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Afficher les journaux avec la différence que chaque commit introduit"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gère de arbres de travail multiples"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Créer un objet arbre depuis l'index courant"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "interface en ligne de commande et conventions de Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Tutoriel du cœur de Git pour les développeurs"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git pour les utilisateurs de CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un glossaire Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Espaces de nom de Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposition d'un dépôt Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Une introduction pratique à Git : deuxième partie"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Une introduction pratique à Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-"met à jour l'index avec les résolutions de conflit réutilisées si possible"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Vous devez démarrer avec \"git bisect start\""
@@ -19573,138 +22322,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "option inconnue : '$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' ne semble être une révision valide"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"
-"valide>'."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Mauvaise HEAD - référence symbolique douteuse"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Mauvais argument pour bisect_write : $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Mauvaise révision en entrée : $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Mauvaise révision en entrée : $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Mauvaise révision en entrée : $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Attention : bissection avec seulement une validation $TERM_BAD."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Confirmez-vous [Y/n] ? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Vous devez me donner au moins une révision $bad_syn et une révision "
-"$good_syn.\n"
-"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
-"pour cela.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Vous devez démarrer avec \"git bisect start\".\n"
-"Puis vous devez me donner au moins une révision $good_syn et une révision "
-"$bad_syn.\n"
-"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
-"pour cela.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "Pas de bissection en cours."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' n'est pas une validation valide"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"Échec d'extraction de la HEAD d'origine '$branch'.\n"
-"Essayez 'git bisect reset <commit>'."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Pas de fichier de log donné"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "impossible de lire $file pour rejouer"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? de quoi parlez-vous ?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "la bissection a échoué : aucune commande fournie."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "lancement de $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19713,11 +22373,11 @@
"la bissection a échoué :\n"
"le code retour $res de '$command' est < 0 ou >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "la bissection ne peut plus continuer"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19726,30 +22386,13 @@
"la bissection a échoué :\n"
"'bisect_state $state' a retourné le code erreur $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "succès de la bissection"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
-"$TERM_GOOD."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "aucun terme défini"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"argument invalide $arg pour 'git bisect terms'.\n"
-"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
-"new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Pas de bissection en cours."
#: git-merge-octopus.sh:46
msgid ""
@@ -19791,269 +22434,116 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Impossible de revenir à $head_name"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Il semble qu'il y ait déjà un répertoire $state_dir_base, et je me demande\n"
-"si un autre rebasage n'est pas déjà en cours. Si c'est le cas,\n"
-"essayez\n"
-"\t$cmd_live_rebase\n"
-"Sinon, essayez\n"
-"\t$cmd_clear_stale_rebase\n"
-"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque "
-"chose\n"
-"d'important ici."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "erreur : '--signoff' et '--preserve-merges' sont incompatibles"
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "invalide '$upstream_name' en amont"
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name : il y a plus d'une base de fusion"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name : il n'y a pas de base de fusion"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Ne pointe pas sur une validation valide : $onto_name"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "fatal : pas de branche ou commit '$branch_name'"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Autoremisage créé : $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "La branche courante $branch_name est à jour."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Changements sur $onto :"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Changements de $mb sur $onto :"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
-"dessus..."
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear avec des paramètres n'est pas implémenté"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Vous n'avez pas encore la validation initiale"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Impossible de sauver l'état courant de l'index"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Impossible de sauver les fichiers non-suivis"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Impossible de sauver l'état courant de la copie de travail"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Aucun changement sélectionné"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Impossible d'enregistrer l'état de la copie de travail"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "erreur : option inconnue pour 'stash push' : $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Pas de modifications locales à sauver"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Impossible d'initialiser le remisage"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Impossible de sauver l'état courant"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Impossible de supprimer les changements de la copie de travail"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Aucune entrée de remisage trouvée."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "L'index n'a pas été sorti de remise."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Impossible de supprimer l'élément de stash"
+msgstr "${REV}: Impossible de supprimer l'entrée de stash"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Aucune branche spécifiée"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' n'a pas de commit extrait"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -20064,24 +22554,24 @@
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -20098,39 +22588,39 @@
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -20139,12 +22629,16 @@
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
+"de rapatriement direct de $sha1 :"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -20153,76 +22647,76 @@
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
"$sha1. La récupération directe de ce commit a échoué."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -20234,12 +22728,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Autoremisage appliqué."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Impossible de stocker $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Rebasage ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -20278,7 +22781,7 @@
"\n"
"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -20297,83 +22800,83 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1 n'est pas un commit qui peut être picorer"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de commit invalide : $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rapide sur $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Avance rapide impossible sur $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Impossible de déplacer HEAD sur $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Refus d'écraser un commit de fusion: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Erreur lors de la réapplication de la fusion $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Impossible de picorer $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Ceci est le ${n}ième message de validation :"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Le message de validation ${n} sera ignoré :"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Ceci est la combinaison de $count commit."
msgstr[1] "Ceci est la combinaison de $count commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Impossible d'écrire $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Ceci est la combinaison de 2 commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "Impossible d'appliquer $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20390,31 +22893,31 @@
"le\n"
"problème avant de pouvoir reformuler le message du commit."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Arrêté à $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "'$squash_style' impossible avec le commit précédent"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Exécution : $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'exécution a échoué : $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "et a mis à jour l'index ou la copie de travail"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20425,7 +22928,7 @@
"git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20440,25 +22943,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Commande inconnue : $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Rebasage et mise à jour de $head_name avec succès."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20489,12 +22992,12 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20502,40 +23005,40 @@
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
@@ -20544,144 +23047,144 @@
msgid "usage: $dashless $USAGE"
msgstr "usage : $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
"travail"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Impossible de rebaser : vous avez des modifications non indexées."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Impossible de réécrire les branches : vous avez des modifications non "
"indexées."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "$action est impossible : vous avez des modifications non indexées."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Impossible de rebaser : votre index contient des modifications non validées."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"impossible de tirer avec rebasage : votre index contient des modifications "
"non validées."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"$action est impossible : votre index contient des modifications non validées."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
"Vous devez lancer cette commande depuis la racine de votre copie de travail."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %s12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "indexé"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "non-indexé"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binaire"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "rien"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "inchangé"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "%d chemin ajouté\n"
msgstr[1] "%d chemins ajoutés\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "%d chemin mis à jour\n"
msgstr[1] "%d chemins mis à jour\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "%d chemin inversé\n"
msgstr[1] "%d chemins inversés\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d chemin touché\n"
msgstr[1] "%d chemins touchés\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Mise à jour"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Inverser"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20689,7 +23192,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme indexée."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20697,7 +23200,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme remisée."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20705,7 +23208,8 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme desindexée."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20713,7 +23217,8 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme appliquée."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20721,17 +23226,17 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme éliminée."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20745,7 +23250,7 @@
"Les lignes commençant par %s seront éliminées.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20755,7 +23260,7 @@
"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
"alors l'édition sera abandonnée et la section conservée.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
@@ -20766,14 +23271,14 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
"l'élimine !) [y|n] ? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20787,7 +23292,7 @@
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20801,7 +23306,7 @@
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20815,7 +23320,7 @@
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20829,7 +23334,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20843,7 +23348,7 @@
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20857,7 +23362,7 @@
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20871,7 +23376,21 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - appliquer cette section à l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20893,218 +23412,234 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Aucune autre section à atteindre\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Désolé, %d seule section disponible.\n"
msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "aucune autre section à rechercher\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "rechercher la regex ? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Désolé, impossible de découper cette section\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Découpée en %d section.\n"
msgstr[1] "Découpée en %d sections.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Désolé, impossible d'éditer cette section\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Réviser la différence"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -21122,18 +23657,19 @@
"diff - visualiser les diff entre HEAD et l'index\n"
"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
@@ -21147,31 +23683,31 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -21179,39 +23715,39 @@
"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
"commande ou des options de configuration)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -21226,12 +23762,12 @@
" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
" * en fournissant l'option --format-patch pour une plage.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -21240,7 +23776,7 @@
"fatal : %s : %s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -21250,17 +23786,17 @@
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -21274,27 +23810,27 @@
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
-msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
+msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -21302,11 +23838,11 @@
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21319,22 +23855,22 @@
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal : l'alias '%s' se développe en lui-même\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
"a) ? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -21342,16 +23878,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1412
+#: 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"
@@ -21378,1117 +23914,130 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
-msgstr "echec de STARTTLS ! %s"
+msgstr "échec de STARTTLS ! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
"debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "échec de l'envoi de %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
-
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
-
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "Mauvaise citation sur la valeur %s dans '%s'"
-
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "synonyme déconseillé de --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "impossible de faire un stat de %s"
-
-#~ msgid "abort rebase"
-#~ msgstr "abandonner le rebasage"
-
-#~ msgid "make rebase script"
-#~ msgstr "créer les script de rebasage"
-
-#~ msgid "No such remote: %s"
-#~ msgstr "Distante inconnue : %s"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "impossible de déplacer un arbre de travail verrouillé"
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "impossible de supprimer un arbre de travail verrouillé"
-
-#~ msgid "Applied autostash."
-#~ msgstr "Autoremisage appliqué."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Impossible de stocker $stash_sha1"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
-#~ "\n"
-#~ "\t"
-
-#~ msgid "could not parse '%s' (looking for '%s'"
-#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
-
-#~ msgid "color both diff and diff-between-diffs"
-#~ msgstr "colorer à la fois les diffs et le diff-between-diffs"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Index sale : fusion impossible (sales : %s)"
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#~ msgid "<command>"
-#~ msgstr "<commande>"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Entrée dans '$displaypath'"
-
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Git de tous les jours avec à peu près 20 commandes"
-
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "première ligne de message de compression inattendue :\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "première ligne de message de compression invalide :\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
-
-#~ msgid "Error in object"
-#~ msgstr "Erreur dans l'objet"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "expression de filtre invalide : '%s'"
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "La copie du patch qui a échoué se trouve dans : %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "un spécificateur de chemin et --all sont incompatibles"
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
-#~ "'$displaypath'"
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr ""
-#~ "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "les chaines de caractères vides comme spécificateurs de chemin seront "
-#~ "invalides dans les prochaines versions. Veuillez utiliser . à la place "
-#~ "pour correspondre à tous le chemins"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "impossible de tronquer '%s'"
-
-#~ msgid "could not finish '%s'"
-#~ msgstr "impossible de finir '%s'"
-
-#~ msgid "could not close %s"
-#~ msgstr "impossible de fermer %s"
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Copie d'une branche mal nommée '%s'"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "créer manuellement 'HEAD' n'a pas de sens"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "Je ne sais pas cloner %s"
-
-#~ msgid "show ignored files"
-#~ msgstr "afficher les fichiers ignorés"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Je ne sais pas récupérer depuis %s"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "'$term' n'est pas un terme valide"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ " To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "erreur: option inconnue pour 'stash save': $option\n"
-#~ " Pour fournir un message, utilisez git stash save -- '$option'"
-
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) n'accepte pas d'argument"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module "
-#~ "'%s'"
-
-#~ msgid "change upstream info"
-#~ msgstr "modifier l'information amont"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n"
-#~ "\n"
-
-#~ msgid "basename"
-#~ msgstr "nom de base"
-
-#~ msgid "prepend parent project's basename to output"
-#~ msgstr "préfixer le nom de base du projet parent à la sortie"
-
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne "
-#~ "suivante :\n"
-#~ " - $line"
-
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
-#~ " - $line"
-
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr ""
-#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-
-#~ msgid "Could not open file '%s'"
-#~ msgstr "impossible d'ouvrir le fichier '%s'"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "dans %0.1f secondes automatiquement..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "échec de dup2(%d,%d)"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Validation initiale sur "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Le patch est vide. Le découpage était-il bon ?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Vous avez toujours des chemins non fusionnés dans votre index\n"
-#~ "Auriez-vous oublié de faire 'git add' ?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "Impossible de mettre à jour les chemins et de basculer sur la branche "
-#~ "'%s' en même temps.\n"
-#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "mode par défaut pour la récursion"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr ""
-#~ "la sous-commande submodule--helper doit être appelée avec une sous-"
-#~ "commande"
-
-#~ msgid "could not stat '%s"
-#~ msgstr "stat impossible de '%s'"
-
-#~ msgid "tag: tagging "
-#~ msgstr "étiquette: étiquetage de "
-
-#~ msgid "commit object"
-#~ msgstr "objet commit"
-
-#~ msgid "tree object"
-#~ msgstr "objet arbre"
-
-#~ msgid "blob object"
-#~ msgstr "objet blob"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
-#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "format non reconnu %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requiert un argument entier positif"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "la réf '%s' n'a pas %ld composants à :strip"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "format de %.*s inconnu %s"
-
-# féminin pour une branche
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: disparue]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: en retard de %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s : en avance de %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s : en avance de %d, en retard de %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** référence invalide ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "objet répertoire démentiellement long %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<options>] <message> HEAD <commit>"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "nom d'étiquette trop long : %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "en-tête d'étiquette trop gros."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Si le patch s'applique proprement, la section éditée sera\n"
-#~ "immediatement marquée comme éliminée"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
-#~ "améliorer le diffs"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Malin... correction du dernier avec un index sale."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n"
-#~ "utilise un répertoire .git :"
-#~ msgstr[1] ""
-#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n"
-#~ "utilisent un répertoire .git :"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
-#~ "son historique)"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Erreur lors de l'emballage de %s."
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr "Impossible de picorer pendant un autre picorage."
-
-#~ msgid "Could not parse line %d."
-#~ msgstr "Impossible d'analyser la ligne %d."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Impossible d'ouvrir %s"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Impossible de formater %s."
-
-#~ msgid "%s: %s"
-#~ msgstr "%s : %s"
-
-#~ msgid "cannot open %s: %s"
-#~ msgstr "impossible d'ouvrir %s : %s"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Vous devez d'abord définir vos informations de validateur"
-
-#~ msgid "This is the 2nd commit message:"
-#~ msgstr "Ceci est le deuxième message de validation :"
-
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "Ceci est le troisième message de validation :"
-
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "Ceci est le quatrième message de validation :"
-
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "Ceci est le cinquième message de validation :"
-
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "Ceci est le sixième message de validation :"
-
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "Ceci est le septième message de validation :"
-
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "Ceci est le huitième message de validation :"
-
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "Ceci est le neuvième message de validation :"
-
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "Ceci est le dixième message de validation :"
-
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "The 1st commit message will be skipped:"
-#~ msgstr "Le premier message de validation sera ignoré :"
-
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "Le deuxième message de validation sera ignoré :"
-
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "Le troisième message de validation sera ignoré :"
-
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "Le quatrième message de validation sera ignoré :"
-
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "Le cinquième message de validation sera ignoré :"
-
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "Le sixième message de validation sera ignoré :"
-
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "Le septième message de validation sera ignoré :"
-
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "Le huitième message de validation sera ignoré :"
-
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "Le neuvième message de validation sera ignoré :"
-
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "Le dixième message de validation sera ignoré :"
-
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "le ${n}ième message de validation sera ignoré :"
-
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "could not run gpg."
-#~ msgstr "impossible de lancer gpg."
-
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg n'a pas accepté les données"
-
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "type d'objet non supporté dans l'arbre"
-
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "Chemin non traité ??? %s"
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Impossible de %s pendant un %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Impossible de picorer vers une HEAD vide"
-
-#~ msgid "could not open %s for writing"
-#~ msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#~ msgid "bug: unhandled unmerged status %x"
-#~ msgstr "bogue : état de non-fusion non géré %x"
-
-#~ msgid "bug: unhandled diff status %c"
-#~ msgstr "bogue : état de diff non géré %c"
-
-#~ msgid "could not write branch description template"
-#~ msgstr "impossible d'écrire le modèle de description de branche"
-
-#~ msgid "corrupt index file"
-#~ msgstr "fichier d'index corrompu"
-
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "détacher la HEAD à la validation nommée"
-
-#~ msgid "Checking connectivity... "
-#~ msgstr "Vérification de la connectivité... "
-
-#~ msgid " (unable to update local ref)"
-#~ msgstr " (impossible de mettre à jour la référence locale)"
-
-#~ msgid "Reinitialized existing"
-#~ msgstr "existant réinitialisé"
-
-#~ msgid "Initialized empty"
-#~ msgstr "vide initialisé"
-
-#~ msgid " shared"
-#~ msgstr " partagé"
-
-#~ msgid "Verify that the named commit has a valid GPG signature"
-#~ msgstr "Vérifier que la validation a une signature GPG valide"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "Écriture de SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "Finition de SQUASH_MSG"
-
-#~ msgid " and with remote"
-#~ msgstr " et avec la distante"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "la suppression de '%s' a échoué"
-
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr ""
-#~ "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
-#~ "nouveau depuis"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "utilisez l'option '--force'. Si le répertoire local git n'est pas le "
-#~ "dépôt correct"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom "
-#~ "avec l'option '--name'."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr ""
-#~ "La copie de travail du sous-module '$displaypath' contient un répertoire ."
-#~ "git"
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
-#~ "son historique)"
-
-#~ msgid "'%s': %s"
-#~ msgstr "'%s' : %s"
-
-#~ msgid "unable to access '%s': %s"
-#~ msgstr "impossible d'accéder à '%s' : %s"
-
-#~ msgid " git branch -d %s\n"
-#~ msgstr " git branch -d %s\n"
-
-#~ msgid " git branch --set-upstream-to %s\n"
-#~ msgstr " git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "impossible d'ouvrir %s : %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
-#~ "continuer"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "échec de la suppression de %s"
-
-#~ msgid "The --exec option must be used with the --interactive option"
-#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Chemin de sous-module '$displaypath' non initialisé\n"
-#~ "Peut-être souhaitez-vous utiliser 'update --init' ?"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr ""
-#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
-#~ "amont"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "format non convenable align:%s"
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "push.default n'est pas défini ; sa valeur implicite a changé dans Git "
-#~ "2.0\n"
-#~ "de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n"
-#~ "le comportement actuel après la modification de la valeur de défaut, "
-#~ "utilisez :\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "Pour supprimer ce message et adopter le nouveau comportement maintenant, "
-#~ "utilisez :\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "Quand push.default vaudra 'matching', git poussera les branches locales\n"
-#~ "sur les branches distantes qui existent déjà avec le même nom.\n"
-#~ "\n"
-#~ "Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif "
-#~ "'simple'\n"
-#~ "qui ne pousse la branche courante que vers la branche distante "
-#~ "correspondante\n"
-#~ "que 'git pull' utilise pour mettre à jour la branche courante.\n"
-#~ " \n"
-#~ "Voir 'git help config' et chercher 'push.default' pour plus "
-#~ "d'information.\n"
-#~ "(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode "
-#~ "similaire\n"
-#~ "'current' au lieu de 'simple' si vous utilisez de temps en temps "
-#~ "d'anciennes versions de Git)"
-
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Impossible d'ajouter '%s'"
-
-#~ msgid "Missing author: %s"
-#~ msgstr "Auteur manquant : %s"
-
-#~ msgid "Testing "
-#~ msgstr "Test en cours "
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr ""
-#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
-#~ "passe : %s"
-
-#~ msgid "no such user"
-#~ msgstr "utilisateur inconnu"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "la branche '%s' ne pointe pas sur un commit"
-
-#~ msgid "print only merged branches"
-#~ msgstr "afficher seulement les branches fusionnées"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "--dissociate est spécifié, mais --reference est absent"
-
-#~ msgid "show usage"
-#~ msgstr "afficher l'usage"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "nom de modèle démentiellement long %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "lien symbolique démentiellement long %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "chemin de modèle %s démentiellement long"
-
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "spécification de tri non supportée '%s'"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "le commutateur 'points-at' a besoin d'un objet"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort et -n sont incompatibles"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr ""
-#~ "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-"
-#~ "versa"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "BUG: réouverture d'un fichier verrou validé"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "l'option %s n'accepte pas de valeur négative"
-
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "impossible d'analyser la valeur '%s' pour l'option %s"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b et -B sont mutuellement exclusifs"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n"
-#~ "Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n"
-#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
-#~ "\"$cmdline --abort\"."
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "Le format de patch $patch_format n'est pas supporté."
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Décidez-vous. --skip ou --abort ?"
-
-#~ msgid ""
-#~ "Patch is empty. Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Le patch est vide. Était-il mal découpé ?\n"
-#~ "Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n"
-#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
-#~ "\"$cmdline --abort\"."
-
-#~ msgid "Patch does not have a valid courriel address."
-#~ msgstr "Le patch n'a pas d'adresse courriel valide."
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Application : $FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Le patch a échoué à $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-#~ "as appropriate to mark resolution and make a commit."
-#~ msgstr ""
-#~ "Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n"
-#~ "Veuillez les corriger dans votre copie de travail, utiliser alors 'git "
-#~ "add/rm <fichier>'\n"
-#~ "si nécessaire pour marquer comme résolu et valider."
-
-#~ msgid "no branch specified"
-#~ msgstr "aucune branche spécifiée"
-
-#~ msgid "prune .git/worktrees"
-#~ msgstr "éliminer .git/worktrees"
-
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "Les commandes git les plus utilisées sont :"
-
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Branche inconnue : '%s'"
-
-#~ msgid "Could not create git link %s"
-#~ msgstr "Impossible de créer le lien git %s"
-
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "gc.pruneexpire invalide : '%s'"
-
-#~ msgid "(detached from %s)"
-#~ msgstr "(détaché de %s)"
-
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Aucun auteur existant trouvé avec '%s'"
-
-#~ msgid "search also in ignored files"
-#~ msgstr "rechercher aussi dans les fichiers ignorés"
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"
-
-#~ msgid "no files added"
-#~ msgstr "aucun fichier ajouté"
-
-#~ msgid "slot"
-#~ msgstr "emplacement"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Échec du verrouillage de la référence pour mise à jour"
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Échec de l'écriture de la référence"
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "impossible de verrouiller la référence HEAD"
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "impossible de mettre à jour la référence HEAD"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s : impossible de verrouiller la référence"
-
-#~ msgid "%s: cannot update the ref"
-#~ msgstr "%s : impossible de mettre à jour la référence"
-
-#~ msgid "commit has empty message"
-#~ msgstr "le commit a un message vide"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Échec de chdir: %s"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr "Suivi de branche non paramétré : le nom est trop long : %s"
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "impossible de trouver .gitmodules dans l'index"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "échec de la lecture du .gitmodules mis à jour"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "échec de stat du .gitmodules mis à jour"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "suppression du .gitmodules dans l'index impossible"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "échec de l'ajout du .gitmodules mis à jour"
-
-#~ msgid "bug"
-#~ msgstr "bogue"
-
-#~ msgid ", behind "
-#~ msgstr ", derrière "
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis "
-#~ "un\n"
-#~ "sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être "
-#~ "utilisé.\n"
-#~ "Pour ajouter le contenu de toute l'arborescence, lancez :\n"
-#~ "\n"
-#~ " git add %s :/\n"
-#~ " (ou git add %s :/)\n"
-#~ "\n"
-#~ "Pour restreindre la commande au répertoire courant, lancez :\n"
-#~ "\n"
-#~ " git add %s .\n"
-#~ " (ou git add %s .)\n"
-#~ "\n"
-#~ "Avec la version actuelle de Git, la commande est restreinte au répertoire "
-#~ "courant.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ " ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n"
-#~ "dont le comportement va changer dans Git 2.0 avec le respect des chemins "
-#~ "que vous supprimez.\n"
-#~ "Les chemins tels que '%s' qui ont été\n"
-#~ "retirés de votre copie de travail sont ignorés avec cette version de "
-#~ "Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <chemin>', qui est l'option par défaut "
-#~ "actuelle,\n"
-#~ " ignore les chemins que vous avez supprimés de votre copie de travail.\n"
-#~ "\n"
-#~ "* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n"
-#~ "\n"
-#~ "Lancez 'git status' pour vérifier les chemins que vous avez supprimés de "
-#~ "votre copie de travail.\n"
-
-#~ msgid "key id"
-#~ msgstr "identifiant de clé"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Compression automatique du dépôt pour une performance optimum. Vous "
-#~ "pouvez aussi\n"
-#~ "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "
-#~ "d'information.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Les mises à jour ont été rejetées car la pointe de la branche poussée est "
-#~ "derrière\n"
-#~ "son homologue distant. Si vous ne vouliez pas pousser cette branche, vous "
-#~ "pourriez\n"
-#~ "vouloir spécifier les branches à pousser ou définir la variable de "
-#~ "configuration\n"
-#~ "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement "
-#~ "la branche courante."
-
-#~ msgid "deleted: %s"
-#~ msgstr "supprimé : %s"
-
-#~ msgid "modified: %s"
-#~ msgstr "modifié : %s"
-
-#~ msgid "renamed: %s -> %s"
-#~ msgstr "renommé : %s -> %s"
-
-#~ msgid "unmerged: %s"
-#~ msgstr "non fus. : %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "les chemins en entrée sont terminés par le caractère nul"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
diff --git a/po/git.pot b/po/git.pot
index 1313d20..d799696 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,160 +18,175 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:170
+#: advice.c:180
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:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
-#: apply.c:59
+#: 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:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr ""
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -182,527 +197,527 @@
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3063
+#: apply.c:3046
#, 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:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr ""
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr ""
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr ""
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4915
+#: apply.c:4900
#, 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:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr ""
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr ""
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr ""
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr ""
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr ""
@@ -723,99 +738,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:453
+#: 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:453
+#: archive.c:457
msgid "archive format"
msgstr ""
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr ""
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr ""
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr ""
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr ""
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr ""
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr ""
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
@@ -835,16 +869,16 @@
msgid "cannot read %s"
msgstr ""
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr ""
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr ""
@@ -859,7 +893,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr ""
@@ -869,12 +903,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr ""
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -885,38 +924,38 @@
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:754
+#: bisect.c:758
#, 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:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:764
+#: bisect.c:768
#, 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:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -924,7 +963,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -932,22 +971,22 @@
"We continue anyway."
msgstr ""
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr ""
@@ -985,42 +1024,42 @@
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1029,85 +1068,85 @@
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1119,27 +1158,27 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
@@ -1154,70 +1193,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:192
+#: 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:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:201
+#: 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:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr ""
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr ""
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr ""
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr ""
@@ -1226,9 +1269,8 @@
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -1238,7 +1280,7 @@
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1250,122 +1292,279 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1378
+#: commit.c:1390
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:108
-#, c-format
-msgid "graph file %s is too small"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
+msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
+msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
+msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: commit-graph.c:153
-#, c-format
-msgid "improper chunk offset %08x%08x"
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: commit-graph.c:189
+#: commit-graph.c:240
#, c-format
-msgid "chunk id %08x appears multiple times"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:308
+#: commit-graph.c:283
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr ""
+#: commit-graph.c:1163
+#, 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:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:895
-msgid "too many commits to write graph"
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
msgstr ""
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr ""
+
+#: commit-graph.c:1657
+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:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr ""
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2071
+#, 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:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1375,294 +1574,294 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr ""
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -1711,57 +1910,52 @@
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr ""
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:642
+#: 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:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1769,52 +1963,52 @@
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
@@ -1823,106 +2017,106 @@
msgid "unable to fork"
msgstr ""
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr ""
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr ""
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:208
#, 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
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:219
+#: convert.c:218
#, 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:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr ""
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:307
+#: 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:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr ""
@@ -1956,53 +2150,53 @@
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr ""
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2010,40 +2204,40 @@
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] ""
msgstr[1] ""
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr ""
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr ""
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr ""
@@ -2057,127 +2251,613 @@
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
-#: diff.c:158
+#: 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:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr ""
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"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:394
+#: 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:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr ""
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr ""
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr ""
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr ""
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr ""
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr ""
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr ""
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr ""
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr ""
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr ""
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr ""
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr ""
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr ""
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr ""
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr ""
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr ""
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr ""
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr ""
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr ""
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr ""
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+#: diff.c:5338
+msgid "<count>"
+msgstr ""
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr ""
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr ""
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr ""
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr ""
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr ""
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr ""
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr ""
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr ""
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr ""
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr ""
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr ""
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr ""
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr ""
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr ""
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr ""
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr ""
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5450
+msgid "<text>"
+msgstr ""
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr ""
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr ""
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr ""
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr ""
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5487
+msgid "<when>"
+msgstr ""
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+
+#: diff.c:5491
+msgid "<format>"
+msgstr ""
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5501
+msgid "<string>"
+msgstr ""
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr ""
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr ""
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr ""
+
+#: diff.c:5521
+msgid "<file>"
+msgstr ""
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr ""
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
@@ -2191,7 +2871,7 @@
msgid "Filtering content"
msgstr ""
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr ""
@@ -2206,7 +2886,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
@@ -2219,248 +2899,236 @@
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr ""
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr ""
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr ""
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr ""
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr ""
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr ""
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr ""
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr ""
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr ""
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr ""
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr ""
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr ""
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr ""
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr ""
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
@@ -2470,18 +3138,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -2538,72 +3206,72 @@
msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr ""
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr ""
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr ""
-#: help.c:594
+#: 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:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2613,16 +3281,16 @@
msgstr[0] ""
msgstr[1] ""
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr ""
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2632,7 +3300,7 @@
msgstr[0] ""
msgstr[1] ""
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2647,48 +3315,72 @@
"\n"
msgstr ""
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr ""
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr ""
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr ""
@@ -2713,12 +3405,13 @@
msgid "failed to read the cache"
msgstr ""
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr ""
@@ -2727,99 +3420,99 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -2830,109 +3523,108 @@
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, 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:1488
+#: merge-recursive.c:1464
#, 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:1495
+#: merge-recursive.c:1471
#, 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:1500
+#: merge-recursive.c:1476
#, 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:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr ""
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr ""
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -2940,64 +3632,49 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, 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:1994
+#: merge-recursive.c:2077
#, 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:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr ""
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr ""
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr ""
@@ -3005,199 +3682,262 @@
msgid "content"
msgstr ""
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr ""
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr ""
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3182
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3189
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr ""
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr ""
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr ""
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr ""
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr ""
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3213,7 +3953,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3221,21 +3961,21 @@
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
@@ -3244,7 +3984,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
@@ -3254,45 +3994,100 @@
msgid "invalid object type \"%s\""
msgstr ""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr ""
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
+msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options.c:672
+#: 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:319
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:887
msgid "..."
msgstr ""
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr ""
@@ -3300,251 +4095,412 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr ""
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, 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:109
+#: 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:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr ""
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr ""
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr ""
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pkt-line.c:104
+#: 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:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr ""
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr ""
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr ""
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr ""
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr ""
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:1490
+#: 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:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr ""
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3566,19 +4522,26 @@
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3587,132 +4550,154 @@
"\n"
msgstr ""
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr ""
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
+msgid "could not write '%s'"
msgstr ""
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr ""
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: rebase-interactive.c:180
+#, 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 ""
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr ""
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr ""
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr ""
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr ""
@@ -3722,348 +4707,461 @@
msgid "invalid refspec '%s'"
msgstr ""
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr ""
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr ""
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr ""
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
+msgid "no branch, rebasing %s"
msgstr ""
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr ""
-
-#: ref-filter.c:1430
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr ""
-
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr ""
-
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr ""
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr ""
-
-#: ref-filter.c:1483 ref-filter.c:1638
-#, c-format
-msgid "missing object %s for %s"
+msgid "no branch, rebasing detached HEAD %s"
msgstr ""
#: ref-filter.c:1491
#, c-format
+msgid "no branch, bisect started on %s"
+msgstr ""
+
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr ""
+
+#: ref-filter.c:1537 ref-filter.c:1743
+#, c-format
+msgid "missing object %s for %s"
+msgstr ""
+
+#: ref-filter.c:1547
+#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr ""
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr ""
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr ""
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:623
-msgid "Internal error"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr ""
+
+#: remote.c:1005
+#, 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:1020
+#, 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:1040
+#, 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:1045
+#, 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:1050
+#, 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:1055
+#, 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:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr ""
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr ""
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr ""
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:1953
+#: remote.c:2034
#, 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:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4071,11 +5169,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4086,10 +5184,15 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr ""
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4113,11 +5216,6 @@
msgid "unable to write rerere record"
msgstr ""
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr ""
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4168,8 +5266,8 @@
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr ""
@@ -4203,215 +5301,229 @@
msgid "unable to open rr-cache directory"
msgstr ""
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: run-command.c:740
+#: revision.c:2714
+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:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1293
+#: 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:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: sequencer.c:321
msgid "revert"
msgstr ""
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr ""
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:379
+#: sequencer.c:388
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:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr ""
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4428,15 +5540,15 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr ""
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4451,7 +5563,7 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4465,299 +5577,346 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, 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:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr ""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
+#: sequencer.c:2668
+msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr ""
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -4769,27 +5928,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr ""
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -4799,11 +5958,11 @@
"\n"
msgstr ""
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -4814,76 +5973,76 @@
"\n"
msgstr ""
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr ""
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -4891,31 +6050,31 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr ""
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr ""
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -4928,151 +6087,105 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:3788
+#: sequencer.c:4131
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:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr ""
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-
-#: sequencer.c:4697
-#, 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 ""
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr ""
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr ""
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr ""
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr ""
@@ -5081,14 +6194,14 @@
msgid "'%s' is outside repository"
msgstr ""
-#: setup.c:172
+#: setup.c:173
#, 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:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5096,12 +6209,12 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5109,91 +6222,91 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr ""
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr ""
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5201,370 +6314,437 @@
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1192
+#: setup.c:1220
#, 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:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr ""
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr ""
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr ""
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr ""
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
+msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr ""
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
+msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr ""
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr ""
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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 ""
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr ""
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5572,16 +6752,16 @@
"'%s'\n"
msgstr ""
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
@@ -5591,21 +6771,21 @@
msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr ""
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
@@ -5640,7 +6820,7 @@
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr ""
@@ -5679,36 +6859,44 @@
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -5724,183 +6912,178 @@
"\n"
msgstr ""
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr ""
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr ""
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr ""
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr ""
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr ""
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr ""
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr ""
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr ""
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, 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:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr ""
@@ -5916,102 +7099,102 @@
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, 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:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, 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:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, 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:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, 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:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, 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:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, 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:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6019,7 +7202,7 @@
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6027,47 +7210,47 @@
"%%s"
msgstr ""
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, 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:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, 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:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6075,7 +7258,7 @@
"%s"
msgstr ""
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6083,23 +7266,23 @@
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:336
-msgid "Checking out files"
+#: unpack-trees.c:318
+msgid "Updating files"
msgstr ""
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6135,32 +7318,32 @@
msgid "invalid '..' path segment"
msgstr ""
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
@@ -6179,374 +7362,394 @@
msgid "unable to get current working directory"
msgstr ""
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:183 wt-status.c:210
+#: 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:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr ""
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr ""
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr ""
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr ""
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr ""
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr ""
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr ""
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr ""
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr ""
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr ""
-#: wt-status.c:880
+#: 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:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1097
+#: 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:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr ""
-#: wt-status.c:1265
+#: 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:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1284
+#: 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:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1368
+#: 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:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1376
+#: 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:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr ""
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr ""
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr ""
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr ""
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -6554,216 +7757,216 @@
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr ""
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr ""
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr ""
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -6781,12 +7984,12 @@
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
@@ -6795,159 +7998,155 @@
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr ""
@@ -6955,41 +8154,42 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1835
+#: builtin/am.c:1821
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:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -6997,184 +8197,188 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr ""
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr ""
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr ""
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr ""
@@ -7192,221 +8396,432 @@
msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr ""
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr ""
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr ""
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/bisect--helper.c:46
+#: 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:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr ""
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/bisect--helper.c:120
+#: 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:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+
+#: builtin/bisect--helper.c:289
+#, 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:321
+#, 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:329
+msgid "Are you sure [Y/n]? "
+msgstr ""
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr ""
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr ""
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr ""
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr ""
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr ""
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr ""
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
@@ -7418,18 +8833,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr ""
@@ -7461,138 +8876,147 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:151
+#: 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:155
+#: 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:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:173
+#: 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:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:458
+#: 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:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -7600,219 +9024,215 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr ""
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr ""
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr ""
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr ""
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr ""
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: 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:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:773
+#: 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:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -7831,144 +9251,144 @@
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
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:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr ""
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: 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:24 builtin/check-ignore.c:26
+#: 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:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr ""
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr ""
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr ""
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr ""
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr ""
@@ -7989,54 +9409,54 @@
msgid "no contacts specified"
msgstr ""
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr ""
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr ""
@@ -8048,105 +9468,161 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: 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:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr ""
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr ""
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8161,7 +9637,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8178,166 +9654,231 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr ""
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr ""
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr ""
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr ""
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr ""
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr ""
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr ""
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr ""
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr ""
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr ""
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr ""
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr ""
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr ""
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr ""
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr ""
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr ""
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr ""
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr ""
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr ""
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr ""
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -8354,37 +9895,104 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr ""
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr ""
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr ""
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr ""
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr ""
+
+#: builtin/checkout.c:1779
+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:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr ""
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -8393,7 +10001,7 @@
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -8406,38 +10014,38 @@
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -8448,391 +10056,405 @@
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr ""
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr ""
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr ""
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr ""
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr ""
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr ""
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr ""
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr ""
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
+msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr ""
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -8868,22 +10490,88 @@
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:40
+#: 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:525
+#, 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:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr ""
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+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:1512 builtin/merge.c:287
+#: builtin/pull.c:194 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:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:50
+#: 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:55
+#: 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"
@@ -8892,112 +10580,115 @@
"\n"
msgstr ""
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9007,7 +10698,7 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9017,14 +10708,14 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, 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:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9032,398 +10723,393 @@
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr ""
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr ""
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr ""
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr ""
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr ""
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr ""
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr ""
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr ""
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1481
-msgid "default"
-msgstr ""
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr ""
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr ""
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr ""
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
@@ -9431,7 +11117,7 @@
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
@@ -9536,7 +11222,7 @@
msgid "Type"
msgstr ""
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr ""
@@ -9580,7 +11266,7 @@
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr ""
@@ -9588,48 +11274,48 @@
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr ""
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -9639,81 +11325,81 @@
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr ""
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr ""
-#: builtin/config.c:657
+#: builtin/config.c:658
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:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr ""
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr ""
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr ""
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr ""
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:772
+#: builtin/config.c:773
#, 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:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr ""
@@ -9726,194 +11412,194 @@
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr ""
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr ""
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr ""
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@ -9922,440 +11608,517 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
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:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fetch.c:29
-msgid "git fetch [<options>] <group>"
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
msgstr ""
#: builtin/fetch.c:30
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/fetch.c:31
+msgid "git fetch [<options>] <group>"
+msgstr ""
+
+#: builtin/fetch.c:32
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr ""
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr ""
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr ""
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+
+#: builtin/fetch.c:858
+#, 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:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, 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:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
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:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
+#: builtin/fetch.c:1703
+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>]"
@@ -10417,90 +12180,271 @@
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr ""
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr ""
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr ""
@@ -10510,17 +12454,22 @@
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -10530,72 +12479,72 @@
"%s"
msgstr ""
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
@@ -10604,297 +12553,293 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr ""
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr ""
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr ""
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr ""
@@ -10934,364 +12879,354 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: 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:217
+#: 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:229
+#: 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:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:249
+#: 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:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:555
+#: 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:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr ""
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr ""
@@ -11335,635 +13270,627 @@
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:548
+#: 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:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr ""
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr ""
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr ""
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr ""
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr ""
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr ""
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr ""
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr ""
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr ""
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr ""
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr ""
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr ""
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr ""
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
+msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
+msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
+msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:910
-msgid "Need exactly one range."
+#: builtin/log.c:941
+msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:920
-msgid "Not a range."
+#: builtin/log.c:951
+msgid "not a range"
msgstr ""
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1204
-msgid "Two output directories?"
+#: builtin/log.c:1244
+msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
+msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr ""
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr ""
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr ""
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr ""
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr ""
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr ""
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr ""
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1585
-msgid "rev"
-msgstr ""
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr ""
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:1931
-msgid "Failed to create output files"
+#: builtin/log.c:1975
+msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr ""
@@ -11978,7 +13905,7 @@
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr ""
@@ -12002,11 +13929,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
@@ -12051,348 +13978,373 @@
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr ""
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr ""
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:797
-#, c-format
+#: 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:833
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -12475,33 +14427,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr ""
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, 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:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr ""
@@ -12514,7 +14466,7 @@
msgid "input is NUL terminated"
msgstr ""
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr ""
@@ -12522,156 +14474,168 @@
msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
msgstr ""
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr ""
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
msgstr ""
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr ""
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr ""
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -12811,14 +14775,14 @@
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:242 builtin/tag.c:513
+#: 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:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 ""
@@ -12851,38 +14815,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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:675
+#: 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:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr ""
@@ -12893,138 +14857,138 @@
"existing notes"
msgstr ""
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: 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:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:536
+#: 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:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:600
+#: 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:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr ""
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13032,422 +14996,435 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897
+#: 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:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr ""
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr ""
@@ -13463,86 +15440,86 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -13550,74 +15527,74 @@
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:461
+#: builtin/pull.c:473
#, 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:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -13625,7 +15602,7 @@
"commit %s."
msgstr ""
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -13636,15 +15613,15 @@
"to recover."
msgstr ""
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -13660,13 +15637,13 @@
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -13681,7 +15658,7 @@
"%s"
msgstr ""
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -13691,7 +15668,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -13700,12 +15677,12 @@
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -13713,12 +15690,12 @@
"to update which remote branch."
msgstr ""
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -13726,7 +15703,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -13734,7 +15711,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -13743,33 +15720,33 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:296
+#: builtin/push.c:298
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:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -13782,104 +15759,104 @@
" git push <name>\n"
msgstr ""
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr ""
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr ""
@@ -13903,136 +15880,319 @@
msgid "use simple diff colors"
msgstr ""
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr ""
-#: builtin/read-tree.c:40
+#: 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:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr ""
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr ""
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr ""
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr ""
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr ""
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr ""
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr ""
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr ""
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr ""
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr ""
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:950 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"
@@ -14041,11 +16201,19 @@
"abort\"."
msgstr ""
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
+#: builtin/rebase.c:1031
+#, 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:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -14056,7 +16224,7 @@
"\n"
msgstr ""
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -14065,168 +16233,169 @@
"\n"
msgstr ""
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr ""
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr ""
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr ""
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -14239,337 +16408,171 @@
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1226
-#, c-format
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr ""
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr ""
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr ""
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr ""
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr ""
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr ""
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr ""
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr ""
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr ""
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr ""
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr ""
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr ""
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr ""
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr ""
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr ""
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr ""
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr ""
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr ""
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr ""
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr ""
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr ""
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr ""
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr ""
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr ""
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr ""
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr ""
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr ""
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -14586,7 +16589,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -14598,19 +16601,69 @@
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr ""
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: 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:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr ""
@@ -15115,95 +17168,123 @@
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr ""
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:478
+#, 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:526
#, c-format
msgid "failed to remove '%s'"
msgstr ""
@@ -15232,39 +17313,34 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr ""
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr ""
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr ""
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr ""
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr ""
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -15272,178 +17348,183 @@
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr ""
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr ""
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr ""
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr ""
@@ -15459,123 +17540,124 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr ""
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr ""
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr ""
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr ""
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr ""
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr ""
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -15584,53 +17666,53 @@
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -15655,72 +17737,81 @@
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:91
+#: 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:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:103
-msgid "don't automatically commit"
-msgstr ""
-
-#: builtin/revert.c:104
-msgid "edit the commit message"
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
msgstr ""
#: builtin/revert.c:107
-msgid "parent-number"
+msgid "don't automatically commit"
msgstr ""
#: builtin/revert.c:108
-msgid "select mainline parent"
+msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:110
-msgid "merge strategy"
+#: 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:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -15730,60 +17821,60 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:215
+#: 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:219 builtin/rm.c:228
+#: 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:225
+#: 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:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
@@ -15812,18 +17903,6 @@
msgid "print status from remote helper"
msgstr ""
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr ""
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr ""
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
@@ -15856,7 +17935,7 @@
msgid "Linewrap output"
msgstr ""
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
@@ -15879,159 +17958,380 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:742
+#: 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:830
+#: 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:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/show-ref.c:11
+#: 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:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: 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:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr ""
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:24 builtin/stash.c:47
+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:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:77
+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:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr ""
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr ""
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr ""
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr ""
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr ""
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr ""
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr ""
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr ""
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr ""
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr ""
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr ""
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr ""
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr ""
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr ""
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr ""
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr ""
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr ""
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr ""
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr ""
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr ""
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr ""
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr ""
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr ""
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr ""
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr ""
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr ""
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr ""
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr ""
@@ -16040,55 +18340,55 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -16096,338 +18396,346 @@
"."
msgstr ""
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, 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:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, 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:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -16462,36 +18770,36 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
-msgstr ""
-
-#: builtin/tag.c:26
-msgid "git tag -d <tagname>..."
+"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:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -16500,7 +18808,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -16510,146 +18818,155 @@
"want to.\n"
msgstr ""
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:218
+#: 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:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr ""
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr ""
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -16658,242 +18975,242 @@
msgid "Unpacking objects"
msgstr ""
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr ""
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr ""
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
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:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
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:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr ""
@@ -16937,6 +19254,10 @@
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 ""
@@ -16949,15 +19270,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr ""
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr ""
@@ -16973,105 +19294,105 @@
msgid "show statistics only"
msgstr ""
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, 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:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -17083,191 +19404,191 @@
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, 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:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, 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:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr ""
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr ""
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -17276,7 +19597,7 @@
"\tchmod 0700 %s"
msgstr ""
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr ""
@@ -17289,6 +19610,14 @@
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"
@@ -17303,96 +19632,143 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:719
+#: 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:377
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:464
+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:802
+#: 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:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -17400,39 +19776,167 @@
" redirect: %s"
msgstr ""
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: list-objects-filter-options.h:60
-msgid "args"
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
msgstr ""
#: list-objects-filter-options.h:61
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr ""
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr ""
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr ""
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr ""
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr ""
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+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 ""
@@ -17686,7 +20190,7 @@
msgstr ""
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
@@ -17858,219 +20362,223 @@
msgstr ""
#: command-list.h:156
-msgid "Revert some existing commits"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:157
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:158
-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:161
-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:162
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:163
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:164
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:165
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:166
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:167
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:168
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:169
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:170
-msgid "Stash the changes in a dirty working directory away"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:171
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:172
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:173
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:174
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:175
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:176
-msgid "Read, modify and delete symbolic refs"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:177
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Switch branches"
msgstr ""
#: command-list.h:178
-msgid "Creates a temporary file with a blob's contents"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:179
-msgid "Unpack objects from a packed archive"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:180
-msgid "Register file contents in the working tree to the index"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:181
-msgid "Update the object name stored in a ref safely"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:182
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:183
-msgid "Send archive back to git-archive"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:184
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:185
-msgid "Show a Git logical variable"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:186
-msgid "Check the GPG signature of commits"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:187
-msgid "Validate packed Git archive files"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:188
-msgid "Check the GPG signature of tags"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:189
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:190
-msgid "Show logs with difference each commit introduces"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:191
-msgid "Manage multiple working trees"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:192
-msgid "Create a tree object from the current index"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:193
-msgid "Defining attributes per path"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:194
-msgid "Git command-line interface and conventions"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:195
-msgid "A Git core tutorial for developers"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:196
-msgid "Git for CVS users"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:197
-msgid "Tweaking diff output"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:198
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:199
-msgid "A Git Glossary"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:200
-msgid "Hooks used by Git"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:201
-msgid "Specifies intentionally untracked files to ignore"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:202
-msgid "Defining submodule properties"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:203
-msgid "Git namespaces"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:204
-msgid "Git Repository Layout"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:205
-msgid "Specifying revisions and ranges for Git"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:206
-msgid "A tutorial introduction to Git: part two"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:207
-msgid "A tutorial introduction to Git"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:208
-msgid "An overview of recommended workflows with Git"
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:209
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:210
+msgid "An overview of recommended workflows with Git"
msgstr ""
#: git-bisect.sh:54
@@ -18084,160 +20592,72 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr ""
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr ""
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr ""
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr ""
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr ""
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-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:312
-msgid "Are you sure [Y/n]? "
-msgstr ""
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr ""
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr ""
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
@@ -18278,253 +20698,113 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr ""
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr ""
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr ""
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr ""
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr ""
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr ""
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr ""
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr ""
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr ""
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr ""
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr ""
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr ""
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr ""
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr ""
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr ""
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr ""
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr ""
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr ""
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr ""
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr ""
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr ""
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr ""
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -18532,22 +20812,22 @@
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -18558,120 +20838,122 @@
"option."
msgstr ""
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
msgstr ""
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -18681,12 +20963,21 @@
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--preserve-merges.sh:136
+#: 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:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -18707,7 +20998,7 @@
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -18719,83 +21010,83 @@
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--preserve-merges.sh:428
+#: 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:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -18805,31 +21096,31 @@
"you are able to reword the commit."
msgstr ""
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -18837,7 +21128,7 @@
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -18847,25 +21138,25 @@
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -18883,50 +21174,50 @@
" git rebase --continue\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:784
+#: 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:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr ""
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--preserve-merges.sh:888
+#: 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:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr ""
@@ -18935,173 +21226,175 @@
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: 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:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:377
+#: 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:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -19111,14 +21404,14 @@
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
@@ -19129,12 +21422,12 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -19143,7 +21436,7 @@
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -19152,7 +21445,7 @@
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -19161,7 +21454,7 @@
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -19170,7 +21463,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -19179,7 +21472,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -19188,7 +21481,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -19197,7 +21490,16 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+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:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -19210,211 +21512,226 @@
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -19425,18 +21742,19 @@
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
@@ -19449,66 +21767,66 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:302
+#: 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:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:395 git-send-email.perl:650
+#: 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:398
+#: 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:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -19518,36 +21836,36 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -19556,37 +21874,37 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:790
+#: 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:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:880
+#: 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:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -19595,20 +21913,20 @@
"want to send.\n"
msgstr ""
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:942
+#: 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:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
@@ -19616,16 +21934,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1412
+#: 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"
@@ -19642,128 +21960,128 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: 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:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1941
+#: 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:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
diff --git a/po/it.po b/po/it.po
index 9080219..30ec99c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,217 +1,2499 @@
# Italian translations for Git.
# Copyright (C) 2012 Marco Paolone <marcopaolone@gmail.com>
+# Copyright © 2018-2019 Alessandro Menti <alessandro.menti@alessandromenti.it>
# This file is distributed under the same license as the Git package.
+#
+# Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com>
+# and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their
+# contributions.
+# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-06-08 10:20+0800\n"
-"PO-Revision-Date: 2012-06-14 14:13+0200\n"
-"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
-"Language-Team: Italian\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-11 11:48+0200\n"
+"Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n"
+"Language-Team: Italian <>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 19.04.3\n"
-#: advice.c:40
+#: advice.c:109
#, c-format
-msgid "hint: %.*s\n"
-msgstr "suggerimento: %.*s\n"
+msgid "%shint: %.*s%s\n"
+msgstr "%ssuggerimento: %.*s%s\n"
-#.
-#. * Message used both when 'git commit' fails and when
-#. * other commands doing a merge do.
-#.
-#: advice.c:70
-msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
+#: advice.c:162
+msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
+"Il cherry picking non è possibile perché ci sono file di cui non è stato "
+"eseguito il merge."
+
+#: advice.c:164
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+"Il commit non è possibile perché ci sono file di cui non è stato eseguito il "
+"merge."
+
+#: advice.c:166
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+"Il merge non è possibile perché ci sono file di cui non è stato eseguito il "
+"merge."
+
+#: advice.c:168
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+"Il pull non è possibile perché ci sono file di cui non è stato eseguito il "
+"merge."
+
+#: advice.c:170
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+"Il revert non è possibile perché ci sono file di cui non è stato eseguito il "
+"merge."
+
+#: advice.c:172
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+"Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito "
+"il merge."
+
+#: advice.c:180
+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 ""
+"Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come "
+"appropriato per risolverli ed esegui un commit."
+
+#: advice.c:188
+msgid "Exiting because of an unresolved conflict."
+msgstr "Esco a causa di un conflitto non risolto."
+
+#: advice.c:193 builtin/merge.c:1327
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)."
+
+#: advice.c:195
+msgid "Please, commit your changes before merging."
+msgstr "Esegui il commit delle modifiche prima di eseguire il merge."
+
+#: advice.c:196
+msgid "Exiting because of unfinished merge."
+msgstr "Esco a causa di un merge non terminato."
+
+#: advice.c:202
+#, 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 ""
+"Nota: eseguo il checkout di '%s'.\n"
+"\n"
+"Sei nello stato 'HEAD scollegato'. Puoi dare un'occhiata, apportare "
+"modifiche\n"
+"sperimentali ed eseguirne il commit, e puoi scartare qualunque commit "
+"eseguito\n"
+"in questo stato senza che ciò abbia alcuna influenza sugli altri branch "
+"tornando\n"
+"su un branch.\n"
+"\n"
+"Se vuoi creare un nuovo branch per mantenere i commit creati, puoi farlo\n"
+"(ora o in seguito) usando l'opzione -c con il comando switch. Ad esempio:\n"
+"\n"
+" git switch -c <nome nuovo branch>\n"
+"\n"
+"Oppure puoi annullare quest'operazione con:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Disattiva questo consiglio impostando la variabile di configurazione\n"
+"advice.detachedHead a false\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "la riga di comando termina con \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "virgolette non chiuse"
+
+#: apply.c:69
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opzione spazi bianchi '%s' non riconosciuta"
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opzione ignora spazi bianchi '%s' non riconosciuta"
+
+#: apply.c:135
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject e --3way non possono essere usati insieme."
+
+#: apply.c:137
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached e --3way non possono essere usati insieme."
+
+#: apply.c:140
+msgid "--3way outside a repository"
+msgstr "--3way al di fuori di un repository"
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr "--index al di fuori di un repository"
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr "--cached al di fuori di un repository"
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Impossibile preparare l'espressione regolare timestamp %s"
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec ha restituito %d per l'input: %s"
+
+#: apply.c:884
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "impossibile trovare il nome del file nella patch alla riga %d"
+
+#: apply.c:922
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d"
+
+#: apply.c:929
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d"
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: git-diff errato - atteso /dev/null alla riga %d"
+
+#: apply.c:963
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo non valido alla riga %d: %s"
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "righe di intestazione %d e %d inconsistenti"
+
+#: apply.c:1460
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: riga inattesa: %.*s"
+
+#: apply.c:1529
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "frammento di patch senza intestazione alla riga %d: %.*s"
+
+#: apply.c:1551
+#, 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] ""
+"l'intestazione git diff non riporta le informazioni sul file una volta "
+"rimosso %d componente iniziale del percorso (riga %d)"
+msgstr[1] ""
+"l'intestazione git diff non riporta le informazioni sul file una volta "
+"rimossi %d componenti iniziali del percorso (riga %d)"
+
+#: apply.c:1564
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)"
+
+#: apply.c:1752
+msgid "new file depends on old contents"
+msgstr "il nuovo file dipende da vecchi contenuti"
+
+#: apply.c:1754
+msgid "deleted file still has contents"
+msgstr "il file eliminato ha ancora dei contenuti"
+
+#: apply.c:1788
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "patch corrotta alla riga %d"
+
+#: apply.c:1825
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "il nuovo file %s dipende da vecchi contenuti"
+
+#: apply.c:1827
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "il file eliminato %s ha ancora dei contenuti"
+
+#: apply.c:1830
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato"
+
+#: apply.c:1977
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "patch binaria corrotta alla riga %d: %.*s"
+
+#: apply.c:2014
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "patch binaria non riconosciuta alla riga %d"
+
+#: apply.c:2176
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch con soli contenuti garbage alla riga %d"
+
+#: apply.c:2262
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "impossibile leggere il collegamento simbolico %s"
+
+#: apply.c:2266
+#, c-format
+msgid "unable to open or read %s"
+msgstr "impossibile aprire o leggere %s"
+
+#: apply.c:2925
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "inizio della riga non valido: '%c'"
+
+#: apply.c:3046
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)."
+msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)."
+
+#: apply.c:3058
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d"
+
+#: apply.c:3064
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"durante la ricerca di:\n"
+"%.*s"
+
+#: apply.c:3086
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "dati della patch binaria mancanti per '%s'"
+
+#: apply.c:3094
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"impossibile applicare una patch binaria al contrario senza l'hunk contrario "
+"per '%s'"
+
+#: apply.c:3141
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"impossibile applicare una patch binaria a '%s' senza la riga d'indice "
+"completa"
+
+#: apply.c:3151
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti "
+"del file."
+
+#: apply.c:3159
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto"
+
+#: apply.c:3177
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "impossibile leggere la postimmagine %s necessaria per '%s'"
+
+#: apply.c:3190
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "la patch binaria non si applica correttamente a '%s'"
+
+#: apply.c:3196
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)"
+
+#: apply.c:3217
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "patch non riuscita: %s:%ld"
+
+#: apply.c:3340
+#, c-format
+msgid "cannot checkout %s"
+msgstr "impossibile eseguire il checkout di '%s'"
+
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#, c-format
+msgid "failed to read %s"
+msgstr "lettura di %s non riuscita"
+
+#: apply.c:3400
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "lettura di '%s' oltre un collegamento simbolico"
+
+#: apply.c:3429 apply.c:3672
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "il percorso %s è stato rinominato/eliminato"
+
+#: apply.c:3515 apply.c:3687
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: non esiste nell'indice"
+
+#: apply.c:3524 apply.c:3695
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: non corrisponde all'indice"
+
+#: apply.c:3559
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"dal repository manca il blob necessario per ripiegare sul merge a tre vie."
+
+#: apply.c:3562
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Ripiego sul merge a tre vie...\n"
+
+#: apply.c:3578 apply.c:3582
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "impossibile leggere i contenuti correnti di '%s'"
+
+#: apply.c:3594
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Ripiego sul merge a tre vie non riuscito...\n"
+
+#: apply.c:3608
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Patch applicata a '%s' con conflitti.\n"
+
+#: apply.c:3613
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Patch '%s' applicata correttamente.\n"
+
+#: apply.c:3639
+msgid "removal patch leaves file contents"
+msgstr "la rimozione della patch lascia contenuti del file"
+
+#: apply.c:3712
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: tipo errato"
+
+#: apply.c:3714
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s ha il tipo %o, atteso %o"
+
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
+#, c-format
+msgid "invalid path '%s'"
+msgstr "percorso '%s' non valido"
+
+#: apply.c:3923
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: esiste già nell'indice"
+
+#: apply.c:3926
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: esiste già nella directory di lavoro"
+
+#: apply.c:3946
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)"
+
+#: apply.c:3951
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s"
+
+#: apply.c:3971
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "il file interessato '%s' si trova oltre un collegamento simbolico"
+
+#: apply.c:3975
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: la patch non si applica correttamente"
+
+#: apply.c:3990
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Controllo della patch %s in corso..."
+
+#: apply.c:4082
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili"
+
+#: apply.c:4089
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "modifica modo per %s che non è nell'HEAD corrente"
+
+#: apply.c:4092
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "le informazioni SHA1 sono mancanti o inutili (%s)."
+
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry non riuscito per il percorso '%s'"
+
+#: apply.c:4101
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "impossibile aggiungere %s all'indice temporaneo"
+
+#: apply.c:4111
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "impossibile scrivere l'indice temporaneo in %s"
+
+#: apply.c:4249
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "impossibile rimuovere %s dall'indice"
+
+#: apply.c:4283
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "patch corrotta per il sottomodulo %s"
+
+#: apply.c:4289
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "impossibile eseguire lo stat del file appena creato '%s'"
+
+#: apply.c:4297
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "impossibile creare l'archivio di backup per il file appena creato %s"
+
+#: apply.c:4303 apply.c:4448
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "impossibile aggiungere la voce della cache per %s"
+
+#: apply.c:4346
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "scrittura in '%s' non riuscita"
+
+#: apply.c:4350
+#, c-format
+msgid "closing file '%s'"
+msgstr "chiusura del file '%s' in corso"
+
+#: apply.c:4420
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "impossibile scrivere il file '%s' con modo %o"
+
+#: apply.c:4518
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Patch %s applicata correttamente."
+
+#: apply.c:4526
+msgid "internal error"
+msgstr "errore interno"
+
+#: apply.c:4529
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Applicazione della patch %%s con %d frammento respinto..."
+msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..."
+
+#: apply.c:4540
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "nome file .rej troncato a %.*s.rej"
+
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#, c-format
+msgid "cannot open %s"
+msgstr "impossibile aprire %s"
+
+#: apply.c:4562
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Frammento %d applicato correttamente."
+
+#: apply.c:4566
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Frammento %d respinto."
+
+#: apply.c:4676
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ignorata."
+
+#: apply.c:4684
+msgid "unrecognized input"
+msgstr "input non riconosciuto"
+
+#: apply.c:4704
+msgid "unable to read index file"
+msgstr "impossibile leggere il file index"
+
+#: apply.c:4859
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "impossibile aprire la patch '%s': %s"
+
+#: apply.c:4886
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d errore di spazi bianchi soppresso"
+msgstr[1] "%d errori di spazi bianchi soppressi"
+
+#: apply.c:4892 apply.c:4907
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d riga aggiunge errori di spazi bianchi."
+msgstr[1] "%d righe aggiungono errori di spazi bianchi."
+
+#: apply.c:4900
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi."
+msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi."
+
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+msgid "Unable to write new index file"
+msgstr "Impossibile scrivere il nuovo file index"
+
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
+msgid "path"
+msgstr "percorso"
+
+#: apply.c:4944
+msgid "don't apply changes matching the given path"
+msgstr "non applicare le modifiche corrispondenti al percorso specificato"
+
+#: apply.c:4947
+msgid "apply changes matching the given path"
+msgstr "applica le modifiche corrispondenti al percorso specificato"
+
+#: apply.c:4949 builtin/am.c:2217
+msgid "num"
+msgstr "num"
+
+#: apply.c:4950
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali"
+
+#: apply.c:4953
+msgid "ignore additions made by the patch"
+msgstr "ignora le aggiunte create dalla patch"
+
+#: apply.c:4955
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+"invece di applicare la patch, visualizza l'output di diffstat per l'input"
+
+#: apply.c:4959
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+"visualizza il numero di righe aggiunte ed eliminate in notazione decimale"
+
+#: apply.c:4961
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "invece di applicare la patch, visualizza un riassunto per l'input"
+
+#: apply.c:4963
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "invece di applicare la patch, verifica se può essere applicata"
+
+#: apply.c:4965
+msgid "make sure the patch is applicable to the current index"
+msgstr "assicura che la patch sia applicabile all'indice corrente"
+
+#: apply.c:4967
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "contrassegna i nuovi file con `git add --intent-to-add`"
+
+#: apply.c:4969
+msgid "apply a patch without touching the working tree"
+msgstr "applica una patch senza modificare l'albero di lavoro"
+
+#: apply.c:4971
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+"accetta una patch che apporta modifiche al di fuori dell'area di lavoro"
+
+#: apply.c:4974
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "applica anche la patch (da usare con --stat/--summary/--check)"
+
+#: apply.c:4976
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "prova un merge a tre vie se la patch non si applica correttamente"
+
+#: apply.c:4978
+msgid "build a temporary index based on embedded index information"
+msgstr "compila un index temporaneo basato sulle informazioni indice incluse"
+
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+msgid "paths are separated with NUL character"
+msgstr "i percorsi sono separati con un carattere NUL"
+
+#: apply.c:4983
+msgid "ensure at least <n> lines of context match"
+msgstr "assicura che almeno <n> righe di contesto corrispondano"
+
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+msgid "action"
+msgstr "azione"
+
+#: apply.c:4985
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi"
+
+#: apply.c:4988 apply.c:4991
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti"
+
+#: apply.c:4994
+msgid "apply the patch in reverse"
+msgstr "applica la patch in maniera inversa"
+
+#: apply.c:4996
+msgid "don't expect at least one line of context"
+msgstr "non aspettare almeno una riga di contesto"
+
+#: apply.c:4998
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "lascia i frammenti respinti nei file *.rej corrispondenti"
+
+#: apply.c:5000
+msgid "allow overlapping hunks"
+msgstr "consenti la sovrapposizione dei frammenti"
+
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+msgid "be verbose"
+msgstr "visualizza ulteriori dettagli"
+
+#: apply.c:5003
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+"tollera carattere fine riga rilevato erroneamente come mancante alla fine "
+"del file"
+
+#: apply.c:5006
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+"non fare affidamento sul numero di righe nelle intestazioni dei frammenti"
+
+#: apply.c:5008 builtin/am.c:2205
+msgid "root"
+msgstr "radice"
+
+#: apply.c:5009
+msgid "prepend <root> to all filenames"
+msgstr "anteponi <radice> a tutti i nomi file"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opzioni>] <albero> [<percorso>...]"
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repository> [--exec <comando>] [<opzioni>] <albero> "
+"[<percorso>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repository> [--exec <comando>] --list"
+
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
+
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "riferimento non esistente: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "%s non è un nome oggetto valido"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "%s non è un oggetto albero valido"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "la directory di lavoro corrente non è tracciata"
+
+#: archive.c:457
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:457
+msgid "archive format"
+msgstr "formato archivio"
+
+#: archive.c:458 builtin/log.c:1580
+msgid "prefix"
+msgstr "prefisso"
+
+#: archive.c:459
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
+
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+msgid "file"
+msgstr "file"
+
+#: archive.c:461 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "scrivi l'archivio in questo file"
+
+#: archive.c:463
+msgid "read .gitattributes in working directory"
+msgstr "leggi il file .gitattributes nella directory di lavoro"
+
+#: archive.c:464
+msgid "report archived files on stderr"
+msgstr "elenca i file archiviati sullo standard error"
+
+#: archive.c:465
+msgid "store only"
+msgstr "salva solamente"
+
+#: archive.c:466
+msgid "compress faster"
+msgstr "comprimi più velocemente"
+
+#: archive.c:474
+msgid "compress better"
+msgstr "comprimi meglio"
+
+#: archive.c:477
+msgid "list supported archive formats"
+msgstr "elenca i formati archivio supportati"
+
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+msgid "repo"
+msgstr "repository"
+
+#: archive.c:480 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recupera l'archivio dal repository remoto <repository>"
+
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
+msgid "command"
+msgstr "comando"
+
+#: archive.c:482 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "percorso al comando remoto git-upload-archive"
+
+#: archive.c:489
+msgid "Unexpected option --remote"
+msgstr "Opzione --remote inattesa"
+
+#: archive.c:491
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'opzione --exec può essere usata solo con --remote"
+
+#: archive.c:493
+msgid "Unexpected option --output"
+msgstr "Opzione --output inattesa"
+
+#: archive.c:515
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato archivio '%s' sconosciuto"
+
+#: archive.c:522
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argomento non supportato per il formato '%s': -%d"
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "impossibile eseguire lo streaming del blob %s"
+
+#: archive-tar.c:260 archive-zip.c:363
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo file non supportato: 0%o (SHA1: %s)"
+
+#: archive-tar.c:287 archive-zip.c:353
+#, c-format
+msgid "cannot read %s"
+msgstr "impossibile leggere %s"
+
+#: archive-tar.c:459
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "impossibile avviare il filtro '%s'"
+
+#: archive-tar.c:462
+msgid "unable to redirect descriptor"
+msgstr "impossibile ridirezionare il descrittore"
+
+#: archive-tar.c:469
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "il filtro '%s' ha segnalato un errore"
+
+#: archive-zip.c:314
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "il percorso non è codificato validamente in UTF-8: %s"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
+
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#, c-format
+msgid "deflate error (%d)"
+msgstr "errore deflate (%d)"
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>"
+
+#: attr.c:211
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s non è un nome attributo valido"
+
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s non consentito: %s:%d"
+
+#: attr.c:408
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"I pattern negativi sono ignorati negli attributi git\n"
+"Usa '\\!' per specificare letteralmente un punto esclamativo iniziale."
+
+#: bisect.c:468
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s"
+
+#: bisect.c:678
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Impossibile eseguire un'ulteriore bisezione!\n"
+
+#: bisect.c:733
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "%s non è un nome commit valido"
+
+#: bisect.c:758
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"La base del merge %s non funziona.\n"
+"Ciò significa che il bug è stato corretto fra %s e [%s].\n"
+
+#: bisect.c:763
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base del merge %s è nuova.\n"
+"La proprietà è stata modificata fra %s e [%s].\n"
+
+#: bisect.c:768
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base del merge %s è %s.\n"
+"Ciò significa che il primo commit '%s' è fra %s e [%s].\n"
+
+#: bisect.c:776
+#, 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 ""
+"Alcune revisioni %s non sono antenate della revisione %s.\n"
+"git bisect non può funzionare correttamente in questo caso.\n"
+"Forse hai confuso le revisioni %s con quelle %s?\n"
+
+#: bisect.c:789
+#, 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 ""
+"la base del merge fra %s e [%s] dev'essere saltata.\n"
+"Non è possibile essere sicuri che il primo commit %s sia fra %s e %s.\n"
+"Continuo comunque."
+
+#: bisect.c:822
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisezione: dev'essere testata una base del merge\n"
+
+#: bisect.c:865
+#, c-format
+msgid "a %s revision is needed"
+msgstr "è richiesta una revisione %s"
+
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#, c-format
+msgid "could not create file '%s'"
+msgstr "impossibile creare il file '%s'"
+
+#: bisect.c:928 builtin/merge.c:148
+#, c-format
+msgid "could not read file '%s'"
+msgstr "impossibile leggere il file '%s'"
+
+#: bisect.c:958
+msgid "reading bisect refs failed"
+msgstr "lettura riferimenti della bisezione non riuscita"
+
+#: bisect.c:977
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s era sia %s sia %s\n"
+
+#: bisect.c:985
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"Nessun commit testabile trovato.\n"
+"Forse hai iniziato il procedimento specificando parametri percorso errati?\n"
+
+#: bisect.c:1004
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(circa %d passo)"
+msgstr[1] "(circa %d passi)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1010
+#, 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] ""
+"Bisezione in corso: %d revisione rimanente da testare dopo questa %s\n"
+msgstr[1] ""
+"Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
+
+#: blame.c:2697
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents e --reverse non sono compatibili."
+
+#: blame.c:2711
+msgid "cannot use --contents with final commit object name"
+msgstr "impossibile usare --contents con il nome oggetto del commit finale"
+
+#: blame.c:2732
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
+"specificato l'ultimo commit"
+
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
+msgstr "impostazione percorso revisioni non riuscita"
+
+#: blame.c:2759
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
+"specificato un intervallo nella catena del primo commit genitore"
+
+#: blame.c:2770
+#, c-format
+msgid "no such path %s in %s"
+msgstr "il percorso %s in %s non esiste"
+
+#: blame.c:2781
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "impossibile leggere il blob %s per il percorso %s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"Dopo aver corretto l'errore è possibile provare a correggere\n"
+"le informazioni di tracciamento remoto eseguendo\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "Non imposto il branch %s come upstream di sé stesso."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Branch '%s' impostato per tracciare il branch remoto '%s' da '%s' tramite "
+"rebase."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Branch '%s' impostato per tracciare il branch remoto '%s' da '%s'."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Branch '%s' impostato per tracciare il branch locale '%s' tramite rebase."
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Branch '%s' impostato per tracciare il branch locale '%s'."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Branch '%s' impostato per tracciare il riferimento remoto '%s' tramite "
+"rebase."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Branch '%s' impostato per tracciare il riferimento remoto '%s'."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Branch '%s' impostato per tracciare il riferimento locale '%s' tramite "
+"rebase."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Branch '%s' impostato per tracciare il riferimento locale '%s'."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Impossibile scrivere la configurazione relativa al branch upstream"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+"Il tracciamento non avverrà: informazioni ambigue per il riferimento %s"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' non è un nome branch valido."
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Un branch denominato '%s' esiste già."
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "Impossibile eseguire un aggiornamento forzato del branch corrente."
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Impossibile impostare le informazioni di tracciamento: il punto di partenza "
+"'%s' non è un branch."
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "il branch upstream richiesto '%s' non esiste"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"Se prevedi di basare il tuo lavoro su un branch\n"
+"upstream già esistente, potresti dover eseguire\n"
+"\"git fetch\" per recuperarlo.\n"
+"\n"
+"Se prevedi di eseguire il push di un nuovo branch locale\n"
+"che traccerà la sua controparte remota, potresti voler\n"
+"usare \"git push -u\" per impostare la configurazione del\n"
+"branch upstream durante il push."
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Nome oggetto non valido: '%s'."
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Nome oggetto ambiguo: '%s'."
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Punto di branch non valido: '%s'."
+
+#: branch.c:364
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "Il checkout di '%s' è già stato eseguito in '%s'"
+
+#: branch.c:387
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "L'HEAD dell'albero di lavoro %s non è aggiornato"
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
-msgstr ""
+msgstr "'%s' non sembra essere un file bundle v2"
-#: bundle.c:63
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
-msgstr "header non riconosciuto: %s%s (%d)"
+msgstr "intestazione non riconosciuta: %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:696
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
-msgstr "non è stato possibile aprire '%s'"
+msgstr "impossibile aprire '%s'"
-#: bundle.c:140
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
-msgstr ""
+msgstr "Dal repository mancano questi commit richiesti come prerequisito:"
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
-#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
-#: builtin/shortlog.c:181
-msgid "revision walk setup failed"
-msgstr ""
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "è necessario un repository per verificare un bundle"
-#: bundle.c:186
+#: bundle.c:197
#, c-format
-msgid "The bundle contains %d ref"
-msgid_plural "The bundle contains %d refs"
-msgstr[0] ""
-msgstr[1] ""
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Il bundle contiene questo riferimento:"
+msgstr[1] "Il bundle contiene questi %d riferimenti:"
-#: bundle.c:192
+#: bundle.c:204
+msgid "The bundle records a complete history."
+msgstr "Nel bundle è registrata una cronologia completa."
+
+#: bundle.c:206
#, c-format
-msgid "The bundle requires this ref"
-msgid_plural "The bundle requires these %d refs"
-msgstr[0] ""
-msgstr[1] ""
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Il bundle richiede questo riferimento:"
+msgstr[1] "Il bundle richiede questi %d riferimenti:"
+
+#: bundle.c:272
+msgid "unable to dup bundle descriptor"
+msgstr "impossibile duplicare il descrittore bundle"
+
+#: bundle.c:279
+msgid "Could not spawn pack-objects"
+msgstr "Impossibile avviare pack-objects"
#: bundle.c:290
-msgid "rev-list died"
-msgstr ""
+msgid "pack-objects died"
+msgstr "comando pack-objects morto"
-#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#: bundle.c:332
+msgid "rev-list died"
+msgstr "comando rev-list morto"
+
+#: bundle.c:381
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list"
+
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argomento non riconosciuto: %s"
-#: bundle.c:331
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
-msgstr "il ref '%s' è escluso dalle opzioni di rev-list"
-
-#: bundle.c:376
+#: bundle.c:468
msgid "Refusing to create empty bundle."
-msgstr ""
+msgstr "Mi rifiuto di creare un bundle vuoto."
-#: bundle.c:394
-msgid "Could not spawn pack-objects"
-msgstr ""
-
-#: bundle.c:412
-msgid "pack-objects died"
-msgstr ""
-
-#: bundle.c:415
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "impossibile creare '%s'"
-#: bundle.c:437
+#: bundle.c:503
msgid "index-pack died"
-msgstr ""
+msgstr "comando index-pack morto"
-#: commit.c:48
+#: color.c:296
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "valore colore non valido: %.*s"
+
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
-msgstr "non è stato possibile analizzare %s"
+msgstr "impossibile analizzare %s"
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s non è un commit!"
+#: commit.c:192
+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 ""
+"Il supporto per <GIT_DIR>/info/graft è deprecato\n"
+"e sarà rimosso in una versione futura di Git.\n"
+"\n"
+"Usa \"git replace --convert-graft-file\"\n"
+"per convertire i graft in ref sostitutivi.\n"
+"\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1127
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s."
+
+#: commit.c:1130
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s."
+
+#: commit.c:1133
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Il commit %s non ha una firma GPG."
+
+#: commit.c:1136
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Il commit %s ha una firma GPG valida di %s\n"
+
+#: commit.c:1390
+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 ""
+"Attenzione: il messaggio di commit non è conforme alla codifica UTF-8.\n"
+"Potresti volerlo modificare dopo aver corretto il messaggio, o impostare\n"
+"la variabile di configurazione i18n.commitencoding alla codifica usata\n"
+"dal tuo progetto.\n"
+
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "il file grafo dei commit %s è troppo piccolo"
+
+#: commit-graph.c:192
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X"
+
+#: commit-graph.c:199
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X"
+
+#: commit-graph.c:206
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+"la versione hash del grafo dei commit %X non corrisponde alla versione %X"
+
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
+"potrebbe non essere completo"
+
+#: commit-graph.c:240
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "offset blocco grafo dei commit improprio %08x%08x"
+
+#: commit-graph.c:283
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "l'ID del blocco grafo dei commit %08x compare più volte"
+
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "il grafo dei commit non ha un blocco grafi di base"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la catena del grafo dei commit non corrisponde"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "impossibile trovare tutti i file grafo dei commit"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"posizione commit non valida. Il grafo dei commit è probabilmente corrotto"
+
+#: commit-graph.c:575
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossibile trovare il commit %s"
+
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "impossibile recuperare il tipo dell'oggetto %s"
+
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Caricamento commit noti nel grafo dei commit in corso"
+
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
+
+#: commit-graph.c:1089
+msgid "Computing commit graph generation numbers"
+msgstr "Calcolo numeri generazione del grafo dei commit in corso"
+
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
+msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
+
+#: commit-graph.c:1176
+#, c-format
+msgid "error adding pack %s"
+msgstr "errore durante l'aggiunta del pack %s"
+
+#: commit-graph.c:1180
+#, c-format
+msgid "error opening index for %s"
+msgstr "errore durante l'apertura dell'indice per %s"
+
+#: commit-graph.c:1204
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+"Ricerca dei commit per il grafo dei commit da %d riferimento in corso"
+msgstr[1] ""
+"Ricerca dei commit per il grafo dei commit da %d riferimenti in corso"
+
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso"
+
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Conteggio commit distinti nel grafo dei commit in corso"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
+
+#: commit-graph.c:1365 midx.c:811
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "impossibile creare le prime directory di %s"
+
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossibile creare '%s'"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso"
+msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "impossibile aprire il file catena grafo dei commit"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "impossibile ridenominare il file di base grafo dei commit"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Scansione dei commit sottoposti a merge in corso"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "ID commit duplicato inatteso: %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Merge del grafo dei commit in corso"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+"il formato del grafo dei commit non può essere usato per scrivere %d commit"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "troppi commit da scrivere nel grafo"
+
+#: commit-graph.c:1945
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"il file del grafo dei commit ha un checksum non corretto e probabilmente è "
+"corrotto"
+
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "impossibile analizzare il commit %s nel grafo dei commit"
+
+#: commit-graph.c:1989
+msgid "Verifying commits in commit graph"
+msgstr "Verifica dei commit nel grafo dei commit in corso"
+
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"impossibile analizzare il commit %s dal database oggetti per il grafo dei "
+"commit"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "il genitore nel grafo dei commit per %s è %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"l'elenco genitori nel grafo dei commit per il commit %s è finito prima del "
+"previsto"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"il grafo dei commit ha un numero generazione zero per il commit %s ma non "
+"pari a zero per gli altri"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"il grafo dei commit ha un numero generazione non pari a zero per il commit "
+"%s ma pari a zero per gli altri"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"la data per il commit %s nel grafo dei commit è %<PRIuMAX> != %<PRIuMAX>"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memoria esaurita"
-#: connected.c:39
-msgid "Could not run 'git rev-list'"
-msgstr "Non è stato possibile eseguire 'git-rev-list'"
-
-#: connected.c:48
+#: config.c:124
#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "scrittura nella rev-list non riuscita: %s"
-
-#: connected.c:56
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
+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 ""
+"profondità massima di inclusione (%d) superata durante l'inclusione di\n"
+"\t%s\n"
+"da\n"
+"\t%s\n"
+"Ciò può essere dovuto a delle inclusioni circolari."
-#: date.c:95
+#: config.c:140
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "impossibile espandere il percorso di inclusione '%s'"
+
+#: config.c:151
+msgid "relative config includes must come from files"
+msgstr "le inclusioni configurazione relative devono provenire da file"
+
+#: config.c:197
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"i condizionali di inclusione configurazione relativi devono provenire da file"
+
+#: config.c:376
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "la chiave non contiene una sezione: %s"
+
+#: config.c:382
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "la chiave non contiene un nome variabile: %s"
+
+#: config.c:406 sequencer.c:2463
+#, c-format
+msgid "invalid key: %s"
+msgstr "chiave non valida: %s"
+
+#: config.c:412
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "chiave non valida (nuova riga): %s"
+
+#: config.c:448 config.c:460
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parametro configurazione fittizio: %s"
+
+#: config.c:495
+#, c-format
+msgid "bogus format in %s"
+msgstr "formato fittizio in %s"
+
+#: config.c:821
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "riga configurazione %d errata nel blob %s"
+
+#: config.c:825
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "riga configurazione %d errata nel file %s"
+
+#: config.c:829
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "riga configurazione %d errata nello standard input"
+
+#: config.c:833
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "riga configurazione %d errata nel blob sottomodulo %s"
+
+#: config.c:837
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "riga configurazione %d errata nella riga di comando %s"
+
+#: config.c:841
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "riga configurazione %d errata in %s"
+
+#: config.c:978
+msgid "out of range"
+msgstr "fuori intervallo"
+
+#: config.c:978
+msgid "invalid unit"
+msgstr "unità non valida"
+
+#: config.c:979
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "valore configurazione numerico '%s' errato per '%s': %s"
+
+#: config.c:998
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "valore configurazione numerico '%s' errato per '%s' nel blob %s: %s"
+
+#: config.c:1001
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "valore configurazione numerico '%s' errato per '%s' nel file %s: %s"
+
+#: config.c:1004
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"valore configurazione numerico '%s' errato per '%s' nello standard input: %s"
+
+#: config.c:1007
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"valore configurazione numerico '%s' errato per '%s' nel blob sottomodulo %s: "
+"%s"
+
+#: config.c:1010
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"valore configurazione numerico '%s' errato per '%s' nella riga di comando "
+"%s: %s"
+
+#: config.c:1013
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "valore configurazione numerico '%s' errato per '%s' in %s: %s"
+
+#: config.c:1108
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "espansione directory utente in '%s' non riuscita"
+
+#: config.c:1117
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' per '%s' non è un timestamp valido"
+
+#: config.c:1208
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "lunghezza abbreviazione fuori intervallo: %d"
+
+#: config.c:1222 config.c:1233
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "livello compressione zlib %d non valido"
+
+#: config.c:1325
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar dovrebbe essere composto da un solo carattere"
+
+#: config.c:1358
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "modalità non valida per la creazione di un oggetto: %s"
+
+#: config.c:1430
+#, c-format
+msgid "malformed value for %s"
+msgstr "valore malformato per %s"
+
+#: config.c:1456
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "valore malformato per %s: %s"
+
+#: config.c:1457
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "dev'essere nothing, matching, simple, upstream o current"
+
+#: config.c:1518 builtin/pack-objects.c:3410
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "livello compressione pack %d non valido"
+
+#: config.c:1639
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "impossibile caricare l'oggetto blob configurazione '%s'"
+
+#: config.c:1642
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "il riferimento '%s' non punta ad un blob"
+
+#: config.c:1659
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "impossibile risolvere il blob configurazione '%s'"
+
+#: config.c:1689
+#, c-format
+msgid "failed to parse %s"
+msgstr "analisi di %s non riuscita"
+
+#: config.c:1745
+msgid "unable to parse command-line config"
+msgstr "impossibile analizzare la configurazione a riga di comando"
+
+#: config.c:2094
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"si è verificato un errore imprevisto durante la lettura dei file di "
+"configurazione"
+
+#: config.c:2264
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s non valido: '%s'"
+
+#: config.c:2307
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito "
+"'keep'"
+
+#: config.c:2333
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+"il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e "
+"100"
+
+#: config.c:2379
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando"
+
+#: config.c:2381
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d"
+
+#: config.c:2462
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nome sezione '%s' non valido"
+
+#: config.c:2494
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s ha più valori"
+
+#: config.c:2523
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "scrittura del nuovo file di configurazione %s non riuscita"
+
+#: config.c:2775 config.c:3099
+#, c-format
+msgid "could not lock config file %s"
+msgstr "impossibile bloccare il file di configurazione %s"
+
+#: config.c:2786
+#, c-format
+msgid "opening %s"
+msgstr "apertura di %s in corso"
+
+#: config.c:2821 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "pattern non valido: %s"
+
+#: config.c:2846
+#, c-format
+msgid "invalid config file %s"
+msgstr "file di configurazione %s non valido"
+
+#: config.c:2859 config.c:3112
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat di %s non riuscita"
+
+#: config.c:2870
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "impossibile eseguire mmap su '%s'"
+
+#: config.c:2879 config.c:3117
+#, c-format
+msgid "chmod on %s failed"
+msgstr "esecuzione chmod su %s non riuscita"
+
+#: config.c:2964 config.c:3214
+#, c-format
+msgid "could not write config file %s"
+msgstr "impossibile scrivere il file di configurazione %s"
+
+#: config.c:2998
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "impossibile impostare '%s' a '%s'"
+
+#: config.c:3000 builtin/remote.c:782
+#, c-format
+msgid "could not unset '%s'"
+msgstr "impossibile eliminare l'impostazione di '%s'"
+
+#: config.c:3090
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nome sezione non valido: %s"
+
+#: config.c:3257
+#, c-format
+msgid "missing value for '%s'"
+msgstr "valore mancante per '%s'"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr ""
+"la controparte remota ha chiuso la connessione durante il contatto iniziale"
+
+#: 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 ""
+"Impossibile leggere dal repository remoto.\n"
+"\n"
+"Assicurati di disporre dei privilegi d'accesso corretti\n"
+"e che il repository esista."
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "il server non supporta '%s'"
+
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "il server non supporta la funzionalità '%s'"
+
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr "atteso flush dopo lettura funzionalità"
+
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "ignoro le funzionalità dopo la prima riga '%s'"
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "errore protocollo: capabilities^{} non atteso"
+
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'"
+
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr "il repository della controparte non può essere shallow"
+
+#: connect.c:313
+msgid "invalid packet"
+msgstr "pacchetto non valido"
+
+#: connect.c:333
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "errore protocollo: '%s' non atteso"
+
+#: connect.c:441
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "risposta ls-refs non valida: %s"
+
+#: connect.c:445
+msgid "expected flush after ref listing"
+msgstr "atteso flush dopo elenco ref"
+
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "il protocollo '%s' non è supportato"
+
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "impossibile impostare SO_KEEPALIVE sul socket"
+
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Risoluzione di %s in corso... "
+
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "impossibile risolvere %s (porta %s) (%s)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"fatto.\n"
+"Connessione a %s (porta %s) in corso... "
+
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"impossibile collegarsi a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
+msgstr "fatto."
+
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "impossibile risolvere %s (%s)"
+
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
+msgstr "porta %s sconosciuta"
+
+#: connect.c:845 connect.c:1171
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "nome host strano '%s' bloccato"
+
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "porta strana '%s' bloccata"
+
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "impossibile avviare il proxy %s"
+
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"nessun percorso specificato; vedere 'git help pull' per le sintassi URL "
+"valide"
+
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
+msgstr "la variante SSH 'simple' non supporta -4"
+
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
+msgstr "la variante SSH 'simple' non supporta -6"
+
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "la variante SSH 'simple' non supporta l'impostazione della porta"
+
+#: connect.c:1260
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "percorso strano '%s' bloccato"
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr "impossibile eseguire fork"
+
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+msgid "Checking connectivity"
+msgstr "Controllo connessione in corso"
+
+#: connected.c:98
+msgid "Could not run 'git rev-list'"
+msgstr "Impossibile eseguire 'git-rev-list'"
+
+#: connected.c:118
+msgid "failed write to rev-list"
+msgstr "scrittura nella rev-list non riuscita"
+
+#: connected.c:125
+msgid "failed to close rev-list's stdin"
+msgstr "chiusura standard input della rev-list non riuscita"
+
+#: convert.c:193
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "crlf_action %d illecita"
+
+#: convert.c:206
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF sarebbe sostituito da LF in %s"
+
+#: convert.c:208
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"CRLF sarà sostituito da LF in %s.\n"
+"Il file avrà i suoi fine riga originari nella propria directory di lavoro"
+
+#: convert.c:216
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF sarebbe sostituito da CRLF in %s"
+
+#: convert.c:218
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"LF sarà sostituito da CRLF in %s.\n"
+"Il file avrà i suoi fine riga originari nella propria directory di lavoro"
+
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "Il BOM è vietato in '%s' se il file è codificato come %s"
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s "
+"come codifica dell'albero di lavoro."
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "Il BOM è richiesto in '%s' se il file è codificato come %s"
+
+#: 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 ""
+"Nel file '%s' manca un indicatore dell'ordine dei byte (BOM). Usare UTF-%sBE "
+"o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di "
+"lavoro."
+
+#: convert.c:424 convert.c:495
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "conversione della codifica '%s' da %s a %s non riuscita"
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso"
+
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'"
+
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "impossibile fornire l'input al filtro esterno '%s'"
+
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "esecuzione del filtro esterno '%s' non riuscita: %d"
+
+#: convert.c:735 convert.c:738
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "lettura dal filtro esterno '%s' non riuscita"
+
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "esecuzione del filtro esterno '%s' non riuscita"
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr "tipo filtro inatteso"
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr "nome percorso troppo lungo per il filtro esterno"
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi "
+"siano stati filtrati"
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false non sono codifiche dell'albero di lavoro valide"
+
+#: convert.c:1398 convert.c:1432
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: esecuzione del filtro clean '%s' non riuscita"
+
+#: convert.c:1476
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: esecuzione del filtro smudge '%s' non riuscita"
+
+#: date.c:137
msgid "in the future"
msgstr "in futuro"
-#: date.c:101
+#: date.c:143
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu secondo fa"
-msgstr[1] "%lu secondi fa"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> secondo fa"
+msgstr[1] "%<PRIuMAX> secondi fa"
-#: date.c:108
+#: date.c:150
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu un minuto fa"
-msgstr[1] "%lu minuti fa"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minuto fa"
+msgstr[1] "%<PRIuMAX> minuti fa"
-#: date.c:115
+#: date.c:157
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu ora fa"
-msgstr[1] "%lu ore fa"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> ora fa"
+msgstr[1] "%<PRIuMAX> ore fa"
-#: date.c:122
+#: date.c:164
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu giorno fa"
-msgstr[1] "%lu giorni fa"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> giorno fa"
+msgstr[1] "%<PRIuMAX> giorni fa"
-#: date.c:128
+#: date.c:170
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu settimana fa"
-msgstr[1] "%lu settimane fa"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> settimana fa"
+msgstr[1] "%<PRIuMAX> settimane fa"
-#: date.c:135
+#: date.c:177
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu mese fa"
-msgstr[1] "%lu mesi fa"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> mese fa"
+msgstr[1] "%<PRIuMAX> mesi fa"
-#: date.c:146
+#: date.c:188
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu anno"
-msgstr[1] "%lu anni"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> anno"
+msgstr[1] "%<PRIuMAX> anni"
-#: date.c:149
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:191
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, %lu mese fa"
-msgstr[1] "%s, %lu mesi fa"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> mese fa"
+msgstr[1] "%s, %<PRIuMAX> mesi fa"
-#: date.c:154 date.c:159
+#: date.c:196 date.c:201
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu anno fa"
-msgstr[1] "%lu anni fa"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> anno fa"
+msgstr[1] "%<PRIuMAX> anni fa"
-#: diff.c:105
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "Propagazione contrassegni isole in corso"
+
+#: delta-islands.c:290
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
+msgid "bad tree object %s"
+msgstr "oggetto albero %s non valido"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
msgstr ""
+"caricamento dell'espressione regolare dell'isola per '%s' non riuscito: %s"
-#: diff.c:110
+#: delta-islands.c:390
#, c-format
-msgid " Unknown dirstat parameter '%.*s'\n"
-msgstr " Parametro dirstat '%.*s' sconosciuto\n"
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"l'espressione regolare dell'isola tratta dalla configurazione ha troppi "
+"gruppi cattura (massimo=%d)"
-#: diff.c:210
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Contrassegnate %d isole, fatto.\n"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "lettura dell'orderfile '%s' non riuscita"
+
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
+msgstr "Rilevamento ridenominazione non esatta in corso"
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opzioni>] <percorso> <percorso>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Non è un repository Git. Usa --no-index per confrontare due percorsi al di "
+"fuori di un albero di lavoro"
+
+#: diff.c:155
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr ""
+" Analisi della percentuale di cutoff statistiche directory '%s' non "
+"riuscita\n"
+
+#: diff.c:160
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Parametro statistiche directory '%s' sconosciuto\n"
+
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"l'impostazione colore per file spostati deve essere 'no', 'default', "
+"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
+
+#: diff.c:324
+#, c-format
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"modalità color-moved-ws '%s' sconosciuta, i valori possibili sono 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change non può essere combinata con altre "
+"modalità spazi bianchi"
+
+#: diff.c:405
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
+"Valore sconosciuto per la variabile di configurazione 'diff.submodule': '%s'"
+
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -220,32 +2502,36 @@
"Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
"%s"
-#: diff.c:1400
-msgid " 0 files changed\n"
-msgstr " 0 file modificati\n"
-
-#: diff.c:1404
+#: diff.c:4215
#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] " %d file modificato"
-msgstr[1] " %d file modificati"
+msgid "external diff died, stopping at %s"
+msgstr "processo esterno diff morto, mi fermo a %s"
-#: diff.c:1421
+#: diff.c:4560
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+"le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive"
+
+#: diff.c:4563
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive"
+
+#: diff.c:4641
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow richiede esattamente uno specificatore percorso"
+
+#: diff.c:4689
#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] ", %d inserzione(+)"
-msgstr[1] ", %d inserzioni(+)"
+msgid "invalid --stat value: %s"
+msgstr "valore non valido per --stat: %s"
-#: diff.c:1432
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] ". %d rimozione(-)"
-msgstr[1] ", %d rimozioni(-)"
+msgid "%s expects a numerical value"
+msgstr "%s richiede un valore numerico"
-#: diff.c:3478
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -254,43 +2540,952 @@
"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
"%s"
-#: gpg-interface.c:59
-msgid "could not run gpg."
-msgstr "non è stato possibile eseguire gpg."
+#: diff.c:4811
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s"
-#: gpg-interface.c:71
-msgid "gpg did not accept the data"
-msgstr "gpg non ha accettato i dati"
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
-#: gpg-interface.c:82
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossibile risolvere '%s'"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s richiede il formato <n>/<m>"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s richiede un carattere, ricevuto '%s'"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argomento --color-moved errato: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "modo non valido '%s' in --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
+"\" e \"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argomento non valido per %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "argomento --word-diff errato: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Opzioni formato output diff"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "genera patch"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "non visualizzare l'output del diff"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "genera diff con <n> righe di contesto"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "genera il diff in formato grezzo"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "sinonimo di '-p --raw'"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "sinonimo di '-p --stat'"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "--stat leggibile da una macchina"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "emetti in output solo l'ultima riga di --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<parametro1,parametro2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"emetti in output la distribuzione del numero di modifiche relativo a ogni "
+"sottodirectory"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinonimo di --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "visualizza solo i nomi dei file modificati"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "visualizza solo i nomi e lo stato dei file modificati"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "genera diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<ampiezza>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "genera il diffstat con un'ampiezza specificata"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "genera il diffstat con un'ampiezza nomi specificata"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "genera il diffstat con un'ampiezza grafo specificata"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<numero>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "genera il diffstat con righe limitate"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "genera riassunto conciso nel diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "stampa in output un diff binario che può essere applicato"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "visualizza diff colorato"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<tipo>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
+"'nuove' nel diff"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo "
+"in --raw o --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<prefisso>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "non visualizzare alcun prefisso sorgente o destinazione"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"visualizza il contesto tra gli hunk del diff fino al numero di righe "
+"specificato"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<carattere>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "specifica il carattere che indica una nuova riga al posto di '+'"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "specifica il carattere che indica una vecchia riga al posto di '-'"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "specifica il carattere che indica un contesto al posto di ' '"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Opzioni rinominazione diff"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"spezza modifiche di riscrittura completa in coppie eliminazione/creazione"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "rileva le ridenominazioni"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "ometti la preimmagine per le eliminazioni"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "rileva le copie"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "usa file non modificati come sorgente per trovare copie"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "disabilita rilevamento ridenominazione"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "usa blob vuoti come sorgente ridenominazione"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+"continua a elencare la cronologia di un file al di là delle ridenominazioni"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"impedisci il rilevamento ridenominazione/copia se il numero delle "
+"destinazioni ridenominazione/copia eccede il limite specificato"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Opzioni algoritmo diff"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "produci il diff più piccolo possibile"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignora gli spazi bianchi durante il confronto delle righe"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignora le modifiche al numero degli spazi bianchi"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignora modifiche agli spazi bianchi a fine riga"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignora carattere ritorno a capo a fine riga"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora modifiche che riguardano solo righe vuote"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"euristica per spostare i limiti degli hunk nel diff per una lettura agevole"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera il diff usando l'algoritmo \"patience diff\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera il diff usando l'algoritmo \"histogram diff\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algoritmo>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "seleziona un algoritmo diff"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<testo>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera il diff usando l'algoritmo \"anchored diff\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<modalità>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"visualizza il diff parola per parola usando <modalità> per delimitare le "
+"parole modificate"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<espressione regolare>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+"equivalente di --word-diff=color --word-diff-regex=<espressione regolare>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "le righe di codice spostate sono colorate in modo diverso"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Altre opzioni diff"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e "
+"visualizza i percorsi relativi"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "tratta tutti i file come se fossero di testo"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "scambia i due input, genera un diff al contrario"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "disabilita l'intero output del programma"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "consenti l'esecuzione di un helper diff esterno"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"esegui filtri di conversione in testo esterni quando si confrontano file "
+"binari"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<quando>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<formato>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "nascondi le voci 'git add -N' nell'indice"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tratta le voci 'git add -N' come reali nell'indice"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<stringa>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"cerca differenze che modificano il numero di occorrenze della stringa "
+"specificata"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"cerca differenze che modificano il numero di occorrenze dell'espressione "
+"regolare specificata"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "visualizza tutte le modifiche nel changeset con -S o -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "controlla l'ordine con cui i file appariranno nell'output"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<ID oggetto>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"cerca differenze che modificano il numero di occorrenze dell'oggetto "
+"specificato"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "seleziona file in base al tipo diff"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<file>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Salva l'output in un file specifico"
+
+#: diff.c:6177
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"il rilevamento ridenominazione non esatta è stato omesso per la presenza di "
+"troppi file."
+
+#: diff.c:6180
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"trovate solo copie dai percorsi modificati per la presenza di troppi file."
+
+#: diff.c:6183
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"potresti voler impostare la variabile %s ad almeno %d e riprovare ad "
+"eseguire il comando."
+
+#: dir.c:537
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+"lo specificatore percorso '%s' non corrisponde ad alcun file noto a git"
+
+#: dir.c:926
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "impossibile usare %s come file di esclusione"
+
+#: dir.c:1843
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "impossibile aprire la directory '%s'"
+
+#: dir.c:2085
+msgid "failed to get kernel name and information"
+msgstr "impossibile ottenere il nome e le informazioni sul kernel"
+
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
+msgstr "la cache non tracciata è disabilitata su questo sistema o percorso"
+
+#: dir.c:3013
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "file index corrotto nel repository %s"
+
+#: dir.c:3058 dir.c:3063
+#, c-format
+msgid "could not create directories for %s"
+msgstr "impossibile creare le directory per %s"
+
+#: dir.c:3092
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "impossibile migrare la directory git da '%s' a '%s'"
+
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+"suggerimento: In attesa della chiusura del file da parte dell'editor...%c"
+
+#: entry.c:178
+msgid "Filtering content"
+msgstr "Filtraggio contenuto in corso"
+
+#: entry.c:476
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "impossibile eseguire stat sul file '%s'"
+
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "percorso spazio dei nomi git \"%s\" non valido"
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "impossibile impostare GIT_DIR a '%s'"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr "troppi argomenti per eseguire %s"
+
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Remoto senza URL"
+
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: attesa lista shallow"
+
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow"
+
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush"
+
+#: fetch-pack.c:185
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'"
+
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "impossibile scrivere sul remoto"
+
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc richiede multi_ack_detailed"
+
+#: fetch-pack.c:360 fetch-pack.c:1284
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "riga shallow non valida: '%s'"
+
+#: fetch-pack.c:366 fetch-pack.c:1290
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "riga unshallow non valida: '%s'"
+
+#: fetch-pack.c:368 fetch-pack.c:1292
+#, c-format
+msgid "object not found: %s"
+msgstr "oggetto non trovato: %s"
+
+#: fetch-pack.c:371 fetch-pack.c:1295
+#, c-format
+msgid "error in object: %s"
+msgstr "errore nell'oggetto: %s"
+
+#: fetch-pack.c:373 fetch-pack.c:1297
+#, c-format
+msgid "no shallow found: %s"
+msgstr "nessuno shallow trovato: %s"
+
+#: fetch-pack.c:376 fetch-pack.c:1301
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "attesi shallow/unshallow, ricevuto %s"
+
+#: fetch-pack.c:417
+#, c-format
+msgid "got %s %d %s"
+msgstr "ricevuto %s %d %s"
+
+#: fetch-pack.c:434
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit non valido: %s"
+
+#: fetch-pack.c:465
+msgid "giving up"
+msgstr "smetto di provare"
+
+#: fetch-pack.c:477 progress.c:277
+msgid "done"
+msgstr "fatto"
+
+#: fetch-pack.c:489
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "ricevuto %s (%d) %s"
+
+#: fetch-pack.c:535
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Contrassegno %s come completo"
+
+#: fetch-pack.c:744
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ho già %s (%s)"
+
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+"fetch-pack: impossibile eseguire il fork del demultiplexer della banda "
+"laterlae"
+
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
+msgstr "errore protocollo: intestazione pack non valida"
+
+#: fetch-pack.c:859
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: impossibile eseguire il fork di %s"
+
+#: fetch-pack.c:875
+#, c-format
+msgid "%s failed"
+msgstr "%s non riuscito"
+
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
+msgstr "errore nel demultiplexer della banda laterale"
+
+#: fetch-pack.c:908
+#, c-format
+msgid "Server version is %.*s"
+msgstr "La versione del server è %.*s"
+
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Il server supporta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Il server non supporta client shallow"
+
+#: fetch-pack.c:975
+msgid "Server does not support --shallow-since"
+msgstr "Il server non supporta --shallow-since"
+
+#: fetch-pack.c:980
+msgid "Server does not support --shallow-exclude"
+msgstr "Il server non supporta --shallow-exclude"
+
+#: fetch-pack.c:984
+msgid "Server does not support --deepen"
+msgstr "Il server non supporta --deepen"
+
+#: fetch-pack.c:1001
+msgid "no common commits"
+msgstr "nessun commit in comune"
+
+#: fetch-pack.c:1013 fetch-pack.c:1462
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: recupero non riuscito."
+
+#: fetch-pack.c:1151
+msgid "Server does not support shallow requests"
+msgstr "Il server non supporta le richieste shallow"
+
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Il server supporta filter"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "impossibile scrivere la richiesta sul remoto"
+
+#: fetch-pack.c:1202
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "errore durante la lettura dell'intestazione di sezione '%s'"
+
+#: fetch-pack.c:1208
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "atteso '%s', ricevuto '%s'"
+
+#: fetch-pack.c:1247
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "riga di conferma inattesa: '%s'"
+
+#: fetch-pack.c:1252
+#, c-format
+msgid "error processing acks: %d"
+msgstr "errore durante l'elaborazione degli ack: %d"
+
+#: fetch-pack.c:1262
+msgid "expected packfile to be sent after 'ready'"
+msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'"
+
+#: fetch-pack.c:1264
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+"ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'"
+
+#: fetch-pack.c:1306
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
+
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "atteso wanted-ref, ricevuto '%s'"
+
+#: fetch-pack.c:1358
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "wanted-ref inatteso: '%s'"
+
+#: fetch-pack.c:1363
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
+
+#: fetch-pack.c:1689
+msgid "no matching remote head"
+msgstr "nessun head remoto corrispondente"
+
+#: fetch-pack.c:1712 builtin/clone.c:686
+msgid "remote did not send all necessary objects"
+msgstr "il remoto non ha inviato tutti gli oggetti necessari"
+
+#: fetch-pack.c:1739
+#, c-format
+msgid "no such remote ref %s"
+msgstr "riferimento remoto non esistente: %s"
+
+#: fetch-pack.c:1742
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s"
+
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg non è riuscito a firmare i dati"
-#: grep.c:1320
+#: gpg-interface.c:347
+msgid "could not create temporary file"
+msgstr "impossibile creare il file temporaneo"
+
+#: gpg-interface.c:350
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "scrittura della firma separata in '%s' non riuscita"
+
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ignoro il colore non valido '%.*s' in log.graphColors"
+
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': impossibile leggere %s"
-#: grep.c:1337
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "stat di '%s' non riuscito"
-#: grep.c:1348
+#: grep.c:2145
#, c-format
-msgid "'%s': short read %s"
-msgstr ""
+msgid "'%s': short read"
+msgstr "'%s': lettura troppo breve"
-#: help.c:207
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "crea un'area di lavoro (vedi anche: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "lavora sulle modifiche correnti (vedi anche: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "esamina la cronologia e lo stato (vedi anche: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "aumenta, contrassegna e metti a punto la cronologia comune"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "collabora (vedi anche: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Comandi principali di alto livello"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Comandi / operazioni di manipolazione ausiliari"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Comandi / operazioni di interrogazione ausiliari"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Interazione con altri"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Comandi / operazioni di manipolazione di basso livello"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Comandi / operazioni di interrogazione di basso livello"
+
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr "Comandi di basso livello / Sincronizzazione repository"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Comandi di basso livello / Funzioni helper interne"
+
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "comandi git disponibili in '%s'"
-#: help.c:214
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandi git disponibili altrove nel tuo $PATH"
-#: help.c:270
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr "Questi sono i comandi Git comuni usati in varie situazioni:"
+
+#: help.c:363 git.c:98
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipo elenco comandi non supportato: '%s'"
+
+#: help.c:403
+msgid "The common Git guides are:"
+msgstr "Le guide Git comuni sono:"
+
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+"Vedi 'git help <comando>' per saperne di più su un sottocomando specifico"
+
+#: help.c:517
+msgid "External commands"
+msgstr "Comandi esterni"
+
+#: help.c:532
+msgid "Command aliases"
+msgstr "Alias comandi"
+
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -299,28 +3494,54 @@
"'%s' sembra essere un comando git, ma non è stato\n"
"possibile eseguirlo. Forse git-%s è corrotto?"
-#: help.c:327
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git."
-#: help.c:349
+#: help.c:677
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "ATTENZIONE: hai chiamato un comando Git '%s' inesistente."
-#: help.c:354
+#: help.c:682
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automaticamente tra %0.1f secondi..."
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuo assumendo che intendessi '%s'."
-#: help.c:361
+#: help.c:687
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Continuo fra %0.1f secondi assumendo che intendessi '%s'."
+
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' non è un comando git. Vedi 'git --help'."
-#: help.c:365
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Il comando maggiormente simile è"
+msgstr[1] ""
+"\n"
+"I comandi maggiormente simili sono"
+
+#: help.c:714
+msgid "git version [<options>]"
+msgstr "git version [<opzioni>]"
+
+#: help.c:782
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -334,43 +3555,2070 @@
"\n"
"Intendevi uno di questi?"
-#: parse-options.c:493
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Dimmi chi sei.\n"
+"\n"
+"Esegui\n"
+"\n"
+" git config --global user.email \"tu@esempio.com\"\n"
+" git config --global user.name \"Il tuo nome\"\n"
+"\n"
+"per impostare l'identità predefinita del tuo account.\n"
+"Ometti --global per impostare l'identità solo in questo repository.\n"
+"\n"
+
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr ""
+"nessun indirizzo e-mail specificato e rilevamento automatico disabilitato"
+
+#: ident.c:384
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+"impossibile rilevare automaticamente l'indirizzo e-mail (ho ricavato '%s')"
+
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
+msgstr "nessun nome specificato e rilevamento automatico disabilitato"
+
+#: ident.c:407
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "impossibile rilevare automaticamente il nome (ho ricavato '%s')"
+
+#: ident.c:415
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nome ident vuoto (per <%s>) non consentito"
+
+#: ident.c:421
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "il nome è composto solo da caratteri non consentiti: %s"
+
+#: ident.c:436 builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato data non valido: %s"
+
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossibile caricare l'albero radice per il commit %s"
+
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "non è possibile combinare più specificatori filtro"
+
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr "atteso 'tree:<profondità>'"
+
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "il supporto per i filtri sparse:percorso è stato rimosso"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "specificatore filtro '%s' non valido"
+
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
+msgstr "impossibile modificare il remoto promettente del clone parziale"
+
+#: 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 ""
+"Impossibile creare '%s.lock': %s.\n"
+"\n"
+"Sembra che un altro processo git sia in esecuzione in questo repository, ad "
+"es.\n"
+"un editor aperto da 'git commit'. Assicurati che tutti i processi\n"
+"siano terminati, quindi riprova. Se l'operazione continua a non riuscire, è\n"
+"possibile che un processo git sia andato in crash in questo repository\n"
+"in precedenza: rimuovi manualmente il file per continuare."
+
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Impossibile creare '%s.lock': %s"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "lettura della cache non riuscita"
+
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
+msgid "unable to write new index file"
+msgstr "impossibile scrivere il nuovo file index"
+
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
+msgstr "(commit non valido)\n"
+
+#: merge-recursive.c:345
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge."
+
+#: merge-recursive.c:354
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+"aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il "
+"merge."
+
+#: merge-recursive.c:437
+msgid "error building trees"
+msgstr "errore durante la costruzione degli alberi"
+
+#: merge-recursive.c:863
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "creazione del percorso '%s' non riuscita%s"
+
+#: merge-recursive.c:874
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Rimuovo %s per fare spazio alla sottodirectory\n"
+
+#: merge-recursive.c:888 merge-recursive.c:907
+msgid ": perhaps a D/F conflict?"
+msgstr ": forse si tratta di un conflitto D/F?"
+
+#: merge-recursive.c:897
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "mi rifiuto di perdere un file non tracciato in '%s'"
+
+#: merge-recursive.c:938 builtin/cat-file.c:40
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "impossibile leggere l'oggetto %s '%s'"
+
+#: merge-recursive.c:941
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "atteso blob per %s '%s'"
+
+#: merge-recursive.c:965
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "apertura di '%s' non riuscita: %s"
+
+#: merge-recursive.c:976
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "creazione del collegamento simbolico '%s' non riuscita: %s"
+
+#: merge-recursive.c:981
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "non so che fare con %06o %s '%s'"
+
+#: merge-recursive.c:1177
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)"
+
+#: merge-recursive.c:1184
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)"
+
+#: merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Merge del sottomodulo %s non riuscito (i commit non seguono la base del "
+"merge)"
+
+#: merge-recursive.c:1199 merge-recursive.c:1211
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:"
+
+#: merge-recursive.c:1202 merge-recursive.c:1214
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Eseguo il fast forward del sottomodulo %s"
+
+#: merge-recursive.c:1237
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+"Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)"
+
+#: merge-recursive.c:1241
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Merge del sottomodulo %s non riuscito (non fast forward)"
+
+#: merge-recursive.c:1242
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n"
+
+#: merge-recursive.c:1245
+#, 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 ""
+"Se è corretta aggiungila semplicemente all'indice, ad esempio\n"
+"usando:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"per accettare questo suggerimento.\n"
+
+#: merge-recursive.c:1254
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)"
+
+#: merge-recursive.c:1327
+msgid "Failed to execute internal merge"
+msgstr "Esecuzione del merge interno non riuscita"
+
+#: merge-recursive.c:1332
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Impossibile aggiungere %s al database"
+
+#: merge-recursive.c:1364
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Merge automatico di %s in corso"
+
+#: merge-recursive.c:1387
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+"Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s."
+
+#: merge-recursive.c:1459
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
+"%s lasciata nell'albero."
+
+#: merge-recursive.c:1464
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
+"%s di %s lasciata nell'albero."
+
+#: merge-recursive.c:1471
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
+"%s lasciata nell'albero in %s."
+
+#: merge-recursive.c:1476
+#, 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 ""
+"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
+"%s di %s lasciata nell'albero in %s."
+
+#: merge-recursive.c:1511
+msgid "rename"
+msgstr "ridenominazione"
+
+#: merge-recursive.c:1511
+msgid "renamed"
+msgstr "rinominato"
+
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Mi rifiuto di perdere un file sporco in %s"
+
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s "
+"aggiunto in %s"
+
+#: merge-recursive.c:1690
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s è una directory in %s; la aggiungo come %s"
+
+#: merge-recursive.c:1695
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s"
+
+#: merge-recursive.c:1714
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s"
+"\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s"
+
+#: merge-recursive.c:1719
+msgid " (left unresolved)"
+msgstr " (lasciato irrisolto)"
+
+#: merge-recursive.c:1828
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. "
+"Ridenominato %s->%s in %s"
+
+#: merge-recursive.c:2035
+#, 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 ""
+"CONFLITTO (split ridenominazione directory): non è chiaro dove collocare %s "
+"perché la directory %s è stata ridenominata in più directory diverse e "
+"nessuna directory di destinazione contiene la maggior parte dei file."
+
+#: merge-recursive.c:2067
+#, 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 ""
+"CONFLITTO (ridenominazione directory implicita): il file/directory esistente "
+"%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
+"posizione i seguenti percorsi: %s."
+
+#: merge-recursive.c:2077
+#, 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 ""
+"CONFLITTO (ridenominazione directory implicita): impossibile mappare più di "
+"un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
+"di spostare in tale posizione i seguenti percorsi: %s"
+
+#: merge-recursive.c:2169
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
+"in %s. Directory ridenominata %s->%s in %s"
+
+#: merge-recursive.c:2413
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s "
+"stesso è stato ridenominato."
+
+#: merge-recursive.c:2938
+#, c-format
+msgid "cannot read object %s"
+msgstr "impossibile leggere l'oggetto %s"
+
+#: merge-recursive.c:2941
+#, c-format
+msgid "object %s is not a blob"
+msgstr "l'oggetto %s non è un blob"
+
+#: merge-recursive.c:3005
+msgid "modify"
+msgstr "modifica"
+
+#: merge-recursive.c:3005
+msgid "modified"
+msgstr "modificato"
+
+#: merge-recursive.c:3017
+msgid "content"
+msgstr "contenuto"
+
+#: merge-recursive.c:3021
+msgid "add/add"
+msgstr "aggiunta/aggiunta"
+
+#: merge-recursive.c:3044
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)"
+
+#: merge-recursive.c:3066 git-submodule.sh:937
+msgid "submodule"
+msgstr "sottomodulo"
+
+#: merge-recursive.c:3067
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLITTO (%s): conflitto di merge in %s"
+
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Lo aggiungo come %s"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
+"lo sposto in %s."
+
+#: merge-recursive.c:3182
+#, 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 ""
+"CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
+"in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Percorso aggiornato: %s ridenominato in %s in %s in una directory "
+"ridenominata in %s; lo sposto in %s."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"CONFLITTO (posizione file): %s ridenominato in %s in %s in una directory "
+"ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
+"%s."
+
+#: merge-recursive.c:3303
+#, c-format
+msgid "Removing %s"
+msgstr "Rimozione di %s"
+
+#: merge-recursive.c:3326
+msgid "file/directory"
+msgstr "file/directory"
+
+#: merge-recursive.c:3331
+msgid "directory/file"
+msgstr "directory/file"
+
+#: merge-recursive.c:3338
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+"CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s "
+"come %s"
+
+#: merge-recursive.c:3347
+#, c-format
+msgid "Adding %s"
+msgstr "Aggiunta %s"
+
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s"
+
+#: merge-recursive.c:3394
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
+" %s"
+
+#: merge-recursive.c:3405
+msgid "Already up to date!"
+msgstr "Già aggiornato!"
+
+#: merge-recursive.c:3414
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "merge degli alberi %s e %s non riuscito"
+
+#: merge-recursive.c:3513
+msgid "Merging:"
+msgstr "Merge in corso:"
+
+#: merge-recursive.c:3526
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "trovato %u antenato comune:"
+msgstr[1] "trovati %u antenati comuni:"
+
+#: merge-recursive.c:3565
+msgid "merge returned no commit"
+msgstr "il merge non ha restituito alcun commit"
+
+#: merge-recursive.c:3631
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Impossibile analizzare l'oggetto '%s'"
+
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+msgid "Unable to write index."
+msgstr "Impossibile scrivere l'indice."
+
+#: midx.c:69
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "il file multi-pack-index %s è troppo piccolo"
+
+#: midx.c:85
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x"
+
+#: midx.c:90
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "versione %d multi-pack-index non riconosciuta"
+
+#: midx.c:95
+#, c-format
+msgid "hash version %u does not match"
+msgstr "la versione dell'hash %u non corrisponde"
+
+#: midx.c:109
+msgid "invalid chunk offset (too large)"
+msgstr "offset blocco non valido (troppo grande)"
+
+#: midx.c:133
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto"
+
+#: midx.c:146
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "dal multi-pack-index manca il blocco richiesto pack-name"
+
+#: midx.c:148
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "dal multi-pack-index manca il blocco richiesto fanout OID"
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "dal multi-pack-index manca il blocco richiesto lookup OID"
+
+#: midx.c:152
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti"
+
+#: midx.c:166
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'"
+
+#: midx.c:211
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "pack-int-id non valido: %u (%u pack totali)"
+
+#: midx.c:261
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+"nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo"
+
+#: midx.c:289
+msgid "error preparing packfile from multi-pack-index"
+msgstr "errore durante la preparazione del packfile dal multi-pack-index"
+
+#: midx.c:470
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "aggiunta del packfile '%s' non riuscita"
+
+#: midx.c:476
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "apertura del pack-index '%s' non riuscita"
+
+#: midx.c:536
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
+
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "non ho visto il file pack %s da scartare"
+
+#: midx.c:1036
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "pulizia del multi-pack-index %s non riuscita"
+
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Ricerca di file pack referenziati in corso"
+
+#: midx.c:1106
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Verifica ordine OID in MIDX in corso"
+
+#: midx.c:1119
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Ordinamento degli oggetti nel packfile in corso"
+
+#: midx.c:1144
+msgid "Verifying object offsets"
+msgstr "Verifica offset oggetti in corso"
+
+#: midx.c:1160
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "caricamento voce pack per oid[%d] = %s non riuscito"
+
+#: midx.c:1166
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "caricamento pack-index per il packfile %s non riuscito"
+
+#: midx.c:1175
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "impossibile avviare pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "impossibile finire pack-objects"
+
+#: name-hash.c:532
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "impossibile creare il thread lazy_dir: %s"
+
+#: name-hash.c:554
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "impossibile creare il thread lazy_name: %s"
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "impossibile bloccare il thread lazy_name: %s"
+
+#: notes-merge.c:277
+#, c-format
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
+msgstr ""
+"Non hai concluso il merge delle note precedente (%s esiste).\n"
+"Usa 'git notes merge --commit' o 'git notes merge --abort' per eseguire il "
+"commit/interrompere il merge precedente prima di iniziare un nuovo merge "
+"delle note."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Non hai concluso il merge delle note (%s esiste)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"Impossibile eseguire il commit di un albero delle note non inizializzato/non "
+"referenziato"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Valore di notes.rewriteMode errato: '%s'"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Mi rifiuto di riscrivere le note in %s (al di fuori di refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Valore di %s errato: '%s'"
+
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "tipo oggetto \"%s\" non valido"
+
+#: object.c:174
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "l'oggetto %s è un %s, non un %s"
+
+#: object.c:234
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d"
+
+#: object.c:247
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "impossibile analizzare l'oggetto: %s"
+
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "hash non corrispondente: %s"
+
+#: packfile.c:648
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset collocato prima della fine del packfile (.idx corrotto?)"
+
+#: packfile.c:1899
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)"
+
+#: packfile.c:1903
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"offset collocato dopo la fine dell'indice pack per %s (indice troncato?)"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s richiede un valore"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s non è compatibile con %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s non è compatibile con qualcos'altro"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s non richiede un valore"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s non è disponibile"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "forse intendevi `--%s` (con due trattini)?"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opzione sconosciuta `%s'"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "opzione `%c` sconosciuta"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:511
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
-msgstr " uso: %s"
+msgstr "uso: %s"
#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:515
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:912
#, c-format
msgid " or: %s"
-msgstr "oppure: %s"
+msgstr " oppure: %s"
-#: parse-options.c:518
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: remote.c:1629
+#: parse-options.c:954
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias di --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'opzione `%s' richiede un valore numerico"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data scadenza '%s' malformata"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nome oggetto '%s' malformato"
+
+#: path.c:897
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Impossibile rendere %s scrivibile dal gruppo"
+
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Carattere di escape '\\' non consentito come ultimo carattere del valore "
+"attributo"
+
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
+msgstr "È consentita solo una specifica 'attr:'."
+
+#: pathspec.c:149
+msgid "attr spec must not be empty"
+msgstr "la specifica attr non deve essere vuota"
+
+#: pathspec.c:192
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nome attributo %s non valido"
+
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono "
+"compatibili"
+
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"l'impostazione globale specificatore percorso 'literal' è incompatibile con "
+"tutte le altre impostazioni globali specificatore percorso"
+
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "parametro per il magic specificatore percorso 'prefix' non valido"
+
+#: pathspec.c:325
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Magic specificatore percorso '%.*s' in '%s' non valido"
+
+#: pathspec.c:330
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "')' mancante alla fine del magic specificatore percorso in '%s'"
+
+#: pathspec.c:368
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Magic specificatore percorso '%c' in '%s' non implementato"
+
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' e 'glob' non sono compatibili"
+
+#: pathspec.c:440
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' è al di fuori del repository"
+
+#: pathspec.c:514
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (opzione mnemonica: '%c')"
+
+#: pathspec.c:524
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: magic specificatore percorso non supportato da questo comando: %s"
+
+#: pathspec.c:591
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr ""
+"lo specificatore percorso '%s' si trova oltre un collegamento simbolico"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "impossibile scrivere il pacchetto flush"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "impossibile scrivere il pacchetto delim"
+
+#: pkt-line.c:106
+msgid "flush packet write failed"
+msgstr "scrittura con flush pacchetto non riuscita"
+
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
+msgstr "errore protocollo: riga impossibilmente lunga"
+
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
+msgstr "scrittura pacchetto con formato non riuscita"
+
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+"scrittura pacchetto non riuscita - i dati sono più della dimensione massima "
+"pacchetto"
+
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr "scrittura pacchetto non riuscita"
+
+#: pkt-line.c:295
+msgid "read error"
+msgstr "errore di lettura"
+
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr "l'interlocutore remoto ha chiuso inaspettatamente la connessione"
+
+#: pkt-line.c:331
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "errore protocollo: carattere lunghezza riga non valido: %.4s"
+
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "errore protocollo: lunghezza riga non valida: %d"
+
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "errore remoto: %s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "Aggiornamento indice in corso"
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "impossibile creare lstat in versione threaded: %s"
+
+#: pretty.c:966
+msgid "unable to parse --pretty format"
+msgstr "impossibile analizzare il formato --pretty"
+
+#: range-diff.c:70
+msgid "could not start `log`"
+msgstr "impossibile avviare `log`"
+
+#: range-diff.c:72
+msgid "could not read `log` output"
+msgstr "impossibile leggere l'output di `log`"
+
+#: range-diff.c:91 sequencer.c:5021
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "impossibile analizzare il commit '%s'"
+
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "impossibile analizzare l'header Git '%.*s'"
+
+#: range-diff.c:274
+msgid "failed to generate diff"
+msgstr "generazione del diff non riuscita"
+
+#: range-diff.c:506 range-diff.c:508
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "impossibile analizzare il registro di '%s'"
+
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "non aggiungerò l'alias file '%s' ('%s' esiste già nell'indice)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "impossibile creare un blob vuoto nel database oggetti"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: è possibile aggiungere solo file regolari, collegamenti simbolici o "
+"directory Git"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' non ha un commit di cui è stato eseguito il checkout"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "impossibile indicizzare il file '%s'"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "impossibile aggiungere '%s' all'indice"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "impossibile eseguire stat su '%s'"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' compare sia come file sia come directory"
+
+#: read-cache.c:1499
+msgid "Refresh index"
+msgstr "Aggiornamento indice"
+
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version impostato, ma il valore non è valido.\n"
+"Uso la versione %i"
+
+#: read-cache.c:1623
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION impostato, ma il valore non è valido.\n"
+"Uso la versione %i"
+
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "firma non valida: 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "versione indice non valida: %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "firma SHA1 file indice non valida"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "l'indice usa l'estensione %.4s che non comprendiamo"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "estensione %.4s ignorata"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "formato voce indice sconosciuto: 0x%08x"
+
+#: read-cache.c:1776
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "campo nome malformato nell'indice, vicino al percorso '%s'"
+
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "voci stage non ordinate nell'indice"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "voci stage multiple per il file sottoposto a merge '%s'"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "voci stage non ordinate per '%s'"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+msgid "index file corrupt"
+msgstr "file indice corrotto"
+
+#: read-cache.c:2087
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "impossibile creare il thread load_cache_entries: %s"
+
+#: read-cache.c:2100
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "impossibile bloccare il thread load_cache_entries: %s"
+
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: apertura del file indice non riuscita"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: impossibile eseguire stat sull'indice aperto"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: file indice più piccolo della dimensione attesa"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: impossibile mappare il file indice"
+
+#: read-cache.c:2187
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "impossibile creare il thread load_index_extensions: %s"
+
+#: read-cache.c:2214
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "impossibile bloccare il thread load_index_extensions: %s"
+
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "impossibile aggiornare l'indice condiviso '%s'"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "indice corrotto, atteso %s in %s, presente %s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#, c-format
+msgid "could not close '%s'"
+msgstr "impossibile chiudere '%s'"
+
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#, c-format
+msgid "could not stat '%s'"
+msgstr "impossibile eseguire lo stat di '%s'"
+
+#: read-cache.c:3105
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "impossibile aprire la directory git: %s"
+
+#: read-cache.c:3117
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "impossibile eseguire unlink: %s"
+
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "impossibile correggere i permessi di '%s'"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: impossibile ripiegare sullo stadio 0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. "
+"La ignoro."
+
+#: rebase-interactive.c:35
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandi:\n"
+"p, pick <commit> = usa il commit\n"
+"r, reword <commit> = usa il commit, ma modifica il messaggio di commit\n"
+"e, edit <commit> = usa il commit, ma fermati per modificarlo\n"
+"s, squash <commit> = usa il commit, ma fondilo con il commit precedente\n"
+"f, fixup <commit> = come \"squash\", ma scarta il messaggio di log di "
+"questo\n"
+" commit\n"
+"x, exec <comando> = esegui il comando (il resto della riga) usando la shell\n"
+"b, break = fermati qui (continua il rebase in un secondo momento con "
+"'git rebase --continue')\n"
+"d, drop <commit> = elimina il commit\n"
+"l, label <etichetta> = etichetta l'HEAD corrente con un nome\n"
+"t, reset <etichetta> = reimposta HEAD a un'etichetta\n"
+"m, merge [-C <commit> | -c <commit>] <etichetta> [# <oneline>]\n"
+". crea un commit di merge usando il messaggio del commit di merge\n"
+". originale (o la oneline se non è stato specificato un commit di "
+"merge\n"
+". originale). Usa -c <commit> per riformulare il messaggio di commit.\n"
+"\n"
+"Queste righe possono essere riordinate; saranno eseguite dalla prima "
+"all'ultima.\n"
+
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebase di %s su %s (%d comando)"
+msgstr[1] "Rebase di %s su %s (%d comandi)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un "
+"commit.\n"
+
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n"
+
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Stai modificando il file todo di un rebase interattivo in corso.\n"
+"Per continuare il rebase dopo la modifica, esegui:\n"
+" git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n"
+"\n"
+
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
+msgstr "Nota che i commit vuoti sono commentati"
+
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#, c-format
+msgid "could not write '%s'"
+msgstr "impossibile scrivere '%s'"
+
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "impossibile copiare '%s' in '%s'."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attenzione: è possibile che alcuni commit siano stati scartati "
+"accidentalmente.\n"
+"Commit scartati (dal più al meno recente):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Per evitare questo messaggio, usa \"drop\" per rimuovere un commit\n"
+"esplicitamente.\n"
+"\n"
+"Usa 'git config rebase.missingCommitsCheck' per modificare il livello\n"
+"degli avvisi.\n"
+"I comportamenti possibili sono ignore, warn, error.\n"
+"\n"
+
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s non punta a un oggetto valido!"
+
+#: refs.c:667
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignoro il riferimento simbolico pendente %s"
+
+#: refs.c:669 ref-filter.c:2092
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignoro il riferimento rotto %s"
+
+#: refs.c:804
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "impossibile aprire '%s' in scrittura: %s"
+
+#: refs.c:814 refs.c:865
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "impossibile leggere il riferimento '%s'"
+
+#: refs.c:820
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "il riferimento '%s' esiste già"
+
+#: refs.c:825
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "ID oggetto inatteso durante la scrittura di '%s'"
+
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossibile scrivere su '%s'"
+
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossibile aprire '%s' in scrittura"
+
+#: refs.c:867
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "ID oggetto inatteso durante l'eliminazione di '%s'"
+
+#: refs.c:998
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s"
+
+#: refs.c:1004
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s"
+
+#: refs.c:1063
+#, c-format
+msgid "log for %s is empty"
+msgstr "il registro per %s è vuoto"
+
+#: refs.c:1155
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'"
+
+#: refs.c:1231
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref per il riferimento '%s' non riuscita: %s"
+
+#: refs.c:2012
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
+
+#: refs.c:2044
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
+
+#: refs.c:2140 refs.c:2170
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' esiste già; impossibile creare '%s'"
+
+#: refs.c:2146 refs.c:2181
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
+
+#: refs/files-backend.c:1234
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossibile rimuovere il riferimento %s"
+
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "impossibile eliminare il riferimento %s: %s"
+
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossibile eliminare i riferimenti: %s"
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "specificatore riferimento '%s' non valido"
+
+#: ref-filter.c:42 wt-status.c:1934
+msgid "gone"
+msgstr "sparito"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "dopo %d"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "prima di %d"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "dopo %d, prima di %d"
+
+#: ref-filter.c:162
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "formato atteso: %%(color:<colore>)"
+
+#: ref-filter.c:164
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "colore non riconosciuto: %%(color:%s)"
+
+#: ref-filter.c:186
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Atteso valore intero: refname:lstrip=%s"
+
+#: ref-filter.c:190
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Atteso valore intero: refname:rstrip=%s"
+
+#: ref-filter.c:192
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argomento %%(%s) non riconosciuto: %s"
+
+#: ref-filter.c:247
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) non accetta argomenti"
+
+#: ref-filter.c:269
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "argomento %%(objectsize) non riconosciuto: %s"
+
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) non accetta argomenti"
+
+#: ref-filter.c:289
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) non accetta argomenti"
+
+#: ref-filter.c:298
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) non accetta argomenti"
+
+#: ref-filter.c:320
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argomento %%(trailers) sconosciuto: %s"
+
+#: ref-filter.c:349
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "atteso valore positivo in contents:lines=%s"
+
+#: ref-filter.c:351
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "argomento %%(contents) non riconosciuto: %s"
+
+#: ref-filter.c:366
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "atteso valore positivo in objectname:short=%s"
+
+#: ref-filter.c:370
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "argomento %%(objectname) non riconosciuto: %s"
+
+#: ref-filter.c:400
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)"
+
+#: ref-filter.c:412
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "valore non riconosciuto: position:%s"
+
+#: ref-filter.c:419
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "valore non riconosciuto: width:%s"
+
+#: ref-filter.c:428
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "argomento %%(align) non riconosciuto: %s"
+
+#: ref-filter.c:436
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "attesa ampiezza positiva con l'atom %%(align)"
+
+#: ref-filter.c:454
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argomento %%(if) non riconosciuto: %s"
+
+#: ref-filter.c:556
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nome campo malformato: %.*s"
+
+#: ref-filter.c:583
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nome campo sconosciuto: %.*s"
+
+#: ref-filter.c:587
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati "
+"oggetto"
+
+#: ref-filter.c:711
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "formato: atomo %%(if) usato senza un atomo %%(then)"
+
+#: ref-filter.c:774
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "formato: atomo %%(then) usato senza un atomo %%(if)"
+
+#: ref-filter.c:776
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: atomo %%(then) usato più di una volta"
+
+#: ref-filter.c:778
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: atomo %%(then) usato dopo %%(else)"
+
+#: ref-filter.c:806
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "formato: atomo %%(else) usato senza un atomo %%(if)"
+
+#: ref-filter.c:808
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "formato: atomo %%(else) usato senza un atomo %%(then)"
+
+#: ref-filter.c:810
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: atomo %%(else) usato più di una volta"
+
+#: ref-filter.c:825
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente"
+
+#: ref-filter.c:882
+#, c-format
+msgid "malformed format string %s"
+msgstr "stringa di formato %s malformata"
+
+#: ref-filter.c:1485
+#, c-format
+msgid "no branch, rebasing %s"
+msgstr "nessun branch, eseguo il rebase di %s"
+
+#: ref-filter.c:1488
+#, c-format
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s"
+
+#: ref-filter.c:1491
+#, c-format
+msgid "no branch, bisect started on %s"
+msgstr "nessun branch, bisezione avviata su %s"
+
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "nessun branch"
+
+#: ref-filter.c:1537 ref-filter.c:1743
+#, c-format
+msgid "missing object %s for %s"
+msgstr "oggetto %s mancante per %s"
+
+#: ref-filter.c:1547
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer non riuscito su %s per %s"
+
+#: ref-filter.c:1998
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "oggetto malformato in '%s'"
+
+#: ref-filter.c:2087
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignoro il riferimento con il nome malformato %s"
+
+#: ref-filter.c:2382
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: atomo %%(end) mancante"
+
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "l'opzione `%s' non è compatibile con --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "l'opzione `%s' non è compatibile con --no-merged"
+
+#: ref-filter.c:2495
+#, c-format
+msgid "malformed object name %s"
+msgstr "nome dell'oggetto %s malformato"
+
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "l'opzione `%s' deve puntare ad un commit"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+"la forma breve della configurazione del remoto non può iniziare con '/': %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "è stata specificata più di una direttiva receivepack, uso la prima"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "è stata specificata più di una direttiva uploadpack, uso la prima"
+
+#: remote.c:608
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Impossibile recuperare sia %s sia %s in %s"
+
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s solitamente traccia %s, non %s"
+
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s traccia sia %s sia %s"
+
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "la chiave '%s' del pattern non aveva un '*'"
+
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "il valore '%s' del pattern non ha un '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr ""
+"sono state trovate più corrispondenze per lo specificatore riferimento "
+"sorgente %s"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"La destinazione che hai fornito non è un nome riferimento\n"
+"completo (ossia che inizia con \"refs/\"). Abbiamo provato a\n"
+"indovinare ciò che intendevi dire:\n"
+"\n"
+"- cercando un riferimento corrispondente a '%s' nel remoto;\n"
+"- controllando se la <sorgente> sottoposta a push ('%s') fosse un\n"
+" riferimento compreso fra quelli in \"refs/{heads,tags}/\". In tal\n"
+" caso avremmo aggiunto il prefisso corrispondente\n"
+" refs/{heads,tags}/ al remoto.\n"
+"\n"
+"Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n"
+"Devi specificare un riferimento completamente qualificato."
+
+#: remote.c:1040
+#, 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 ""
+"La parte <sorgente> dello specificatore riferimento\n"
+"è un oggetto tag. Forse intendevi creare un nuovo\n"
+"branch eseguendo il push a '%s:refs/heads/%s'?"
+
+#: remote.c:1045
+#, 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 ""
+"La parte <sorgente> dello specificatore riferimento\n"
+"è un oggetto tag. Forse intendevi creare un nuovo\n"
+"branch eseguendo il push a '%s:refs/tags/%s'?"
+
+#: remote.c:1050
+#, 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 ""
+"La parte <sorgente> dello specificatore riferimento\n"
+"è un oggetto albero. Forse intendevi aggiungere un\n"
+"tag a un nuovo albero eseguendo il push a\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1055
+#, 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 ""
+"La parte <sorgente> dello specificatore riferimento\n"
+"è un oggetto blob. Forse intendevi aggiungere un\n"
+"tag a un nuovo blob eseguendo il push a\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s non può essere risolto in un branch"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "impossibile eliminare '%s': il riferimento remoto non esiste"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+"sono state trovate più corrispondenze per lo specificatore riferimento "
+"destinazione %s"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+"lo specificatore riferimento destinazione %s riceve dati da più di una "
+"sorgente"
+
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
+msgstr "HEAD non punta ad un branch"
+
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "branch '%s' non esistente"
+
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "nessun upstream configurato per il branch '%s'"
+
+#: remote.c:1642
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+"branch upstream '%s' non memorizzato come branch che ne traccia uno remoto"
+
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la "
+"traccia"
+
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "il branch '%s' non ha un remoto per il push"
+
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "gli specificatori riferimento per '%s' non includono '%s'"
+
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "il push non ha una destinazione (push.default è 'nothing')"
+
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "impossibile risolvere il push 'simple' a una singola destinazione"
+
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "impossibile trovare il riferimento remoto %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignoro localmente il riferimento strano '%s'"
+
+#: remote.c:2016
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n"
+
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n"
+
+#: remote.c:2023
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n"
+
+#: remote.c:2027
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n"
+
+#: remote.c:2030
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (usa \"%s\" per visualizzare i dettagli)\n"
+
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n"
msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n"
-#: remote.c:1635
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n"
+
+#: remote.c:2043
#, 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] ""
+"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
+"il fast forward.\n"
msgstr[1] ""
+"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
+"il fast forward.\n"
-#: remote.c:1643
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n"
+
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -379,1689 +5627,428 @@
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
+"Il tuo branch e '%s' sono diventati divergenti\n"
+"e hanno rispettivamente %d e %d commit differenti.\n"
msgstr[1] ""
+"Il tuo branch e '%s' sono diventati divergenti\n"
+"e hanno rispettivamente %d e %d commit differenti.\n"
-#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
-#: builtin/merge.c:1088 builtin/merge.c:1098
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n"
+
+#: remote.c:2247
#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Non è stato possibile aprire '%s' per la scrittura"
+msgid "cannot parse expected object name '%s'"
+msgstr "impossibile analizzare il nome oggetto atteso '%s'"
-#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
-#: builtin/merge.c:1090 builtin/merge.c:1103
+#: replace-object.c:21
#, c-format
-msgid "Could not write to '%s'"
-msgstr "Non è stato possibile scrivere su '%s'"
+msgid "bad replace ref name: %s"
+msgstr "nome riferimento sostitutivo non valido: %s"
-#: sequencer.c:144
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "riferimento sostitutivo duplicato: %s"
+
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "profondità sostituzione troppo elevata per l'oggetto %s"
+
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
+msgstr "MERGE_RR corrotta"
+
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
+msgstr "impossibile scrivere il record rerere"
+
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "si sono verificati errori durante la scrittura di '%s' (%s)"
+
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "flush di '%s' non riuscito"
+
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "impossibile analizzare gli hunk conflitto in '%s'"
+
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "utime() di '%s' non riuscita"
+
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
+msgstr "scrittura di '%s' non riuscita"
+
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "'%s' aggiunto all'area di staging usando la risoluzione precedente."
+
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Risoluzione per '%s' registrata."
+
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Risolto conflitto in '%s' usando la risoluzione precedente."
+
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'"
+
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Salvata preimmagine di '%s'"
+
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "impossibile creare la directory '%s'"
+
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "aggiornamento dello stato conflitto per '%s' non riuscito"
+
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "nessuna risoluzione presente in memoria per '%s'"
+
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "impossibile eseguire l'unlink di '%s'"
+
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Preimmagine di '%s' aggiornata"
+
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Risoluzione per '%s' dimenticata\n"
+
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
+msgstr "impossibile aprire la directory cache rr"
+
+#: revision.c:2507
+msgid "your current branch appears to be broken"
+msgstr "sembra che il tuo branch corrente sia rotto"
+
+#: revision.c:2510
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "il tuo branch corrente '%s' non ha ancora commit"
+
+#: revision.c:2710
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent non è compatibile con --bisect"
+
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L non supporta ancora formati diff oltre a -p e -s"
+
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr "apertura di /dev/null non riuscita"
+
+#: run-command.c:1269
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "impossibile creare il thread async: %s"
+
+#: run-command.c:1333
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n"
+"Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`."
+
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"pacchetto flush inatteso durante la lettura dello stato decompressione del "
+"remoto"
+
+#: send-pack.c:143
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "impossibile analizzare lo stato decompressione del remoto: %s"
+
+#: send-pack.c:145
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "decompressione sul remoto non riuscita: %s"
+
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
+msgstr "firma del certificato per il push non riuscita"
+
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
+msgstr "il ricevente non supporta i push --signed"
+
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"non invio un certificato push perché il ricevente non supporta i push --"
+"signed"
+
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
+msgstr "il ricevente non supporta i push --atomic"
+
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
+msgstr "il ricevente non supporta le opzioni push"
+
+#: sequencer.c:187
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "modalità pulizia messaggio commit non valida: '%s'"
+
+#: sequencer.c:292
+#, c-format
+msgid "could not delete '%s'"
+msgstr "impossibile eliminare '%s'"
+
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossibile rimuovere '%s'"
+
+#: sequencer.c:321
+msgid "revert"
+msgstr "revert"
+
+#: sequencer.c:323
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:325
+msgid "rebase -i"
+msgstr "rebase -i"
+
+#: sequencer.c:327
+#, c-format
+msgid "unknown action: %d"
+msgstr "azione sconosciuta: %d"
+
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-"dopo aver risolto i conflitti, segna i path corretti\n"
+"dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
"con 'git add <path>' o 'git rm <path>'"
-#: sequencer.c:147
+#: sequencer.c:388
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 ""
-"dopo aver risolto i conflitti, segna i path corretti\n"
-"con 'git add <path>' o 'git rm <path>' ed eseguire\n"
+"dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
+"con 'git add <path>' o 'git rm <path>' ed esegui\n"
"il commit del risultato con 'git commit'"
-#: sequencer.c:160 sequencer.c:758 sequencer.c:841
+#: sequencer.c:401 sequencer.c:2909
#, c-format
-msgid "Could not write to %s"
-msgstr "Non è stato possibile scrivere su %s"
+msgid "could not lock '%s'"
+msgstr "impossibile bloccare '%s'"
-#: sequencer.c:163
+#: sequencer.c:408
#, c-format
-msgid "Error wrapping up %s"
-msgstr ""
+msgid "could not write eol to '%s'"
+msgstr "impossibile scrivere il carattere di fine riga in '%s'"
-#: sequencer.c:178
-msgid "Your local changes would be overwritten by cherry-pick."
-msgstr "Le tue modifiche locali verranno sovrascritte da cherry-pick"
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "finalizzazione di '%s' non riuscita"
-#: sequencer.c:180
-msgid "Your local changes would be overwritten by revert."
-msgstr "Le tue modifiche locali verranno sovrascritte da revert."
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossibile leggere '%s'"
-#: sequencer.c:183
-msgid "Commit your changes or stash them to proceed."
-msgstr ""
+#: sequencer.c:462
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "le tue modifiche locali sarebbero sovrascritte da %s."
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:233
+#: sequencer.c:466
+msgid "commit your changes or stash them to proceed."
+msgstr "esegui il commit delle modifiche o lo stash per procedere."
+
+#: sequencer.c:498
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: fast forward"
+
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modalità pulizia non valida: %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
-msgstr "%s: impossibile scrivere il nuovo index file"
+msgstr "%s: impossibile scrivere il nuovo file indice"
-#: sequencer.c:261
-msgid "Could not resolve HEAD commit\n"
-msgstr "Non è stato possibile risolvere il commit HEAD\n"
+#: sequencer.c:649
+msgid "unable to update cache tree"
+msgstr "impossibile aggiornare l'albero cache"
-#: sequencer.c:282
-msgid "Unable to update cache tree\n"
-msgstr ""
+#: sequencer.c:663
+msgid "could not resolve HEAD commit"
+msgstr "impossibile risolvere il commit HEAD"
-#: sequencer.c:324
+#: sequencer.c:743
#, c-format
-msgid "Could not parse commit %s\n"
-msgstr "Non è stato possibile analizzare il commit %s\n"
+msgid "no key present in '%.*s'"
+msgstr "nessuna chiave presente in '%.*s'"
-#: sequencer.c:329
+#: sequencer.c:754
#, c-format
-msgid "Could not parse parent commit %s\n"
-msgstr ""
+msgid "unable to dequote value of '%s'"
+msgstr "impossibile rimuovere gli apici dal valore di '%s'"
-#: sequencer.c:395
-msgid "Your index file is unmerged."
-msgstr ""
-
-#: sequencer.c:398
-msgid "You do not have a valid HEAD"
-msgstr "Non hai un HEAD valido"
-
-#: sequencer.c:413
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
-msgstr "Il commit %s è un merge ma non è stata specificata l'opzione -m."
+msgid "could not open '%s' for reading"
+msgstr "impossibile aprire '%s' in lettura"
-#: sequencer.c:421
-#, c-format
-msgid "Commit %s does not have parent %d"
-msgstr ""
+#: sequencer.c:801
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' già specificato"
-#: sequencer.c:425
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
-msgstr ""
+#: sequencer.c:806
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' già specificato"
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:436
-#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr ""
-
-#: sequencer.c:440
-#, c-format
-msgid "Cannot get commit message for %s"
-msgstr "Impossibile ottenere il messaggio di commit per %s"
-
-#: sequencer.c:524
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "non è stato possibile eseguire il revert di %s... %s"
-
-#: sequencer.c:525
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "non è stato possibile applicare %s... %s"
-
-#: sequencer.c:553
-msgid "empty commit set passed"
-msgstr "è stato passato un set di commit vuoto"
-
-#: sequencer.c:561
-#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: lettura di index non riuscita"
-
-#: sequencer.c:566
-#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: aggiornamento di index non riuscito"
-
-#: sequencer.c:624
-#, c-format
-msgid "Cannot %s during a %s"
-msgstr ""
-
-#: sequencer.c:646
-#, c-format
-msgid "Could not parse line %d."
-msgstr "Non è stato possibile analizzare la riga %d."
-
-#: sequencer.c:651
-msgid "No commits parsed."
-msgstr "Nessun commit analizzato."
-
-#: sequencer.c:664
-#, c-format
-msgid "Could not open %s"
-msgstr "Non è stato possibile aprire %s"
-
-#: sequencer.c:668
-#, c-format
-msgid "Could not read %s."
-msgstr "Non è stato possibile leggere %s."
-
-#: sequencer.c:675
-#, c-format
-msgid "Unusable instruction sheet: %s"
-msgstr ""
-
-#: sequencer.c:703
-#, c-format
-msgid "Invalid key: %s"
-msgstr "Chiave non valida: %s"
-
-#: sequencer.c:706
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Valore non valido per %s: %s"
-
-#: sequencer.c:718
-#, c-format
-msgid "Malformed options sheet: %s"
-msgstr ""
-
-#: sequencer.c:739
-msgid "a cherry-pick or revert is already in progress"
-msgstr "è già in corso un'operazione di cherry-pick o di revert"
-
-#: sequencer.c:740
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\""
-
-#: sequencer.c:744
-#, c-format
-msgid "Could not create sequencer directory %s"
-msgstr ""
-
-#: sequencer.c:760 sequencer.c:845
-#, c-format
-msgid "Error wrapping up %s."
-msgstr ""
-
-#: sequencer.c:779 sequencer.c:913
-msgid "no cherry-pick or revert in progress"
-msgstr "nessuna operazione di cherry-pick o revert in corso"
-
-#: sequencer.c:781
-msgid "cannot resolve HEAD"
-msgstr "impossibile risolvere HEAD"
-
-#: sequencer.c:783
-msgid "cannot abort from a branch yet to be born"
-msgstr ""
-
-#: sequencer.c:805 builtin/apply.c:3697
-#, c-format
-msgid "cannot open %s: %s"
-msgstr "impossibile aprire %s: %s"
-
-#: sequencer.c:808
-#, c-format
-msgid "cannot read %s: %s"
-msgstr "impossibile leggere %s: %s"
-
-#: sequencer.c:809
-msgid "unexpected end of file"
-msgstr "fine del file inattesa"
+#: sequencer.c:811
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' già specificato"
#: sequencer.c:815
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
+msgid "unknown variable '%s'"
+msgstr "variabile '%s' sconosciuta"
-#: sequencer.c:838
+#: sequencer.c:820
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' mancante"
+
+#: sequencer.c:822
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' mancante"
+
+#: sequencer.c:824
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' mancante"
+
+#: sequencer.c:884
#, c-format
-msgid "Could not format %s."
-msgstr ""
+msgid "invalid date format '%s' in '%s'"
+msgstr "formato data '%s' non valido in '%s'"
-#: sequencer.c:1000
-msgid "Can't revert as initial commit"
-msgstr "Impossibile eseguire il revert come commit iniziale"
-
-#: sequencer.c:1001
-msgid "Can't cherry-pick into empty head"
-msgstr ""
-
-#: sha1_name.c:864
-msgid "HEAD does not point to a branch"
-msgstr "HEAD non punta ad un branch"
-
-#: sha1_name.c:867
-#, c-format
-msgid "No such branch: '%s'"
-msgstr "Nessun branch esistente: '%s'"
-
-#: sha1_name.c:869
-#, c-format
-msgid "No upstream configured for branch '%s'"
-msgstr "Nessun upstream configurato per il branch '%s'"
-
-#: sha1_name.c:872
-#, c-format
-msgid "Upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-
-#: wrapper.c:413
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "impossibile trovare l'utente corrente nel file passwd: %s"
-
-#: wrapper.c:414
-msgid "no such user"
-msgstr "utente non esistente"
-
-#: wt-status.c:135
-msgid "Unmerged paths:"
-msgstr ""
-
-#: wt-status.c:141 wt-status.c:158
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:143 wt-status.c:160
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr ""
-
-#: wt-status.c:144
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " (usa \"git add/rm <file>...\" come appropriato per la risoluzione)"
-
-#: wt-status.c:152
-msgid "Changes to be committed:"
-msgstr ""
-
-#: wt-status.c:170
-msgid "Changes not staged for commit:"
-msgstr ""
-
-#: wt-status.c:174
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:176
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-
-#: wt-status.c:177
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr ""
-
-#: wt-status.c:179
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr ""
-
-#: wt-status.c:188
-#, c-format
-msgid "%s files:"
-msgstr "%s file:"
-
-#: wt-status.c:191
-#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-
-#: wt-status.c:208
-msgid "bug"
-msgstr "bug"
-
-#: wt-status.c:213
-msgid "both deleted:"
-msgstr "entrambi eliminati:"
-
-#: wt-status.c:214
-msgid "added by us:"
-msgstr "aggiunto da noi:"
-
-#: wt-status.c:215
-msgid "deleted by them:"
-msgstr "eliminato da loro:"
-
-#: wt-status.c:216
-msgid "added by them:"
-msgstr "aggiunto da loro:"
-
-#: wt-status.c:217
-msgid "deleted by us:"
-msgstr "eliminato da noi:"
-
-#: wt-status.c:218
-msgid "both added:"
-msgstr "entrambi aggiunti:"
-
-#: wt-status.c:219
-msgid "both modified:"
-msgstr "entrambi modificati:"
-
-#: wt-status.c:249
-msgid "new commits, "
-msgstr "nuovi commit, "
-
-#: wt-status.c:251
-msgid "modified content, "
-msgstr "contenuto modificato, "
-
-#: wt-status.c:253
-msgid "untracked content, "
-msgstr ""
-
-#: wt-status.c:267
-#, c-format
-msgid "new file: %s"
-msgstr "nuovo file: %s"
-
-#: wt-status.c:270
-#, c-format
-msgid "copied: %s -> %s"
-msgstr "copiato: %s -> %s"
-
-#: wt-status.c:273
-#, c-format
-msgid "deleted: %s"
-msgstr "eliminato: %s"
-
-#: wt-status.c:276
-#, c-format
-msgid "modified: %s"
-msgstr "modificato: %s"
-
-#: wt-status.c:279
-#, c-format
-msgid "renamed: %s -> %s"
-msgstr "rinominato: %s -> %s"
-
-#: wt-status.c:282
-#, c-format
-msgid "typechange: %s"
-msgstr ""
-
-#: wt-status.c:285
-#, c-format
-msgid "unknown: %s"
-msgstr "sconosciuto: %s"
-
-#: wt-status.c:288
-#, c-format
-msgid "unmerged: %s"
-msgstr ""
-
-#: wt-status.c:291
-#, c-format
-msgid "bug: unhandled diff status %c"
-msgstr ""
-
-#: wt-status.c:737
-msgid "On branch "
-msgstr "Sul branch "
-
-#: wt-status.c:744
-msgid "Not currently on any branch."
-msgstr ""
-
-#: wt-status.c:755
-msgid "Initial commit"
-msgstr "Commit iniziale"
-
-#: wt-status.c:769
-msgid "Untracked"
-msgstr ""
-
-#: wt-status.c:771
-msgid "Ignored"
-msgstr "Ignorato"
-
-#: wt-status.c:773
-#, c-format
-msgid "Untracked files not listed%s"
-msgstr ""
-
-#: wt-status.c:775
-msgid " (use -u option to show untracked files)"
-msgstr ""
-
-#: wt-status.c:781
-msgid "No changes"
-msgstr "Nessuna modifica"
-
-#: wt-status.c:785
-#, c-format
-msgid "no changes added to commit%s\n"
-msgstr "nessuna modifica aggiunta al commit%s\n"
-
-#: wt-status.c:787
-msgid " (use \"git add\" and/or \"git commit -a\")"
-msgstr " (usa \"git add\" e/o \"git commit -a\")"
-
-#: wt-status.c:789
-#, c-format
-msgid "nothing added to commit but untracked files present%s\n"
-msgstr ""
-
-#: wt-status.c:791
-msgid " (use \"git add\" to track)"
-msgstr ""
-
-#: wt-status.c:793 wt-status.c:796 wt-status.c:799
-#, c-format
-msgid "nothing to commit%s\n"
-msgstr ""
-
-#: wt-status.c:794
-msgid " (create/copy files and use \"git add\" to track)"
-msgstr ""
-
-#: wt-status.c:797
-msgid " (use -u to show untracked files)"
-msgstr ""
-
-#: wt-status.c:800
-msgid " (working directory clean)"
-msgstr ""
-
-#: wt-status.c:908
-msgid "HEAD (no branch)"
-msgstr "HEAD (nessun branch)"
-
-#: wt-status.c:914
-msgid "Initial commit on "
-msgstr "Commit iniziale su "
-
-#: wt-status.c:929
-msgid "behind "
-msgstr "indietro "
-
-#: wt-status.c:932 wt-status.c:935
-msgid "ahead "
-msgstr "avanti "
-
-#: wt-status.c:937
-msgid ", behind "
-msgstr ", indietro "
-
-#: builtin/add.c:62
-#, c-format
-msgid "unexpected diff status %c"
-msgstr "status diff %c inatteso"
-
-#: builtin/add.c:67 builtin/commit.c:226
-msgid "updating files failed"
-msgstr "aggiornamento dei file non riuscito"
-
-#: builtin/add.c:77
-#, c-format
-msgid "remove '%s'\n"
-msgstr "elimina '%s'\n"
-
-#: builtin/add.c:176
-#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr "Il path '%s' è nel sottomodulo '%.*s'"
-
-#: builtin/add.c:192
-msgid "Unstaged changes after refreshing the index:"
-msgstr ""
-
-#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: builtin/add.c:209
-#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr "'%s' si trova oltre un link simbolico"
-
-#: builtin/add.c:276
-msgid "Could not read the index"
-msgstr "Non è stato possibile leggere index"
-
-#: builtin/add.c:286
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Non è stato possibile aprire '%s' per la scrittura."
-
-#: builtin/add.c:290
-msgid "Could not write patch"
-msgstr "Non è stato possibile scrivere la patch"
-
-#: builtin/add.c:295
-#, c-format
-msgid "Could not stat '%s'"
-msgstr "Non è stato possibile eseguire lo stat di '%s'"
-
-#: builtin/add.c:297
-msgid "Empty patch. Aborted."
-msgstr "Patch vuota. Operazione interrotta."
-
-#: builtin/add.c:303
-#, c-format
-msgid "Could not apply '%s'"
-msgstr "Non è stato possibile applicare '%s'"
-
-#: builtin/add.c:312
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "I seguenti path sono stati ignorati da uno o più dei tuoi file .gitignore:\n"
-
-#: builtin/add.c:352
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Usa -f se vuoi davvero aggiungerli.\n"
-
-#: builtin/add.c:353
-msgid "no files added"
-msgstr "nessun file aggiunto"
-
-#: builtin/add.c:359
-msgid "adding files failed"
-msgstr "aggiunta dei file non riuscita"
-
-#: builtin/add.c:391
-msgid "-A and -u are mutually incompatible"
-msgstr "-A e -u sono reciprocamente incompatibili"
-
-#: builtin/add.c:393
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run"
-
-#: builtin/add.c:413
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr ""
-
-#: builtin/add.c:414
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Forse intendevi dire 'git add .'?\n"
-
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
-#: builtin/rm.c:162
-msgid "index file corrupt"
-msgstr "index file corrotto"
-
-#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
-msgid "Unable to write new index file"
-msgstr "Impossibile scrivere il nuovo index file"
-
-#: builtin/apply.c:53
-msgid "git apply [options] [<patch>...]"
-msgstr "git apply [opzioni] [<patch>...]"
-
-#: builtin/apply.c:106
-#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr ""
-
-#: builtin/apply.c:121
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr ""
-
-#: builtin/apply.c:815
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
-
-#: builtin/apply.c:824
-#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec ha restituito %d per l'input: %s"
-
-#: builtin/apply.c:905
-#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "impossibile trovare il nome del file nella patch alla riga %d"
-
-#: builtin/apply.c:937
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d"
-
-#: builtin/apply.c:941
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d"
-
-#: builtin/apply.c:942
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d"
-
-#: builtin/apply.c:949
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff errato - atteso /dev/nulla alla riga %d"
-
-#: builtin/apply.c:1394
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: riga inattesa: %.*s"
-
-#: builtin/apply.c:1451
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "frammento di patch senza intestazione alla riga %d: %.*s"
-
-#: builtin/apply.c:1468
+#: sequencer.c:901
#, 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] ""
-
-#: builtin/apply.c:1628
-msgid "new file depends on old contents"
-msgstr "il nuovo file dipende da contenuti precedenti"
-
-#: builtin/apply.c:1630
-msgid "deleted file still has contents"
-msgstr "il file eliminato ha ancora dei contenuti"
-
-#: builtin/apply.c:1656
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr ""
-
-#: builtin/apply.c:1692
-#, c-format
-msgid "new file %s depends on old contents"
-msgstr "il nuovo file %s dipende da contenuti precedenti"
-
-#: builtin/apply.c:1694
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "il file eliminato %s ha ancora dei contenuti"
-
-#: builtin/apply.c:1697
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato"
-
-#: builtin/apply.c:1843
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "patch binaria corrotta alla riga %d: %.*s"
-
-#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1872
-#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "patch binaria non riconosciuta alla riga %d"
-
-#: builtin/apply.c:1958
-#, c-format
-msgid "patch with only garbage at line %d"
-msgstr ""
-
-#: builtin/apply.c:2048
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "impossibile leggere il link simbolico %s"
-
-#: builtin/apply.c:2052
-#, c-format
-msgid "unable to open or read %s"
-msgstr "impossibile aprire o leggere %s"
-
-#: builtin/apply.c:2123
-msgid "oops"
-msgstr "oops"
-
-#: builtin/apply.c:2645
-#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "inizio della riga non valido: '%c'"
-
-#: builtin/apply.c:2763
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:2775
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
-
-#: builtin/apply.c:2781
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
-"durante la ricerca per:\n"
-"%.*s"
-
-#: builtin/apply.c:2800
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "dati della patch binaria mancanti per '%s'"
-
-#: builtin/apply.c:2903
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "la patch binaria non può essere applicata a '%s'"
-
-#: builtin/apply.c:2909
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)"
-
-#: builtin/apply.c:2930
-#, c-format
-msgid "patch failed: %s:%ld"
-msgstr "patch non riuscita: %s:%ld"
-
-#: builtin/apply.c:3045
-#, c-format
-msgid "patch %s has been renamed/deleted"
-msgstr "la patch %s è stata rinominata/eliminata"
-
-#: builtin/apply.c:3052 builtin/apply.c:3069
-#, c-format
-msgid "read of %s failed"
-msgstr "lettura di %s non riuscita"
-
-#: builtin/apply.c:3084
-msgid "removal patch leaves file contents"
-msgstr "la rimozione della patch lascia contenuti del file"
-
-#: builtin/apply.c:3105
-#, c-format
-msgid "%s: already exists in working directory"
-msgstr "%s: esiste già nella directory di lavoro"
-
-#: builtin/apply.c:3143
-#, c-format
-msgid "%s: has been deleted/renamed"
-msgstr "%s: è stata eliminata/rinominata"
-
-#: builtin/apply.c:3148 builtin/apply.c:3179
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: builtin/apply.c:3159
-#, c-format
-msgid "%s: does not exist in index"
-msgstr "%s: non esiste in index"
-
-#: builtin/apply.c:3173
-#, c-format
-msgid "%s: does not match index"
-msgstr "%s: non corrisponde a index"
-
-#: builtin/apply.c:3190
-#, c-format
-msgid "%s: wrong type"
-msgstr "%s: tipo errato"
-
-#: builtin/apply.c:3192
-#, c-format
-msgid "%s has type %o, expected %o"
-msgstr "%s ha il tipo %o, atteso %o"
-
-#: builtin/apply.c:3247
-#, c-format
-msgid "%s: already exists in index"
-msgstr "%s: esiste già in index"
-
-#: builtin/apply.c:3267
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
-
-#: builtin/apply.c:3272
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
-
-#: builtin/apply.c:3280
-#, c-format
-msgid "%s: patch does not apply"
-msgstr "%s: la patch non può essere applicata"
-
-#: builtin/apply.c:3293
-#, c-format
-msgid "Checking patch %s..."
-msgstr "Controllo della patch %s..."
-
-#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry non riuscito per il path '%s'"
-
-#: builtin/apply.c:3491
-#, c-format
-msgid "unable to remove %s from index"
-msgstr "impossibile rimuovere %s da index"
-
-#: builtin/apply.c:3518
-#, c-format
-msgid "corrupt patch for subproject %s"
-msgstr "patch corrotta per il sottoprogetto %s"
-
-#: builtin/apply.c:3522
-#, c-format
-msgid "unable to stat newly created file '%s'"
-msgstr "impossibile eseguire lo stat del file appena creato '%s'"
-
-#: builtin/apply.c:3527
-#, c-format
-msgid "unable to create backing store for newly created file %s"
-msgstr ""
-
-#: builtin/apply.c:3530
-#, c-format
-msgid "unable to add cache entry for %s"
-msgstr "impossibile aggiungere la voce della cache per %s"
-
-#: builtin/apply.c:3563
-#, c-format
-msgid "closing file '%s'"
-msgstr "chiusura del file '%s'"
-
-#: builtin/apply.c:3612
-#, c-format
-msgid "unable to write file '%s' mode %o"
-msgstr "impossibile scrivere il file '%s' in modalità %o"
-
-#: builtin/apply.c:3668
-#, c-format
-msgid "Applied patch %s cleanly."
-msgstr "Patch %s applicata correttamente."
-
-#: builtin/apply.c:3676
-msgid "internal error"
-msgstr "errore interno"
-
-#. Say this even without --verbose
-#: builtin/apply.c:3679
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:3689
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
-
-#: builtin/apply.c:3710
-#, c-format
-msgid "Hunk #%d applied cleanly."
-msgstr "Frammento #%d applicato correttamente."
-
-#: builtin/apply.c:3713
-#, c-format
-msgid "Rejected hunk #%d."
-msgstr "Frammento #%d respinto."
-
-#: builtin/apply.c:3844
-msgid "unrecognized input"
-msgstr "input non riconosciuto"
-
-#: builtin/apply.c:3855
-msgid "unable to read index file"
-msgstr "impossibile leggere index file"
-
-#: builtin/apply.c:3970 builtin/apply.c:3973
-msgid "path"
-msgstr "path"
-
-#: builtin/apply.c:3971
-msgid "don't apply changes matching the given path"
-msgstr "non applica le modifiche corrispondenti al path specificato"
-
-#: builtin/apply.c:3974
-msgid "apply changes matching the given path"
-msgstr "applica le modifiche corrispondenti al path specificato"
-
-#: builtin/apply.c:3976
-msgid "num"
-msgstr "num"
-
-#: builtin/apply.c:3977
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
-
-#: builtin/apply.c:3980
-msgid "ignore additions made by the patch"
-msgstr "ignora le aggiunte create dalla patch"
-
-#: builtin/apply.c:3982
-msgid "instead of applying the patch, output diffstat for the input"
-msgstr "invece di applicare la patch, mostra l'output di diffstat per l'input"
-
-#: builtin/apply.c:3986
-msgid "shows number of added and deleted lines in decimal notation"
-msgstr "mostra il numero di righe aggiunte e eliminate in notazione decimale"
-
-#: builtin/apply.c:3988
-msgid "instead of applying the patch, output a summary for the input"
-msgstr "invece di applicare la patch, mostra un riassunto per l'input"
-
-#: builtin/apply.c:3990
-msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "invece di applicare la patch, verifica se può essere applicata"
-
-#: builtin/apply.c:3992
-msgid "make sure the patch is applicable to the current index"
-msgstr "assicura che la patch sia applicabile all'attuale index"
-
-#: builtin/apply.c:3994
-msgid "apply a patch without touching the working tree"
-msgstr ""
-
-#: builtin/apply.c:3996
-msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "applica anche la patch (da usare con --stat/--summary/--check)"
-
-#: builtin/apply.c:3998
-msgid "build a temporary index based on embedded index information"
-msgstr ""
-
-#: builtin/apply.c:4000
-msgid "paths are separated with NUL character"
-msgstr "i path sono separati con un carattere NUL"
-
-#: builtin/apply.c:4003
-msgid "ensure at least <n> lines of context match"
-msgstr "assicura almeno <n> righe di contesto corrispondente"
-
-#: builtin/apply.c:4004
-msgid "action"
-msgstr "azione"
-
-#: builtin/apply.c:4005
-msgid "detect new or modified lines that have whitespace errors"
-msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi"
-
-#: builtin/apply.c:4008 builtin/apply.c:4011
-msgid "ignore changes in whitespace when finding context"
-msgstr ""
-
-#: builtin/apply.c:4014
-msgid "apply the patch in reverse"
-msgstr "applica la patch in maniera inversa"
-
-#: builtin/apply.c:4016
-msgid "don't expect at least one line of context"
-msgstr ""
-
-#: builtin/apply.c:4018
-msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "lascia i frammenti respinti nei file .rej corrispondenti"
-
-#: builtin/apply.c:4020
-msgid "allow overlapping hunks"
-msgstr "consente la sovrapposizione dei frammenti"
-
-#: builtin/apply.c:4021
-msgid "be verbose"
-msgstr "dettagliato"
-
-#: builtin/apply.c:4023
-msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
-
-#: builtin/apply.c:4026
-msgid "do not trust the line counts in the hunk headers"
-msgstr ""
-
-#: builtin/apply.c:4028
-msgid "root"
-msgstr "radice"
-
-#: builtin/apply.c:4029
-msgid "prepend <root> to all filenames"
-msgstr "antepone <root> a tutti i nomi file"
-
-#: builtin/apply.c:4050
-msgid "--index outside a repository"
-msgstr "--index al di fuori di un repository"
-
-#: builtin/apply.c:4053
-msgid "--cached outside a repository"
-msgstr "--cached al di fuori di un repository"
-
-#: builtin/apply.c:4069
-#, c-format
-msgid "can't open patch '%s'"
-msgstr "impossibile aprire la patch '%s'"
-
-#: builtin/apply.c:4083
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4089 builtin/apply.c:4099
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d riga aggiunge errori di spazi bianchi."
-msgstr[1] "%d righe aggiungono errori di spazi bianchi."
-
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "non è stato possibile creare il file del repository '%s'"
-
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr "non è stato possibile redirigere l'output"
-
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr "git archive: Remote non ha un URL"
-
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: atteso ACK/NAK, ricevuto EOF"
-
-#: builtin/archive.c:63
-#, c-format
-msgid "git archive: NACK %s"
-msgstr "git archive: NACK %s"
-
-#: builtin/archive.c:65
-#, c-format
-msgid "remote error: %s"
-msgstr "errore remoto: %s"
-
-#: builtin/archive.c:66
-msgid "git archive: protocol error"
-msgstr "git archive: errore del protocollo"
-
-#: builtin/archive.c:71
-msgid "git archive: expected a flush"
-msgstr "git archive: atteso un flush"
-
-#: builtin/branch.c:144
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
-msgstr ""
-
-#: builtin/branch.c:148
-#, 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:180
-msgid "cannot use -a with -d"
-msgstr "impossibile usare -a con -d"
-
-#: builtin/branch.c:186
-msgid "Couldn't look up commit object for HEAD"
-msgstr ""
-
-#: builtin/branch.c:191
-#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr ""
-
-#: builtin/branch.c:202
-#, c-format
-msgid "remote branch '%s' not found."
-msgstr "il branch remoto '%s' non è stato trovato."
-
-#: builtin/branch.c:203
-#, c-format
-msgid "branch '%s' not found."
-msgstr "branch '%s' non trovato."
-
-#: builtin/branch.c:210
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr ""
-
-#: builtin/branch.c:216
-#, 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:225
-#, c-format
-msgid "Error deleting remote branch '%s'"
-msgstr "Errore nella rimozione del branch remoto '%s'"
-
-#: builtin/branch.c:226
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Errore nella rimozione del branch '%s'"
-
-#: builtin/branch.c:233
-#, c-format
-msgid "Deleted remote branch %s (was %s).\n"
-msgstr "Ramo remoto %s eliminato (era %s).\n"
-
-#: builtin/branch.c:234
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr "Ramo %s eliminato (era %s).\n"
-
-#: builtin/branch.c:239
-msgid "Update of config-file failed"
-msgstr "Aggiornamento del file di configurazione fallito"
-
-#: builtin/branch.c:337
-#, c-format
-msgid "branch '%s' does not point at a commit"
-msgstr "il branch '%s' non punta ad un commit"
-
-#: builtin/branch.c:409
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: dietro %d]"
-
-#: builtin/branch.c:411
-#, c-format
-msgid "[behind %d]"
-msgstr "[dietro %d]"
-
-#: builtin/branch.c:415
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: avanti %d]"
-
-#: builtin/branch.c:417
-#, c-format
-msgid "[ahead %d]"
-msgstr ""
-
-#: builtin/branch.c:420
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr ""
-
-#: builtin/branch.c:423
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr ""
-
-#: builtin/branch.c:535
-msgid "(no branch)"
-msgstr "(nessun branch)"
-
-#: builtin/branch.c:600
-msgid "some refs could not be read"
-msgstr ""
-
-#: builtin/branch.c:613
-msgid "cannot rename the current branch while not on any."
-msgstr ""
-
-#: builtin/branch.c:623
-#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr "Nome del branch non valido: '%s'"
-
-#: builtin/branch.c:638
-msgid "Branch rename failed"
-msgstr ""
-
-#: builtin/branch.c:642
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr ""
-
-#: builtin/branch.c:646
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "Ramo rinominato in %s, ma HEAD non è aggiornato!"
-
-#: builtin/branch.c:653
-msgid "Branch is renamed, but update of config-file failed"
-msgstr ""
-"Il branch è stato rinominato, ma l'aggiornamento del file di configurazione "
-"è fallito"
-
-#: builtin/branch.c:668
-#, c-format
-msgid "malformed object name %s"
-msgstr "nome dell'oggetto %s errato"
-
-#: builtin/branch.c:692
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr ""
-
-#: builtin/branch.c:783
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: builtin/branch.c:788 builtin/clone.c:558
-msgid "HEAD not found below refs/heads!"
-msgstr ""
-
-#: builtin/branch.c:808
-msgid "--column and --verbose are incompatible"
-msgstr "--column e --verbose non sono compatibili"
-
-#: builtin/branch.c:857
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr ""
-"le opzioni -a e -r per 'git branch' non hanno senso con il nome di un branch"
-
-#: builtin/bundle.c:47
-#, c-format
-msgid "%s is okay\n"
-msgstr "%s è corretto\n"
-
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
-msgstr ""
-
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
-msgstr ""
-
-#: builtin/checkout.c:113 builtin/checkout.c:146
-#, c-format
-msgid "path '%s' does not have our version"
-msgstr "il path '%s' non ha la nostra versione"
-
-#: builtin/checkout.c:115 builtin/checkout.c:148
-#, c-format
-msgid "path '%s' does not have their version"
-msgstr "il path '%s' non ha la loro versione"
-
-#: builtin/checkout.c:131
-#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr ""
-
-#: builtin/checkout.c:175
-#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr "il path '%s' non ha le versioni necessarie"
-
-#: builtin/checkout.c:192
-#, c-format
-msgid "path '%s': cannot merge"
-msgstr ""
-
-#: builtin/checkout.c:209
-#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr ""
-
-#: builtin/checkout.c:234 builtin/checkout.c:392
-msgid "corrupt index file"
-msgstr "file index corrotto"
-
-#: builtin/checkout.c:264 builtin/checkout.c:271
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr ""
-
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
-#: builtin/merge.c:812
-msgid "unable to write new index file"
-msgstr "impossibile scrivere il nuovo file index"
-
-#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
-msgstr "diff_setup_done non riuscito"
-
-#: builtin/checkout.c:414
-msgid "you need to resolve your current index first"
-msgstr "è necessario risolvere prima l'attuale index"
-
-#: builtin/checkout.c:533
-#, c-format
-msgid "Can not do reflog for '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:566
-msgid "HEAD is now at"
-msgstr "HEAD si trova ora a"
-
-#: builtin/checkout.c:573
-#, c-format
-msgid "Reset branch '%s'\n"
-msgstr "Ripristina il branch '%s'\n"
-
-#: builtin/checkout.c:576
-#, c-format
-msgid "Already on '%s'\n"
-msgstr "Si è già su '%s'\n"
-
-#: builtin/checkout.c:580
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:582
-#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr ""
-
-#: builtin/checkout.c:584
-#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "Si è passati al branch '%s'\n"
-
-#: builtin/checkout.c:640
-#, c-format
-msgid " ... and %d more.\n"
-msgstr " ... e %d altri.\n"
-
-#. The singular version
-#: builtin/checkout.c:646
-#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
+" git commit --amend %s\n"
"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:664
-#, c-format
-msgid ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
+"If they are meant to go into a new commit, run:\n"
"\n"
-" git branch new_branch_name %s\n"
+" git commit %s\n"
"\n"
-msgstr ""
-"Se si vuole mantenerle creando un nuovo branch, questo potrebbe essere\n"
-"un buon momento per farlo con:\n"
+"In both cases, once you're done, continue with:\n"
"\n"
-" git branch nuovo_nome_branch %s\n"
+" git rebase --continue\n"
+msgstr ""
+"hai modifiche in staging nell'albero di lavoro\n"
+"Se queste modifiche devono essere sottoposte a squash nel commit\n"
+"precedente, esegui:\n"
"\n"
+" git commit --amend %s\n"
+"\n"
+"Se devono essere incluse in un nuovo commit, esegui:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In entrambi i casi, una volta finito, continua con:\n"
+"\n"
+" git rebase --continue\n"
-#: builtin/checkout.c:694
-msgid "internal error in revision walk"
-msgstr ""
+#: sequencer.c:995
+msgid "writing root commit"
+msgstr "scrittura commit radice in corso"
-#: builtin/checkout.c:698
-msgid "Previous HEAD position was"
-msgstr "La precedente posizione di HEAD era"
+#: sequencer.c:1216
+msgid "'prepare-commit-msg' hook failed"
+msgstr "hook 'prepare-commit-msg' non riuscito"
-#: builtin/checkout.c:724
-msgid "You are on a branch yet to be born"
-msgstr ""
-
-#. case (1)
-#: builtin/checkout.c:855
-#, c-format
-msgid "invalid reference: %s"
-msgstr "riferimento non valido: %s"
-
-#. case (1): want a tree
-#: builtin/checkout.c:894
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr ""
-
-#: builtin/checkout.c:974
-msgid "-B cannot be used with -b"
-msgstr "-B non può essere usata con -b"
-
-#: builtin/checkout.c:983
-msgid "--patch is incompatible with all other options"
-msgstr "--patch non è compatibile con tutte le altre opzioni"
-
-#: builtin/checkout.c:986
-msgid "--detach cannot be used with -b/-B/--orphan"
-msgstr "--detach non può essere usata con -b/-B/--orphan"
-
-#: builtin/checkout.c:988
-msgid "--detach cannot be used with -t"
-msgstr "--detach non può essere usata con -t"
-
-#: builtin/checkout.c:994
-msgid "--track needs a branch name"
-msgstr "--track necessita del nome di un branch"
-
-#: builtin/checkout.c:1001
-msgid "Missing branch name; try -b"
-msgstr "Nome del branch mancante; prova con -b"
-
-#: builtin/checkout.c:1007
-msgid "--orphan and -b|-B are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1009
-msgid "--orphan cannot be used with -t"
-msgstr "--orphan non può essere usata con -t"
-
-#: builtin/checkout.c:1019
-msgid "git checkout: -f and -m are incompatible"
-msgstr "git checkout: -f e -m non sono compatibili"
-
-#: builtin/checkout.c:1053
-msgid "invalid path specification"
-msgstr ""
-
-#: builtin/checkout.c:1061
-#, c-format
+#: sequencer.c:1223
msgid ""
-"git checkout: updating paths is incompatible with switching branches.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+"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 ""
+"Il tuo nome e l'indirizzo e-mail sono stati configurati automaticamente "
+"usando\n"
+"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n"
+"È possibile eliminare questo messaggio impostandoli esplicitamente.\n"
+"Esegui il seguente comando e segui le istruzioni fornite nel tuo editor\n"
+"per modificare il file di configurazione:\n"
+"\n"
+" git config --global --edit\n"
+"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit "
+"con:\n"
+"\n"
+" git commit --amend --reset-author\n"
-#: builtin/checkout.c:1063
-msgid "git checkout: updating paths is incompatible with switching branches."
-msgstr ""
-
-#: builtin/checkout.c:1068
-msgid "git checkout: --detach does not take a path argument"
-msgstr "git checkout: --detach non prende un path come argomento"
-
-#: builtin/checkout.c:1071
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-
-#: builtin/checkout.c:1090
-msgid "Cannot switch branch to a non-commit."
-msgstr ""
-
-#: builtin/checkout.c:1093
-msgid "--ours/--theirs is incompatible with switching branches."
-msgstr "--ours/--theirs non sono compatibili con il passaggio ai branch."
-
-#: builtin/clean.c:78
-msgid "-x and -X cannot be used together"
-msgstr "-x e -X non possono essere usati insieme"
-
-#: builtin/clean.c:82
-msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
-msgstr ""
-"clean.requireForce è impostato a vero, ma né -n né -f sono state specificate; "
-"clean interrotto"
-
-#: builtin/clean.c:85
-msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
-msgstr ""
-"clean.requireForce è vero per default, ma né -n né -f sono state specificate; "
-"clean interrotto"
-
-#: builtin/clean.c:155 builtin/clean.c:176
-#, c-format
-msgid "Would remove %s\n"
-msgstr ""
-
-#: builtin/clean.c:159 builtin/clean.c:179
-#, c-format
-msgid "Removing %s\n"
-msgstr "Rimozione di %s\n"
-
-#: builtin/clean.c:162 builtin/clean.c:182
-#, c-format
-msgid "failed to remove %s"
-msgstr "rimozione di %s non riuscita"
-
-#: builtin/clean.c:166
-#, c-format
-msgid "Would not remove %s\n"
-msgstr ""
-
-#: builtin/clean.c:168
-#, c-format
-msgid "Not removing %s\n"
-msgstr ""
-
-#: builtin/clone.c:243
-#, c-format
-msgid "reference repository '%s' is not a local directory."
-msgstr "il repository di riferimento '%s' non è una directory locale."
-
-#: builtin/clone.c:302
-#, c-format
-msgid "failed to open '%s'"
-msgstr "apertura di '%s' non riuscita"
-
-#: builtin/clone.c:306
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "creazione della directory '%s' non riuscita"
-
-#: builtin/clone.c:308 builtin/diff.c:75
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "stat di '%s' non riuscito"
-
-#: builtin/clone.c:310
-#, c-format
-msgid "%s exists and is not a directory"
-msgstr "%s esiste e non è una directory"
-
-#: builtin/clone.c:324
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "stat di %s non riuscito\n"
-
-#: builtin/clone.c:341
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "rimozione del link '%s' non riuscita"
-
-#: builtin/clone.c:346
-#, c-format
-msgid "failed to create link '%s'"
-msgstr "creazione del link '%s' non riuscita"
-
-#: builtin/clone.c:350
-#, c-format
-msgid "failed to copy file to '%s'"
-msgstr "copia del file in '%s' non riuscita"
-
-#: builtin/clone.c:373
-#, c-format
-msgid "done.\n"
-msgstr "fatto.\n"
-
-#: builtin/clone.c:440
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr "Non è stato possibile trovare il branch remoto %s da clonare."
-
-#: builtin/clone.c:549
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr ""
-"l'HEAD remoto si riferisce ad un ref inesistente, impossibile eseguire il "
-"checkout.\n"
-
-#: builtin/clone.c:639
-msgid "Too many arguments."
-msgstr "Troppi argomenti."
-
-#: builtin/clone.c:643
-msgid "You must specify a repository to clone."
-msgstr "Devi specificare un repository da clonare."
-
-#: builtin/clone.c:654
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "le opzioni --bare e --origin %s non sono compatibili."
-
-#: builtin/clone.c:668
-#, c-format
-msgid "repository '%s' does not exist"
-msgstr "il repository '%s' non esiste"
-
-#: builtin/clone.c:673
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:683
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr ""
-"il path di destinazione '%s' esiste già e non è una directory vuota."
-
-#: builtin/clone.c:693
-#, c-format
-msgid "working tree '%s' already exists."
-msgstr ""
-
-#: builtin/clone.c:706 builtin/clone.c:720
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr ""
-
-#: builtin/clone.c:709
-#, c-format
-msgid "could not create work tree dir '%s'."
-msgstr ""
-
-#: builtin/clone.c:728
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr "Clone nel repository spoglio '%s'...\n"
-
-#: builtin/clone.c:730
-#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:786
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Non so come clonare %s"
-
-#: builtin/clone.c:835
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr "Il branch remoto %s non è stato trovato in upstream %s"
-
-#: builtin/clone.c:842
-msgid "You appear to have cloned an empty repository."
-msgstr "Sembra che tu abbia clonato un repository vuoto."
-
-#: builtin/column.c:51
-msgid "--command must be the first argument"
-msgstr "--command deve essere il primo argomento"
-
-#: builtin/commit.c:43
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -2074,121 +6061,5631 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"Il tuo nome e l'indirizzo email sono stati configurati automaticamente usando\n"
+"Il tuo nome e l'indirizzo e-mail sono stati configurati automaticamente "
+"usando\n"
"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n"
"È possibile eliminare questo messaggio impostandoli esplicitamente:\n"
"\n"
-" git config --global user.name \"Tuo Nome\"\n"
+" git config --global user.name \"Il tuo nome\"\n"
" git config --global user.email tu@esempio.com\n"
"\n"
-"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit con:\n"
+"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit "
+"con:\n"
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:55
+#: sequencer.c:1278
+msgid "couldn't look up newly created commit"
+msgstr "impossibile trovare il commit appena creato"
+
+#: sequencer.c:1280
+msgid "could not parse newly created commit"
+msgstr "impossibile analizzare il commit appena creato"
+
+#: sequencer.c:1326
+msgid "unable to resolve HEAD after creating commit"
+msgstr "impossibile risolvere HEAD dopo la creazione del commit"
+
+#: sequencer.c:1328
+msgid "detached HEAD"
+msgstr "HEAD scollegato"
+
+#: sequencer.c:1332
+msgid " (root-commit)"
+msgstr " (commit radice)"
+
+#: sequencer.c:1353
+msgid "could not parse HEAD"
+msgstr "impossibile analizzare HEAD"
+
+#: sequencer.c:1355
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "L'HEAD %s non è un commit!"
+
+#: sequencer.c:1359 builtin/commit.c:1571
+msgid "could not parse HEAD commit"
+msgstr "impossibile analizzare il commit HEAD"
+
+#: sequencer.c:1411 sequencer.c:2004
+msgid "unable to parse commit author"
+msgstr "impossibile analizzare l'autore del commit"
+
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree non è riuscito a scrivere un albero"
+
+#: sequencer.c:1438 sequencer.c:1499
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "impossibile leggere il messaggio di commit da '%s'"
+
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
+msgid "failed to write commit object"
+msgstr "scrittura dell'oggetto del commit non riuscita"
+
+#: sequencer.c:1526
+#, c-format
+msgid "could not parse commit %s"
+msgstr "impossibile analizzare il commit %s"
+
+#: sequencer.c:1531
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "impossibile analizzare il commit genitore %s"
+
+#: sequencer.c:1605 sequencer.c:1715
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando sconosciuto: %d"
+
+#: sequencer.c:1662 sequencer.c:1687
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Questa è una combinazione di %d commit."
+
+#: sequencer.c:1672
+msgid "need a HEAD to fixup"
+msgstr "è necessaria un'HEAD per il fixup"
+
+#: sequencer.c:1674 sequencer.c:3219
+msgid "could not read HEAD"
+msgstr "impossibile leggere l'HEAD"
+
+#: sequencer.c:1676
+msgid "could not read HEAD's commit message"
+msgstr "impossibile leggere il messaggio di commit dell'HEAD"
+
+#: sequencer.c:1682
+#, c-format
+msgid "cannot write '%s'"
+msgstr "impossibile scrivere '%s'"
+
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+msgid "This is the 1st commit message:"
+msgstr "Questo è il primo messaggio di commit:"
+
+#: sequencer.c:1697
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "impossibile leggere il messaggio di commit di %s"
+
+#: sequencer.c:1704
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Questo è il messaggio di commit numero %d:"
+
+#: sequencer.c:1710
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Il messaggio di commit numero %d sarà saltato:"
+
+#: sequencer.c:1798
+msgid "your index file is unmerged."
+msgstr "il file indice non è stato sottoposto a merge."
+
+#: sequencer.c:1805
+msgid "cannot fixup root commit"
+msgstr "impossibile eseguire il fixup sul commit radice"
+
+#: sequencer.c:1824
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m."
+
+#: sequencer.c:1832 sequencer.c:1840
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "il commit %s non ha il genitore %d"
+
+#: sequencer.c:1846
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "impossibile ottenere il messaggio di commit per %s"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1865
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: impossibile analizzare il commit genitore %s"
+
+#: sequencer.c:1930
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "impossibile ridenominare '%s' in '%s'"
+
+#: sequencer.c:1985
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "non è stato possibile eseguire il revert di %s... %s"
+
+#: sequencer.c:1986
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "non è stato possibile applicare %s... %s"
+
+#: sequencer.c:2045
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: lettura dell'indice non riuscita"
+
+#: sequencer.c:2052
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: aggiornamento dell'indice non riuscito"
+
+#: sequencer.c:2128
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s non accetta argomenti: '%s'"
+
+#: sequencer.c:2137
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argomenti mancanti per %s"
+
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "impossibile analizzare '%.*s'"
+
+#: sequencer.c:2228
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "riga %d non valida: %.*s"
+
+#: sequencer.c:2239
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "impossibile eseguire '%s' senza un commit precedente"
+
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossibile leggere '%s'."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "annullo un'operazione di cherry-pick in corso"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "annullo un'operazione di revert in corso"
+
+#: sequencer.c:2364
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "correggi la situazione usando 'git rebase --edit-todo'."
+
+#: sequencer.c:2366
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "foglio istruzioni inutilizzabile: '%s'"
+
+#: sequencer.c:2371
+msgid "no commits parsed."
+msgstr "nessun commit analizzato."
+
+#: sequencer.c:2382
+msgid "cannot cherry-pick during a revert."
+msgstr "impossibile eseguire un cherry-pick durante un revert."
+
+#: sequencer.c:2384
+msgid "cannot revert during a cherry-pick."
+msgstr "impossibile eseguire un revert durante un cherry-pick."
+
+#: sequencer.c:2466
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valore non valido per %s: %s"
+
+#: sequencer.c:2553
+msgid "unusable squash-onto"
+msgstr "squash-onto inutilizzabile"
+
+#: sequencer.c:2569
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "foglio opzioni malformati: '%s'"
+
+#: sequencer.c:2652 sequencer.c:4351
+msgid "empty commit set passed"
+msgstr "è stato passato un insieme di commit vuoto"
+
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "un'operazione di revert è già in corso"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "un'operazione di cherry-pick è già in corso"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "impossibile creare la directory sequencer '%s'"
+
+#: sequencer.c:2704
+msgid "could not lock HEAD"
+msgstr "impossibile bloccare HEAD"
+
+#: sequencer.c:2764 sequencer.c:4103
+msgid "no cherry-pick or revert in progress"
+msgstr "nessuna operazione di cherry-pick o revert in corso"
+
+#: sequencer.c:2766 sequencer.c:2777
+msgid "cannot resolve HEAD"
+msgstr "impossibile risolvere HEAD"
+
+#: sequencer.c:2768 sequencer.c:2812
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+"impossibile interrompere l'operazione da un branch che deve essere ancora "
+"creato"
+
+#: sequencer.c:2798 builtin/grep.c:734
+#, c-format
+msgid "cannot open '%s'"
+msgstr "impossibile aprire '%s'"
+
+#: sequencer.c:2800
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "impossibile leggere '%s': %s"
+
+#: sequencer.c:2801
+msgid "unexpected end of file"
+msgstr "fine del file inattesa"
+
+#: sequencer.c:2807
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr ""
+"il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto"
+
+#: sequencer.c:2818
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!"
+
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "nessun revert in corso"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "nessun cherry-pick in corso"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "salto del commit non riuscito"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "non c'è nulla da saltare"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"hai già eseguito il commit?\n"
+"prova \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
+#, c-format
+msgid "could not update %s"
+msgstr "impossibile aggiornare %s"
+
+#: sequencer.c:3049 sequencer.c:3995
+msgid "cannot read HEAD"
+msgstr "impossibile leggere l'HEAD"
+
+#: sequencer.c:3066
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "impossibile copiare '%s' in '%s'"
+
+#: sequencer.c:3074
+#, 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 ""
+"È possibile modificare il commit ora con\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Quando sei soddisfatto delle modifiche, esegui\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:3084
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Impossibile applicare %s... %.*s"
+
+#: sequencer.c:3091
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Impossibile eseguire il merge di %.*s"
+
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "impossibile copiare '%s' in '%s'"
+
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
+msgid "could not read index"
+msgstr "impossibile leggere l'indice"
+
+#: sequencer.c:3136
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"esecuzione non riuscita: %s\n"
+"%sPuoi correggere il problema e quindi eseguire\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3142
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n"
+
+#: sequencer.c:3148
+#, 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 ""
+"esecuzione riuscita: %s\n"
+"ma sono state mantenute modifiche all'indice e/o all'albero di lavoro\n"
+"Esegui il commit o lo stash delle modifiche, quindi esegui\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3209
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nome etichetta illecito: '%.*s'"
+
+#: sequencer.c:3263
+msgid "writing fake root commit"
+msgstr "scrittura commit radice falso in corso"
+
+#: sequencer.c:3268
+msgid "writing squash-onto"
+msgstr "scrittura squash-onto in corso"
+
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossibile trovare l'albero di %s"
+
+#: sequencer.c:3324 builtin/rebase.c:873
+msgid "could not write index"
+msgstr "impossibile scrivere l'indice"
+
+#: sequencer.c:3351
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "impossibile risolvere '%s'"
+
+#: sequencer.c:3379
+msgid "cannot merge without a current revision"
+msgstr "impossibile eseguire il merge senza una revisione corrente"
+
+#: sequencer.c:3401
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "impossibile analizzare '%.*s'"
+
+#: sequencer.c:3410
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "non c'è nulla di cui eseguire il merge: '%.*s'"
+
+#: sequencer.c:3422
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]"
+
+#: sequencer.c:3437
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "impossibile ottenere il messaggio di commit per '%s'"
+
+#: sequencer.c:3590
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'"
+
+#: sequencer.c:3606
+msgid "merge: Unable to write new index file"
+msgstr "merge: impossibile scrivere il nuovo file indice"
+
+#: sequencer.c:3675 builtin/rebase.c:711
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Stash automatico applicato.\n"
+
+#: sequencer.c:3687
+#, c-format
+msgid "cannot store %s"
+msgstr "impossibile memorizzare %s"
+
+#: sequencer.c:3690 builtin/rebase.c:727 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 ""
+"L'applicazione dello stash automatico ha generato conflitti.\n"
+"Le tue modifiche sono al sicuro nello stash.\n"
+"Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n"
+
+#: sequencer.c:3751
+#, c-format
+msgid "could not checkout %s"
+msgstr "impossibile eseguire il checkout di %s"
+
+#: sequencer.c:3765
+#, c-format
+msgid "%s: not a valid OID"
+msgstr "%s: non è un OID valido"
+
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+msgid "could not detach HEAD"
+msgstr "impossibile scollegare l'HEAD"
+
+#: sequencer.c:3785
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Fermato a HEAD\n"
+
+#: sequencer.c:3787
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Fermato a %s\n"
+
+#: sequencer.c:3795
+#, 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 ""
+"Impossibile eseguire il comando todo\n"
+"\n"
+" %.*s\n"
+"\n"
+"Il comando è stato pianificato nuovamente. Per modificarlo prima di\n"
+"continuare, modifica prima la lista todo:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+
+#: sequencer.c:3877
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Fermato a %s... %.*s\n"
+
+#: sequencer.c:3958
+#, c-format
+msgid "unknown command %d"
+msgstr "comando %d sconosciuto"
+
+#: sequencer.c:4003
+msgid "could not read orig-head"
+msgstr "impossibile leggere orig-head"
+
+#: sequencer.c:4008
+msgid "could not read 'onto'"
+msgstr "impossibile leggere 'onto'"
+
+#: sequencer.c:4022
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "impossibile aggiornare l'HEAD a %s"
+
+#: sequencer.c:4115
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+"impossibile eseguire il rebase: ci sono delle modifiche non in staging."
+
+#: sequencer.c:4124
+msgid "cannot amend non-existing commit"
+msgstr "impossibile modificare un commit inesistente"
+
+#: sequencer.c:4126
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "file non valido: '%s'"
+
+#: sequencer.c:4128
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenuti non validi: '%s'"
+
+#: sequencer.c:4131
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Ci sono modifiche di cui non è stato eseguito il commit nel tuo albero\n"
+"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
+"--continue'."
+
+#: sequencer.c:4167 sequencer.c:4205
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "impossibile scrivere il file: '%s'"
+
+#: sequencer.c:4220
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
+
+#: sequencer.c:4227
+msgid "could not commit staged changes."
+msgstr "impossibile eseguire il commit delle modifiche in staging."
+
+#: sequencer.c:4328
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: impossibile eseguire il cherry pick di un %s"
+
+#: sequencer.c:4332
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: revisione non valida"
+
+#: sequencer.c:4367
+msgid "can't revert as initial commit"
+msgstr "impossibile eseguire il revert come commit iniziale"
+
+#: sequencer.c:4810
+msgid "make_script: unhandled options"
+msgstr "make_script: opzioni non gestite"
+
+#: sequencer.c:4813
+msgid "make_script: error preparing revisions"
+msgstr "make_script: errore durante la preparazione delle revisioni"
+
+#: sequencer.c:4971
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi "
+"eseguire 'git rebase --continue'.\n"
+"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
+
+#: sequencer.c:5083 sequencer.c:5100
+msgid "nothing to do"
+msgstr "nulla da fare"
+
+#: sequencer.c:5114
+msgid "could not skip unnecessary pick commands"
+msgstr "impossibile saltare i comandi pick non necessari"
+
+#: sequencer.c:5197
+msgid "the script was already rearranged."
+msgstr "lo script è già stato riordinato."
+
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
+msgstr "'%s' è al di fuori del repository"
+
+#: setup.c:173
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgstr ""
+"%s: percorso non esistente nell'albero di lavoro.\n"
+"Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti "
+"localmente."
+
+#: setup.c:186
+#, 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 ""
+"argomento '%s' ambiguo: revisione sconosciuta o percorso non nell'albero di "
+"lavoro.\n"
+"Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
+"'git <comando> [<revisione>...] -- [<file>...]'"
+
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+"l'opzione '%s' deve essere specificata prima degli argomenti che non "
+"costituiscono un'opzione"
+
+#: setup.c:254
+#, 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 ""
+"argomento '%s' ambiguo: è sia una revisione sia un nome file\n"
+"Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
+"'git <comando> [<revisione>...] -- [<file>...]'"
+
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"impossibile preparare l'albero di lavoro usando una configurazione non valida"
+
+#: setup.c:394
+msgid "this operation must be run in a work tree"
+msgstr "quest'operazione deve essere eseguita in un albero di lavoro"
+
+#: setup.c:540
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Attesa versione repository Git <= %d, trovata %d"
+
+#: setup.c:548
+msgid "unknown repository extensions found:"
+msgstr "trovate estensioni repository sconosciute:"
+
+#: setup.c:567
+#, c-format
+msgid "error opening '%s'"
+msgstr "errore durante l'apertura di '%s'"
+
+#: setup.c:569
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "'%s' troppo grande per essere un file .git"
+
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
+msgstr "errore durante la lettura di %s"
+
+#: setup.c:573
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "formato file Git non valido: %s"
+
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "nessun percorso presente nel file Git: %s"
+
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
+msgstr "%s non è un repository Git"
+
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' è troppo grande"
+
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "'%s' non è un repository Git"
+
+#: setup.c:719 setup.c:721 setup.c:752
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "impossibile modificare la directory corrente in '%s'"
+
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
+msgstr "impossibile tornare alla directory di lavoro corrente"
+
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "stat di '%*s%s%s' non riuscito"
+
+#: setup.c:1083
+msgid "Unable to read current working directory"
+msgstr "Impossibile leggere la directory di lavoro corrente"
+
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "impossibile entrare in '%s'"
+
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)"
+
+#: setup.c:1109
+#, 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 ""
+"non è un repository Git (né lo è alcun genitore fino al punto di mount %s)\n"
+"Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"non è impostata)."
+
+#: setup.c:1220
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"si è verificato un problema con il valore modo file di core.sharedRepository "
+"(0%.3o).\n"
+"Il proprietario dei file deve avere sempre i permessi di lettura e scrittura."
+
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
+msgstr "apertura di /dev/null o dup non riuscita"
+
+#: setup.c:1279
+msgid "fork failed"
+msgstr "fork non riuscita"
+
+#: setup.c:1284
+msgid "setsid failed"
+msgstr "setsid non riuscita"
+
+#: sha1-file.c:453
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"la directory oggetti %s non esiste; controlla .git/objects/info/alternates"
+
+#: sha1-file.c:504
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "impossibile normalizzare il percorso alternativo oggetto: %s"
+
+#: sha1-file.c:576
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo "
+"profonda"
+
+#: sha1-file.c:583
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "impossibile normalizzare la directory oggetti: %s"
+
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
+msgstr "impossibile eseguire fdopen sul file di lock alternates"
+
+#: sha1-file.c:644
+msgid "unable to read alternates file"
+msgstr "impossibile leggere il file alternates"
+
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
+msgstr "impossibile spostare il nuovo file alternates nella posizione corretta"
+
+#: sha1-file.c:686
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "il percorso '%s' non esiste"
+
+#: sha1-file.c:712
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"l'aggiunta del repository di riferimento '%s' come checkout collegato non è "
+"ancora supportata."
+
+#: sha1-file.c:718
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "il repository di riferimento '%s' non è un repository locale."
+
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "il repository di riferimento '%s' è shallow"
+
+#: sha1-file.c:732
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "il repository di riferimento '%s' è un graft"
+
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s"
+
+#: sha1-file.c:944
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>"
+
+#: sha1-file.c:969
+msgid "mmap failed"
+msgstr "mmap non riuscita"
+
+#: sha1-file.c:1133
+#, c-format
+msgid "object file %s is empty"
+msgstr "l'oggetto %s è vuoto"
+
+#: sha1-file.c:1257 sha1-file.c:2396
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "oggetto sciolto '%s' corrotto"
+
+#: sha1-file.c:1259 sha1-file.c:2400
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'"
+
+#: sha1-file.c:1301
+msgid "invalid object type"
+msgstr "tipo oggetto non valido"
+
+#: sha1-file.c:1385
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type"
+
+#: sha1-file.c:1388
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "impossibile decomprimere l'intestazione %s"
+
+#: sha1-file.c:1394
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type"
+
+#: sha1-file.c:1397
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossibile analizzare l'intestazione %s"
+
+#: sha1-file.c:1588
+#, c-format
+msgid "failed to read object %s"
+msgstr "lettura dell'oggetto %s non riuscita"
+
+#: sha1-file.c:1592
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s sostitutivo non trovato per %s"
+
+#: sha1-file.c:1596
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto"
+
+#: sha1-file.c:1600
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto"
+
+#: sha1-file.c:1703
+#, c-format
+msgid "unable to write file %s"
+msgstr "impossibile scrivere il file %s"
+
+#: sha1-file.c:1710
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "impossibile impostare i permessi a '%s'"
+
+#: sha1-file.c:1717
+msgid "file write error"
+msgstr "errore di scrittura del file"
+
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "errore durante la chiusura del file oggetto sciolto"
+
+#: sha1-file.c:1801
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"permessi non sufficienti per l'aggiunta di un oggetto al database repository "
+"%s"
+
+#: sha1-file.c:1803
+msgid "unable to create temporary file"
+msgstr "impossibile creare il file temporaneo"
+
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "impossibile scrivere il file oggetto sciolto"
+
+#: sha1-file.c:1833
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)"
+
+#: sha1-file.c:1837
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
+
+#: sha1-file.c:1841
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "sono confuso dall'origine dati oggetto non stabile per %s"
+
+#: sha1-file.c:1851 builtin/pack-objects.c:925
+#, c-format
+msgid "failed utime() on %s"
+msgstr "utime() di %s non riuscita"
+
+#: sha1-file.c:1926
+#, c-format
+msgid "cannot read object for %s"
+msgstr "impossibile leggere l'oggetto per %s"
+
+#: sha1-file.c:1966
+msgid "corrupt commit"
+msgstr "commit corrotto"
+
+#: sha1-file.c:1974
+msgid "corrupt tag"
+msgstr "tag corrotto"
+
+#: sha1-file.c:2073
+#, c-format
+msgid "read error while indexing %s"
+msgstr "errore di lettura durante l'indicizzazione di %s"
+
+#: sha1-file.c:2076
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lettura troppo breve durante l'indicizzazione di %s"
+
+#: sha1-file.c:2149 sha1-file.c:2158
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: inserimento del record nel database non riuscito"
+
+#: sha1-file.c:2164
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo di file non supportato"
+
+#: sha1-file.c:2188
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s non è un oggetto valido"
+
+#: sha1-file.c:2190
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s non è un oggetto '%s' valido"
+
+#: sha1-file.c:2217 builtin/index-pack.c:155
+#, c-format
+msgid "unable to open %s"
+msgstr "impossibile aprire %s"
+
+#: sha1-file.c:2407 sha1-file.c:2459
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "mancata corrispondenza per %s (atteso %s)"
+
+#: sha1-file.c:2431
+#, c-format
+msgid "unable to mmap %s"
+msgstr "impossibile eseguire mmap su %s"
+
+#: sha1-file.c:2436
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "impossibile decomprimere l'intestazione di %s"
+
+#: sha1-file.c:2442
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "impossibile analizzare l'intestazione di %s"
+
+#: sha1-file.c:2453
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "impossibile decomprimere i contenuti di %s"
+
+#: sha1-name.c:490
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "lo SHA1 breve %s è ambiguo"
+
+#: sha1-name.c:501
+msgid "The candidates are:"
+msgstr "I candidati sono:"
+
+#: sha1-name.c:800
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalmente non crea mai un riferimento che termina con 40\n"
+"caratteri esadecimali perché sarà ignorato se si specificano\n"
+"semplicemente 40 caratteri esadecimali. Questi riferimenti\n"
+"potrebbero essere creati per errore. Ad esempio:\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"dove \"$br\" è vuoto per qualche motivo e quindi viene creato un\n"
+"riferimento con 40 caratteri esadecimali. Esamina tali\n"
+"riferimenti ed eliminali se necessario. Disabilita questo\n"
+"messaggio eseguendo \"git config advice.objectNameWarning false\""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u byte"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u byte/s"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Impossibile modificare il file .gitmodules non sottoposto a merge, risolvi "
+"prima i conflitti di merge"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Impossibile trovare una sezione in .gitmodules dove path=%s"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Impossibile rimuovere la voce .gitmodules per %s"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "staging del file .gitmodules aggiornato non riuscito"
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "nel sottomodulo non popolato '%s'"
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Lo specificatore percorso '%s' è nel sottomodulo '%.*s'"
+
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit"
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Impossibile risolvere HEAD come riferimento valido."
+
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "Impossibile accedere al sottomodulo '%s'"
+
+#: submodule.c:1651
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' non riconosciuto come repository Git"
+
+#: submodule.c:1789
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "impossibile avviare 'git status' nel sottomodulo '%s'"
+
+#: submodule.c:1802
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'"
+
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+"Impossibile annullare l'impostazione dell'opzione core.worktree nel "
+"sottomodulo '%s'"
+
+#: submodule.c:1907
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "il sottomodulo '%s' ha l'indice sporco"
+
+#: submodule.c:1959
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Impossibile aggiornare il sottomodulo '%s'."
+
+#: submodule.c:2007
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir non è supportata per il sottomodulo '%s' con più di un "
+"albero di lavoro"
+
+#: submodule.c:2019 submodule.c:2074
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "impossibile ricercare il nome per il sottomodulo '%s'"
+
+#: submodule.c:2026
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Sto migrando la directory Git di '%s%s' da\n"
+"'%s' a\n"
+"'%s'\n"
+
+#: submodule.c:2109
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
+
+#: submodule.c:2153
+msgid "could not start ls-files in .."
+msgstr "impossibile avviare ls-files in .."
+
+#: submodule.c:2192
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree ha restituito il valore di ritorno inatteso %d"
+
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignoro un nome sottomodulo sospetto: %s"
+
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "i valori negativi non sono consentiti per submodule.fetchjobs"
+
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignoro '%s' che potrebbe essere interpretato come argomento della riga di "
+"comando: %s"
+
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
+msgstr "valore non valido per %s"
+
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Impossibile aggiornare la voce .gitmodules %s"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "esecuzione del comando finale '%s' non riuscita"
+
+#: 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 "valore '%s' sconosciuto per la chiave '%s'"
+
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
+msgstr "più di un %s"
+
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token finale vuoto nella stringa finale '%.*s'"
+
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "impossibile leggere il file di input '%s'"
+
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "impossibile leggere dallo standard input"
+
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
+msgstr "impossibile eseguire lo stat di '%s'"
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "il file %s non è un file regolare"
+
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "il file %s non è scrivibile dall'utente"
+
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr "impossibile aprire un file temporaneo"
+
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "impossibile ridenominare il file temporaneo in %s"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
+
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossibile leggere il bundle '%s'"
+
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "trasporto: opzione profondità '%s' non valida"
+
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "vedi protocol.version in 'git help config' per maggiori dettagli"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
+
+#: transport.c:625
+msgid "could not parse transport.color.* config"
+msgstr "impossibile analizzare la configurazione transport.color.*"
+
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
+msgstr "supporto alla versione 2 del protocollo non ancora implementato"
+
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valore sconosciuto per la configurazione '%s': %s"
+
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "trasporto '%s' non consentito"
+
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync non è più supportato"
+
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"I seguenti percorsi sottomodulo contengono modifiche\n"
+"non trovate su nessun remoto:\n"
+
+#: transport.c:1044
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Prova\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o esegui un cd al percorso e usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per eseguirne il push a un remoto.\n"
+"\n"
+
+#: transport.c:1052
+msgid "Aborting."
+msgstr "Interrompo l'operazione."
+
+#: transport.c:1193
+msgid "failed to push all needed submodules"
+msgstr "push di tutti i sottomoduli richiesti non riuscito"
+
+#: transport.c:1340 transport-helper.c:645
+msgid "operation not supported by protocol"
+msgstr "operazione non supportata dal protocollo"
+
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr "scrittura completa verso l'helper remoto non riuscita"
+
+#: transport-helper.c:134
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "impossibile trovare l'helper remoto per '%s'"
+
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
+msgstr "impossibile duplicare il descrittore file dell'output helper"
+
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capability necessaria %s sconosciuta; quest'helper remoto probabilmente "
+"richiede una versione di Git più recente"
+
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
+msgstr "questo helper remoto dovrebbe implementare la capability refspec"
+
+#: transport-helper.c:274 transport-helper.c:414
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s ha inviato un messaggio inatteso: '%s'"
+
+#: transport-helper.c:403
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ha bloccato anche %s"
+
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
+msgstr "impossibile eseguire fast-import"
+
+#: transport-helper.c:504
+msgid "error while running fast-import"
+msgstr "errore durante l'esecuzione di fast-import"
+
+#: transport-helper.c:533 transport-helper.c:1105
+#, c-format
+msgid "could not read ref %s"
+msgstr "impossibile leggere il riferimento %s"
+
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "risposta inattesa a connect: %s"
+
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+"l'impostazione del percorso del servizio remoto non è supportata dal "
+"protocollo"
+
+#: transport-helper.c:602
+msgid "invalid remote service path"
+msgstr "percorso servizio remoto non valido"
+
+#: transport-helper.c:648
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "impossibile connettersi al sottoservizio %s"
+
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "attesi ok/error, l'helper ha inviato '%s'"
+
+#: transport-helper.c:773
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'helper ha segnalato uno stato inatteso di %s"
+
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "l'helper %s non supporta dry-run"
+
+#: transport-helper.c:837
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "l'helper %s non supporta --signed"
+
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "l'helper %s non supporta --signed=if-asked"
+
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "l'helper %s non supporta 'push-option'"
+
+#: transport-helper.c:945
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+"l'helper remoto non supporta il push; è necessario uno specificatore "
+"riferimento"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "l'helper %s non supporta 'force'"
+
+#: transport-helper.c:997
+msgid "couldn't run fast-export"
+msgstr "impossibile eseguire fast-export"
+
+#: transport-helper.c:1002
+msgid "error while running fast-export"
+msgstr "errore durante l'esecuzione di fast-export"
+
+#: transport-helper.c:1027
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+"Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
+"Forse dovresti specificare un branch come 'master'.\n"
+
+#: transport-helper.c:1091
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "risposta malformata nell'elenco riferimenti: %s"
+
+#: transport-helper.c:1244
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) non riuscita"
+
+#: transport-helper.c:1271
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) non riuscita"
+
+#: transport-helper.c:1320
+#, c-format
+msgid "%s thread failed"
+msgstr "thread %s non riuscito"
+
+#: transport-helper.c:1324
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "join non riuscita per il thread %s: %s"
+
+#: transport-helper.c:1343 transport-helper.c:1347
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "impossibile avviare il thread per la copia dei dati: %s"
+
+#: transport-helper.c:1384
+#, c-format
+msgid "%s process failed to wait"
+msgstr "wait non riuscita per il processo %s"
+
+#: transport-helper.c:1388
+#, c-format
+msgid "%s process failed"
+msgstr "processo %s non riuscito"
+
+#: transport-helper.c:1406 transport-helper.c:1415
+msgid "can't start thread for copying data"
+msgstr "impossibile avviare il thread per la copia dei dati"
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "oggetto albero troppo corto"
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "modo malformato nella voce dell'albero"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "nome file vuoto nella voce dell'albero"
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr "file alber troppo corto"
+
+#: unpack-trees.c:111
+#, 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 ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con il "
+"checkout:\n"
+"%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch."
+
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con il "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:116
+#, 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 ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con il "
+"merge:\n"
+"%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge."
+
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con il "
+"merge:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, 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 ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con "
+"l'operazione di %s:\n"
+"%%sEsegui il commit o lo stash delle modifiche prima di eseguire "
+"l'operazione di %s."
+
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Le tue modifiche locali ai seguenti file sarebbero sovrascritte con "
+"l'operazione di %s:\n"
+"%%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"L'aggiornamento delle seguenti directory farebbe sì che dei file non "
+"tracciati in esse contenuti vengano persi:\n"
+"%s"
+
+#: unpack-trees.c:132
+#, 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 ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati con il checkout:\n"
+"%%sSpostali o eliminali prima di cambiare branch."
+
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati con il checkout:\n"
+"%%s"
+
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati dal merge:\n"
+"%%sSpostali o eliminali prima di eseguire il merge."
+
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati dal merge:\n"
+"%%s"
+
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati con l'operazione di %s:\n"
+"%%sSpostali o eliminali prima di eseguire l'operazione di %s."
+
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati con l'operazione di %s:\n"
+"%%s"
+
+#: unpack-trees.c:150
+#, 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 ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti con il checkout:\n"
+"%%sSpostali o eliminali prima di cambiare branch."
+
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti con il checkout:\n"
+"%%s"
+
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti dal merge:\n"
+"%%sSpostali o eliminali prima di eseguire il merge."
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti dal merge:\n"
+"%%s"
+
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti con l'operazione di %s:\n"
+"%%sSpostali o eliminali prima di eseguire l'operazione di %s."
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"sovrascritti con l'operazione di %s:\n"
+"%%s"
+
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+"La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento."
+
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"Impossibile aggiornare il checkout sparse: le seguenti voci non sono "
+"aggiornate:\n"
+"%s"
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"I seguenti file dell'albero di lavoro sarebbero sovrascritti con "
+"l'aggiornamento del checkout sparse:\n"
+"%s"
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"I seguenti file dell'albero di lavoro sarebbero eliminati con "
+"l'aggiornamento del checkout sparse:\n"
+"%s"
+
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Impossibile aggiornare il sottomodulo:\n"
+"%s"
+
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
+msgstr "Interrompo l'operazione\n"
+
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Aggiornamento dei file in corso"
+
+#: unpack-trees.c:350
+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 ""
+"i seguenti percorsi sono entrati in conflitto (ad es. se ci\n"
+"sono percorsi che differiscono solo per le maiuscole/minuscole\n"
+"su un filesystem non sensibile a tale differenza) e solo uno\n"
+"per gruppo in conflitto è nell'albero di lavoro:\n"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nome schema URL non valido o suffisso '://' mancante"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "sequenza di escape %XX non valida"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "host mancante e lo schema non è 'file:'"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "un URL 'file:' non può avere un numero di porta"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "caratteri non validi nel nome host"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "numero di porta non valido"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "parte percorso '..' non valida"
+
+#: worktree.c:258 builtin/am.c:2095
+#, c-format
+msgid "failed to read '%s'"
+msgstr "lettura di '%s' non riuscita"
+
+#: worktree.c:304
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+"'%s' nell'albero di lavoro principale non è la directory del repository"
+
+#: worktree.c:315
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"il file '%s' non contiene il percorso assoluto alla posizione dell'albero di "
+"lavoro"
+
+#: worktree.c:327
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' non esiste"
+
+#: worktree.c:333
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' non è un file .git, codice d'errore %d"
+
+#: worktree.c:341
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' non punta a '%s'"
+
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "impossibile aprire '%s' in lettura e scrittura"
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr "impossibile accedere a '%s'"
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr "impossibile ottenere la directory di lavoro corrente"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "Percorsi non sottoposti a merge:"
+
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --staged <file>...\" per rimuovere gli elementi "
+"dall'area di staging)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --source=%s --staged <file>...\" per rimuovere gli "
+"elementi dall'area di staging)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+" (usa \"git rm --cached <file>...\" per rimuovere gli elementi dall'area di "
+"staging)"
+
+#: wt-status.c:197
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+" (usa \"git add <file>...\" per contrassegnare il conflitto come risolto)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (usa \"git add/rm <file>...\" come appropriato per contrassegnare il "
+"conflitto come risolto)"
+
+#: wt-status.c:201
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+" (usa \"git rm <file>...\" per contrassegnare il conflitto come risolto)"
+
+#: wt-status.c:211 wt-status.c:1074
+msgid "Changes to be committed:"
+msgstr "Modifiche di cui verrà eseguito il commit:"
+
+#: wt-status.c:234 wt-status.c:1083
+msgid "Changes not staged for commit:"
+msgstr "Modifiche non nell'area di staging per il commit:"
+
+#: wt-status.c:238
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (usa \"git add <file>...\" per aggiornare gli elementi di cui sarà "
+"eseguito il commit)"
+
+#: wt-status.c:240
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+" (usa \"git add/rm <file>...\" per aggiornare gli elementi di cui sarà "
+"eseguito il commit)"
+
+#: wt-status.c:241
+msgid ""
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+" (usa \"git restore <file>...\" per scartare le modifiche nella directory "
+"di lavoro)"
+
+#: wt-status.c:243
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (esegui il commit o scarta il contenuto non tracciato o modificato nei "
+"sottomoduli)"
+
+#: wt-status.c:254
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+" (usa \"git %s <file>...\" per includere l'elemento fra quelli di cui verrà "
+"eseguito il commit)"
+
+#: wt-status.c:268
+msgid "both deleted:"
+msgstr "entrambi eliminati:"
+
+#: wt-status.c:270
+msgid "added by us:"
+msgstr "aggiunto da noi:"
+
+#: wt-status.c:272
+msgid "deleted by them:"
+msgstr "eliminato da loro:"
+
+#: wt-status.c:274
+msgid "added by them:"
+msgstr "aggiunto da loro:"
+
+#: wt-status.c:276
+msgid "deleted by us:"
+msgstr "eliminato da noi:"
+
+#: wt-status.c:278
+msgid "both added:"
+msgstr "entrambi aggiunti:"
+
+#: wt-status.c:280
+msgid "both modified:"
+msgstr "entrambi modificati:"
+
+#: wt-status.c:290
+msgid "new file:"
+msgstr "nuovo file:"
+
+#: wt-status.c:292
+msgid "copied:"
+msgstr "copiato:"
+
+#: wt-status.c:294
+msgid "deleted:"
+msgstr "eliminato:"
+
+#: wt-status.c:296
+msgid "modified:"
+msgstr "modificato:"
+
+#: wt-status.c:298
+msgid "renamed:"
+msgstr "rinominato:"
+
+#: wt-status.c:300
+msgid "typechange:"
+msgstr "modifica tipo:"
+
+#: wt-status.c:302
+msgid "unknown:"
+msgstr "sconosciuto:"
+
+#: wt-status.c:304
+msgid "unmerged:"
+msgstr "non sottoposto a merge:"
+
+#: wt-status.c:384
+msgid "new commits, "
+msgstr "nuovi commit, "
+
+#: wt-status.c:386
+msgid "modified content, "
+msgstr "contenuto modificato, "
+
+#: wt-status.c:388
+msgid "untracked content, "
+msgstr "contenuto non tracciato, "
+
+#: wt-status.c:906
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Lo stash attualmente ha %d voce"
+msgstr[1] "Lo stash attualmente ha %d voci"
+
+#: wt-status.c:938
+msgid "Submodules changed but not updated:"
+msgstr "Sottomoduli modificati ma non aggiornati:"
+
+#: wt-status.c:940
+msgid "Submodule changes to be committed:"
+msgstr "Modifiche ai sottomoduli di cui verrà eseguito il commit:"
+
+#: wt-status.c:1022
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Non modificare o rimuovere la riga soprastante.\n"
+"Tutto ciò che si trova al di sotto di essa sarà ignorato."
+
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Sono stati necessari %.2f secondi per calcolare il numero di commit\n"
+"precedenti/successivi nel branch.\n"
+"Puoi usare '--no-ahead-behind' per evitare il calcolo.\n"
+
+#: wt-status.c:1144
+msgid "You have unmerged paths."
+msgstr "Hai dei percorsi non sottoposti a merge."
+
+#: wt-status.c:1147
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (risolvi i conflitti ed esegui \"git commit\")"
+
+#: wt-status.c:1149
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (usa \"git merge --abort\" per interrompere il merge)"
+
+#: wt-status.c:1153
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tutti i conflitti sono stati risolti ma il merge è ancora in corso."
+
+#: wt-status.c:1156
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (usa \"git commit\" per terminare il merge)"
+
+#: wt-status.c:1165
+msgid "You are in the middle of an am session."
+msgstr "Sei nel bel mezzo di una sessione am."
+
+#: wt-status.c:1168
+msgid "The current patch is empty."
+msgstr "La patch corrente è vuota."
+
+#: wt-status.c:1172
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (risolvi i conflitti e quindi esegui \"git am --continue\")"
+
+#: wt-status.c:1174
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (usa \"git am --skip\" per saltare questa patch)"
+
+#: wt-status.c:1176
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (usa \"git am --abort\" per ripristinare il branch originario)"
+
+#: wt-status.c:1309
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo è mancante."
+
+#: wt-status.c:1311
+msgid "No commands done."
+msgstr "Nessun comando eseguito."
+
+#: wt-status.c:1314
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Ultimo comando eseguito (%d comando eseguito):"
+msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):"
+
+#: wt-status.c:1325
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (vedi di più nel file %s)"
+
+#: wt-status.c:1330
+msgid "No commands remaining."
+msgstr "Nessun comando rimanente."
+
+#: 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] "Prossimo comando da eseguire (%d comando rimanente):"
+msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):"
+
+#: wt-status.c:1341
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+" (usa \"git rebase --edit-todo\" per visualizzare e modificare le "
+"operazioni)"
+
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Attualmente stai eseguendo il rebase del branch '%s' su '%s'."
+
+#: wt-status.c:1358
+msgid "You are currently rebasing."
+msgstr "Attualmente stai eseguendo un rebase."
+
+#: wt-status.c:1371
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (risolvi i conflitti e quindi esegui \"git rebase --continue\")"
+
+#: wt-status.c:1373
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (usa \"git rebase --skip\" per saltare questa patch)"
+
+#: wt-status.c:1375
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+" (usa \"git rebase --abort\" per eseguire il checkout del branch originario)"
+
+#: wt-status.c:1382
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+" (tutti i conflitti sono stati risolti: esegui \"git rebase --continue\")"
+
+#: wt-status.c:1386
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Attualmente stai dividendo un commit durante il rebase del branch '%s' su "
+"'%s'."
+
+#: wt-status.c:1391
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Attualmente stai dividendo un commit durante un rebase."
+
+#: wt-status.c:1394
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Una volta che la tua directory di lavoro è pulita, esegui \"git rebase --"
+"continue\")"
+
+#: wt-status.c:1398
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Attualmente stai modificando un commit durante il rebase del branch '%s' su "
+"'%s'."
+
+#: wt-status.c:1403
+msgid "You are currently editing a commit during a rebase."
+msgstr "Attualmente stai modificando un commit durante un rebase."
+
+#: wt-status.c:1406
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (usa \"git commit --amend\" per correggere il commit corrente)"
+
+#: wt-status.c:1408
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (usa \"git rebase --continue\" una volta soddisfatto delle tue modifiche)"
+
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick in corso."
+
+#: wt-status.c:1422
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Attualmente stai eseguendo il cherry-pick del commit %s."
+
+#: wt-status.c:1429
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (risolvi i conflitti ed esegui \"git cherry-pick --continue\")"
+
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (esegui \"git cherry-pick --continue\" per continuare)"
+
+#: wt-status.c:1435
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (tutti i conflitti sono stati risolti: esegui \"git cherry-pick --continue"
+"\")"
+
+#: wt-status.c:1437
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+" (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)"
+
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Revert in corso."
+
+#: wt-status.c:1450
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Attualmente stai eseguendo il revert del commit %s."
+
+#: wt-status.c:1456
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")"
+
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (esegui \"git revert --continue\" per continuare)"
+
+#: wt-status.c:1462
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+" (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")"
+
+#: wt-status.c:1464
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)"
+
+#: wt-status.c:1474
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'."
+
+#: wt-status.c:1478
+msgid "You are currently bisecting."
+msgstr "Attualmente stai eseguendo una bisezione."
+
+#: wt-status.c:1481
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (usa \"git bisect reset\" per tornare al branch originario)"
+
+#: wt-status.c:1690
+msgid "On branch "
+msgstr "Sul branch "
+
+#: wt-status.c:1697
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interattivo in corso su "
+
+#: wt-status.c:1699
+msgid "rebase in progress; onto "
+msgstr "rebase in corso su "
+
+#: wt-status.c:1709
+msgid "Not currently on any branch."
+msgstr "Attualmente non sei su alcun branch."
+
+#: wt-status.c:1726
+msgid "Initial commit"
+msgstr "Commit iniziale"
+
+#: wt-status.c:1727
+msgid "No commits yet"
+msgstr "Non ci sono ancora commit"
+
+#: wt-status.c:1741
+msgid "Untracked files"
+msgstr "File non tracciati"
+
+#: wt-status.c:1743
+msgid "Ignored files"
+msgstr "File ignorati"
+
+#: wt-status.c:1747
+#, 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 ""
+"Sono stati necessari %.2f secondi per elencare i file non\n"
+"tracciati. 'status -uno' potrebbe velocizzare tale operazione,\n"
+"ma devi stare attento a non dimenticarti di aggiungere\n"
+"autonomamente i file nuovi (vedi 'git help status')."
+
+#: wt-status.c:1753
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "File non tracciati non elencati%s"
+
+#: wt-status.c:1755
+msgid " (use -u option to show untracked files)"
+msgstr " (usa l'opzione -u per visualizzare i file non tracciati)"
+
+#: wt-status.c:1761
+msgid "No changes"
+msgstr "Nessuna modifica"
+
+#: wt-status.c:1766
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n"
+
+#: wt-status.c:1769
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "nessuna modifica aggiunta al commit\n"
+
+#: wt-status.c:1772
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"non è stato aggiunto nulla al commit ma sono presenti file non tracciati "
+"(usa \"git add\" per tracciarli)\n"
+
+#: wt-status.c:1775
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n"
+
+#: wt-status.c:1778
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add"
+"\" per tracciarli)\n"
+
+#: wt-status.c:1781 wt-status.c:1786
+#, c-format
+msgid "nothing to commit\n"
+msgstr "non c'è nulla di cui eseguire il commit\n"
+
+#: wt-status.c:1784
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non "
+"tracciati)\n"
+
+#: wt-status.c:1788
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n"
+
+#: wt-status.c:1901
+msgid "No commits yet on "
+msgstr "Non ci sono ancora commit su"
+
+#: wt-status.c:1905
+msgid "HEAD (no branch)"
+msgstr "HEAD (nessun branch)"
+
+#: wt-status.c:1936
+msgid "different"
+msgstr "differente"
+
+#: wt-status.c:1938 wt-status.c:1946
+msgid "behind "
+msgstr "indietro "
+
+#: wt-status.c:1941 wt-status.c:1944
+msgid "ahead "
+msgstr "avanti "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2466
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging."
+
+#: wt-status.c:2472
+msgid "additionally, your index contains uncommitted changes."
+msgstr ""
+"inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit."
+
+#: wt-status.c:2474
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+"impossibile eseguire %s: l'indice contiene modifiche di cui non è stato "
+"eseguito il commit."
+
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opzioni>] [--] <specificatore percorso>..."
+
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "stato diff inatteso %c"
+
+#: builtin/add.c:89 builtin/commit.c:288
+msgid "updating files failed"
+msgstr "aggiornamento dei file non riuscito"
+
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
+msgstr "elimina '%s'\n"
+
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:"
+
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
+msgstr "Impossibile leggere l'indice"
+
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Impossibile aprire '%s' in scrittura."
+
+#: builtin/add.c:249
+msgid "Could not write patch"
+msgstr "Impossibile scrivere la patch"
+
+#: builtin/add.c:252
+msgid "editing patch failed"
+msgstr "modifica della patch non riuscita"
+
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Impossibile eseguire lo stat di '%s'"
+
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
+msgstr "Patch vuota. Operazione interrotta."
+
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Impossibile applicare '%s'"
+
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n"
+
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "test controllato"
+
+#: builtin/add.c:293
+msgid "interactive picking"
+msgstr "scelta interattiva"
+
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+msgid "select hunks interactively"
+msgstr "seleziona gli hunk in modalità interattiva"
+
+#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr "modifica il diff corrente e applicalo"
+
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
+msgstr "consenti l'aggiunta di file altrimenti ignorati"
+
+#: builtin/add.c:297
+msgid "update tracked files"
+msgstr "aggiorna i file tracciati"
+
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "rinormalizza i fine riga dei file tracciati (implica -u)"
+
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
+msgstr "salva solo il fatto che il percorso sarà aggiunto successivamente"
+
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
+msgstr "aggiungi le modifiche da tutti i file tracciati e non"
+
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ignora i percorsi eliminati nell'albero di lavoro (come --no-all)"
+
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
+msgstr "non eseguire l'aggiunta, aggiorna solo l'indice"
+
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+"salta semplicemente i file che non possono essere aggiunti a causa di errori"
+
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+"controlla se i file - anche quelli mancanti - sono ignorati durante il test "
+"controllato"
+
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
+msgstr "esegui l'override del bit eseguibile dei file elencati"
+
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr "emetti un avviso quando si aggiunge un repository incorporato"
+
+#: builtin/add.c:326
+#, 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 ""
+"Hai aggiunto un altro repository Git all'interno del repository\n"
+"corrente. I cloni del repository esterno non conterranno i\n"
+"contenuti del repository incorporato e non sapranno come ottenerli.\n"
+"Se intendevi aggiungere un sottomodulo, usa:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Se hai aggiunto questo percorso per errore, puoi rimuoverlo\n"
+"dall'indice con:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Vedi \"git help submodule\" per ulteriori informazioni."
+
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "aggiunta repository Git incorporato in corso: %s"
+
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Usa -f se vuoi davvero aggiungerli.\n"
+
+#: builtin/add.c:379
+msgid "adding files failed"
+msgstr "aggiunta dei file non riuscita"
+
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
+msgstr "-A e -u non sono compatibili fra loro"
+
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run"
+
+#: builtin/add.c:430
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "Il parametro --chmod '%s' deve essere -x o +x"
+
+#: builtin/add.c:445
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n"
+
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Forse intendevi dire 'git add .'?\n"
+
+#: builtin/am.c:348
+msgid "could not parse author script"
+msgstr "impossibile analizzare lo script author"
+
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' è stato eliminato dall'hook applypatch-msg"
+
+#: builtin/am.c:474
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Riga di input malformata: '%s'."
+
+#: builtin/am.c:512
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Copia delle note da '%s' a '%s' non riuscita"
+
+#: builtin/am.c:538
+msgid "fseek failed"
+msgstr "fseek non riuscita"
+
+#: builtin/am.c:726
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "impossibile analizzare la patch '%s'"
+
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Può essere applicata solo una serie di patch StGIT per volta"
+
+#: builtin/am.c:839
+msgid "invalid timestamp"
+msgstr "timestamp non valido"
+
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
+msgstr "riga Date non valida"
+
+#: builtin/am.c:851
+msgid "invalid timezone offset"
+msgstr "offset fuso orario non valido"
+
+#: builtin/am.c:944
+msgid "Patch format detection failed."
+msgstr "Rilevamento del formato della patch non riuscito."
+
+#: builtin/am.c:949 builtin/clone.c:407
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "creazione della directory '%s' non riuscita"
+
+#: builtin/am.c:954
+msgid "Failed to split patches."
+msgstr "Divisione delle patch non riuscita."
+
+#: builtin/am.c:1084 builtin/commit.c:374
+msgid "unable to write index file"
+msgstr "impossibile scrivere il file indice"
+
+#: builtin/am.c:1098
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Una volta risolto questo problema, esegui \"%s --continue\"."
+
+#: builtin/am.c:1099
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"."
+
+#: builtin/am.c:1100
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Per ripristinare il branch originario e terminare il patching, esegui \"%s --"
+"abort\"."
+
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+"Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero "
+"essere andati perduti."
+
+#: builtin/am.c:1211
+msgid "Patch is empty."
+msgstr "La patch è vuota."
+
+#: builtin/am.c:1277
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "riga ident non valida: %.*s"
+
+#: builtin/am.c:1299
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossibile analizzare il commit %s"
+
+#: builtin/am.c:1496
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"Dal repository mancano i blob necessari per ripiegare sul merge a tre vie."
+
+#: builtin/am.c:1498
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+"Utilizzo le informazioni dell'indice per ricostruire un albero di base..."
+
+#: builtin/am.c:1517
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Hai modificato manualmente la patch?\n"
+"Non può essere applicata ai blob registrati nel suo indice."
+
+#: builtin/am.c:1523
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Ripiego sul patching della base e sul merge a tre vie..."
+
+#: builtin/am.c:1549
+msgid "Failed to merge in the changes."
+msgstr "Merge delle modifiche non riuscito."
+
+#: builtin/am.c:1581
+msgid "applying to an empty history"
+msgstr "applicazione a una cronologia vuota"
+
+#: builtin/am.c:1628 builtin/am.c:1632
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "impossibile riprendere l'attività: %s non esiste."
+
+#: builtin/am.c:1650
+msgid "Commit Body is:"
+msgstr "Il corpo del commit è:"
+
+#. 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:1660
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+"Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:"
+
+#: builtin/am.c:1710
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)"
+
+#: builtin/am.c:1750 builtin/am.c:1818
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Applicazione in corso: %.*s"
+
+#: builtin/am.c:1767
+msgid "No changes -- Patch already applied."
+msgstr "Nessuna modifica -- patch già applicata."
+
+#: builtin/am.c:1773
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Patch non riuscita a %s %.*s"
+
+#: builtin/am.c:1777
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita"
+
+#: builtin/am.c:1821
+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 ""
+"Nessuna modifica - ti sei dimenticato di usare 'git add'?\n"
+"Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n"
+"ha già introdotto le stesse modifiche; potresti voler saltare questa patch."
+
+#: builtin/am.c:1828
+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 ""
+"Nell'indice hai ancora dei percorsi di cui non è stato eseguito il merge.\n"
+"Dovresti eseguire 'git add' su ogni file i cui conflitti sono stati risolti "
+"per contrassegnarli come tali.\n"
+"Potresti eseguire `git rm` su un file per accettarne la risoluzione "
+"\"eliminato da loro\"."
+
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Impossibile analizzare l'oggetto '%s'."
+
+#: builtin/am.c:1987
+msgid "failed to clean index"
+msgstr "pulizia dell'indice non riuscita"
+
+#: builtin/am.c:2031
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Sembra che tu abbia spostato HEAD dall'ultima esecuzione non riuscita di "
+"'am'.\n"
+"Non ritorno indietro a ORIG_HEAD"
+
+#: builtin/am.c:2128
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Valore non valido per --patch-format: %s"
+
+#: builtin/am.c:2164
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2165
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2171
+msgid "run interactively"
+msgstr "esegui in modalità interattiva"
+
+#: builtin/am.c:2173
+msgid "historical option -- no-op"
+msgstr "opzione storica -- non esegue nulla"
+
+#: builtin/am.c:2175
+msgid "allow fall back on 3way merging if needed"
+msgstr "consenti il ripiego sul merge a tre vie se necessario"
+
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
+msgid "be quiet"
+msgstr "non visualizzare messaggi"
+
+#: builtin/am.c:2178
+msgid "add a Signed-off-by line to the commit message"
+msgstr "aggiungi una riga Signed-off-by al messaggio di commit"
+
+#: builtin/am.c:2181
+msgid "recode into utf8 (default)"
+msgstr "converti codifica in UTF-8 (impostazione predefinita)"
+
+#: builtin/am.c:2183
+msgid "pass -k flag to git-mailinfo"
+msgstr "fornisci l'argomento -k a git-mailinfo"
+
+#: builtin/am.c:2185
+msgid "pass -b flag to git-mailinfo"
+msgstr "fornisci l'argomento -b a git-mailinfo"
+
+#: builtin/am.c:2187
+msgid "pass -m flag to git-mailinfo"
+msgstr "fornisci l'argomento -m a git-mailinfo"
+
+#: builtin/am.c:2189
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox"
+
+#: builtin/am.c:2192
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal "
+"valore di am.keepcr"
+
+#: builtin/am.c:2195
+msgid "strip everything before a scissors line"
+msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\""
+
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
+msgid "pass it through git-apply"
+msgstr "passa l'argomento a git-apply"
+
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+msgid "format"
+msgstr "formato"
+
+#: builtin/am.c:2221
+msgid "format the patch(es) are in"
+msgstr "il formato delle patch"
+
+#: builtin/am.c:2227
+msgid "override error message when patch failure occurs"
+msgstr ""
+"esegui l'override del messaggio d'errore quando si verifica un errore legato "
+"alle patch"
+
+#: builtin/am.c:2229
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+"continua l'applicazione delle patch dopo la risoluzione di un conflitto"
+
+#: builtin/am.c:2232
+msgid "synonyms for --continue"
+msgstr "sinonimi di --continue"
+
+#: builtin/am.c:2235
+msgid "skip the current patch"
+msgstr "salta la patch corrente"
+
+#: builtin/am.c:2238
+msgid "restore the original branch and abort the patching operation."
+msgstr "ripristina il branch originario e interrompi l'operazione di patching."
+
+#: builtin/am.c:2241
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è."
+
+#: builtin/am.c:2244
+msgid "show the patch being applied."
+msgstr "visualizza la patch in fase di applicazione."
+
+#: builtin/am.c:2248
+msgid "lie about committer date"
+msgstr "menti sulla data del commit"
+
+#: builtin/am.c:2250
+msgid "use current timestamp for author date"
+msgstr "usa il timestamp corrente come data autore"
+
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+msgid "key-id"
+msgstr "ID chiave"
+
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+msgid "GPG-sign commits"
+msgstr "firma i commit con GPG"
+
+#: builtin/am.c:2256
+msgid "(internal use for git-rebase)"
+msgstr "(a uso interno per git-rebase)"
+
+#: builtin/am.c:2274
+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 ""
+"L'opzione -b/--binary non esegue nulla da molto tempo e\n"
+"sarà rimossa. Non usarla più."
+
+#: builtin/am.c:2281
+msgid "failed to read the index"
+msgstr "lettura dell'indice non riuscita"
+
+#: builtin/am.c:2296
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"la directory di rebase precedente %s esiste ancora ma è stata specificata "
+"un'mbox."
+
+#: builtin/am.c:2320
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Trovata directory smarrita %s.\n"
+"Usa \"git am --abort\" per eliminarla."
+
+#: builtin/am.c:2326
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Operazione di risoluzione non in corso, non riprendiamo."
+
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+"la modalità interattiva richiede che le patch siano fornite sulla riga di "
+"comando"
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opzioni>] [<patch>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "impossibile creare il file archivio '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "impossibile redirigere l'output"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: il remoto non ha un URL"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: attesi ACK/NAK, ricevuto pacchetto di flush"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: errore del protocollo"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: atteso un flush"
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr ""
+"git bisect--helper --write-terms <termine revisione non funzionante> "
+"<termine revisione funzionante>"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<commit>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <stato> <revisione> <termine "
+"revisione funzionante> <termine revisione non funzionante>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <comando> <termine revisione "
+"funzionante> <termine revisione non funzionante>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <termine revisione funzionante> "
+"<termine revisione non funzionante> [<termine>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<termine> --term-{new,"
+"bad}=<termine>][--no-checkout] [<non funzionante> [<funzionante>...]] [--] "
+"[<percorsi>...]"
+
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' non è un termine valido"
+
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "impossibile usare il comando nativo '%s' come termine"
+
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "impossibile cambiare il significato del termine '%s'"
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr "usa due termini differenti"
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr "impossibile aprire il file BISECT_TERMS"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Non stiamo eseguendo un bisect.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' non è un commit valido"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git "
+"bisect reset <commit>'."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Argomento bisect_write errato: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "impossibile recuperare l'OID della revisione '%s'"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "impossibile aprire il file '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s"
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Devi specificare almeno una revisione %s ed una %s.\n"
+"Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo."
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Devi iniziare con \"git bisect start\".\n"
+"Quindi devi specificare almeno una revisione %s ed una %s.\n"
+"Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "eseguo la bisezione solo con un commit %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Sei sicuro? [Y/n] "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "nessun termine definito"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"I tuoi termini correnti sono %s per lo stato vecchio\n"
+"e %s per lo stato nuovo.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argomento %s non valido per 'git bisect terms'.\n"
+"Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opzione non riconosciuta: '%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "sembra che '%s' non sia una revisione valida"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD non valida - ho bisogno di un'HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "non eseguirò la bisezione su un albero sottoposto a cg-seek"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "head non valida - riferimento simbolico strano"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "riferimento non valido: '%s'"
+
+#: builtin/bisect--helper.c:630
+msgid "perform 'git bisect next'"
+msgstr "esegui 'git bisect next'"
+
+#: builtin/bisect--helper.c:632
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "scrivi i termini in .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:634
+msgid "cleanup the bisection state"
+msgstr "pulisci lo stato bisezione"
+
+#: builtin/bisect--helper.c:636
+msgid "check for expected revs"
+msgstr "controlla se le revisioni attese sono presenti"
+
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "reimposta lo stato della bisezione"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "scrivi lo stato della bisezione in BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "controlla e imposta i termini in uno stato bisezione"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr ""
+"controlla se esistono termini per revisioni non funzionanti o funzionanti"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "stampa i termini della bisezione"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "inizia la sessione di bisezione"
+
+#: builtin/bisect--helper.c:650
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente"
+
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "non registrare le operazioni eseguite per BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms richiede due argomenti"
+
+#: builtin/bisect--helper.c:673
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state non richiede argomenti"
+
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset richiede o nessun argomento o un commit"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write richiede o quattro o cinque argomenti"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms richiede tre argomenti"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check richiede due o tre argomenti"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms richiede zero o un argomento"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)"
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr "atteso colore: %s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "deve terminare con un colore"
+
+#: builtin/blame.c:730
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "colore '%s' non valido in color.blame.repeatedLines"
+
+#: builtin/blame.c:748
+msgid "invalid value for blame.coloring"
+msgstr "valore non valido per blame.coloring"
+
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "impossibile trovare la revisione %s da ignorare"
+
+#: builtin/blame.c:845
+msgid "Show blame entries as we find them, incrementally"
+msgstr ""
+"Visualizza le voci blame incrementalmente, a mano a mano che le troviamo"
+
+#: builtin/blame.c:846
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr ""
+"Visualizza un hash SHA-1 vuoto per i commit limite (impostazione "
+"predefinita: off)"
+
+#: builtin/blame.c:847
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr ""
+"Non gestire i commit radice come commit limite (impostazione predefinita: "
+"off)"
+
+#: builtin/blame.c:848
+msgid "Show work cost statistics"
+msgstr "Visualizza le statistiche sul costo dell'operazione"
+
+#: builtin/blame.c:849
+msgid "Force progress reporting"
+msgstr "Forza l'indicazione d'avanzamento dell'operazione"
+
+#: builtin/blame.c:850
+msgid "Show output score for blame entries"
+msgstr "Visualizza il punteggio di output per le voci blame"
+
+#: builtin/blame.c:851
+msgid "Show original filename (Default: auto)"
+msgstr ""
+"Visualizza il nome file originario (impostazione predefinita: automatico)"
+
+#: builtin/blame.c:852
+msgid "Show original linenumber (Default: off)"
+msgstr ""
+"Visualizza il numero di riga originario (impostazione predefinita: off)"
+
+#: builtin/blame.c:853
+msgid "Show in a format designed for machine consumption"
+msgstr ""
+"Visualizza l'output in un formato progettato per l'utilizzo da parte di una "
+"macchina"
+
+#: builtin/blame.c:854
+msgid "Show porcelain format with per-line commit information"
+msgstr ""
+"Visualizza il formato porcelain con le informazioni sul commit per ogni riga"
+
+#: builtin/blame.c:855
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr ""
+"Usa la stessa modalità di output di git-annotate (impostazione predefinita: "
+"off)"
+
+#: builtin/blame.c:856
+msgid "Show raw timestamp (Default: off)"
+msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)"
+
+#: builtin/blame.c:857
+msgid "Show long commit SHA1 (Default: off)"
+msgstr ""
+"Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: "
+"off)"
+
+#: builtin/blame.c:858
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr ""
+"Non visualizzare il nome autore e il timestamp (impostazione predefinita: "
+"off)"
+
+#: builtin/blame.c:859
+msgid "Show author email instead of name (Default: off)"
+msgstr ""
+"Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione "
+"predefinita: off)"
+
+#: builtin/blame.c:860
+msgid "Ignore whitespace differences"
+msgstr "Ignora le differenze relative agli spazi bianchi"
+
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "revisione"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Ignora <revisione> durante l'esecuzione del blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Ignora le revisioni specificate in <file>"
+
+#: builtin/blame.c:863
+msgid "color redundant metadata from previous line differently"
+msgstr "colora in modo differente i metadati ridondanti della riga precedente"
+
+#: builtin/blame.c:864
+msgid "color lines by age"
+msgstr "colora le righe in base all'età"
+
+#: builtin/blame.c:871
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Usa un'euristica sperimentale per migliorare i diff"
+
+#: builtin/blame.c:873
+msgid "Spend extra cycles to find better match"
+msgstr "Usa cicli extra per trovare una corrispondenza migliore"
+
+#: builtin/blame.c:874
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list"
+
+#: builtin/blame.c:875
+msgid "Use <file>'s contents as the final image"
+msgstr "Usa i contenuti di <file> come immagine finale"
+
+#: builtin/blame.c:876 builtin/blame.c:877
+msgid "score"
+msgstr "punteggio"
+
+#: builtin/blame.c:876
+msgid "Find line copies within and across files"
+msgstr "Trova copie delle righe all'interno e fra file"
+
+#: builtin/blame.c:877
+msgid "Find line movements within and across files"
+msgstr "Trova righe spostate all'interno e fra file"
+
+#: builtin/blame.c:878
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:878
+msgid "Process only line range n,m, counting from 1"
+msgstr "Elabora solo l'intervallo righe n,m, contandole da 1"
+
+#: builtin/blame.c:929
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+"--progress non può essere usato con --incremental o con i formati porcelain"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:980
+msgid "4 years, 11 months ago"
+msgstr "4 anni, 11 giorni fa"
+
+#: builtin/blame.c:1087
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "il file %s ha solo %lu riga"
+msgstr[1] "il file %s ha solo %lu righe"
+
+#: builtin/blame.c:1133
+msgid "Blaming lines"
+msgstr "Eseguo il blame sulle righe"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opzioni>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opzioni>] [-l] [-f] <nome branch> [<punto di partenza>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opzioni>] [-r] (-d | -D) <nome branch>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opzioni>] (-m | -M) [<vecchio branch>] <nuovo branch>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opzioni>] (-c | -C) [<vecchio branch>] <nuovo branch>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opzioni>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opzioni>] [-r | -a] [--format]"
+
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"elimino il branch '%s' di cui è stato eseguito il merge in\n"
+" '%s', ma di cui non è ancora stato eseguito il merge in HEAD."
+
+#: 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 ""
+"non elimino il branch '%s' di cui non è ancora stato eseguito il merge in\n"
+" '%s', benché ne sia stato eseguito il merge in HEAD."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Impossibile trovare l'oggetto commit per '%s'"
+
+#: builtin/branch.c:176
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"Il branch '%s' non è stato sottoposto completamente a un merge.\n"
+"Se sei sicuro di volerlo eliminare, esegui 'git branch -D %s'."
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "Aggiornamento del file di configurazione non riuscito"
+
+#: builtin/branch.c:220
+msgid "cannot use -a with -d"
+msgstr "impossibile usare -a con -d"
+
+#: builtin/branch.c:226
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Impossibile trovare l'oggetto commit per HEAD"
+
+#: builtin/branch.c:240
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr ""
+"Impossibile eliminare il branch '%s' di cui è stato eseguito il checkout in "
+"'%s'"
+
+#: builtin/branch.c:255
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "branch remoto tracciato '%s' non trovato."
+
+#: builtin/branch.c:256
+#, c-format
+msgid "branch '%s' not found."
+msgstr "branch '%s' non trovato."
+
+#: builtin/branch.c:271
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Errore durante l'eliminazione del branch remoto tracciato '%s'"
+
+#: builtin/branch.c:272
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "Errore durante l'eliminazione del branch '%s'"
+
+#: builtin/branch.c:279
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Branch remoto tracciato %s eliminato (era %s).\n"
+
+#: builtin/branch.c:280
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Branch %s eliminato (era %s).\n"
+
+#: builtin/branch.c:429 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr "impossibile analizzare la stringa di formato"
+
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "impossibile risolvere HEAD"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) punta a un oggetto non in refs/heads/"
+
+#: builtin/branch.c:481
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Rebase del branch %s in corso in %s"
+
+#: builtin/branch.c:485
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Bisezione del branch %s in corso in %s"
+
+#: builtin/branch.c:502
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+"impossibile copiare il branch corrente quando non si è su alcun branch."
+
+#: builtin/branch.c:504
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+"impossibile ridenominare il branch corrente quando non si è su alcun branch."
+
+#: builtin/branch.c:515
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nome branch non valido: '%s'"
+
+#: builtin/branch.c:542
+msgid "Branch rename failed"
+msgstr "Ridenominazione del branch non riuscita"
+
+#: builtin/branch.c:544
+msgid "Branch copy failed"
+msgstr "Copia del branch non riuscita"
+
+#: builtin/branch.c:548
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Creata copia del branch mal denominato '%s'"
+
+#: builtin/branch.c:551
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Branch mal denominato '%s' rinominato"
+
+#: builtin/branch.c:557
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "Branch rinominato in %s, ma HEAD non è aggiornato!"
+
+#: builtin/branch.c:566
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+"Il branch è stato rinominato, ma l'aggiornamento del file di configurazione "
+"non è riuscito"
+
+#: builtin/branch.c:568
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"Il branch è stato copiato, ma l'aggiornamento del file di configurazione non "
+"è riuscito"
+
+#: 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 ""
+"Modifica la descrizione del branch\n"
+" %s\n"
+"Le righe che iniziano con '%c' saranno omesse.\n"
+
+#: builtin/branch.c:618
+msgid "Generic options"
+msgstr "Opzioni generiche"
+
+#: builtin/branch.c:620
+msgid "show hash and subject, give twice for upstream branch"
+msgstr ""
+"visualizza l'hash e l'oggetto, usa l'opzione due volte per il branch upstream"
+
+#: builtin/branch.c:621
+msgid "suppress informational messages"
+msgstr "non visualizzare i messaggi informativi"
+
+#: builtin/branch.c:622
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "imposta la modalità tracking (vedi git-pull(1))"
+
+#: builtin/branch.c:624
+msgid "do not use"
+msgstr "non usare"
+
+#: builtin/branch.c:626 builtin/rebase.c:485
+msgid "upstream"
+msgstr "upstream"
+
+#: builtin/branch.c:626
+msgid "change the upstream info"
+msgstr "modifica le informazioni sull'upstream"
+
+#: builtin/branch.c:627
+msgid "Unset the upstream info"
+msgstr "Rimuovi le informazioni sull'upstream"
+
+#: builtin/branch.c:628
+msgid "use colored output"
+msgstr "usa l'output colorato"
+
+#: builtin/branch.c:629
+msgid "act on remote-tracking branches"
+msgstr "agisci sui branch remoti tracciati"
+
+#: builtin/branch.c:631 builtin/branch.c:633
+msgid "print only branches that contain the commit"
+msgstr "stampa solo i branch che contengono i commit"
+
+#: builtin/branch.c:632 builtin/branch.c:634
+msgid "print only branches that don't contain the commit"
+msgstr "stampa solo i branch che non contengono i commit"
+
+#: builtin/branch.c:637
+msgid "Specific git-branch actions:"
+msgstr "Azioni specifiche di git-branch:"
+
+#: builtin/branch.c:638
+msgid "list both remote-tracking and local branches"
+msgstr "elenca sia i branch remoti tracciati sia quelli locali"
+
+#: builtin/branch.c:640
+msgid "delete fully merged branch"
+msgstr "elimina il branch completamente sottoposto a merge"
+
+#: builtin/branch.c:641
+msgid "delete branch (even if not merged)"
+msgstr "elimina il branch (anche se non è stato sottoposto a merge)"
+
+#: builtin/branch.c:642
+msgid "move/rename a branch and its reflog"
+msgstr "sposta/rinomina un branch e il suo registro dei riferimenti"
+
+#: builtin/branch.c:643
+msgid "move/rename a branch, even if target exists"
+msgstr "sposta/rinomina un branch anche se la destinazione esiste"
+
+#: builtin/branch.c:644
+msgid "copy a branch and its reflog"
+msgstr "copia un branch e il suo registro dei riferimenti"
+
+#: builtin/branch.c:645
+msgid "copy a branch, even if target exists"
+msgstr "copia un branch anche se la destinazione esiste"
+
+#: builtin/branch.c:646
+msgid "list branch names"
+msgstr "elenca i nomi dei branch"
+
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "visualizza il nome del branch corrente"
+
+#: builtin/branch.c:648
+msgid "create the branch's reflog"
+msgstr "crea il registro dei riferimenti del branch"
+
+#: builtin/branch.c:650
+msgid "edit the description for the branch"
+msgstr "modifica la descrizione del branch"
+
+#: builtin/branch.c:651
+msgid "force creation, move/rename, deletion"
+msgstr "forza la creazione, spostamento/ridenominazione, eliminazione"
+
+#: builtin/branch.c:652
+msgid "print only branches that are merged"
+msgstr "stampa solo i branch sottoposti a merge"
+
+#: builtin/branch.c:653
+msgid "print only branches that are not merged"
+msgstr "stampa solo i branch non sottoposti a merge"
+
+#: builtin/branch.c:654
+msgid "list branches in columns"
+msgstr "elenca i branch in colonne"
+
+#: 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 "oggetto"
+
+#: builtin/branch.c:658
+msgid "print only branches of the object"
+msgstr "stampa solo i branch dell'oggetto"
+
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+"l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole"
+
+#: 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 "formato da usare per l'output"
+
+#: builtin/branch.c:684 builtin/clone.c:761
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD non trovato fra i riferimenti/head!"
+
+#: builtin/branch.c:708
+msgid "--column and --verbose are incompatible"
+msgstr "--column e --verbose non sono compatibili"
+
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+msgid "branch name required"
+msgstr "nome branch richiesto"
+
+#: builtin/branch.c:753
+msgid "Cannot give description to detached HEAD"
+msgstr "Impossibile fornire una descrizione per l'HEAD scollegato"
+
+#: builtin/branch.c:758
+msgid "cannot edit description of more than one branch"
+msgstr "impossibile modificare la descrizione per più di un branch"
+
+#: builtin/branch.c:765
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Non esiste ancora nessun commit sul branch '%s'."
+
+#: builtin/branch.c:768
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Non esiste alcun branch denominato '%s'."
+
+#: builtin/branch.c:783
+msgid "too many branches for a copy operation"
+msgstr "sono presenti troppi branch per consentire un'operazione di copia"
+
+#: builtin/branch.c:792
+msgid "too many arguments for a rename operation"
+msgstr ""
+"sono presenti troppi argomenti per consentire un'operazione di "
+"ridenominazione"
+
+#: builtin/branch.c:797
+msgid "too many arguments to set new upstream"
+msgstr ""
+"sono presenti troppi argomenti per consentire l'impostazione del nuovo "
+"upstream"
+
+#: builtin/branch.c:801
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"impossibile impostare l'upstream di HEAD a %s quando non punta ad alcun "
+"branch."
+
+#: builtin/branch.c:804 builtin/branch.c:827
+#, c-format
+msgid "no such branch '%s'"
+msgstr "branch '%s' non esistente"
+
+#: builtin/branch.c:808
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "il branch '%s' non esiste"
+
+#: builtin/branch.c:821
+msgid "too many arguments to unset upstream"
+msgstr ""
+"sono presenti troppi argomenti per rimuovere le informazioni sull'upstream"
+
+#: builtin/branch.c:825
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+"impossibile rimuovere le informazioni sull'upstream di HEAD quando non punta "
+"ad alcun branch."
+
+#: builtin/branch.c:831
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Il branch '%s' non ha informazioni sull'upstream"
+
+#: 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 ""
+"Le opzioni di 'git branch' -a e -r non richiedono un nome branch.\n"
+"Forse volevi usare: -a|-r --list <pattern>?"
+
+#: builtin/branch.c:845
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"l'opzione '--set-upstream' non è più supportata. Usa '--track' o '--set-"
+"upstream-to'."
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s è corretto\n"
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "Per creare un bundle è necessario un repository."
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "Per decomprimere un bundle è necessario un repository."
+
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>"
+
+#: builtin/cat-file.c:595
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:616
+msgid "only one batch option may be specified"
+msgstr "può essere specificata solo un'opzione batch"
+
+#: builtin/cat-file.c:634
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<tipo> può essere uno fra blob, tree, commit, tag"
+
+#: builtin/cat-file.c:635
+msgid "show object type"
+msgstr "visualizza tipo oggetto"
+
+#: builtin/cat-file.c:636
+msgid "show object size"
+msgstr "visualizza dimensioni oggetto"
+
+#: builtin/cat-file.c:638
+msgid "exit with zero when there's no error"
+msgstr "esci con codice d'uscita zero se non si sono verificati errori"
+
+#: builtin/cat-file.c:639
+msgid "pretty-print object's content"
+msgstr "stampa il contenuto dell'oggetto con un formato leggibile"
+
+#: builtin/cat-file.c:641
+msgid "for blob objects, run textconv on object's content"
+msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)"
+
+#: builtin/cat-file.c:643
+msgid "for blob objects, run filters on object's content"
+msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)"
+
+#: builtin/cat-file.c:644 git-submodule.sh:936
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:645
+msgid "use a specific path for --textconv/--filters"
+msgstr "usa un percorso specifico per --textconv/--filters"
+
+#: builtin/cat-file.c:647
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti"
+
+#: builtin/cat-file.c:648
+msgid "buffer --batch output"
+msgstr "esegui il buffering dell'output di --batch"
+
+#: builtin/cat-file.c:650
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+"visualizza le informazioni e il contenuto degli oggetti forniti nello "
+"standard input"
+
+#: builtin/cat-file.c:654
+msgid "show info about objects fed from the standard input"
+msgstr "visualizza le informazioni degli oggetti forniti nello standard input"
+
+#: builtin/cat-file.c:658
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+"segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-"
+"check)"
+
+#: builtin/cat-file.c:660
+msgid "show all objects with --batch or --batch-check"
+msgstr "visualizza tutti gli oggetti con --batch o --batch-check"
+
+#: builtin/cat-file.c:662
+msgid "do not order --batch-all-objects output"
+msgstr "non ordinare l'output di --batch-all-objects"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <attributo>...] [--] <nome percorso>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attributo>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "indica tutti gli attributi impostati sul file"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "usa solo il file .gitattributes dell'indice"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "leggi i nomi dei file dallo standard input"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "termina i record di input e output con un carattere NUL"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
+msgid "suppress progress reporting"
+msgstr "non visualizzare l'avanzamento dell'operazione"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "visualizza i percorsi di input non corrispondenti"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "ignora l'indice durante il controllo"
+
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
+msgstr "impossibile specificare i nomi percorso con --stdin"
+
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr "-z ha senso solo con --stdin"
+
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr "nessun percorso specificato"
+
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet è valido solo con un nome percorso singolo"
+
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr "non è possibile usare sia --quiet sia --verbose"
+
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching è valido solo con --verbose"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opzioni>] <contatto>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "leggi i contatti anche dallo standard input"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "impossibile analizzare il contatto: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "nessun contatto specificato"
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opzioni>] [--] [<file>...]"
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr "la fase dev'essere compresa fra 1 e 3 o all"
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr "esegui il checkout di tutti i file nell'indice"
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr "forza la sovrascrittura dei file esistenti"
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr "non emettere un avviso per i file esistenti e i file non nell'indice"
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr "non eseguire il checkout dei file nuovi"
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr "aggiorna le informazioni stat nel file indice"
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr "leggi l'elenco dei percorsi dallo standard input"
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr "scrivi il contenuto in file temporanei"
+
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
+msgid "string"
+msgstr "stringa"
+
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr "aggiungi il prefisso <stringa> durante la creazione dei file"
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr "copia i file dalla fase specificata"
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opzioni>] <branch>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opzioni>] [<branch>] -- <file>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opzioni>] <branch>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opzioni>] [--source=<branch>] <file>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "il percorso '%s' non ha la nostra versione"
+
+#: builtin/checkout.c:174 builtin/checkout.c:213
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "il percorso '%s' non ha la loro versione"
+
+#: builtin/checkout.c:190
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "il percorso '%s' non ha tutte le versioni necessarie"
+
+#: builtin/checkout.c:240
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "il percorso '%s' non ha le versioni necessarie"
+
+#: builtin/checkout.c:258
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "percorso '%s': impossibile eseguire il merge"
+
+#: builtin/checkout.c:274
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Impossibile aggiungere il risultato del merge per '%s'"
+
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Ricreato %d conflitto di merge"
+msgstr[1] "Ricreati %d conflitti di merge"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Aggiornato %d percorso da %s"
+msgstr[1] "Aggiornati %d percorsi da %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Aggiornato %d percorso dall'indice"
+msgstr[1] "Aggiornati %d percorsi dall'indice"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento"
+
+#: builtin/checkout.c:422 builtin/checkout.c:425
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' non può essere usato con %s"
+
+#: builtin/checkout.c:429
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+"Impossibile aggiornare dei percorsi e passare al branch '%s' "
+"contemporaneamente."
+
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "né '%s' né '%s' sono stati specificati"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' dev'essere usato quando '%s' non è specificato"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' o '%s' non possono essere usati con %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "il percorso '%s' non è stato sottoposto a merge"
+
+#: builtin/checkout.c:679
+msgid "you need to resolve your current index first"
+msgstr "prima devi risolvere l'indice corrente"
+
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"impossibile continuare con modifiche in stage nei file seguenti:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s"
+
+#: builtin/checkout.c:833
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n"
+
+#: builtin/checkout.c:875
+msgid "HEAD is now at"
+msgstr "HEAD si trova ora a"
+
+#: builtin/checkout.c:879 builtin/clone.c:714
+msgid "unable to update HEAD"
+msgstr "impossibile aggiornare HEAD"
+
+#: builtin/checkout.c:883
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Ripristina il branch '%s'\n"
+
+#: builtin/checkout.c:886
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Si è già su '%s'\n"
+
+#: builtin/checkout.c:890
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Si è passati al branch '%s' e lo si è reimpostato\n"
+
+#: builtin/checkout.c:892 builtin/checkout.c:1289
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Si è passati a un nuovo branch '%s'\n"
+
+#: builtin/checkout.c:894
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Si è passati al branch '%s'\n"
+
+#: builtin/checkout.c:945
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ...e altri %d.\n"
+
+#: builtin/checkout.c:951
+#, 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] ""
+"Attenzione: stai rimuovendo %d commit non collegato ad alcun\n"
+"branch:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Attenzione: stai rimuovendo %d commit non collegati ad alcun\n"
+"branch:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:970
+#, 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] ""
+"Se vuoi mantenerlo creando un nuovo branch, questo potrebbe essere\n"
+"un buon momento per farlo con:\n"
+"\n"
+" git branch <nome del nuovo branch> %s\n"
+"\n"
+msgstr[1] ""
+"Se vuoi mantenerli creando un nuovo branch, questo potrebbe essere\n"
+"un buon momento per farlo con:\n"
+"\n"
+" git branch <nome del nuovo branch> %s\n"
+"\n"
+
+#: builtin/checkout.c:1005
+msgid "internal error in revision walk"
+msgstr "errore interno durante la visita delle revisioni"
+
+#: builtin/checkout.c:1009
+msgid "Previous HEAD position was"
+msgstr "La precedente posizione di HEAD era"
+
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
+msgid "You are on a branch yet to be born"
+msgstr "Sei su un branch che deve ancora essere creato"
+
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "atteso solo un riferimento"
+
+#: builtin/checkout.c:1193
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "atteso solo un riferimento, %d specificati."
+
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n"
+"Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#, c-format
+msgid "invalid reference: %s"
+msgstr "riferimento non valido: %s"
+
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "il riferimento non è un albero: %s"
+
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "atteso branch, ricevuto tag '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "atteso branch, ricevuto branch remoto '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "atteso branch, ricevuto '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "atteso branch, ricevuto commit '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un merge\n"
+"Considera l'uso di \"git merge --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch nel bel mezzo di una sessione am\n"
+"Considera l'uso di \"git am --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un rebase\n"
+"Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un cherry-pick\n"
+"Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un revert\n"
+"Considera l'uso di \"git revert --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "stai cambiando branch durante una bisezione"
+
+#: builtin/checkout.c:1352
+msgid "paths cannot be used with switching branches"
+msgstr "i percorsi non possono essere usati passando da un branch a un altro"
+
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' non può essere usato passando da un branch a un altro"
+
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' non può essere usato con '%s'"
+
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' non accetta l'argomento <punto di partenza>"
+
+#: builtin/checkout.c:1388
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit"
+
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "argomento branch o commit mancante"
+
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "forza l'indicazione d'avanzamento dell'operazione"
+
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "esegui un merge a tre vie con il nuovo branch"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "stile"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "stile conflitti (merge o diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "scollega l'HEAD al commit specificato"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "imposta le informazioni sull'upstream per il nuovo branch"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "nuovo branch"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "nuovo branch senza genitore"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "aggiorna i file ignorati (impostazione predefinita)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"non controllare se un altro albero di lavoro contiene il riferimento "
+"specificato"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr ""
+"esegui il checkout della nostra versione per i file non sottoposti a merge"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr ""
+"esegui il checkout della loro versione per i file non sottoposti a merge"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "non limitare gli specificatori percorso solo alle voci sparse"
+
+#: builtin/checkout.c:1533
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive"
+
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
+
+#: builtin/checkout.c:1573
+msgid "--track needs a branch name"
+msgstr "--track richiede il nome di un branch"
+
+#: builtin/checkout.c:1578
+msgid "missing branch name; try -b"
+msgstr "nome del branch mancante; prova con -b"
+
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "impossibile risolvere %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "devi specificare il percorso/i percorsi da ripristinare"
+
+#: builtin/checkout.c:1631
+msgid "invalid path specification"
+msgstr "specificatore percorso non valido"
+
+#: builtin/checkout.c:1638
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+"'%s' non è un commit e non si può creare un branch '%s' che parta da esso"
+
+#: builtin/checkout.c:1642
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach non accetta un percorso '%s' come argomento"
+
+#: builtin/checkout.c:1646
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
+"si esegue il checkout dell'indice."
+
+#: builtin/checkout.c:1666
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"'%s' corrisponde a più di un branch remoto.\n"
+"Abbiamo trovato %d remoti con un riferimento corrispondente, per cui\n"
+"abbiamo ripiegato tentando di risolvere l'argomento come percorso, ma\n"
+"non siamo riusciti nemmeno a portare a termine tale operazione!\n"
+"\n"
+"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n"
+"puoi farlo usando la versione completamente qualificata del nome\n"
+"con l'opzione --track:\n"
+"\n"
+" git checkout --track origin/<nome>\n"
+"\n"
+"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
+"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
+"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
+
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branch"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crea un nuovo branch ed eseguine il checkout"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crea/reimposta un branch ed eseguine il checkout"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crea il registro dei riferimenti per il nuovo branch"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "usa modalità overlay (impostazione predefinita)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "crea un nuovo branch e passa a quest'ultimo"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "crea/reimposta un branch e passa a quest'ultimo"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "prevedi 'git switch <branch inesistente>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "scarta le modifiche locali"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "albero da cui eseguire il checkout"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "ripristina l'indice"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignora voci non sottoposte a merge"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "usa modalità overlay"
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"<percorsi>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "Eliminazione di %s in corso\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Eliminerei %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Salto il repository %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Salterei il repository %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr "eliminazione di %s non riuscita"
+
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "impossibile eseguire l'lstat di %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
+#, 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 ""
+"Guida al prompt:\n"
+"1 - seleziona un elemento numerato\n"
+"pippo - seleziona un elemento basandoti su un prefisso univoco\n"
+" - (vuoto) non selezionare niente\n"
+
+#: builtin/clean.c:304 git-add--interactive.perl:602
+#, 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 ""
+"Guida al prompt:\n"
+"1 - seleziona un singolo elemento\n"
+"3-5 - seleziona un intervallo di elementi\n"
+"2-3,6-9 - seleziona intervalli multipli\n"
+"pippo - seleziona un elemento basandoti su un prefisso univoco\n"
+"-... - deseleziona elementi specifici\n"
+"* - seleziona tutti gli elementi\n"
+" - (vuoto) termina il processo di selezione\n"
+
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Eh (%s)?\n"
+
+#: builtin/clean.c:662
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Immetti i pattern da ignorare>> "
+
+#: builtin/clean.c:699
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s"
+
+#: builtin/clean.c:720
+msgid "Select items to delete"
+msgstr "Seleziona gli elementi da eliminare"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:761
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Eliminare %s [y/N]? "
+
+#: builtin/clean.c:786 git-add--interactive.perl:1763
+#, c-format
+msgid "Bye.\n"
+msgstr "Ciao.\n"
+
+#: builtin/clean.c:794
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - inizia la pulizia\n"
+"filter by pattern - escludi degli elementi dall'eliminazione\n"
+"select by numbers - seleziona gli elementi da eliminare specificandoli\n"
+" con dei numeri\n"
+"ask each - conferma ogni eliminazione (come \"rm -i\")\n"
+"quit - termina la pulizia\n"
+"help - visualizza questa schermata\n"
+"? - guida al prompt di selezione"
+
+#: builtin/clean.c:821 git-add--interactive.perl:1849
+msgid "*** Commands ***"
+msgstr "*** Comandi ***"
+
+#: builtin/clean.c:822 git-add--interactive.perl:1846
+msgid "What now"
+msgstr "Cosa faccio ora"
+
+#: builtin/clean.c:830
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Eliminerei il seguente elemento:"
+msgstr[1] "Eliminerei i seguenti elementi:"
+
+#: builtin/clean.c:846
+msgid "No more files to clean, exiting."
+msgstr "Non ci sono più file da ripulire, esco."
+
+#: builtin/clean.c:908
+msgid "do not print names of files removed"
+msgstr "non stampare i nomi dei file eliminati"
+
+#: builtin/clean.c:910
+msgid "force"
+msgstr "forza l'operazione"
+
+#: builtin/clean.c:911
+msgid "interactive cleaning"
+msgstr "pulizia interattiva"
+
+#: builtin/clean.c:913
+msgid "remove whole directories"
+msgstr "rimuovi intere directory"
+
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "pattern"
+
+#: builtin/clean.c:915
+msgid "add <pattern> to ignore rules"
+msgstr "aggiungi <pattern> alle regole usate per ignorare i file"
+
+#: builtin/clean.c:916
+msgid "remove ignored files, too"
+msgstr "elimina anche i file ignorati"
+
+#: builtin/clean.c:918
+msgid "remove only ignored files"
+msgstr "elimina solo i file ignorati"
+
+#: builtin/clean.c:936
+msgid "-x and -X cannot be used together"
+msgstr "-x e -X non possono essere usati insieme"
+
+#: builtin/clean.c:940
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce è impostato a true e né -i, né -n, né -f sono stati "
+"specificati; mi rifiuto di eseguire la pulizia"
+
+#: builtin/clean.c:943
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f "
+"sono stati specificati; mi rifiuto di eseguire la pulizia"
+
+#: builtin/clone.c:46
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opzioni>] [--] <repository> [<directory>]"
+
+#: builtin/clone.c:93
+msgid "don't create a checkout"
+msgstr "non creare un checkout"
+
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr "crea un repository spoglio"
+
+#: builtin/clone.c:98
+msgid "create a mirror repository (implies bare)"
+msgstr "crea un repository mirror (implica che sia spoglio)"
+
+#: builtin/clone.c:100
+msgid "to clone from a local repository"
+msgstr "per clonare da un repository locale"
+
+#: builtin/clone.c:102
+msgid "don't use local hardlinks, always copy"
+msgstr "non usare i collegamenti reali locali, copia sempre i file"
+
+#: builtin/clone.c:104
+msgid "setup as shared repository"
+msgstr "imposta il repository come condiviso"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "specificatore percorso"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "inizializza sottomoduli durante la clonazione"
+
+#: builtin/clone.c:110
+msgid "number of submodules cloned in parallel"
+msgstr "numero di sottomoduli clonati in parallelo"
+
+#: builtin/clone.c:111 builtin/init-db.c:486
+msgid "template-directory"
+msgstr "directory modelli"
+
+#: builtin/clone.c:112 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr "directory da cui saranno recuperati i modelli"
+
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
+msgstr "repository di riferimento"
+
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
+msgstr "usa --reference solo durante la clonazione"
+
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
+msgid "name"
+msgstr "nome"
+
+#: builtin/clone.c:120
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "usa <nome> anziché 'origin' per tracciare l'upstream"
+
+#: builtin/clone.c:122
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto"
+
+#: builtin/clone.c:124
+msgid "path to git-upload-pack on the remote"
+msgstr "percorso al comando remoto git-upload-pack"
+
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
+msgid "depth"
+msgstr "profondità"
+
+#: builtin/clone.c:126
+msgid "create a shallow clone of that depth"
+msgstr "crea un clone shallow con questa profondità"
+
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+msgid "time"
+msgstr "tempo"
+
+#: builtin/clone.c:128
+msgid "create a shallow clone since a specific time"
+msgstr "crea un clone shallow a partire dall'istante specificato"
+
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
+msgid "revision"
+msgstr "revisione"
+
+#: builtin/clone.c:130 builtin/fetch.c:157
+msgid "deepen history of shallow clone, excluding rev"
+msgstr ""
+"aumenta la profondità della cronologia del clone shallow fino alla revisione "
+"specificata esclusa"
+
+#: builtin/clone.c:132
+msgid "clone only one branch, HEAD or --branch"
+msgstr "clona solo un branch, HEAD o quello specificato con --branch"
+
+#: builtin/clone.c:134
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "non clonare alcun tag e fai sì che i fetch successivi non li seguano"
+
+#: builtin/clone.c:136
+msgid "any cloned submodules will be shallow"
+msgstr "tutti i sottomoduli clonati saranno shallow"
+
+#: builtin/clone.c:137 builtin/init-db.c:495
+msgid "gitdir"
+msgstr "directory Git"
+
+#: builtin/clone.c:138 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr "separa la directory Git dall'albero di lavoro"
+
+#: builtin/clone.c:139
+msgid "key=value"
+msgstr "chiave=valore"
+
+#: builtin/clone.c:140
+msgid "set config inside the new repository"
+msgstr "imposta la configurazione nel nuovo repository"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "specifica del server"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "opzione da trasmettere"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr "usa solo indirizzi IPv4"
+
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr "usa solo indirizzi IPv6"
+
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+"tutti i sottomoduli clonati useranno il loro rispettivo branch remoto "
+"tracciato"
+
+#: builtin/clone.c:285
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Non è stato possibile indovinare alcun nome directory.\n"
+"Specifica una directory tramite la riga di comando"
+
+#: builtin/clone.c:338
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n"
+
+#: builtin/clone.c:411
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s esiste e non è una directory"
+
+#: builtin/clone.c:428
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "impossibile avviare l'iteratore su '%s'"
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "unlink di '%s' non riuscito"
+
+#: builtin/clone.c:458
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "creazione del collegamento '%s' non riuscita"
+
+#: builtin/clone.c:462
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "copia del file in '%s' non riuscita"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "iterazione su '%s' non riuscita"
+
+#: builtin/clone.c:492
+#, c-format
+msgid "done.\n"
+msgstr "fatto.\n"
+
+#: builtin/clone.c:506
+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 ""
+"Clone completato con successo, ma il checkout non è riuscito.\n"
+"Puoi esaminare gli elementi di cui è stato eseguito il checkout\n"
+"con 'git status' e riprovare ad eseguire il checkout con\n"
+"'git restore --source=HEAD :/'\n"
+
+#: builtin/clone.c:583
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Impossibile trovare il branch remoto %s da clonare."
+
+#: builtin/clone.c:702
+#, c-format
+msgid "unable to update %s"
+msgstr "impossibile aggiornare %s"
+
+#: builtin/clone.c:752
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile "
+"eseguire il checkout.\n"
+
+#: builtin/clone.c:783
+msgid "unable to checkout working tree"
+msgstr "impossibile eseguire il checkout dell'albero di lavoro"
+
+#: builtin/clone.c:833
+msgid "unable to write parameters to config file"
+msgstr "impossibile scrivere i parametri nel file di configurazione"
+
+#: builtin/clone.c:896
+msgid "cannot repack to clean up"
+msgstr "impossibile eseguire il repack per pulire l'area di lavoro"
+
+#: builtin/clone.c:898
+msgid "cannot unlink temporary alternates file"
+msgstr "impossibile eseguire l'unlink del file alternates temporaneo"
+
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
+msgid "Too many arguments."
+msgstr "Troppi argomenti."
+
+#: builtin/clone.c:942
+msgid "You must specify a repository to clone."
+msgstr "Devi specificare un repository da clonare."
+
+#: builtin/clone.c:955
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "le opzioni --bare e --origin %s non sono compatibili."
+
+#: builtin/clone.c:958
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "le opzioni --bare e --separate-git-dir non sono compatibili."
+
+#: builtin/clone.c:971
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "il repository '%s' non esiste"
+
+#: builtin/clone.c:977 builtin/fetch.c:1660
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "la profondità %s non è un numero positivo"
+
+#: builtin/clone.c:987
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+"il percorso di destinazione '%s' esiste già e non è una directory vuota."
+
+#: builtin/clone.c:997
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "l'albero di lavoro '%s' esiste già."
+
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "impossibile creare le prime directory di '%s'"
+
+#: builtin/clone.c:1017
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "impossibile creare la directory dell'albero di lavoro '%s'"
+
+#: builtin/clone.c:1037
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Clone nel repository spoglio '%s' in corso...\n"
+
+#: builtin/clone.c:1039
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Clone in '%s' in corso...\n"
+
+#: builtin/clone.c:1063
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"il clone --recursive non è compatibile né con --reference né con --reference-"
+"if-able"
+
+#: builtin/clone.c:1124
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://."
+
+#: builtin/clone.c:1126
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://."
+
+#: builtin/clone.c:1128
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://."
+
+#: builtin/clone.c:1130
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://."
+
+#: builtin/clone.c:1133
+msgid "source repository is shallow, ignoring --local"
+msgstr "il repository sorgente è shallow, ignoro l'opzione --local"
+
+#: builtin/clone.c:1138
+msgid "--local is ignored"
+msgstr "l'opzione --local è ignorata"
+
+#: builtin/clone.c:1215 builtin/clone.c:1223
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Il branch remoto %s non è stato trovato nell'upstream %s"
+
+#: builtin/clone.c:1226
+msgid "You appear to have cloned an empty repository."
+msgstr "Sembra che tu abbia clonato un repository vuoto."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<opzioni>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "recupera le variabili di configurazione da qui"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "layout da usare"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "Larghezza massima"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "Spazi vuoti per il margine sinistro"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "Spazi vuoti per il margine destro"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "Spazi vuoti fra le colonne"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command deve essere il primo argomento"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <genitore>)...] [-S[<ID chiave>]] [(-m <messaggio>)...] "
+"[(-F <file>)...] <albero>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "genitore duplicato %s ignorato"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "%s non è un nome oggetto valido"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: apertura di '%s' non riuscita"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: lettura di '%s' non riuscita"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: chiusura di '%s' non riuscita"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "genitore"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "ID di un oggetto commit genitore"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "messaggio"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "messaggio di commit"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "leggi il messaggio di log del commit da un file"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "firma il commit con GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "è necessario fornire esattamente un albero"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: lettura non riuscita"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opzioni>] [--] <specificatore percorso>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opzioni>] [--] <specificatore percorso>..."
+
+#: 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 ""
+"Hai richiesto di modificare il commit più recente, ma eseguire tale\n"
+"operazione lo renderebbe vuoto. Puoi ripetere l'esecuzione del comando\n"
+"con --allow-empty o puoi rimuovere completamente il commit con\n"
+"\"git reset HEAD^\".\n"
-#: builtin/commit.c:60
+#: 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"
-"Otherwise, please use 'git reset'\n"
msgstr ""
+"Il cherry-pick precedente ora è vuoto, probabilmente a causa di alcuni\n"
+"conflitti risolti.\n"
+"Se vuoi comunque eseguirne il commit, usa:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
-#: builtin/commit.c:253
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Altrimenti, usa 'git cherry-pick --skip'\n"
+
+#: builtin/commit.c:66
+msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"e quindi usa:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"per riprendere l'esecuzione il cherry-pick per i commit rimanenti.\n"
+"Se vuoi saltare questo commit, usa:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
-msgstr ""
+msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita"
-#: builtin/commit.c:295
+#: builtin/commit.c:356
msgid "unable to create temporary index"
-msgstr ""
+msgstr "impossibile creare l'indice temporaneo"
-#: builtin/commit.c:301
+#: builtin/commit.c:362
msgid "interactive add failed"
-msgstr "add interattivo non riuscito"
+msgstr "aggiunta interattiva non riuscita"
-#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
+#: builtin/commit.c:376
+msgid "unable to update temporary index"
+msgstr "impossibile aggiornare l'indice temporaneo"
+
+#: builtin/commit.c:378
+msgid "Failed to update main cache tree"
+msgstr "Impossibile aggiornare l'albero cache principale"
+
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "impossibile scrivere il file new_index"
-#: builtin/commit.c:386
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "impossibile eseguire un commit parziale durante un merge."
-#: builtin/commit.c:388
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossibile eseguire un commit parziale durante un cherry-pick."
-#: builtin/commit.c:398
+#: builtin/commit.c:465
msgid "cannot read the index"
-msgstr "impossibile leggere index"
+msgstr "impossibile leggere l'indice"
-#: builtin/commit.c:418
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
-msgstr ""
-
-#: builtin/commit.c:493 builtin/commit.c:499
-#, c-format
-msgid "invalid commit: %s"
-msgstr "commit non valido: %s"
-
-#: builtin/commit.c:522
-msgid "malformed --author parameter"
-msgstr "parametro --author malformato"
+msgstr "impossibile scrivere il file indice temporaneo"
#: builtin/commit.c:582
#, c-format
-msgid "Malformed ident string: '%s'"
-msgstr ""
+msgid "commit '%s' lacks author header"
+msgstr "dal commit '%s' manca l'intestazione autore"
-#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
+#: builtin/commit.c:584
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "il commit '%s' ha una riga autore malformata"
+
+#: builtin/commit.c:603
+msgid "malformed --author parameter"
+msgstr "parametro --author malformato"
+
+#: builtin/commit.c:656
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"impossibile selezionare un carattere commento non usato\n"
+"nel messaggio di commit corrente"
+
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
-msgstr "non è stato possibile trovare il commit %s"
+msgstr "impossibile trovare il commit %s"
-#: builtin/commit.c:632 builtin/shortlog.c:296
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lettura del messaggio di log dallo standard input)\n"
-#: builtin/commit.c:634
+#: builtin/commit.c:708
msgid "could not read log from standard input"
-msgstr "non è stato possibile leggere il log dallo standard input"
+msgstr "impossibile leggere il log dallo standard input"
-#: builtin/commit.c:638
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
-msgstr "non è stato possibile leggere il file di log '%s'"
+msgstr "impossibile leggere il file di log '%s'"
-#: builtin/commit.c:644
-msgid "commit has empty message"
-msgstr "il commit ha un messaggio vuoto"
-
-#: builtin/commit.c:660
-msgid "could not read MERGE_MSG"
-msgstr "non è stato possibile leggere MERGE_MSG"
-
-#: builtin/commit.c:664
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
-msgstr "non è stato possibile leggere SQUASH_MSG"
+msgstr "impossibile leggere SQUASH_MSG"
-#: builtin/commit.c:668
-#, c-format
-msgid "could not read '%s'"
-msgstr "non è stato possibile leggere '%s'"
+#: builtin/commit.c:750
+msgid "could not read MERGE_MSG"
+msgstr "impossibile leggere MERGE_MSG"
-#: builtin/commit.c:720
+#: builtin/commit.c:810
msgid "could not write commit template"
-msgstr "non è stato possibile scrivere il modello di commit"
+msgstr "impossibile scrivere il modello di commit"
-#: builtin/commit.c:731
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -2198,12 +11695,12 @@
"and try again.\n"
msgstr ""
"\n"
-"Sembra che si stia eseguendo il commit di un merge.\n"
-"Se l'operazione non è corretta, per favore elimina il file\n"
+"Sembra che tu stia eseguendo il commit di un merge.\n"
+"Se ciò non è corretto, elimina il file\n"
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:736
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -2213,571 +11710,2335 @@
"and try again.\n"
msgstr ""
"\n"
-"Sembra che si stia eseguendo il commit di un cherry-pick.\n"
-"Se l'operazione non è corretta, per favore rimuovi il file\n"
+"Sembra che tu stia eseguendo il commit di un merge.\n"
+"Se ciò non è corretto, elimina il file\n"
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:748
+#: builtin/commit.c:847
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-"Per favore inserisci il messaggio di commit per le modifiche. Le righe\n"
-"che iniziano con '#' verranno ignorate, e un messaggio vuoto annulla il commit.\n"
+"Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
+"con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:753
+#: builtin/commit.c:855
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-"Per favore inserisci il messaggio di commit per le modifiche. Le\n"
-"righe che iniziano con '#' verranno mantenute; possono comunque essere\n"
-"rimosse manualmente. Un messaggio vuoto annulla il commit.\n"
+"Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
+"con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n"
+"Un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:766
+#: builtin/commit.c:872
#, c-format
-msgid "%sAuthor: %s"
-msgstr "%sAutore: %s"
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sAutore: %.*s <%.*s>"
-#: builtin/commit.c:773
+#: builtin/commit.c:880
#, c-format
-msgid "%sCommitter: %s"
-msgstr "%sCommitter: %s"
+msgid "%sDate: %s"
+msgstr "%sData: %s"
-#: builtin/commit.c:793
+#: builtin/commit.c:887
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sEsecutore commit: %.*s <%.*s>"
+
+#: builtin/commit.c:905
msgid "Cannot read index"
-msgstr "Impossibile leggere index"
+msgstr "Impossibile leggere l'indice"
-#: builtin/commit.c:830
+#: builtin/commit.c:972
msgid "Error building trees"
-msgstr ""
+msgstr "Errore durante la costruzione degli alberi"
-#: builtin/commit.c:845 builtin/tag.c:361
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
-msgstr "Per favore, specifica il messaggio usando l'opzione -m o -F.\n"
+msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n"
-#: builtin/commit.c:942
+#: builtin/commit.c:1030
#, c-format
-msgid "No existing author found with '%s'"
-msgstr "Nessun autore esistente trovato con '%s'"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun "
+"autore esistente"
-#: builtin/commit.c:957 builtin/commit.c:1157
+#: builtin/commit.c:1044
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Modo non valido ignorato: '%s'"
+
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr ""
+msgstr "Modo file non tracciati non valido: '%s'"
-#: builtin/commit.c:997
+#: builtin/commit.c:1102
+msgid "--long and -z are incompatible"
+msgstr "--long e -z non sono compatibili"
+
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso"
-#: builtin/commit.c:1008
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
-msgstr ""
+msgstr "Non c'è nulla da modificare."
-#: builtin/commit.c:1011
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
-msgstr ""
+msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend."
-#: builtin/commit.c:1013
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr ""
+msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend."
-#: builtin/commit.c:1016
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Le opzioni --squash e --fixup non possono essere usate insieme"
-#: builtin/commit.c:1026
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata."
-#: builtin/commit.c:1028
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "L'opzione -m non può essere combinata con -c/-C/-F/--fixup."
+#: builtin/commit.c:1175
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "L'opzione -m non può essere combinata con -c/-C/-F."
-#: builtin/commit.c:1036
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend."
-#: builtin/commit.c:1053
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Può essere usata solo una delle opzioni --include/--only/--all/--"
-"interactive/--patch ."
+"interactive/--patch."
-#: builtin/commit.c:1055
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
-msgstr "Devi specificare un path se usi --include/--only."
-
-#: builtin/commit.c:1057
-msgid "Clever... amending the last one with dirty index."
msgstr ""
+"Non specificare un percorso con le opzioni --include/--only non ha senso."
-#: builtin/commit.c:1059
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
-msgstr ""
-
-#: builtin/commit.c:1069 builtin/tag.c:577
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "i percorsi '%s ...' non hanno senso con -a"
+
+#: builtin/commit.c:1339 builtin/commit.c:1523
+msgid "show status concisely"
+msgstr "visualizza concisamente lo stato"
+
+#: builtin/commit.c:1341 builtin/commit.c:1525
+msgid "show branch information"
+msgstr "visualizza le informazioni sul branch"
+
+#: builtin/commit.c:1343
+msgid "show stash information"
+msgstr "visualizza le informazioni sullo stash"
+
+#: builtin/commit.c:1345 builtin/commit.c:1527
+msgid "compute full ahead/behind values"
+msgstr "calcola tutti i valori dopo/prima di"
+
+#: builtin/commit.c:1347
+msgid "version"
+msgstr "versione"
+
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
+msgid "machine-readable output"
+msgstr "output leggibile da una macchina"
+
+#: builtin/commit.c:1350 builtin/commit.c:1531
+msgid "show status in long format (default)"
+msgstr "visualizza lo stato in forma lunga (impostazione predefinita)"
+
+#: builtin/commit.c:1353 builtin/commit.c:1534
+msgid "terminate entries with NUL"
+msgstr "termina le voci con NUL"
+
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+msgid "mode"
+msgstr "modo"
+
+#: builtin/commit.c:1356 builtin/commit.c:1537
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
+"visualizza file non tracciati, modalità facoltative: all, normal, no. "
+"(Impostazione predefinita: all)"
-#: builtin/commit.c:1074
-msgid "Paths with -a does not make sense."
-msgstr "I path con -a non hanno senso."
-
-#: builtin/commit.c:1257
-msgid "couldn't look up newly created commit"
-msgstr "non è stato possibile trovare il commit appena creato"
-
-#: builtin/commit.c:1259
-msgid "could not parse newly created commit"
-msgstr "non è stato possibile analizzare il commit appena creato"
-
-#: builtin/commit.c:1300
-msgid "detached HEAD"
+#: builtin/commit.c:1360
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
+"visualizza file ignorati, modalità facoltative: traditional, matching, no. "
+"(Impostazione predefinita: traditional)"
-#: builtin/commit.c:1302
-msgid " (root-commit)"
-msgstr " (root-commit)"
+#: builtin/commit.c:1362 parse-options.h:179
+msgid "when"
+msgstr "quando"
-#: builtin/commit.c:1446
-msgid "could not parse HEAD commit"
-msgstr "non è stato possibile analizzare il commit HEAD"
+#: builtin/commit.c:1363
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
+"untracked. (Impostazione predefinita: all)"
-#: builtin/commit.c:1484 builtin/merge.c:509
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "non è stato possibile aprire '%s' per la lettura"
+#: builtin/commit.c:1365
+msgid "list untracked files in columns"
+msgstr "elenca i file non tracciati in colonne"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1366
+msgid "do not detect renames"
+msgstr "non rilevare le ridenominazioni"
+
+#: builtin/commit.c:1368
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+"rileva le ridenominazioni, imposta facoltativamente l'indice di similarità"
+
+#: builtin/commit.c:1388
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+"Combinazione di argomenti sui file ignorati e non tracciati non supportata"
+
+#: builtin/commit.c:1493
+msgid "suppress summary after successful commit"
+msgstr ""
+"ometti di visualizzare il riepilogo dopo un commit completato con successo"
+
+#: builtin/commit.c:1494
+msgid "show diff in commit message template"
+msgstr "visualizza il diff nel modello del messaggio di commit"
+
+#: builtin/commit.c:1496
+msgid "Commit message options"
+msgstr "Opzioni messaggio di commit"
+
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+msgid "read message from file"
+msgstr "leggi il messaggio da un file"
+
+#: builtin/commit.c:1498
+msgid "author"
+msgstr "autore"
+
+#: builtin/commit.c:1498
+msgid "override author for commit"
+msgstr "sovrascrivi l'autore per il commit"
+
+#: builtin/commit.c:1499 builtin/gc.c:539
+msgid "date"
+msgstr "data"
+
+#: builtin/commit.c:1499
+msgid "override date for commit"
+msgstr "sovrascrivi la data per il commit"
+
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+msgid "commit"
+msgstr "commit"
+
+#: builtin/commit.c:1501
+msgid "reuse and edit message from specified commit"
+msgstr "riusa il messaggio del commit specificato per poi modificarlo"
+
+#: builtin/commit.c:1502
+msgid "reuse message from specified commit"
+msgstr "riusa il messaggio del commit specificato"
+
+#: builtin/commit.c:1503
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+"usa il messaggio in formato autosquash per correggere il commit specificato"
+
+#: builtin/commit.c:1504
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+"usa il messaggio in formato autosquash per eseguire lo squash del commit "
+"specificato"
+
+#: builtin/commit.c:1505
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)"
+
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
+msgid "add Signed-off-by:"
+msgstr "aggiungi Signed-off-by:"
+
+#: builtin/commit.c:1507
+msgid "use specified template file"
+msgstr "usa il file modello specificato"
+
+#: builtin/commit.c:1508
+msgid "force edit of commit"
+msgstr "forza la modifica del commit"
+
+#: builtin/commit.c:1510
+msgid "include status in commit message template"
+msgstr "includi lo stato nel modello del messaggio di commit"
+
+#: builtin/commit.c:1515
+msgid "Commit contents options"
+msgstr "Opzioni contenuto commit"
+
+#: builtin/commit.c:1516
+msgid "commit all changed files"
+msgstr "esegui il commit di tutti i file modificati"
+
+#: builtin/commit.c:1517
+msgid "add specified files to index for commit"
+msgstr "aggiungi i file specificati all'indice per il commit"
+
+#: builtin/commit.c:1518
+msgid "interactively add files"
+msgstr "aggiungi i file in modalità interattiva"
+
+#: builtin/commit.c:1519
+msgid "interactively add changes"
+msgstr "aggiungi le modifiche in modalità interattiva"
+
+#: builtin/commit.c:1520
+msgid "commit only specified files"
+msgstr "esegui il commit solo dei file specificati"
+
+#: builtin/commit.c:1521
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "ignora gli hook pre-commit e commit-msg"
+
+#: builtin/commit.c:1522
+msgid "show what would be committed"
+msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
+
+#: builtin/commit.c:1535
+msgid "amend previous commit"
+msgstr "modifica il commit precedente"
+
+#: builtin/commit.c:1536
+msgid "bypass post-rewrite hook"
+msgstr "ignora l'hook post-rewrite"
+
+#: builtin/commit.c:1541
+msgid "ok to record an empty change"
+msgstr "accetta di registrare una modifica vuota"
+
+#: builtin/commit.c:1543
+msgid "ok to record a change with an empty message"
+msgstr "accetta di registrare una modifica con un messaggio vuoto"
+
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "File MERGE_HEAD corrotto (%s)"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
-msgstr "non è stato possibile leggere MERGE_MODE"
+msgstr "impossibile leggere MERGE_MODE"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
-msgstr "non è stato possibile leggere il messaggio di commit: %s"
+msgstr "impossibile leggere il messaggio di commit: %s"
-#: builtin/commit.c:1531
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Commit interrotto; il messaggio non è stato modificato.\n"
-
-#: builtin/commit.c:1536
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "Interruzione del commit a causa di un messaggio di commit vuoto.\n"
+msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n"
-#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
-msgid "failed to write commit object"
-msgstr "scrittura dell'oggetto di commit non riuscita"
+#: builtin/commit.c:1654
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Interrompo il commit; non hai modificato il messaggio.\n"
-#: builtin/commit.c:1572
-msgid "cannot lock HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1576
-msgid "cannot update HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1587
+#: builtin/commit.c:1688
msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+"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 ""
-"Il repository è stato aggiornato, ma non è stato possibile scrivere il file\n"
-"new_index. Verifica che l'unità disco non sia piena o che la quota non sia\n"
-"stata superata, ed esegui \"git reset HEAD\" per il ripristino."
+"Il repository è stato aggiornato, ma non è stato\n"
+"possibile scrivere il file new_index. Verifica che il\n"
+"disco non sia pieno e che la quota non sia stata\n"
+"superata, quindi esegui \"git restore --staged :/\" per\n"
+"procedere al ripristino."
-#: builtin/describe.c:234
+#: builtin/commit-graph.c:11
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <directory oggetti>]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr "git commit-graph read [--object-dir <directory oggetti>]"
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] "
+"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>"
+
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
+msgid "dir"
+msgstr "directory"
+
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+msgid "The object directory to store the graph"
+msgstr "La directory oggetti in cui memorizzare il grafo"
+
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Impossibile aprire il grafo dei commit '%s'"
+
+#: builtin/commit-graph.c:164
+msgid "start walk at all refs"
+msgstr "inizia la visita da tutti i riferimenti"
+
+#: builtin/commit-graph.c:166
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+"esamina i pack-index elencati sullo standard input alla ricerca di commit"
+
+#: builtin/commit-graph.c:168
+msgid "start walk at commits listed by stdin"
+msgstr "inizia la visita ai commit elencati sullo standard input"
+
+#: builtin/commit-graph.c:170
+msgid "include all commits already in the commit-graph file"
+msgstr "includi tutti i commit già presenti nel file commit-graph"
+
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "consenti la scrittura di un file grafo dei commit incrementale"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
+
+#: builtin/commit-graph.c:191
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs"
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<opzioni>]"
+
+#: builtin/config.c:103 builtin/env--helper.c:23
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argomento --type non riconosciuto: %s"
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr "solo un tipo per volta"
+
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr "Percorso file di configurazione"
+
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr "usa il file di configurazione globale"
+
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr "usa il file di configurazione di sistema"
+
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr "usa il file di configurazione del repository"
+
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr "usa il file di configurazione per albero di lavoro"
+
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr "usa il file di configurazione specificato"
+
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr "ID blob"
+
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr "leggi la configurazione dall'oggetto blob specificato"
+
+#: builtin/config.c:131
+msgid "Action"
+msgstr "Azione"
+
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr "ottieni valore: nome [espressione-regolare-valore]"
+
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]"
+
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+"ottieni i valori in base a un'espressione regolare: espressione-regolare-"
+"nome [espressione-regolare-valore]"
+
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL"
+
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+"sostituisci tutte le variabili corrispondenti: nome-valore [espressione-"
+"regolare-valore]"
+
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr "aggiungi una nuova variabile: nome valore"
+
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr "rimuovi una variabile: nome [espressione-regolare-valore]"
+
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]"
+
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr "rinomina sezione: vecchio-nome nuovo-nome"
+
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr "rimuovi una sezione: nome"
+
+#: builtin/config.c:142
+msgid "list all"
+msgstr "elenca tutti"
+
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr "apri un editor"
+
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr "trova il colore configurato: slot [valore-predefinito]"
+
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "trova l'impostazione colore: slot [standard-output-è-una-tty]"
+
+#: builtin/config.c:146
+msgid "Type"
+msgstr "Tipo"
+
+#: builtin/config.c:147 builtin/env--helper.c:38
+msgid "value is given this type"
+msgstr "al valore è assegnato questo tipo"
+
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr "il valore è \"true\" o \"false\""
+
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr "il valore è un numero decimale"
+
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr "il valore è --bool o --int"
+
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr "il valore è un percorso (nome file o directory)"
+
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr "il valore è una data di scadenza"
+
+#: builtin/config.c:153
+msgid "Other"
+msgstr "Altro"
+
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr "termina i valori con un byte NUL"
+
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr "visualizza solo i nomi delle variabili"
+
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr ""
+"rispetta le directory di inclusione durante il recupero delle variabili"
+
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"visualizza l'origine del file di configurazione (file, standard input, blob, "
+"riga di comando)"
+
+#: builtin/config.c:158 builtin/env--helper.c:40
+msgid "value"
+msgstr "valore"
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr "con --get, usa il valore predefinito se la voce è mancante"
+
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "numero di argomenti errato, dovrebbero essere %d"
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "numero di argomenti errato, dovrebbero essere da %d a %d"
+
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "pattern chiave non valido: %s"
+
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "formattazione del valore configurazione predefinito non riuscita: %s"
+
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "impossibile analizzare il colore '%s'"
+
+#: builtin/config.c:443
+msgid "unable to parse default color value"
+msgstr "impossibile analizzare il valore colore predefinito"
+
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
+msgstr "non si è in una directory git"
+
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
+msgstr "la scrittura su standard input non è supportata"
+
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
+msgstr "la scrittura di blob di configurazione non è supportata"
+
+#: builtin/config.c:587
+#, 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 ""
+"# Questo è il file di configurazione utente di Git.\n"
+"[user]\n"
+"# Adatta e decommenta le seguenti righe:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:611
+msgid "only one config file at a time"
+msgstr "solo un file di configurazione per volta"
+
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
+msgstr "--local può essere usato solo in un repository Git"
+
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob può essere usato solo in un repository Git"
+
+#: builtin/config.c:638
+msgid "$HOME not set"
+msgstr "$HOME non impostata"
+
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+"--worktree non può essere usato con alberi di lavoro multipli a meno\n"
+"che l'estensione di configurazione worktreeConfig non sia abilitata.\n"
+"Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n"
+"i dettagli"
+
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color e il tipo della variabile non sono coerenti"
+
+#: builtin/config.c:693
+msgid "only one action at a time"
+msgstr "solo un'azione per volta"
+
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only è applicabile solo a --list o --get-regexp"
+
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin è applicabile solo a --get, --get-all, --get-regexp e --list"
+
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
+msgstr "--default è applicabile solo a --get"
+
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "impossibile leggere il file di configurazione '%s'"
+
+#: builtin/config.c:734
+msgid "error processing config file(s)"
+msgstr "errore durante l'elaborazione del/dei file di configurazione"
+
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
+msgstr "la modifica dello standard input non è supportata"
+
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
+msgstr "la modifica dei blob non è supportata"
+
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "impossibile creare il file di configurazione %s"
+
+#: builtin/config.c:773
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"impossibile sovrascrivere valori multipli con un singolo valore\n"
+" Usa un'espressione regolare, --add o --replace-all per modificare %s."
+
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
+msgstr "sezione %s non esistente"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "stampa le dimensioni in un formato leggibile"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opzioni>] [<espressione commit>...]"
+
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opzioni>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "head"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "leggero"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "annotato"
+
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
-msgstr ""
+msgstr "il tag annotato %s non è disponibile"
-#: builtin/describe.c:238
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
-msgstr ""
+msgstr "il tag annotato %s non ha un nome incorporato"
-#: builtin/describe.c:240
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
-msgstr "il tag '%s' è davvero '%s' qui"
+msgstr "il tag '%s' in realtà qui è '%s'"
-#: builtin/describe.c:267
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "Non è il nome di un oggetto valido %s"
-
-#: builtin/describe.c:270
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s non è un oggetto '%s' valido"
-
-#: builtin/describe.c:287
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "nessun tag corrisponde esattamente a '%s'"
-#: builtin/describe.c:289
+#: builtin/describe.c:325
#, c-format
-msgid "searching to describe %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
+"Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una "
+"ricerca per descrivere il commit\n"
-#: builtin/describe.c:329
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
-msgstr ""
+msgstr "ricerca terminata in %s\n"
-#: builtin/describe.c:353
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
+"Nessun tag annotato può descrivere '%s'.\n"
+"Ciò nonostante, c'erano dei tag non annotati: prova con --tags."
-#: builtin/describe.c:357
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
"Nessun tag può descrivere '%s'.\n"
-"Prova con --always, o crea dei tag."
+"Prova con --always o crea dei tag."
-#: builtin/describe.c:378
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
-msgstr ""
+msgstr "ho attraversato %lu commit\n"
-#: builtin/describe.c:381
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
+"trovati più di %i tag; ho elencato i %i più recenti\n"
+"ho terminato la ricerca in %s\n"
-#: builtin/describe.c:436
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
+msgstr "descrivi %s\n"
+
+#: builtin/describe.c:513
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s non è un nome oggetto valido"
+
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s non è né un commit né un blob"
+
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
+msgstr "trova il tag successivo al commit"
+
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
+msgstr "esegui il debug della strategia di ricerca sullo standard error"
+
+#: builtin/describe.c:537
+msgid "use any ref"
+msgstr "usa qualunque riferimento"
+
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
+msgstr "usa qualunque tag, anche quelli non annotati"
+
+#: builtin/describe.c:539
+msgid "always use long format"
+msgstr "usa sempre il formato lungo"
+
+#: builtin/describe.c:540
+msgid "only follow first parent"
+msgstr "segui solo il primo genitore"
+
+#: builtin/describe.c:543
+msgid "only output exact matches"
+msgstr "visualizza solo le corrispondenze esatte"
+
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "considera gli <n> tag più recenti (impostazione predefinita: 10)"
+
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
+msgstr "considera solo i tag corrispondenti al <pattern>"
+
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
+msgstr "non considerare i tag corrispondenti al <pattern>"
+
+#: builtin/describe.c:551 builtin/name-rev.c:422
+msgid "show abbreviated commit object as fallback"
+msgstr "visualizza l'oggetto commit abbreviato come fallback"
+
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
+msgstr "contrassegno"
+
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr ""
+"aggiungi <contrassegno> all'albero di lavoro sporco (impostazione "
+"predefinita: \"-dirty\")"
+
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"aggiungi <contrassegno> all'albero di lavoro rotto (impostazione "
+"predefinita: \"-broken\")"
+
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long non è compatibile con --abbrev=0"
-#: builtin/describe.c:462
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
-msgstr ""
+msgstr "Nessun nome trovato, non è possibile descrivere nulla."
-#: builtin/describe.c:482
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
+msgstr "--dirty non è compatibile con le espressioni commit"
-#: builtin/diff.c:77
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken non è compatibile con le espressioni commit"
+
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
-msgstr "'%s': non è un file regolare o un link simbolico"
+msgstr "'%s': non è un file regolare o un collegamento simbolico"
-#: builtin/diff.c:220
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opzione non valida: %s"
-#: builtin/diff.c:297
+#: builtin/diff.c:350
msgid "Not a git repository"
-msgstr "Non è un repository git"
+msgstr "Non è un repository Git"
-#: builtin/diff.c:347
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
-msgstr "oggetto non valido '%s' specificato."
+msgstr "specificato oggetto non valido '%s'."
-#: builtin/diff.c:352
-#, c-format
-msgid "more than %d trees given: '%s'"
-msgstr ""
-
-#: builtin/diff.c:362
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "più di due blob specificati: '%s'"
-#: builtin/diff.c:370
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
-msgstr "oggetto non gestito '%s' specificato."
+msgstr "specificato oggetto non gestito '%s'."
-#: builtin/fetch.c:200
-msgid "Couldn't find remote ref HEAD"
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
+
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
+msgstr "non riuscito: %d"
+
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
+msgstr "impossibile leggere il collegamento simbolico %s"
+
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "impossibile leggere il file collegamento simbolico %s"
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s"
+
+#: builtin/difftool.c:406
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
+"i formati diff combinati ('-c' e '--cc') non sono supportati in\n"
+"modalità diff directory ('-d' e '--dir-diff')."
-#: builtin/fetch.c:253
+#: builtin/difftool.c:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "entrambi i file risultano modificati: '%s' e '%s'."
+
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
+msgstr "il file nell'albero di lavoro è stato mantenuto."
+
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "esistono file temporanei in '%s'."
+
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
+msgstr "potresti voler ripulirli o ripristinarli."
+
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "usa `diff.guitool` anziché `diff.tool`"
+
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
+msgstr "esegui un diff directory completo"
+
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
+msgstr "non chiedere conferma prima di lanciare un tool diff"
+
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
+msgstr "usa collegamenti simbolici in modalità diff directory"
+
+#: builtin/difftool.c:699
+msgid "tool"
+msgstr "strumento"
+
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
+msgstr "usa lo strumento diff specificato"
+
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+"stampa un elenco di strumenti diff che possono essere usati con `--tool`"
+
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"fai sì che 'git-difftool' esca quando uno strumento diff invocato "
+"restituisce un codice d'uscita diverso da zero"
+
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
+msgstr "specifica un comando personalizzato per visualizzare i diff"
+
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "fornito a `diff`"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool richiede un albero di lavoro o --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff non è compatibile con --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive"
+
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
+msgstr "nessuno <strumento> specificato per --tool=<strumento>"
+
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "nessun <comando> specificato per --extcmd=<comando>"
+
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opzioni> <variabile d'ambiente>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipo"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+"impostazione predefinita su cui ripiegheranno le chiamate git_env_*(...)"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"non visualizzare messaggi, usa solo il valore di git_env_*() come codice "
+"d'uscita"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"l'opzione `--default' richiede un valore booleano con `--type=bool`, non `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"l'opzione `--default' richiede un valore unsigned long con `--type=ulong`, "
+"non `%s`"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [opzioni-elenco-rev]"
+
+#: builtin/fast-export.c:1124
+msgid "show progress after <n> objects"
+msgstr "visualizza l'avanzamento dopo <n> oggetti"
+
+#: builtin/fast-export.c:1126
+msgid "select handling of signed tags"
+msgstr "seleziona la gestione dei tag firmati"
+
+#: builtin/fast-export.c:1129
+msgid "select handling of tags that tag filtered objects"
+msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati"
+
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"seleziona la gestione dei messaggi di commit in una codifica alternativa"
+
+#: builtin/fast-export.c:1135
+msgid "Dump marks to this file"
+msgstr "Esegui il dump dei contrassegni in questo file"
+
+#: builtin/fast-export.c:1137
+msgid "Import marks from this file"
+msgstr "Importa i contrassegni da questo file"
+
+#: builtin/fast-export.c:1139
+msgid "Fake a tagger when tags lack one"
+msgstr "Usa un tagger falso se i tag non ne hanno uno"
+
+#: builtin/fast-export.c:1141
+msgid "Output full tree for each commit"
+msgstr "Visualizza in output l'albero completo per ogni commit"
+
+#: builtin/fast-export.c:1143
+msgid "Use the done feature to terminate the stream"
+msgstr "Usa la funzionalità \"fatto\" per terminare il flusso"
+
+#: builtin/fast-export.c:1144
+msgid "Skip output of blob data"
+msgstr "Ometti l'output dei dati dei blob"
+
+#: builtin/fast-export.c:1145 builtin/log.c:1632
+msgid "refspec"
+msgstr "specificatore riferimento"
+
+#: builtin/fast-export.c:1146
+msgid "Apply refspec to exported refs"
+msgstr "Applica lo specificatore riferimento ai riferimenti esportati"
+
+#: builtin/fast-export.c:1147
+msgid "anonymize output"
+msgstr "rendi anonimo l'output"
+
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Visualizza gli ID oggetto originari dei blob/commit"
+
+#: builtin/fetch.c:30
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]"
+
+#: builtin/fetch.c:31
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opzioni>] <gruppo>"
+
+#: builtin/fetch.c:32
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]"
+
+#: builtin/fetch.c:33
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opzioni>]"
+
+#: builtin/fetch.c:125 builtin/pull.c:203
+msgid "fetch from all remotes"
+msgstr "esegui il fetch da tutti i remoti"
+
+#: builtin/fetch.c:127 builtin/pull.c:206
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli"
+
+#: builtin/fetch.c:129 builtin/pull.c:209
+msgid "path to upload pack on remote end"
+msgstr "percorso in cui caricare il pack sul remoto"
+
+#: builtin/fetch.c:130
+msgid "force overwrite of local reference"
+msgstr "forza la sovrascrittura del riferimento locale"
+
+#: builtin/fetch.c:132
+msgid "fetch from multiple remotes"
+msgstr "esegui il fetch da più remoti"
+
+#: builtin/fetch.c:134 builtin/pull.c:213
+msgid "fetch all tags and associated objects"
+msgstr "esegui il fetch di tutti i tag e degli oggetti associati"
+
+#: builtin/fetch.c:136
+msgid "do not fetch all tags (--no-tags)"
+msgstr "non eseguire il fetch di alcun tag (--no-tags)"
+
+#: builtin/fetch.c:138
+msgid "number of submodules fetched in parallel"
+msgstr "numero di sottomoduli recuperati in parallelo"
+
+#: builtin/fetch.c:140 builtin/pull.c:216
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+"elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto"
+
+#: builtin/fetch.c:142
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"elimina i tag locali non più presenti sul remoto e sovrascrivi i tag "
+"modificati"
+
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+msgid "on-demand"
+msgstr "a richiesta"
+
+#: builtin/fetch.c:144
+msgid "control recursive fetching of submodules"
+msgstr "controlla il recupero ricorsivo dei sottomoduli"
+
+#: builtin/fetch.c:148 builtin/pull.c:224
+msgid "keep downloaded pack"
+msgstr "mantieni il pack scaricato"
+
+#: builtin/fetch.c:150
+msgid "allow updating of HEAD ref"
+msgstr "consenti l'aggiornamento del riferimento HEAD"
+
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+msgid "deepen history of shallow clone"
+msgstr "aumenta la profondità della cronologia di un clone shallow"
+
+#: builtin/fetch.c:155
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+"aumenta la profondità della cronologia di un clone shallow in base al tempo"
+
+#: builtin/fetch.c:161 builtin/pull.c:230
+msgid "convert to a complete repository"
+msgstr "converti in un repository completo"
+
+#: builtin/fetch.c:164
+msgid "prepend this to submodule path output"
+msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
+
+#: builtin/fetch.c:167
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"impostazione predefinita per il recupero ricorsivo dei sottomoduli (a "
+"priorità minore rispetto ai file di configurazione)"
+
+#: builtin/fetch.c:171 builtin/pull.c:233
+msgid "accept refs that update .git/shallow"
+msgstr "accetta i riferimenti che aggiornano .git/shallow"
+
+#: builtin/fetch.c:172 builtin/pull.c:235
+msgid "refmap"
+msgstr "mappa riferimenti"
+
+#: builtin/fetch.c:173 builtin/pull.c:236
+msgid "specify fetch refmap"
+msgstr "specifica la mappa dei riferimenti per il fetch"
+
+#: builtin/fetch.c:180
+msgid "report that we have only objects reachable from this object"
+msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto"
+
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "esegui 'gc --auto' dopo il fetch"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati"
+
+#: builtin/fetch.c:491
+msgid "Couldn't find remote ref HEAD"
+msgstr "Impossibile trovare l'HEAD del riferimento remoto"
+
+#: builtin/fetch.c:630
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s"
+
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "oggetto %s non trovato"
-#: builtin/fetch.c:259
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[aggiornato]"
-#: builtin/fetch.c:273
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
-msgstr ""
-
-#: builtin/fetch.c:274 builtin/fetch.c:360
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
-msgstr "[respinto]"
+msgstr "[rifiutato]"
-#: builtin/fetch.c:285
+#: builtin/fetch.c:746
+msgid "can't fetch in current branch"
+msgstr "impossibile eseguire il fetch nel branch corrente"
+
+#: builtin/fetch.c:756
msgid "[tag update]"
-msgstr "[tag aggiornata]"
+msgstr "[tag aggiornato]"
-#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
-msgid " (unable to update local ref)"
-msgstr " (impossibile aggiornare il ref locale)"
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
+msgid "unable to update local ref"
+msgstr "impossibile aggiornare il riferimento locale"
-#: builtin/fetch.c:305
+#: builtin/fetch.c:761
+msgid "would clobber existing tag"
+msgstr "sovrascriverebbe il tag esistente"
+
+#: builtin/fetch.c:783
msgid "[new tag]"
-msgstr "[nuova tag]"
+msgstr "[nuovo tag]"
-#: builtin/fetch.c:308
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nuovo branch]"
-#: builtin/fetch.c:311
+#: builtin/fetch.c:789
msgid "[new ref]"
-msgstr "[nuovo ref]"
+msgstr "[nuovo riferimento]"
-#: builtin/fetch.c:356
-msgid "unable to update local ref"
-msgstr "impossibile aggiornare il ref locale"
-
-#: builtin/fetch.c:356
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "aggiornamento forzato"
-#: builtin/fetch.c:362
-msgid "(non-fast-forward)"
+#: builtin/fetch.c:833
+msgid "non-fast-forward"
+msgstr "non fast forward"
+
+#: builtin/fetch.c:854
+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 ""
+"Il fetch normalmente indica quali branch siano stati sottoposti ad\n"
+"aggiornamento forzato, ma tale controllo è stato disabilitato. Per\n"
+"riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
+"fetch.showForcedUpdates true'."
-#: builtin/fetch.c:393 builtin/fetch.c:685
+#: builtin/fetch.c:858
#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "impossibile aprire %s: %s\n"
+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 ""
+"Sono stati richiesti %.2f secondi per controllare la presenza di eventuali\n"
+"aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n"
+"'git config fetch.showForcedUpdates false' per omettere questo controllo.\n"
-#: builtin/fetch.c:402
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s non ha inviato tutti gli oggetti necessari\n"
-#: builtin/fetch.c:488
+#: builtin/fetch.c:909
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "%s rifiutato perché non è consentito aggiornare radici shallow"
+
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Da %.*s\n"
-#: builtin/fetch.c:499
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-"non è stato possibile aggiornare alcuni ref locali; prova con\n"
-" 'git remote prune %s' per rimuovere ogni branch che vada in conflitto"
+"non è stato possibile aggiornare alcuni riferimenti locali; prova ad "
+"eseguire\n"
+" 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
-#: builtin/fetch.c:549
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
-msgstr ""
+msgstr " (%s diventerà pendente)"
-#: builtin/fetch.c:550
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
-msgstr ""
+msgstr " (%s è diventato pendente)"
-#: builtin/fetch.c:557
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[eliminato]"
-#: builtin/fetch.c:558 builtin/remote.c:1055
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nessuno)"
-#: builtin/fetch.c:675
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
+"Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non "
+"bare"
-#: builtin/fetch.c:709
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr ""
-
-#: builtin/fetch.c:786
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr ""
+msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s"
-#: builtin/fetch.c:789
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'opzione \"%s\" è ignorata per %s\n"
-#: builtin/fetch.c:888
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
-msgstr ""
+msgstr "Recupero di %s in corso\n"
-#: builtin/fetch.c:890 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
-msgstr ""
+msgstr "Impossibile recuperare %s"
-#: builtin/fetch.c:907
+#: builtin/fetch.c:1532
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
+msgstr ""
+"--filter può essere usato solo con il remoto configurato nelle estensioni."
+"partialClone"
+
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-"Nessun repository remoto specificato. Per favore, specifica un URL o\n"
-"il nome di un remote da cui prelevare nuove revisioni."
+"Non è stato specificato alcun repository remoto. Specifica un URL o il\n"
+"nome di un remoto da cui dovranno essere recuperate le nuove revisioni."
-#: builtin/fetch.c:927
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Devi specificare il nome di un tag."
-#: builtin/fetch.c:979
+#: builtin/fetch.c:1644
+msgid "Negative depth in --deepen is not supported"
+msgstr "Le profondità negative in --deepen non sono supportate"
+
+#: builtin/fetch.c:1646
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
+
+#: builtin/fetch.c:1651
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth e --unshallow non possono essere usati insieme."
+
+#: builtin/fetch.c:1653
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow su un repository completo non ha senso"
+
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all non richiede il repository come argomento"
+msgstr "fetch --all non richiede un repository come argomento"
-#: builtin/fetch.c:981
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
-msgstr ""
+msgstr "fetch --all non ha senso con degli specificatori riferimento"
-#: builtin/fetch.c:992
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
-msgstr ""
+msgstr "Remoto o gruppo remoti non esistente: %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
+"Recuperare un gruppo e specificare gli specificatori riferimento non ha senso"
-#: builtin/gc.c:63
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter può essere usato solo con il remoto configurato nelle estensioni."
+"partialclone"
+
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]"
+
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "popola il registro con al più <n> voci del registro breve"
+
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr "alias di --log (deprecato)"
+
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr "testo"
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr "usa <testo> come stringa iniziale del messaggio"
+
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr "file da cui leggere"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<opzioni>] [<pattern>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <oggetto>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+"racchiudi i segnaposto fra virgolette in modo da poterli usare in una shell"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+"racchiudi i segnaposto fra virgolette in modo da poterli usare con Perl"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+"racchiudi i segnaposto fra virgolette in modo da poterli usare con Python"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "racchiudi i segnaposto fra virgolette in modo da poterli usare con Tcl"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "visualizza solo <n> riferimenti corrispondenti"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
+msgid "respect format colors"
+msgstr "rispetta le stringhe di formato per i colori"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "stampa solo i riferimenti che puntano all'oggetto dato"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "stampa solo i riferimenti sottoposti a merge"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "stampa solo i riferimenti non sottoposti a merge"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "stampa solo i riferimenti contenenti il commit"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "stampa solo i riferimenti che non contengono il commit"
+
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "sconosciuto"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s non valido: '%s'"
+msgid "error in %s %s: %s"
+msgstr "errore in %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "avviso in %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "collegamento rotto da %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "tipo oggetto errato nel collegamento"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"collegamento rotto da %7s %s\n"
+" a %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "%s mancante %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "%s non raggiungibile %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "%s pendente %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "impossibile creare lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "impossibile terminare '%s'"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Controllo di %s in corso"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Controllo connessione in corso (%d oggetti)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Controllo di %s in corso %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "collegamenti rotti"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "radice %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "eseguito tag di %s %s (%s) in %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: oggetto corrotto o mancante"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: voce registro riferimenti non valida: %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Controllo registro riferimenti %s->%s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: puntatore SHA1 non valido: %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: non è un commit"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "avviso: nessun riferimento predefinito"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: oggetto corrotto o mancante: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: impossibile analizzare l'oggetto: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "file SHA1 non valido: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Controllo directory oggetti in corso"
+
+#: builtin/fsck.c:685
+msgid "Checking object directories"
+msgstr "Controllo directory oggetti in corso"
+
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Controllo collegamento %s"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "%s non valido"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s punta a qualcosa di strano (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: l'HEAD scollegato non punta a niente"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "avviso: %s punta a un branch non nato (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Controllo cache albero in corso"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: puntatore SHA1 non valido nella cache alberi"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "oggetto non albero nella cache alberi"
+
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<opzioni>] [<oggetto>...]"
+
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
+msgstr "visualizza oggetti non raggiungibili"
+
+#: builtin/fsck.c:788
+msgid "show dangling objects"
+msgstr "visualizza oggetti pendenti"
+
+#: builtin/fsck.c:789
+msgid "report tags"
+msgstr "segnala i tag"
+
+#: builtin/fsck.c:790
+msgid "report root nodes"
+msgstr "segnala i nodi radice"
+
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
+msgstr "rendi gli oggetti indice nodi head"
+
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
+msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)"
+
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
+msgstr "considera anche i pack e gli oggetti alternativi"
+
+#: builtin/fsck.c:794
+msgid "check only connectivity"
+msgstr "controlla solo la connessione"
+
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
+msgstr "abilita controlli più restrittivi"
+
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
+msgstr "scrivi oggetti pendenti in .git/lost-found"
+
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
+msgstr "visualizza l'avanzamento"
+
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
+msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
+
+#: builtin/fsck.c:859 builtin/index-pack.c:225
+msgid "Checking objects"
+msgstr "Controllo oggetti in corso"
+
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: oggetto mancante"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parametro non valido: atteso SHA1, presente '%s'"
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr "git gc [<opzioni>]"
#: builtin/gc.c:90
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr ""
+msgid "Failed to fstat %s: %s"
+msgstr "fstat di %s non riuscito: %s"
-#: builtin/gc.c:221
+#: builtin/gc.c:126
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr ""
+msgid "failed to parse '%s' value '%s'"
+msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita"
-#: builtin/gc.c:224
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "impossibile eseguire lo stat di '%s'"
+
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#, c-format
+msgid "cannot read '%s'"
+msgstr "impossibile leggere '%s'"
+
+#: builtin/gc.c:492
#, c-format
msgid ""
-"Auto packing the repository for optimum performance. You may also\n"
-"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+"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 ""
+"L'ultima esecuzione di gc ha segnalato quanto segue. Correggi la causa\n"
+"alla radice ed elimina %s.\n"
+"L'operazione di pulizia automatica non sarà eseguita fino all'eliminazione\n"
+"del file.\n"
+"\n"
+"%s"
-#: builtin/gc.c:251
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
+msgstr "elimina oggetti non referenziati"
+
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
+msgstr "sii più accurato (tempi di esecuzione maggiori)"
+
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
+msgstr "abilita modalità garbage collector automatica"
+
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+"forza l'esecuzione del garbage collector anche nel caso in cui ve ne "
+"potrebbe essere un altro in esecuzione"
+
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
+msgstr ""
+"esegui il repack di tutti gli altri pack ad eccezione di quello più grande"
+
+#: builtin/gc.c:566
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "analisi del valore %s di gc.logexpiry non riuscita"
+
+#: builtin/gc.c:577
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita"
+
+#: builtin/gc.c:597
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+"Comprimo il repository in background per ottenere le migliori prestazioni.\n"
+
+#: builtin/gc.c:599
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n"
+
+#: builtin/gc.c:600
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n"
+
+#: builtin/gc.c:640
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se "
+"non lo è)"
+
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
+"Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per "
+"eliminarli."
-#: builtin/grep.c:216
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+"git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]"
+
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: creazione del thread non riuscita: %s"
-#: builtin/grep.c:402
+#: builtin/grep.c:279
#, c-format
-msgid "Failed to chdir: %s"
-msgstr ""
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "specificato numero non valido di thread (%d) per %s"
-#: builtin/grep.c:478 builtin/grep.c:512
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "non vi è supporto per i thread, ignoro %s"
+
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossibile leggere il tree (%s)"
-#: builtin/grep.c:526
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
-msgstr ""
+msgstr "impossibile eseguire grep su un oggetto di tipo %s"
-#: builtin/grep.c:584
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch '%c' richiede un valore numerico"
-#: builtin/grep.c:601
-#, c-format
-msgid "cannot open '%s'"
-msgstr "impossibile aprire '%s'"
+#: builtin/grep.c:813
+msgid "search in index instead of in the work tree"
+msgstr "cerca nell'index anziché nell'albero di lavoro"
+
+#: builtin/grep.c:815
+msgid "find in contents not managed by git"
+msgstr "la ricerca nei contenuti non è gestita da Git"
+
+#: builtin/grep.c:817
+msgid "search in both tracked and untracked files"
+msgstr "cerca sia nei file tracciati sia in quelli non tracciati"
+
+#: builtin/grep.c:819
+msgid "ignore files specified via '.gitignore'"
+msgstr "ignora i file specificati in '.gitignore'"
+
+#: builtin/grep.c:821
+msgid "recursively search in each submodule"
+msgstr "cerca ricorsivamente in ogni sottomodulo"
+
+#: builtin/grep.c:824
+msgid "show non-matching lines"
+msgstr "visualizza le righe non corrispondenti"
+
+#: builtin/grep.c:826
+msgid "case insensitive matching"
+msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
+
+#: builtin/grep.c:828
+msgid "match patterns only at word boundaries"
+msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
+
+#: builtin/grep.c:830
+msgid "process binary files as text"
+msgstr "elabora i file binari come testuali"
+
+#: builtin/grep.c:832
+msgid "don't match patterns in binary files"
+msgstr "non cercare corrispondenze ai pattern nei file binari"
+
+#: builtin/grep.c:835
+msgid "process binary files with textconv filters"
+msgstr "elabora i file binari con filtri di conversione in testo"
+
+#: builtin/grep.c:837
+msgid "search in subdirectories (default)"
+msgstr "cerca nelle sottodirectory (impostazione predefinita)"
+
+#: builtin/grep.c:839
+msgid "descend at most <depth> levels"
+msgstr "scendi al più di <profondità> livelli"
+
+#: builtin/grep.c:843
+msgid "use extended POSIX regular expressions"
+msgstr "usa espressioni regolari POSIX estese"
+
+#: builtin/grep.c:846
+msgid "use basic POSIX regular expressions (default)"
+msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
+
+#: builtin/grep.c:849
+msgid "interpret patterns as fixed strings"
+msgstr "interpreta i pattern come stringhe fisse"
+
+#: builtin/grep.c:852
+msgid "use Perl-compatible regular expressions"
+msgstr "usa espressioni regolari compatibili con Perl"
+
+#: builtin/grep.c:855
+msgid "show line numbers"
+msgstr "visualizza numeri di riga"
+
+#: builtin/grep.c:856
+msgid "show column number of first match"
+msgstr "visualizza il numero di colonna della prima corrispondenza"
+
+#: builtin/grep.c:857
+msgid "don't show filenames"
+msgstr "non visualizzare i nomi file"
+
+#: builtin/grep.c:858
+msgid "show filenames"
+msgstr "visualizza i nomi file"
+
+#: builtin/grep.c:860
+msgid "show filenames relative to top directory"
+msgstr "visualizza i nomi file relativi alla directory di primo livello"
+
+#: builtin/grep.c:862
+msgid "show only filenames instead of matching lines"
+msgstr "visualizza solo i nomi file anziché le righe corrispondenti"
+
+#: builtin/grep.c:864
+msgid "synonym for --files-with-matches"
+msgstr "sinonimo di --files-with-matches"
+
+#: builtin/grep.c:867
+msgid "show only the names of files without match"
+msgstr "visualizza solo i nomi dei file non corrispondenti"
+
+#: builtin/grep.c:869
+msgid "print NUL after filenames"
+msgstr "stampa NUL dopo i nomi file"
+
+#: builtin/grep.c:872
+msgid "show only matching parts of a line"
+msgstr "visualizza solo le parti corrispondenti di una riga"
+
+#: builtin/grep.c:874
+msgid "show the number of matches instead of matching lines"
+msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti"
+
+#: builtin/grep.c:875
+msgid "highlight matches"
+msgstr "evidenzia corrispondenze"
+
+#: builtin/grep.c:877
+msgid "print empty line between matches from different files"
+msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
+
+#: builtin/grep.c:879
+msgid "show filename only once above matches from same file"
+msgstr ""
+"visualizza il nome file solo una volta prima delle corrispondenze nello "
+"stesso file"
+
+#: builtin/grep.c:882
+msgid "show <n> context lines before and after matches"
+msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze"
#: builtin/grep.c:885
-msgid "no pattern given."
-msgstr "nessun modello specificato."
+msgid "show <n> context lines before matches"
+msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
-#: builtin/grep.c:899
+#: builtin/grep.c:887
+msgid "show <n> context lines after matches"
+msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
+
+#: builtin/grep.c:889
+msgid "use <n> worker threads"
+msgstr "usa <n> thread di lavoro"
+
+#: builtin/grep.c:890
+msgid "shortcut for -C NUM"
+msgstr "scorciatoia per -C NUM"
+
+#: builtin/grep.c:893
+msgid "show a line with the function name before matches"
+msgstr "visualizza una riga con il nome funzione prima delle corrispondenze"
+
+#: builtin/grep.c:895
+msgid "show the surrounding function"
+msgstr "visualizza la funzione circostante"
+
+#: builtin/grep.c:898
+msgid "read patterns from file"
+msgstr "leggi le corrispondenze da un file"
+
+#: builtin/grep.c:900
+msgid "match <pattern>"
+msgstr "cerca corrispondenze con <pattern>"
+
+#: builtin/grep.c:902
+msgid "combine patterns specified with -e"
+msgstr "combina i pattern specificati con -e"
+
+#: builtin/grep.c:914
+msgid "indicate hit with exit status without output"
+msgstr ""
+"segnala una corrispondenza con il codice di uscita senza emettere output"
+
+#: builtin/grep.c:916
+msgid "show only matches from files that match all patterns"
+msgstr ""
+"visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per "
+"tutti i pattern"
+
+#: builtin/grep.c:918
+msgid "show parse tree for grep expression"
+msgstr "visualizza l'albero di analisi per l'espressione grep"
+
+#: builtin/grep.c:922
+msgid "pager"
+msgstr "pager"
+
+#: builtin/grep.c:922
+msgid "show matching files in the pager"
+msgstr "visualizza i file corrispondenti nel pager"
+
+#: builtin/grep.c:926
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "consenti"
+
+#: builtin/grep.c:990
+msgid "no pattern given"
+msgstr "nessun pattern specificato"
+
+#: builtin/grep.c:1026
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index o --untracked non possono essere usate con le revisioni"
+
+#: builtin/grep.c:1034
#, c-format
-msgid "bad object %s"
-msgstr "oggetto %s errato"
+msgid "unable to resolve revision: %s"
+msgstr "impossibile risolvere la revisione %s"
-#: builtin/grep.c:940
+#: builtin/grep.c:1065
+msgid "invalid option combination, ignoring --threads"
+msgstr "combinazione di opzioni non valida, ignoro --threads"
+
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+msgid "no threads support, ignoring --threads"
+msgstr "non vi è supporto per i thread, ignoro --threads"
+
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "specificato numero non valido di thread (%d)"
+
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager funziona solo sull'albero di lavoro"
+
+#: builtin/grep.c:1117
+msgid "option not supported with --recurse-submodules"
+msgstr "opzione non supportata con --recurse-submodules"
+
+#: builtin/grep.c:1123
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached o --untracked non possono essere usate con --no-index"
+
+#: builtin/grep.c:1129
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati"
+
+#: builtin/grep.c:1137
+msgid "both --cached and trees are given"
+msgstr "sono specificati sia --cached sia degli alberi"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
+"git hash-object [-t <tipo>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
-#: builtin/grep.c:963
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached o --untracked non può essere usato con --no-index."
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/grep.c:968
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index o --untracked non possono essere usate con le revisioni."
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "tipo oggetto"
-#: builtin/grep.c:971
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "scrivi l'oggetto nel database oggetti"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "leggi l'oggetto dallo standard input"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "salva il file così com'è senza filtri"
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
+"esegui semplicemente l'hash di dati inutili per creare oggetti corrotti al "
+"fine di eseguire il debug di Git"
-#: builtin/grep.c:979
-msgid "both --cached and trees are given."
-msgstr ""
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "elabora i file come se fossero in questo percorso"
-#: builtin/help.c:59
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr "stampa tutti i comandi disponibili"
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr "escludi le guide"
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr "stampa un elenco di guide utili"
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr "stampa i nomi di tutte le variabili di configurazione"
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr "visualizza la pagina man"
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr "visualizza il manuale nel browser Web"
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr "visualizza la pagina info"
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr "stampa la descrizione del comando"
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
+
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato di aiuto '%s' non riconosciuto"
-#: builtin/help.c:87
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Esecuzione di emacsclient non riuscita."
-#: builtin/help.c:100
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Verifica della versione di emacsclient non riuscita."
-#: builtin/help.c:108
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versione '%d' di emacsclient è troppo vecchia (<22)."
-#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "esecuzione di '%s' non riuscita: %s"
+msgid "failed to exec '%s'"
+msgstr "esecuzione di '%s' non riuscita"
-#: builtin/help.c:211
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -2786,7 +14047,7 @@
"'%s': path ad un visualizzatore man pages non supportato.\n"
"Usa invece 'man.<tool>.cmd'."
-#: builtin/help.c:223
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -2795,396 +14056,422 @@
"'%s': comando per visualizzatore man pages supportato.\n"
"Per favore usa 'man.<tool>.path' invece."
-#: builtin/help.c:287
-msgid "The most commonly used git commands are:"
-msgstr "I comandi git usati più di frequente sono:"
-
-#: builtin/help.c:355
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizzatore man sconosciuto."
-#: builtin/help.c:372
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "nessun visualizzatore man ha gestito la richiesta"
-#: builtin/help.c:380
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "nessun visualizzatore info ha gestito la richiesta"
-#: builtin/help.c:391
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
-msgid "'%s': not a documentation directory."
-msgstr "'%s': non è una directory della documentazione."
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' è un alias di '%s'"
-#: builtin/help.c:432 builtin/help.c:439
+#: builtin/help.c:448 git.c:365
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "stringa alias.%s non valida: %s"
+
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/help.c:453
-#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "'git %s è un alias di '%s'"
+#: builtin/help.c:491
+msgid "'git help config' for more information"
+msgstr "Vedi 'git help config' per maggiori informazioni"
-#: builtin/index-pack.c:169
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
-msgstr ""
+msgstr "tipo oggetto non corrispondente in %s"
-#: builtin/index-pack.c:189
-msgid "object of unexpected type"
-msgstr ""
+#: builtin/index-pack.c:205
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "non si è ricevuto l'oggetto atteso %s"
-#: builtin/index-pack.c:226
+#: builtin/index-pack.c:208
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "oggetto %s: atteso tipo %s, trovato %s"
+
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "impossibile riempire %d byte"
+msgstr[1] "impossibile riempire %d byte"
-#: builtin/index-pack.c:236
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF prematuro"
-#: builtin/index-pack.c:237
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "errore di lettura in input"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "usati più byte di quelli disponibili"
-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "pack troppo largo per la definizione corrente di off_t"
-#: builtin/index-pack.c:272
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossibile creare '%s'"
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr "il pack supera la dimensione massima consentita"
-#: builtin/index-pack.c:277
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossibile aprire il file pack '%s'"
-#: builtin/index-pack.c:291
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "la firma del pack non coincide"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:328
#, c-format
-msgid "pack has bad object at offset %lu: %s"
-msgstr ""
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versione pack %<PRIu32> non supportata"
-#: builtin/index-pack.c:405
+#: builtin/index-pack.c:346
#, c-format
-msgid "inflate returned %d"
-msgstr ""
-
-#: builtin/index-pack.c:450
-msgid "offset value overflow for delta base object"
-msgstr ""
-
-#: builtin/index-pack.c:458
-msgid "delta base offset is out of bound"
-msgstr ""
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "il pack ha un oggetto danneggiato all'offset %<PRIuMAX>: %s"
#: builtin/index-pack.c:466
#, c-format
+msgid "inflate returned %d"
+msgstr "inflate ha restituito il codice %d"
+
+#: builtin/index-pack.c:515
+msgid "offset value overflow for delta base object"
+msgstr "overflow del valore dell'offset base del delta"
+
+#: builtin/index-pack.c:523
+msgid "delta base offset is out of bound"
+msgstr "l'offset base del delta è fuori dall'intervallo consentito"
+
+#: builtin/index-pack.c:531
+#, c-format
msgid "unknown object type %d"
-msgstr "tipo di oggetto %d sconosciuto"
+msgstr "tipo oggetto %d sconosciuto"
-#: builtin/index-pack.c:495
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
-msgstr ""
+msgstr "impossibile eseguire pread sul file pack"
-#: builtin/index-pack.c:497
+#: builtin/index-pack.c:564
#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] ""
-msgstr[1] ""
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "fine del file pack prematura, %<PRIuMAX> byte mancante"
+msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti"
-#: builtin/index-pack.c:510
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
-msgstr ""
+msgstr "inconsistenza grave di inflate"
-#: builtin/index-pack.c:583
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "non è possibile leggere l'oggetto %s esistente"
-
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "TROVATA COLLISIONE SHA1 CON %s !"
-#: builtin/index-pack.c:598
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#, c-format
+msgid "unable to read %s"
+msgstr "impossibile leggere %s"
+
+#: builtin/index-pack.c:801
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s"
+
+#: builtin/index-pack.c:809
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "non è possibile leggere l'oggetto %s esistente"
+
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "oggetto blob %s non valido"
-#: builtin/index-pack.c:610
-#, c-format
-msgid "invalid %s"
-msgstr "%s non valido"
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
+msgid "fsck error in packed object"
+msgstr "errore fsck nell'oggetto sottoposto a pack"
-#: builtin/index-pack.c:612
-msgid "Error in object"
-msgstr "Errore nell'oggetto"
-
-#: builtin/index-pack.c:614
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili"
-#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "applicazione del delta non riuscita"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Ricezione degli oggetti"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indicizzazione degli oggetti"
-#: builtin/index-pack.c:872
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "il pack è corrotto (SHA1 non corrisponde)"
-#: builtin/index-pack.c:877
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
-msgstr ""
+msgstr "impossibile eseguire fstat sul file pack"
-#: builtin/index-pack.c:880
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
-msgstr ""
+msgstr "il pack ha dati inutili alla fine"
-#: builtin/index-pack.c:903
+#: builtin/index-pack.c:1172
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "confusione oltre ogni follia in parse_pack_objects()"
+
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Risoluzione dei delta"
-#: builtin/index-pack.c:954
-msgid "confusion beyond insanity"
-msgstr "confusione al di là della follia"
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "impossibile creare il thread: %s"
-#: builtin/index-pack.c:973
+#: builtin/index-pack.c:1246
+msgid "confusion beyond insanity"
+msgstr "confusione oltre ogni follia"
+
+#: builtin/index-pack.c:1252
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "completato con %d oggetto locale"
+msgstr[1] "completato con %d oggetti locali"
+
+#: builtin/index-pack.c:1264
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Checksum in coda inatteso per %s (disco corrotto?)"
+
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pack ha %d delta irrisolto"
msgstr[1] "pack ha %d delta irrisolti"
-#: builtin/index-pack.c:998
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
-msgstr ""
+msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)"
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'oggetto locale %s è corrotto"
-#: builtin/index-pack.c:1101
+#: builtin/index-pack.c:1402
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "il nome del file pack '%s' non termina con '.pack'"
+
+#: builtin/index-pack.c:1427
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "impossibile scrivere il file %s '%s'"
+
+#: builtin/index-pack.c:1435
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "impossibile chiudere il file %s scritto '%s'"
+
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "errore nella chiusura del file pack"
-#: builtin/index-pack.c:1114
-#, c-format
-msgid "cannot write keep file '%s'"
-msgstr "impossibile scrivere il file keep '%s'"
-
-#: builtin/index-pack.c:1122
-#, c-format
-msgid "cannot close written keep file '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "impossibile archiviare il file pack"
-#: builtin/index-pack.c:1146
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "impossibile archiviare index file"
-#: builtin/index-pack.c:1247
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "pack.indexversion=%<PRIu32> non valida"
+
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossibile aprire il file pack '%s' esistente"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
-msgstr ""
+msgstr "Impossibile aprire il file pack idx esistente per '%s'"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "non delta: %d oggetto"
msgstr[1] "non delta: %d oggetti"
-#: builtin/index-pack.c:1303
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "lunghezza della catena = %d: %lu oggetto"
msgstr[1] "lunghezza della catena = %d: %lu oggetti"
-#: builtin/index-pack.c:1330
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
-msgstr ""
+msgstr "impossibile tornare alla directory di lavoro corrente"
-#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
-#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s errato"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin non può essere usato senza --stdin"
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "il nome del file pack '%s' non termina con '.pack'"
+#: builtin/index-pack.c:1779
+msgid "--stdin requires a git repository"
+msgstr "--stdin richiede un repository Git"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify senza un nome del file pack specificato"
-#: builtin/init-db.c:35
-#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Non è stato possible rendere %s scrivibile dal gruppo"
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr "errore fsck negli oggetti sottoposti a pack"
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
-msgstr ""
-
-#: builtin/init-db.c:67
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "impossibile eseguire lo stat di '%s'"
-
-#: builtin/init-db.c:73
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
-msgstr ""
+msgstr "impossibile eseguire stat sul modello '%s'"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "impossibile aprire la directory '%s'"
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "impossibile leggere il link '%s'"
#: builtin/init-db.c:80
#, c-format
-msgid "cannot opendir '%s'"
-msgstr ""
-
-#: builtin/init-db.c:97
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr ""
-
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
-msgstr ""
-
-#: builtin/init-db.c:102
-#, c-format
msgid "cannot symlink '%s' '%s'"
-msgstr ""
+msgstr "impossibile creare il collegamento simbolico da '%s' a '%s'"
-#: builtin/init-db.c:106
+#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
-msgstr ""
+msgstr "impossibile copiare '%s' in '%s'"
-#: builtin/init-db.c:110
+#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
-msgstr ""
+msgstr "ignoro il modello %s"
-#: builtin/init-db.c:133
+#: builtin/init-db.c:121
#, c-format
-msgid "insanely long template path %s"
-msgstr ""
+msgid "templates not found in %s"
+msgstr "modelli non trovati in %s"
-#: builtin/init-db.c:141
+#: builtin/init-db.c:136
#, c-format
-msgid "templates not found %s"
-msgstr ""
+msgid "not copying templates from '%s': %s"
+msgstr "non copio i modelli da '%s': %s"
-#: builtin/init-db.c:154
-#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
-msgstr ""
-
-#: builtin/init-db.c:322 builtin/init-db.c:325
-#, c-format
-msgid "%s already exists"
-msgstr "%s esiste già"
-
-#: builtin/init-db.c:354
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "impossibile gestire il tipo di file %d"
-#: builtin/init-db.c:357
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "impossibile spostare %s in %s"
-#: builtin/init-db.c:362
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
-msgid "Could not create git link %s"
-msgstr "Non è stato possibile creare il link git %s"
+msgid "%s already exists"
+msgstr "%s esiste già"
-#.
-#. * TRANSLATORS: The first '%s' is either "Reinitialized
-#. * existing" or "Initialized empty", the second " shared" or
-#. * "", and the last '%s%s' is the verbatim directory name.
-#.
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Reinizializzato repository Git condiviso esistente in %s%s\n"
+
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Reinizializzato repository Git esistente in %s%s\n"
+
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Inizializzato repository Git condiviso vuoto in %s%s\n"
+
#: builtin/init-db.c:419
#, c-format
-msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s repository Git in %s%s\n"
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Inizializzato repository Git vuoto in %s%s\n"
-#: builtin/init-db.c:420
-msgid "Reinitialized existing"
-msgstr "Reinizializzato un esistente"
-
-#: builtin/init-db.c:420
-msgid "Initialized empty"
-msgstr "Inizializzato un"
-
-#: builtin/init-db.c:421
-msgid " shared"
-msgstr " condiviso"
-
-#: builtin/init-db.c:440
-msgid "cannot tell cwd"
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<directory-modello>] [--"
+"shared[=<permessi>]] [<directory>]"
-#: builtin/init-db.c:521 builtin/init-db.c:528
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr "permessi"
+
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "specifica che il repository Git deve essere condiviso con più utenti"
+
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
-msgstr ""
+msgstr "impossibile creare la directory %s"
-#: builtin/init-db.c:532
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
-msgstr ""
+msgstr "impossibile modificare la directory corrente in %s"
-#: builtin/init-db.c:554
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -3193,625 +14480,2456 @@
"%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-"
"dir=<directory>)"
-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
-msgstr "Impossibile accedere alla directory di lavoro corrente"
-
-#: builtin/init-db.c:585
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr ""
+msgstr "Impossibile accedere all'albero di lavoro '%s'"
-#: builtin/log.c:188
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<valore>])...] [<file>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "modifica i file sul posto"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "rimuovi spazi dalle stringhe finali vuote"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "dove collocare la nuova stringa finale"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "azione da eseguire se la stringa finale esiste già"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "azione da eseguire se la stringa finale è mancante"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "emetti in output solo le stringhe finali"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "non applicare le regole di configurazione"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "unisci i valori resi contigui dagli spazi bianchi"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "imposta le opzioni di analisi"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "non trattare la sequenza --- in modo speciale"
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "stringa finale"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "stringa/e finale/i da aggiungere"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer con --only-input non ha senso"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "nessun file di input specificato per la modifica sul posto"
+
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]"
+
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opzioni>] <oggetto>..."
+
+#: builtin/log.c:109
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "opzione --decorate non valida: %s"
+
+#: builtin/log.c:173
+msgid "show source"
+msgstr "visualizza sorgente"
+
+#: builtin/log.c:174
+msgid "Use mail map file"
+msgstr "Usa il file mappatura e-mail"
+
+#: builtin/log.c:176
+msgid "only decorate refs that match <pattern>"
+msgstr "decora solo i riferimenti corrispondenti a <pattern>"
+
+#: builtin/log.c:178
+msgid "do not decorate refs that match <pattern>"
+msgstr "non decorare i riferimenti corrispondenti a <pattern>"
+
+#: builtin/log.c:179
+msgid "decorate options"
+msgstr "opzioni decorazione"
+
+#: builtin/log.c:182
+msgid "Process line range n,m in file, counting from 1"
+msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1"
+
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output finale: %d %s\n"
-#: builtin/log.c:401 builtin/log.c:489
+#: builtin/log.c:534
#, c-format
-msgid "Could not read object %s"
-msgstr "Non è stato possibile leggere l'oggetto %s"
+msgid "git show %s: bad file"
+msgstr "git show %s: file non valido"
-#: builtin/log.c:513
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Unknown type: %d"
-msgstr "Tipo sconosciuto: %d"
+msgid "could not read object %s"
+msgstr "impossibile leggere l'oggetto %s"
-#: builtin/log.c:602
+#: builtin/log.c:668
+#, c-format
+msgid "unknown type: %d"
+msgstr "tipo sconosciuto: %d"
+
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers non ha alcun valore"
-#: builtin/log.c:676
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "il nome della directory di output è troppo lungo"
-#: builtin/log.c:687
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Impossibile aprire il file patch %s"
+msgid "cannot open patch file %s"
+msgstr "impossibile aprire il file patch %s"
-#: builtin/log.c:701
-msgid "Need exactly one range."
-msgstr ""
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "è necessario specificare esattamente un intervallo"
-#: builtin/log.c:709
-msgid "Not a range."
-msgstr ""
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "il valore non è un intervallo"
-#: builtin/log.c:786
-msgid "Cover letter needs email format"
-msgstr ""
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
-#: builtin/log.c:859
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "creazione del file lettera di accompagnamento non riuscita"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
-msgstr ""
+msgstr "valore in-reply-to folle: %s"
-#: builtin/log.c:932
-msgid "Two output directories?"
-msgstr "Due directory di output?"
+#: builtin/log.c:1186
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
-#: builtin/log.c:1153
+#: builtin/log.c:1244
+msgid "two output directories?"
+msgstr "due directory di output?"
+
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "bogus committer info %s"
-msgstr ""
+msgid "unknown commit %s"
+msgstr "commit %s sconosciuto"
-#: builtin/log.c:1198
-msgid "-n and -k are mutually exclusive."
-msgstr ""
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "impossibile risolvere '%s' come riferimento valido"
-#: builtin/log.c:1200
-msgid "--subject-prefix and -k are mutually exclusive."
-msgstr ""
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1208
+#: builtin/log.c:1374
+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 ""
+"impossibile recuperare l'upstream, se vuoi registrare automaticamente\n"
+"il commit di base usa git branch --set-upstream-to per tracciare un branch\n"
+"remoto.\n"
+"In alternativa puoi specificare manualmente il commit di base con\n"
+"--base=<ID commit di base>"
+
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
+msgstr "impossibile trovare esattamente la base del merge"
+
+#: builtin/log.c:1405
+msgid "base commit should be the ancestor of revision list"
+msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni"
+
+#: builtin/log.c:1409
+msgid "base commit shouldn't be in revision list"
+msgstr "il commit di base non dovrebbe essere nell'elenco revisioni"
+
+#: builtin/log.c:1462
+msgid "cannot get patch id"
+msgstr "impossibile ottenere l'ID della patch"
+
+#: builtin/log.c:1514
+msgid "failed to infer range-diff ranges"
+msgstr "inferenza degli intervalli range-diff non riuscita"
+
+#: builtin/log.c:1559
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "usa [PATCH n/m] anche con una singola patch"
+
+#: builtin/log.c:1562
+msgid "use [PATCH] even with multiple patches"
+msgstr "usa [PATCH] anche con più patch"
+
+#: builtin/log.c:1566
+msgid "print patches to standard out"
+msgstr "stampa le patch sullo standard output"
+
+#: builtin/log.c:1568
+msgid "generate a cover letter"
+msgstr "genera una lettera di accompagnamento"
+
+#: builtin/log.c:1570
+msgid "use simple number sequence for output file names"
+msgstr "usa una sequenza numerica semplice per i nomi file di output"
+
+#: builtin/log.c:1571
+msgid "sfx"
+msgstr "suff"
+
+#: builtin/log.c:1572
+msgid "use <sfx> instead of '.patch'"
+msgstr "usa <suff> anziché '.patch'"
+
+#: builtin/log.c:1574
+msgid "start numbering patches at <n> instead of 1"
+msgstr "inizia a numerare le patch da <n> anziché da 1"
+
+#: builtin/log.c:1576
+msgid "mark the series as Nth re-roll"
+msgstr "contrassegna la serie come l'n-esima versione revisionata"
+
+#: builtin/log.c:1578
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Usa [RFC PATCH] anziché [PATCH]"
+
+#: builtin/log.c:1581
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "Usa [<prefisso>] anziché [PATCH]"
+
+#: builtin/log.c:1584
+msgid "store resulting files in <dir>"
+msgstr "salva i file risultanti in <dir>"
+
+#: builtin/log.c:1587
+msgid "don't strip/add [PATCH]"
+msgstr "non eliminare/aggiungere [PATCH]"
+
+#: builtin/log.c:1590
+msgid "don't output binary diffs"
+msgstr "non mandare in output diff binari"
+
+#: builtin/log.c:1592
+msgid "output all-zero hash in From header"
+msgstr "manda in output un hash costituito da soli zeri nell'intestazione From"
+
+#: builtin/log.c:1594
+msgid "don't include a patch matching a commit upstream"
+msgstr "non includere una patch corrispondente a un commit upstream"
+
+#: builtin/log.c:1596
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+"visualizza il formato della patch anziché l'impostazione predefinita (patch "
+"+ stat)"
+
+#: builtin/log.c:1598
+msgid "Messaging"
+msgstr "Messaggistica"
+
+#: builtin/log.c:1599
+msgid "header"
+msgstr "intestazione"
+
+#: builtin/log.c:1600
+msgid "add email header"
+msgstr "aggiungi intestazione e-mail"
+
+#: builtin/log.c:1601 builtin/log.c:1603
+msgid "email"
+msgstr "e-mail"
+
+#: builtin/log.c:1601
+msgid "add To: header"
+msgstr "aggiungi intestazione A:"
+
+#: builtin/log.c:1603
+msgid "add Cc: header"
+msgstr "aggiungi intestazione Cc:"
+
+#: builtin/log.c:1605
+msgid "ident"
+msgstr "identità"
+
+#: builtin/log.c:1606
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il "
+"commit se assente)"
+
+#: builtin/log.c:1608
+msgid "message-id"
+msgstr "ID messaggio"
+
+#: builtin/log.c:1609
+msgid "make first mail a reply to <message-id>"
+msgstr "rendi la prima e-mail una risposta a <ID messaggio>"
+
+#: builtin/log.c:1610 builtin/log.c:1613
+msgid "boundary"
+msgstr "delimitatore"
+
+#: builtin/log.c:1611
+msgid "attach the patch"
+msgstr "allega la patch"
+
+#: builtin/log.c:1614
+msgid "inline the patch"
+msgstr "includi la patch nel messaggio"
+
+#: builtin/log.c:1618
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+"abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
+"profondo"
+
+#: builtin/log.c:1620
+msgid "signature"
+msgstr "firma"
+
+#: builtin/log.c:1621
+msgid "add a signature"
+msgstr "aggiungi una firma"
+
+#: builtin/log.c:1622
+msgid "base-commit"
+msgstr "commit di base"
+
+#: builtin/log.c:1623
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+"aggiungi le informazioni prerequisito per l'albero alla serie delle patch"
+
+#: builtin/log.c:1625
+msgid "add a signature from a file"
+msgstr "aggiungi una firma da file"
+
+#: builtin/log.c:1626
+msgid "don't print the patch filenames"
+msgstr "non stampare i nomi file delle patch"
+
+#: builtin/log.c:1628
+msgid "show progress while generating patches"
+msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
+
+#: builtin/log.c:1630
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+"visualizza le modifiche rispetto a <revisione> nella lettera di "
+"accompagnamento o in una patch singola"
+
+#: builtin/log.c:1633
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"visualizza le modifiche rispetto a <specificatore revisione> nella lettera "
+"di accompagnamento o in una patch singola"
+
+#: builtin/log.c:1635
+msgid "percentage by which creation is weighted"
+msgstr "percentuale in base a cui viene pesata la creazione"
+
+#: builtin/log.c:1710
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "riga ident non valida: %s"
+
+#: builtin/log.c:1725
+msgid "-n and -k are mutually exclusive"
+msgstr "le opzioni -n e -k sono mutuamente esclusive"
+
+#: builtin/log.c:1727
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive"
+
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only non ha senso"
-#: builtin/log.c:1210
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status non ha senso"
-#: builtin/log.c:1212
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check non ha senso"
-#: builtin/log.c:1235
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "standard output, o directory, quale dei due?"
-#: builtin/log.c:1237
+#: builtin/log.c:1860
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff richiede --cover-letter o una singola patch"
+
+#: builtin/log.c:1864
+msgid "Interdiff:"
+msgstr "Interdiff:"
+
+#: builtin/log.c:1865
#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Non è stato possibile creare la directory '%s'"
+msgid "Interdiff against v%d:"
+msgstr "Interdiff rispetto alla versione %d:"
-#: builtin/log.c:1390
-msgid "Failed to create output files"
-msgstr "Creazione dei file di output non riuscita"
+#: builtin/log.c:1871
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor richiede --range-diff"
-#: builtin/log.c:1494
+#: builtin/log.c:1875
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff richiede --cover-letter o una singola patch"
+
+#: builtin/log.c:1883
+msgid "Range-diff:"
+msgstr "Range-diff:"
+
+#: builtin/log.c:1884
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Range-diff rispetto alla versione %d:"
+
+#: builtin/log.c:1895
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "impossibile leggere il file firma '%s'"
+
+#: builtin/log.c:1931
+msgid "Generating patches"
+msgstr "Generazione delle patch in corso"
+
+#: builtin/log.c:1975
+msgid "failed to create output files"
+msgstr "creazione dei file di output non riuscita"
+
+#: builtin/log.c:2034
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
+
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
+"Impossibile trovare un branch remoto tracciato, specifica <upstream> "
+"manualmente.\n"
-#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opzioni>] [<file>...]"
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr "identifica lo stato del file con i tag"
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "usa lettere minuscole per i file che si 'assumono non modificati'"
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "usa lettere minuscole per i file 'fsmonitor clean'"
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr "visualizza file in cache nell'output (impostazione predefinita)"
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr "visualizza file eliminati nell'output"
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr "visualizza file modificati nell'output"
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr "visualizza altri file nell'output"
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr "visualizza file ignorati nell'output"
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr ""
+"visualizza il nome dell'oggetto \"contenuti nell'area di staging\" "
+"nell'output"
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr "visualizza i file nel filesystem che devono essere rimossi"
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr "visualizza solo i nomi delle directory 'altro'"
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr "visualizza i fine riga dei file"
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr "non visualizzare le directory vuote"
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr "visualizza file non sottoposti a merge nell'output"
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr "visualizza informazioni resolve-undo"
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr "salta i file corrispondenti a \"espressione regolare\""
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr "le espressioni regolari di esclusione sono lette da <file>"
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+"leggi espressioni regolari di esclusione aggiuntive specifiche per directory "
+"da <file>"
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr "aggiungi le esclusioni standard di Git"
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr "rendi l'output relativo alla directory radice del progetto"
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr "esegui ricorsivamente sui sottomoduli"
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "se dei <file> non sono nell'indice, consideralo un errore"
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr "espressione albero"
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+"fingi che i percorsi rimossi da <espressione albero> in poi siano ancora "
+"presenti"
+
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr "visualizza informazioni di debug"
+
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<eseguibile>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<riferimenti>...]]"
+
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr "non stampare l'URL del remoto"
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+msgid "exec"
+msgstr "eseguibile"
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr "percorso di git-upload-pack sull'host remoto"
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr "limitati ai tag"
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr "limitati alle head"
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr "non visualizzare i tag rimossi"
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr "tieni in considerazione url.<base>.insteadOf"
+
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+"esci con codice d'uscita 2 se non sono stati trovati riferimenti "
+"corrispondenti"
+
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "visualizza riferimento sottostante oltre all'oggetto a cui punta"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opzioni>] <espressione albero> [<percorso>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "visualizza solo alberi"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "esegui ricorsivamente nei sottoalberi"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "visualizza gli alberi durante la ricorsione"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "termina le voci con un byte NUL"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "includi dimensioni oggetto"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "elenca solo i nomi file"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "usa nomi percorso completi"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+"elenca l'intero albero; non solo la directory corrente (implica --full-name)"
+
+#: builtin/mailsplit.c:241
#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit %s sconosciuto"
+msgid "empty mbox: '%s'"
+msgstr "mbox vuota: '%s'"
-#: builtin/merge.c:90
+#: builtin/merge.c:55
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opzioni>] [<commit>...]"
+
+#: builtin/merge.c:56
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:57
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "lo switch 'm' richiede un valore"
-#: builtin/merge.c:127
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "l'opzione `%s' richiede un valore"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n"
-#: builtin/merge.c:128
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Le strategie disponibili sono:"
-#: builtin/merge.c:133
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Le strategie personalizzate disponibili sono:"
-#: builtin/merge.c:240
+#: builtin/merge.c:244 builtin/pull.c:151
+msgid "do not show a diffstat at the end of the merge"
+msgstr "non visualizzare un diffstat al termine del merge"
+
+#: builtin/merge.c:247 builtin/pull.c:154
+msgid "show a diffstat at the end of the merge"
+msgstr "visualizza un diffstat al termine del merge"
+
+#: builtin/merge.c:248 builtin/pull.c:157
+msgid "(synonym to --stat)"
+msgstr "(sinonimo di --stat)"
+
+#: builtin/merge.c:250 builtin/pull.c:160
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"aggiungi (al più <n>) voci dal registro breve al messaggio di commit del "
+"merge"
+
+#: builtin/merge.c:253 builtin/pull.c:166
+msgid "create a single commit instead of doing a merge"
+msgstr "crea un singolo commit anziché eseguire un merge"
+
+#: builtin/merge.c:255 builtin/pull.c:169
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "esegui un commit se il merge ha successo (impostazione predefinita)"
+
+#: builtin/merge.c:257 builtin/pull.c:172
+msgid "edit message before committing"
+msgstr "modifica il messaggio prima di eseguire il commit"
+
+#: builtin/merge.c:259
+msgid "allow fast-forward (default)"
+msgstr "consenti fast forward (impostazione predefinita)"
+
+#: builtin/merge.c:261 builtin/pull.c:179
+msgid "abort if fast-forward is not possible"
+msgstr "interrompi se il fast forward non è possibile"
+
+#: builtin/merge.c:265 builtin/pull.c:182
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "verifica che il commit specificato abbia una firma GPG valida"
+
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+msgid "strategy"
+msgstr "strategia"
+
+#: builtin/merge.c:267 builtin/pull.c:187
+msgid "merge strategy to use"
+msgstr "strategia di merge da usare"
+
+#: builtin/merge.c:268 builtin/pull.c:190
+msgid "option=value"
+msgstr "opzione=valore"
+
+#: builtin/merge.c:269 builtin/pull.c:191
+msgid "option for selected merge strategy"
+msgstr "opzione per la strategia di merge selezionata"
+
+#: builtin/merge.c:271
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "messaggio di commit del merge (per un merge non fast forward)"
+
+#: builtin/merge.c:278
+msgid "abort the current in-progress merge"
+msgstr "interrompi il merge attualmente in corso"
+
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro"
+
+#: builtin/merge.c:282
+msgid "continue the current in-progress merge"
+msgstr "continua il merge attualmente in corso"
+
+#: builtin/merge.c:284 builtin/pull.c:198
+msgid "allow merging unrelated histories"
+msgstr "consenti di unire cronologie non correlate"
+
+#: builtin/merge.c:290
+msgid "verify commit-msg hook"
+msgstr "verifica hook commit-msg"
+
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "non è stato possibile eseguire stash."
-#: builtin/merge.c:245
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "esecuzione di stash non riuscita"
-#: builtin/merge.c:250
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "non è un oggetto valido: %s"
-#: builtin/merge.c:269 builtin/merge.c:286
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree non riuscito"
-#: builtin/merge.c:316
+#: builtin/merge.c:386
msgid " (nothing to squash)"
-msgstr ""
+msgstr " (nulla di cui eseguire lo squash)"
-#: builtin/merge.c:329
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
-msgstr ""
+msgstr "Commit di squash -- non aggiorno HEAD\n"
-#: builtin/merge.c:361
-msgid "Writing SQUASH_MSG"
-msgstr "Scrittura di SQUASH_MSG"
-
-#: builtin/merge.c:363
-msgid "Finishing SQUASH_MSG"
-msgstr "Completamento di SQUASH_MSG"
-
-#: builtin/merge.c:386
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
-#: builtin/merge.c:437
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' non punta ad un commit"
-#: builtin/merge.c:536
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Stringa branch.%s.mergeoptions errata: %s"
-#: builtin/merge.c:629
-msgid "git write-tree failed to write a tree"
-msgstr ""
-
-#: builtin/merge.c:679
-msgid "failed to read the cache"
-msgstr "lettura della cache non riuscita"
-
-#: builtin/merge.c:697
-msgid "Unable to write index."
-msgstr "Impossibile scrivere index."
-
-#: builtin/merge.c:710
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
-msgstr ""
+msgstr "Non gestisco nulla che non sia il merge di due head."
-#: builtin/merge.c:724
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opzione per merge-recursive sconosciuta: -X%s"
+msgstr "Opzione sconosciuta per merge-recursive: -X%s"
-#: builtin/merge.c:738
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
-msgstr "non è possibile scrivere %s"
+msgstr "impossibile scrivere %s"
-#: builtin/merge.c:877
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Non è stato possibile leggere da '%s'"
-#: builtin/merge.c:886
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
+"Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n"
-#: builtin/merge.c:892
+#: 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"
-"Lines starting with '#' will be ignored, and an empty message aborts\n"
+msgstr ""
+"Inserisci un messaggio di commit per spiegare perché è necessario\n"
+"questo merge, in particolare se si esegue il merge di un upstream\n"
+"aggiornato in un topic branch.\n"
+"\n"
+
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Un messaggio vuoto interromperà il commit.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
+"Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
+"interromperà il commit.\n"
-#: builtin/merge.c:916
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Messaggio di commit vuoto."
-#: builtin/merge.c:928
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Splendido.\n"
-#: builtin/merge.c:993
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-"Merge automatico fallito; risolvi i conflitti ed eseguire il commit\n"
+"Merge automatico fallito; risolvi i conflitti ed esegui il commit\n"
"del risultato.\n"
-#: builtin/merge.c:1009
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' non è un commit"
-
-#: builtin/merge.c:1050
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Nessun branch corrente."
-#: builtin/merge.c:1052
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Nessun remote per il branch corrente."
-#: builtin/merge.c:1054
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Nessun upstream di default definito per il branch corrente."
-#: builtin/merge.c:1059
+#: builtin/merge.c:981
#, c-format
-msgid "No remote tracking branch for %s from %s"
-msgstr ""
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Nessun branch che tracci un remoto per %s da %s"
-#: builtin/merge.c:1146 builtin/merge.c:1303
+#: builtin/merge.c:1038
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valore errato '%s' nell'ambiente '%s'"
+
+#: builtin/merge.c:1141
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s"
+
+#: builtin/merge.c:1175
+msgid "not something we can merge"
+msgstr "non è qualcosa di cui possiamo eseguire il merge"
+
+#: builtin/merge.c:1278
+msgid "--abort expects no arguments"
+msgstr "--abort non richiede argomenti"
+
+#: builtin/merge.c:1282
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)."
+
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit non richiede argomenti"
+
+#: builtin/merge.c:1304
+msgid "--continue expects no arguments"
+msgstr "--continue non richiede argomenti"
+
+#: builtin/merge.c:1308
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)."
+
+#: builtin/merge.c:1324
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Non hai concluso il merge (MERGE_HEAD esiste).\n"
+"Esegui il commit delle modifiche prima di eseguire il merge."
+
+#: builtin/merge.c:1331
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
+"Esegui il commit delle modifiche prima di eseguire il merge."
+
+#: builtin/merge.c:1334
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)."
+
+#: builtin/merge.c:1348
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Non è possibile combinare --squash con --no-ff."
+
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Non è possibile combinare --squash con --commit."
+
+#: builtin/merge.c:1366
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
+
+#: builtin/merge.c:1383
+msgid "Squash commit into empty head not supported yet"
+msgstr "Lo squash di un commit in un'head vuota non è ancora supportato"
+
+#: builtin/merge.c:1385
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Un commit non fast forward non ha senso in un'head vuota"
+
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
-#: builtin/merge.c:1214
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Non c'è nessun merge da interrompere (manca MERGE_HEAD)"
-
-#: builtin/merge.c:1230 git-pull.sh:31
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
-msgstr ""
-"Il merge non è stato concluso (esiste MERGE_HEAD).\n"
-"Per favore, esegui il commit delle modifiche prima del merge."
-
-#: builtin/merge.c:1233 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)."
-
-#: builtin/merge.c:1237
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
-msgstr ""
-"Il cherry-pick non è stato concluso (esiste CHERRY_PICK_HEAD).\n"
-"Per favore, esegui il commit delle modifiche prima del merge."
-
-#: builtin/merge.c:1240
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Il tuo cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)."
-
-#: builtin/merge.c:1249
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Impossibile combinare --squash con --no-off."
-
-#: builtin/merge.c:1254
-msgid "You cannot combine --no-ff with --ff-only."
-msgstr "Impossibile combinare --no-ff con --ff-only."
-
-#: builtin/merge.c:1261
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Nessun commit specificato e merge.defaultToUpstream non definito."
-
-#: builtin/merge.c:1293
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
-msgstr ""
+msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota"
-#: builtin/merge.c:1296
-msgid "Squash commit into empty head not supported yet"
-msgstr ""
+#: builtin/merge.c:1471
+msgid "refusing to merge unrelated histories"
+msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
-#: builtin/merge.c:1298
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
+#: builtin/merge.c:1480
+msgid "Already up to date."
+msgstr "Già aggiornato."
-#: builtin/merge.c:1413
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aggiornamento di %s..%s\n"
-#: builtin/merge.c:1451
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr ""
+msgstr "Provo con un merge veramente banale dentro l'indice...\n"
-#: builtin/merge.c:1458
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1490
-msgid "Not possible to fast-forward, aborting."
-msgstr "Fast-forward non possibile, stop."
+#: builtin/merge.c:1564
+msgid "Already up to date. Yeeah!"
+msgstr "Già aggiornato. Oh sì!"
-#: builtin/merge.c:1513 builtin/merge.c:1592
+#: builtin/merge.c:1570
+msgid "Not possible to fast-forward, aborting."
+msgstr "Fast forward non possibile, interrompo l'operazione."
+
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
-msgstr ""
+msgstr "Ripristino l'albero in uno stato pulito...\n"
-#: builtin/merge.c:1517
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Tentativo con la strategia di merge %s...\n"
-#: builtin/merge.c:1583
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Nessuna strategia di merge ha gestito il merge.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge con la strategia %s fallito.\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
-msgstr ""
+msgstr "Uso %s per preparare una risoluzione manuale.\n"
-#: builtin/merge.c:1606
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Il merge automatico è andato a buon fine; fermato prima del commit come "
"richiesto\n"
-#: builtin/mv.c:108
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <riferimento> [<commit>]"
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr "manda in output tutti gli antenati comuni"
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr "trova gli antenati per un singolo merge a n vie"
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr "elenca le revisioni non raggiungibili dalle altre"
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr "il primo argomento è antenato dell'altro?"
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+"trova il punto di fork di <commit> dal registro dei riferimenti di "
+"<riferimento>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] "
+"<file1> <file originale> <file2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "invia i risultati allo standard output"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usa un merge basato su diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "per i conflitti, usa la nostra versione"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "per i conflitti, usa la loro versione"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "per i conflitti, usa una versione unita"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "per i conflitti, usa questa dimensione dei contrassegni"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "non emettere avvisi in caso di conflitti"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "imposta etichette per file1/file originale/file2"
+
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
+msgstr "opzione sconosciuta %s"
+
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "impossibile analizzare l'oggetto '%s'"
+
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "impossibile gestire più di %d base. Ignoro %s."
+msgstr[1] "impossibile gestire più di %d basi. Ignoro %s."
+
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr "non gestisco nulla che non sia il merge di due head."
+
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "impossibile risolvere il riferimento '%s'"
+
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Merge di %s con %s in corso\n"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "l'input è terminato da NUL"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "consenti oggetti mancanti"
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "consenti la creazione di più di un albero"
+
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack "
+"--batch-size=<dimensione>)"
+
+#: builtin/multi-pack-index.c:23
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+"directory oggetti contenente un insieme di coppie packfile e pack-index"
+
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"durante il repack, raccogli i file pack di dimensioni più piccole in un "
+"gruppo più grande di queste dimensioni"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr "troppi argomenti"
+
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "l'opzione --batch-size è consentita solo per il sottocomando 'repack'"
+
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "sottocomando sconosciuto: %s"
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<opzioni>] <sorgente>... <destinazione>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "La directory %s è nell'indice e non è specificato un sottomodulo?"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per "
+"procedere"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s è nell'indice"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "forza spostamento/ridenominazione anche se la destinazione esiste"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "salta errori spostamento/ridenominazione"
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "la destinazione '%s' non è una directory"
+
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr ""
+msgstr "Controllo la ridenominazione di '%s' in '%s'\n"
-#: builtin/mv.c:112
+#: builtin/mv.c:184
msgid "bad source"
-msgstr ""
+msgstr "sourgente errata"
-#: builtin/mv.c:115
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "non è possibile spostare la directory in sé stessa"
-#: builtin/mv.c:118
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "non è possibile spostare la directory su un file"
-#: builtin/mv.c:128
-#, c-format
-msgid "Huh? %.*s is in index?"
-msgstr "Eh? %.*s si trova in index?"
-
-#: builtin/mv.c:140
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "la directory sorgente è vuota"
-#: builtin/mv.c:171
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "non è sotto controllo di versione"
-#: builtin/mv.c:173
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "la destinazione esiste"
-#: builtin/mv.c:181
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "sovrascrittura di %s in corso"
-#: builtin/mv.c:184
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Impossibile sovrascrivere"
-#: builtin/mv.c:187
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "fonti multiple per la stessa destinazione"
-#: builtin/mv.c:202
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr "la directory di destinazione non esiste"
+
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, sorgente=%s, destinazione=%s"
-#: builtin/mv.c:212
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Rinominazione di %s in %s in corso\n"
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "rinomina di '%s' non riuscita"
-#: builtin/notes.c:139
+#: builtin/name-rev.c:352
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opzioni>] <commit>..."
+
+#: builtin/name-rev.c:353
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opzioni>] --all"
+
+#: builtin/name-rev.c:354
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<opzioni>] --stdin"
+
+#: builtin/name-rev.c:411
+msgid "print only names (no SHA-1)"
+msgstr "stampa solo i nomi (non lo SHA-1)"
+
+#: builtin/name-rev.c:412
+msgid "only use tags to name the commits"
+msgstr "usa solo tag per denominare i commit"
+
+#: builtin/name-rev.c:414
+msgid "only use refs matching <pattern>"
+msgstr "usa solo i riferimenti corrispondenti a <pattern>"
+
+#: builtin/name-rev.c:416
+msgid "ignore refs matching <pattern>"
+msgstr "ignora i riferimenti corrispondenti a <pattern>"
+
+#: builtin/name-rev.c:418
+msgid "list all commits reachable from all refs"
+msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti"
+
+#: builtin/name-rev.c:419
+msgid "read from stdin"
+msgstr "leggi dallo standard input"
+
+#: builtin/name-rev.c:420
+msgid "allow to print `undefined` names (default)"
+msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)"
+
+#: builtin/name-rev.c:426
+msgid "dereference tags in the input (internal use)"
+msgstr "dereferenzia tag nell'input (uso interno)"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <riferimento note>] [list [<oggetto>]]"
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <riferimento note>] add [-f] [--allow-empty] [-m "
+"<messaggio> | -F <file> | (-c | -C) <oggetto>] [<oggetto>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+"git notes [--ref <riferimento note>] copy [-f] <oggetto sorgente> <oggetto "
+"destinazione>"
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <riferimento note>] append [--allow-empty] [-m <messaggio> "
+"| -F <file> | (-c | -C) <oggetto>] [<oggetto>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <riferimento note>] edit [--allow-empty] [<oggetto>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <riferimento note>] show [<oggetto>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <riferimento note>] merge [-v | -q] [-s <strategia>] "
+"<riferimento note>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <riferimento note>] remove [<oggetto>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <riferimento note>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <riferimento note>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<oggetto>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opzioni>] [<oggetto>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<oggetto>] <oggetto sorgente> <oggetto destinazione>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<oggetto sorgente> <oggetto destinazione>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opzioni>] [<oggetto>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<oggetto>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<oggetto>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opzioni>] <riferimento note>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opzioni>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opzioni>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<oggetto>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opzioni>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "Scrivi/modifica le note per l'oggetto seguente:"
+
+#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "impossibile avviare 'show' per l'oggetto '%s'"
-#: builtin/notes.c:145
-msgid "can't fdopen 'show' output fd"
-msgstr ""
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "impossibile leggere l'output di 'show'"
-#: builtin/notes.c:155
-#, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
-msgstr ""
-
-#: builtin/notes.c:158
+#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
-msgstr ""
+msgstr "impossibile terminare 'show' per l'oggetto '%s'"
-#: builtin/notes.c:175 builtin/tag.c:347
-#, c-format
-msgid "could not create file '%s'"
-msgstr "non è stato possibile creare il file '%s'"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "fornisci i contenuti delle note usando l'opzione -m o -F"
-#: builtin/notes.c:189
-msgid "Please supply the note contents using either -m or -F option"
-msgstr "Per favore specifica il contenuto delle note usando le opzioni -m o -F"
-
-#: builtin/notes.c:210 builtin/notes.c:973
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr "Rimozione della nota per l'oggetto %s\n"
-
-#: builtin/notes.c:215
+#: builtin/notes.c:206
msgid "unable to write note object"
msgstr "impossibile scrivere l'oggetto nota"
-#: builtin/notes.c:217
+#: builtin/notes.c:208
#, c-format
-msgid "The note contents has been left in %s"
-msgstr "Il contenuto della nota è stato lasciato in %s"
+msgid "the note contents have been left in %s"
+msgstr "i contenuti della nota sono stati lasciati in %s"
-#: builtin/notes.c:251 builtin/tag.c:542
-#, c-format
-msgid "cannot read '%s'"
-msgstr "impossibile leggere '%s'"
-
-#: builtin/notes.c:253 builtin/tag.c:545
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "non è stato possibile aprire o leggere '%s'"
-#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
+#: 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."
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "impossibile risolvere '%s' come riferimento valido."
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "lettura dell'oggetto '%s' non riuscita."
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "impossibile leggere i dati della nota dall'oggetto non blob '%s'."
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "riga di input malformata: '%s'."
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "copia delle note da '%s' a '%s' non riuscita"
+
+#. 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 ""
+"mi rifiuto di eseguire %s delle note in %s (al di fuori di refs/notes/)"
-#: builtin/notes.c:275
-#, c-format
-msgid "Failed to read object '%s'."
-msgstr "Lettura dell'oggetto '%s' non riuscita."
-
-#: builtin/notes.c:299
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr ""
-
-#: builtin/notes.c:340
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valore di notes.rewriteMode errato: '%s'"
-
-#: builtin/notes.c:350
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Impossibile riscrivere le note in %s (al di fuori di refs/notes/)"
-
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: builtin/notes.c:377
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Valore di %s errato: '%s'"
-
-#: builtin/notes.c:441
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Riga di input malformata: '%s'."
-
-#: builtin/notes.c:456
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Copia delle note da '%s' a '%s' non riuscita"
-
-#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:1033
+#: 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 "troppi parametri"
-#: builtin/notes.c:513 builtin/notes.c:772
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
-msgid "No note found for object %s."
-msgstr "Nessuna nota trovata per l'oggetto %s."
+msgid "no note found for object %s."
+msgstr "nessuna nota trovata per l'oggetto %s."
-#: builtin/notes.c:580
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "contenuti della nota come stringa"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "contenuti della nota in un file"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "riusa l'oggetto nota specificato per poi modificarlo"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "riusa l'oggetto nota specificato"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "consenti il salvataggio di una nota vuota"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "sostituisci le note esistenti"
+
+#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
+"Impossibile aggiungere note. Trovate note esistenti per l'oggetto %s. Usa '-"
+"f' per sovrascrivere le note esistenti"
-#: builtin/notes.c:585 builtin/notes.c:662
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Sovrascrittura delle note esistenti per l'oggetto %s\n"
-#: builtin/notes.c:635
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Rimozione della nota per l'oggetto %s\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "leggi oggetti dallo standard input"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+"carica la configurazione di riscrittura per <comando> (implica --stdin)"
+
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "troppi pochi parametri"
-#: builtin/notes.c:656
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-"Impossibile copiare le note. Trovate note esistenti per l'oggetto %s. Usa "
-"'-f' per sovrascrivere le note esistenti"
+"Impossibile copiare le note. Trovate note esistenti per l'oggetto %s. Usa '-"
+"f' per sovrascrivere le note esistenti"
-#: builtin/notes.c:668
+#: builtin/notes.c:550
#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
-msgstr "Note mancanti per l'oggetto sorgente %s. Impossibile copiare."
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "note mancanti per l'oggetto sorgente %s. Impossibile copiare."
-#: builtin/notes.c:717
+#: 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 ""
"Le opzioni -m/-F/-c/-C per il sottocomando 'edit' sono deprecate.\n"
-"Per favore usa 'git notes add -f -m/-F/-c/-C' invece.\n"
+"Usa 'git notes add -f -m/-F/-c/-C' al loro posto.\n"
-#: builtin/notes.c:971
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "eliminazione del riferimento NOTES_MERGE_PARTIAL non riuscita"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "eliminazione del riferimento NOTES_MERGE_REF non riuscita"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "rimozione dell'albero di lavoro di 'git notes merge' non riuscita"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "lettura del riferimento NOTES_MERGE_PARTIAL non riuscita"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "impossibile trovare il commit da NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "impossibile analizzare il commit da NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "risoluzione di NOTES_MERGE_REF non riuscita"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "finalizzazione del merge delle note non riuscita"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "strategia di merge delle note %s sconosciuta"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "Opzioni generali"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "Opzioni merge"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"risolvi i conflitti delle note usando la strategia data (manual/ours/theirs/"
+"union/cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "Commit delle note non sottoposte a merge"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+"finalizza il merge delle note eseguendo il commit delle note non sottoposte "
+"a merge"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Interruzione della risoluzione del merge delle note"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "interrompi il merge delle note"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "impossibile usare contemporaneamente --commit, --abort o -s/--strategy"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "devi specificare un riferimento note da sottoporre a merge"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "-s/--strategy sconosciuta: %s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "è già in corso un'operazione di merge delle note in %s al percorso %s"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+"salvataggio del collegamento al riferimento corrente delle note (%s) non "
+"riuscito"
+
+#: 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 ""
+"Merge automatico delle note non riuscito. Risolvi i conflitti in %s ed "
+"esegui il commit del risultato con 'git notes merge --commit' o interrompi "
+"il merge con 'git notes merge --abort'.\n"
+
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Risoluzione di '%s' come riferimento valido non riuscita."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "L'oggetto %s non ha note.\n"
-#: builtin/notes.c:1103 builtin/remote.c:1598
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sottocomando sconosciuto: %s"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "il tentativo di rimuovere una nota inesistente non è un errore"
-#: builtin/pack-objects.c:2337
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "leggi i nomi degli oggetti dallo standard input"
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr "non rimuovere, limitati a visualizzare"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "segnala le note eliminate"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "riferimento note"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "usa le note in <riferimento note>"
+
+#: builtin/notes.c:1034 builtin/stash.c:1598
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "sottocomando sconosciuto: %s"
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opzioni>...] [< <elenco riferimenti> | < <elenco "
+"oggetti>]"
+
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < "
+"<elenco oggetti>]"
+
+#: builtin/pack-objects.c:428
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "CRC oggetto sottoposto a pack %s errato"
+
+#: builtin/pack-objects.c:439
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "oggetto sottoposto a pack %s corrotto"
+
+#: builtin/pack-objects.c:570
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "rilevato delta ricorsivo per l'oggetto %s"
+
+#: builtin/pack-objects.c:781
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "%u oggetti ordinati, attesi %<PRIu32>"
+
+#: builtin/pack-objects.c:794
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr "packfile non valido: %s"
+
+#: builtin/pack-objects.c:798
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr "impossibile aprire il packfile per il suo riuso: %s"
+
+#: builtin/pack-objects.c:802
+msgid "unable to seek in reused packfile"
+msgstr "impossibile eseguire seek nel packfile riusato"
+
+#: builtin/pack-objects.c:813
+msgid "unable to read from reused packfile"
+msgstr "impossibile leggere dal packfile riusato"
+
+#: builtin/pack-objects.c:841
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"disabilito la scrittura delle bitmap, i pack sono divisi a causa "
+"dell'impostazione pack.packSizeLimit"
+
+#: builtin/pack-objects.c:854
+msgid "Writing objects"
+msgstr "Scrittura degli oggetti in corso"
+
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr "stat di %s non riuscito"
+
+#: builtin/pack-objects.c:970
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>"
+
+#: builtin/pack-objects.c:1166
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+"disabilito la scrittura delle bitmap perché alcuni oggetti non saranno "
+"sottoposti a pack"
+
+#: builtin/pack-objects.c:1597
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "overflow dell'offset base del delta nel pack per %s"
+
+#: builtin/pack-objects.c:1606
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "offset base del delta fuori dall'intervallo consentito per %s"
+
+#: builtin/pack-objects.c:1875
+msgid "Counting objects"
+msgstr "Conteggio degli oggetti in corso"
+
+#: builtin/pack-objects.c:2005
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossibile recuperare le dimensioni di %s"
+
+#: builtin/pack-objects.c:2020
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "impossibile analizzare l'intestazione oggetto di %s"
+
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
+#, c-format
+msgid "object %s cannot be read"
+msgstr "impossibile leggere l'oggetto %s"
+
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+"oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)"
+
+#: builtin/pack-objects.c:2130
+msgid "suboptimal pack - out of memory"
+msgstr "pack subottimo - memoria esaurita"
+
+#: builtin/pack-objects.c:2456
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Compressione delta in corso, uso fino a %d thread"
+
+#: builtin/pack-objects.c:2588
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s"
+
+#: builtin/pack-objects.c:2675
+msgid "Compressing objects"
+msgstr "Compressione oggetti in corso"
+
+#: builtin/pack-objects.c:2681
+msgid "inconsistency with delta count"
+msgstr "inconsistenza con il numero dei delta"
+
+#: builtin/pack-objects.c:2762
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"atteso ID oggetto arco, ricevuti dati errati:\n"
+" %s"
+
+#: builtin/pack-objects.c:2768
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"atteso ID oggetto, ricevuti dati errati:\n"
+" %s"
+
+#: builtin/pack-objects.c:2866
+msgid "invalid value for --missing"
+msgstr "valore non valido per --missing"
+
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+msgid "cannot open pack index"
+msgstr "impossibile aprire l'indice pack"
+
+#: builtin/pack-objects.c:2956
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "impossibile esaminare l'oggetto sciolto %s"
+
+#: builtin/pack-objects.c:3041
+msgid "unable to force loose object"
+msgstr "impossibile forzare l'oggetto sciolto"
+
+#: builtin/pack-objects.c:3133
+#, c-format
+msgid "not a rev '%s'"
+msgstr "'%s' non è una revisione"
+
+#: builtin/pack-objects.c:3136
+#, c-format
+msgid "bad revision '%s'"
+msgstr "revisione '%s' errata"
+
+#: builtin/pack-objects.c:3161
+msgid "unable to add recent objects"
+msgstr "impossibile aggiungere gli oggetti recenti"
+
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "versione %s di index non supportata"
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "versione '%s' di index errata"
-#: builtin/pack-objects.c:2364
-#, c-format
-msgid "option %s does not accept negative form"
-msgstr "l'opzione %s non accetta forme negative"
+#: builtin/pack-objects.c:3248
+msgid "do not show progress meter"
+msgstr "non visualizzare la barra di avanzamento"
-#: builtin/pack-objects.c:2368
-#, c-format
-msgid "unable to parse value '%s' for option %s"
-msgstr "impossibile analizzare il valore '%s' per l'opzione %s"
+#: builtin/pack-objects.c:3250
+msgid "show progress meter"
+msgstr "visualizza la barra di avanzamento"
-#: builtin/push.c:45
-msgid "tag shorthand without <tag>"
+#: builtin/pack-objects.c:3252
+msgid "show progress meter during object writing phase"
msgstr ""
+"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
-#: builtin/push.c:64
+#: builtin/pack-objects.c:3255
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento"
+
+#: builtin/pack-objects.c:3256
+msgid "<version>[,<offset>]"
+msgstr "<versione>[,<offset>]"
+
+#: builtin/pack-objects.c:3257
+msgid "write the pack index file in the specified idx format version"
+msgstr "scrivi il file indice pack usando la versione formato idx specificata"
+
+#: builtin/pack-objects.c:3260
+msgid "maximum size of each output pack file"
+msgstr "dimensione massima di ogni file pack in output"
+
+#: builtin/pack-objects.c:3262
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo"
+
+#: builtin/pack-objects.c:3264
+msgid "ignore packed objects"
+msgstr "ignora gli oggetti sottoposti a pack"
+
+#: builtin/pack-objects.c:3266
+msgid "limit pack window by objects"
+msgstr "limita la finestra di pack al numero di oggetti specificato"
+
+#: builtin/pack-objects.c:3268
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+"limita la finestra di pack alla memoria specificata in aggiunta al limite "
+"sugli oggetti"
+
+#: builtin/pack-objects.c:3270
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "lunghezza massima della catena di delta consentita nel pack risultante"
+
+#: builtin/pack-objects.c:3272
+msgid "reuse existing deltas"
+msgstr "riusa i delta esistenti"
+
+#: builtin/pack-objects.c:3274
+msgid "reuse existing objects"
+msgstr "riusa gli oggetti esistenti"
+
+#: builtin/pack-objects.c:3276
+msgid "use OFS_DELTA objects"
+msgstr "usa oggetti OFS_DELTA"
+
+#: builtin/pack-objects.c:3278
+msgid "use threads when searching for best delta matches"
+msgstr ""
+"usa più thread durante la ricerca delle migliori corrispondenze per i delta"
+
+#: builtin/pack-objects.c:3280
+msgid "do not create an empty pack output"
+msgstr "non creare un output pack vuoto"
+
+#: builtin/pack-objects.c:3282
+msgid "read revision arguments from standard input"
+msgstr "leggi gli argomenti revisione dallo standard input"
+
+#: builtin/pack-objects.c:3284
+msgid "limit the objects to those that are not yet packed"
+msgstr "limita gli oggetti a quelli non ancora sottoposti a pack"
+
+#: builtin/pack-objects.c:3287
+msgid "include objects reachable from any reference"
+msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
+
+#: builtin/pack-objects.c:3290
+msgid "include objects referred by reflog entries"
+msgstr "includi gli oggetti referenziati da voci del log riferimenti"
+
+#: builtin/pack-objects.c:3293
+msgid "include objects referred to by the index"
+msgstr "includi gli oggetti referenziati dall'indice"
+
+#: builtin/pack-objects.c:3296
+msgid "output pack to stdout"
+msgstr "invia il pack in output sullo standard output"
+
+#: builtin/pack-objects.c:3298
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+"includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a "
+"pack"
+
+#: builtin/pack-objects.c:3300
+msgid "keep unreachable objects"
+msgstr "mantieni gli oggetti non raggiungibili"
+
+#: builtin/pack-objects.c:3302
+msgid "pack loose unreachable objects"
+msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
+
+#: builtin/pack-objects.c:3304
+msgid "unpack unreachable objects newer than <time>"
+msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>"
+
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "usa l'algoritmo di raggiungibilità sparse"
+
+#: builtin/pack-objects.c:3309
+msgid "create thin packs"
+msgstr "crea pack thin"
+
+#: builtin/pack-objects.c:3311
+msgid "create packs suitable for shallow fetches"
+msgstr "crea pack adatti per fetch shallow"
+
+#: builtin/pack-objects.c:3313
+msgid "ignore packs that have companion .keep file"
+msgstr "ignora i pack che hanno un file .keep che li accompagna"
+
+#: builtin/pack-objects.c:3315
+msgid "ignore this pack"
+msgstr "ignora questo pack"
+
+#: builtin/pack-objects.c:3317
+msgid "pack compression level"
+msgstr "livello compressione pack"
+
+#: builtin/pack-objects.c:3319
+msgid "do not hide commits by grafts"
+msgstr "non nascondere i commit innestati"
+
+#: builtin/pack-objects.c:3321
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+"usa un indice bitmap se disponibile per velocizzare il conteggio degli "
+"oggetti"
+
+#: builtin/pack-objects.c:3323
+msgid "write a bitmap index together with the pack index"
+msgstr "scrivi un indice bitmap insieme all'indice pack"
+
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "scrivi un indice bitmap se possibile"
+
+#: builtin/pack-objects.c:3331
+msgid "handling for missing objects"
+msgstr "azione da eseguire sugli oggetti mancanti"
+
+#: builtin/pack-objects.c:3334
+msgid "do not pack objects in promisor packfiles"
+msgstr "non eseguire il pack degli oggetti nei file pack promettenti"
+
+#: builtin/pack-objects.c:3336
+msgid "respect islands during delta compression"
+msgstr "rispetta le isole durante la compressione delta"
+
+#: builtin/pack-objects.c:3361
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d"
+
+#: builtin/pack-objects.c:3366
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d"
+
+#: builtin/pack-objects.c:3420
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+"--max-pack-size non può essere usato per generare un pack da trasferire"
+
+#: builtin/pack-objects.c:3422
+msgid "minimum pack size limit is 1 MiB"
+msgstr "il limite minimo delle dimensioni dei pack è 1 MiB"
+
+#: builtin/pack-objects.c:3427
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin non può essere usato per generare un pack indicizzabile"
+
+#: builtin/pack-objects.c:3430
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili"
+
+#: builtin/pack-objects.c:3436
+msgid "cannot use --filter without --stdout"
+msgstr "impossibile usare --filter senza --stdout"
+
+#: builtin/pack-objects.c:3497
+msgid "Enumerating objects"
+msgstr "Enumerazione degli oggetti in corso"
+
+#: builtin/pack-objects.c:3527
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+"%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati "
+"(%<PRIu32> delta)"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<opzioni>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "esegui il pack di tutto"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "elimina i riferimenti sciolti (impostazione predefinita)"
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr "Rimozione oggetti duplicati in corso"
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<head>...]"
+
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr "segnala gli oggetti ripuliti"
+
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr "fai scadere oggetti più vecchi di <tempo>"
+
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "limita la visita agli oggetti al di fuori dei file pack promettenti"
+
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+"impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'"
+
+#: builtin/pull.c:66 builtin/pull.c:68
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valore non valido per %s: %s"
+
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
+
+#: builtin/pull.c:141
+msgid "control for recursive fetching of submodules"
+msgstr "controlla il recupero ricorsivo dei sottomoduli"
+
+#: builtin/pull.c:145
+msgid "Options related to merging"
+msgstr "Opzioni relative al merge"
+
+#: builtin/pull.c:148
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "incorpora le modifiche eseguendo un rebase anziché un merge"
+
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+msgid "allow fast-forward"
+msgstr "consenti fast forward"
+
+#: builtin/pull.c:185
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase"
+
+#: builtin/pull.c:201
+msgid "Options related to fetching"
+msgstr "Opzioni relative al fetch"
+
+#: builtin/pull.c:211
+msgid "force overwrite of local branch"
+msgstr "forza la sovrascrittura del branch locale"
+
+#: builtin/pull.c:219
+msgid "number of submodules pulled in parallel"
+msgstr "numero di sottomoduli recuperati in parallelo"
+
+#: builtin/pull.c:316
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Valore non valido per pull.ff: %s"
+
+#: builtin/pull.c:433
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
+"appena recuperati."
+
+#: builtin/pull.c:435
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti "
+"appena recuperati."
+
+#: builtin/pull.c:436
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"In generale, questo significa che hai fornito uno specificatore\n"
+"riferimento che non aveva corrispondenze nel remoto."
+
+#: builtin/pull.c:439
+#, 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 ""
+"Hai chiesto di eseguire un pull dal remoto '%s' ma non hai\n"
+"specificato un branch. Dal momento che questo non è il remoto\n"
+"configurato come predefinito per il branch corrente, devi\n"
+"specificare un branch sulla riga di comando."
+
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "Attualmente non sei su un branch."
+
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "Specifica il branch in base a cui vuoi effettuare il rebase."
+
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "Specifica il branch in base a cui vuoi effettuare il merge."
+
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "See git-pull(1) for details."
+msgstr "Vedi git-pull(1) per ulteriori dettagli."
+
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remoto>"
+
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<branch>"
+
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "Non ci sono informazioni di tracciamento per il branch corrente."
+
+#: builtin/pull.c:468 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Se vuoi impostare le informazioni di tracciamento per questo branch puoi "
+"farlo con:"
+
+#: builtin/pull.c:473
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"La tua configurazione specifica che deve essere eseguito\n"
+"il merge con il riferimento '%s' del remoto, ma un tale\n"
+"riferimento non è stato recuperato."
+
+#: builtin/pull.c:581
+#, c-format
+msgid "unable to access commit %s"
+msgstr "impossibile accedere al commit %s"
+
+#: builtin/pull.c:861
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignoro --verify-signature per il rebase"
+
+#: builtin/pull.c:916
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "l'opzione --[no-]autostash option è valida solo con --rebase."
+
+#: builtin/pull.c:924
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice."
+
+#: builtin/pull.c:928
+msgid "pull with rebase"
+msgstr "pull con rebase"
+
+#: builtin/pull.c:929
+msgid "please commit or stash them."
+msgstr "eseguine il commit o lo stash."
+
+#: builtin/pull.c:954
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"il fetch ha aggiornato l'head del\n"
+"branch corrente.\n"
+"Eseguo il fast forward dell'albero\n"
+"di lavoro dal commit %s."
+
+#: builtin/pull.c:960
+#, 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 ""
+"Impossibile eseguire il fast forward dell'albero\n"
+"di lavoro.\n"
+"Dopo esserti assicurato di aver salvato tutto ciò\n"
+"che è importante dall'output di\n"
+"$ git diff %s\n"
+"esegui\n"
+"$ git reset --hard\n"
+"per eseguire il ripristino."
+
+#: builtin/pull.c:975
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Impossibile eseguire il merge di più branch in un head vuoto."
+
+#: builtin/pull.c:979
+msgid "Cannot rebase onto multiple branches."
+msgstr "Impossibile eseguire il rebase su più branch."
+
+#: builtin/pull.c:986
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"impossibile eseguire il rebase se ci sono delle modifiche registrate "
+"localmente ai sottomoduli"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "esegui il tag della forma breve senza <tag>"
+
+#: builtin/push.c:121
msgid "--delete only accepts plain target ref names"
msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro"
-#: builtin/push.c:99
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
+"\n"
+"Per scegliere permanentemente una delle due opzioni, vedi push.default in "
+"'git help config'."
-#: builtin/push.c:102
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -3822,11 +16940,21 @@
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
-" git push %s %s\n"
+" git push %s HEAD\n"
"%s"
msgstr ""
+"Il branch upstream del branch attuale non corrisponde al\n"
+"nome del branch attuale. Per eseguire il push al branch upstream\n"
+"del remoto, usa\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"Per eseguire il push al branch con lo stesso nome del remoto, usa\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
-#: builtin/push.c:121
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -3835,8 +16963,13 @@
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
+"Attualmente non sei su un branch.\n"
+"Per eseguire ora il push della cronologia che ha condotto\n"
+"allo stato corrente (HEAD scollegato), usa\n"
+"\n"
+" git push %s HEAD:<nome del branch remoto>\n"
-#: builtin/push.c:128
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -3845,69 +16978,112 @@
" git push --set-upstream %s %s\n"
msgstr ""
"Il branch corrente %s non ha alcun branch upstream.\n"
-"Per eseguire il push del branch corrente ed impostare remote come upstream, usa\n"
+"Per eseguire il push del branch corrente ed impostare il remoto come "
+"upstream, usa\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:136
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "Il branch corrente %s ha branch multipli in upstream; push non eseguito."
+msgstr ""
+"Il branch corrente %s ha più branch upstream, mi rifiuto di eseguire il push."
-#: builtin/push.c:139
+#: builtin/push.c:210
#, 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 ""
+"Stai eseguendo il push al remoto '%s', che non è l'upstream del\n"
+"branch corrente '%s', senza dirmi di cosa devo eseguire il push\n"
+"per aggiornare quale branch remoto."
-#: builtin/push.c:174
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-"Non è stato specificato alcun refspec per il push, e push.default è \"nothing\"."
+"Non è stato specificato alcun refspec per il push, e push.default è \"nothing"
+"\"."
-#: builtin/push.c:181
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
-"before pushing again.\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 ""
+"Gli aggiornamenti sono stati rifiutati perché l'ultimo commit del branch\n"
+"attuale è rimasto indietro rispetto alla sua controparte remota.\n"
+"Integra le modifiche remote (ad es. con 'git pull ...') prima di\n"
+"eseguire nuovamente il push.\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
+"dettagli."
-#: builtin/push.c:187
+#: builtin/push.c:282
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration\n"
-"variable to 'current' or 'upstream' to push only the current branch."
-msgstr ""
-
-#: builtin/push.c:193
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge the remote changes\n"
-"(e.g. 'git pull') before pushing again.\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 ""
+"Gli aggiornamenti sono stati rifiutati perché l'ultimo commit di un\n"
+"branch di cui è stato eseguito il push è rimasto indietro rispetto\n"
+"alla sua controparte remota. Esegui il checkout di questo branch e\n"
+"integra le modifiche remote (ad es. con 'git pull ...') prima di\n"
+"eseguire nuovamente il push.\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
+"dettagli."
-#: builtin/push.c:233
+#: builtin/push.c:288
+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 ""
+"Gli aggiornamenti sono stati rifiutati perché il remoto contiene delle\n"
+"modifiche che non hai localmente. Ciò solitamente è causato da un push\n"
+"da un altro repository allo stesso riferimento. Potresti voler integrare\n"
+"le modifiche remote (ad es. con 'git pull ...') prima di eseguire\n"
+"nuovamente il push.\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
+"dettagli."
+
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+"Gli aggiornamenti sono stati rifiutati perché il tag esiste già nel remoto."
+
+#: builtin/push.c:298
+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 ""
+"Non puoi aggiornare un riferimento remoto che punta a un oggetto\n"
+"diverso da un commit o aggiornare un riferimento remoto per farlo\n"
+"puntare a un oggetto diverso da un commit senza usare l'opzione\n"
+"'--force'.\n"
+
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
-msgstr ""
+msgstr "Push su %s in corso\n"
-#: builtin/push.c:237
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr ""
+msgstr "push di alcuni riferimenti su '%s' non riuscito"
-#: builtin/push.c:269
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "repository '%s' errato"
-#: builtin/push.c:270
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -3929,34 +17105,1087 @@
"\n"
" git push <nome>\n"
-#: builtin/push.c:285
-msgid "--all and --tags are incompatible"
-msgstr "--all e --tags non sono compatibili"
+#: builtin/push.c:554
+msgid "repository"
+msgstr "repository"
-#: builtin/push.c:286
-msgid "--all can't be combined with refspecs"
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "esegui il push di tutti i riferimenti"
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "esegui il mirror di tutti i riferimenti"
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr "elimina riferimenti"
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)"
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "forza gli aggiornamenti"
+
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr "<nome riferimento>:<valore atteso>"
+
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
msgstr ""
+"richiedi che il vecchio valore del riferimento corrisponda a questo valore"
-#: builtin/push.c:291
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror e --tags non sono compatibili"
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr "controlla il push ricorsivo dei sottomoduli"
-#: builtin/push.c:292
-msgid "--mirror can't be combined with refspecs"
-msgstr ""
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "usa un thin pack"
-#: builtin/push.c:297
-msgid "--all and --mirror are incompatible"
-msgstr "--all e --mirror non sono compatibili"
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "programma ricezione pack"
-#: builtin/push.c:385
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "imposta l'upstream per git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "elimina i riferimenti rimossi localmente"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "ignora l'hook pre-push"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "esegui il push dei tag mancanti ma rilevanti"
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "firma il push con GPG"
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "richiedi l'atomicità della transazione al remoto"
+
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete non è compatibile con --all, --mirror e --tags"
-#: builtin/push.c:387
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete non ha senso senza alcun ref"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr "--all e --tags non sono compatibili"
+
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr "--all non può essere combinato con degli specificatori riferimento"
+
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror e --tags non sono compatibili"
+
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror non può essere combinato con degli specificatori riferimento"
+
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr "--all e --mirror non sono compatibili"
+
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr "le opzioni push non devono avere caratteri di fine riga"
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opzioni>] <vecchia base>..<vecchio ultimo commit> <nuova "
+"base>..<nuovo ultimo commit>"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+"git range-diff [<opzioni>] <vecchio ultimo commit>...<nuovo ultimo commit>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+"git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo "
+"commit>"
+
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr "Percentuale in base a cui viene pesata la creazione"
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr "usa colori semplici per il diff"
+
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr "nessun .. nell'intervallo: '%s'"
+
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
+msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico"
+
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
+msgstr "devono essere specificati due intervalli commit"
+
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefisso>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<file>] (--empty | <espressione albero 1> "
+"[<espressione albero 2> [<espressione albero 3>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "scrivi l'indice risultante in <file>"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "svuota solo l'indice"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "Merge"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "esegui il merge oltre a una lettura"
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "merge a tre vie se non sono richiesti merge a livello di file"
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "merge a tre vie se sono presenti aggiunte ed eliminazioni"
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "come -m, ma scarta le voci non sottoposte a merge"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<sottodirectory>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "leggi l'albero nell'indice in <sottodirectory>/"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "aggiorna l'albero di lavoro con il risultato del merge"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "consenti la sovrascrittura dei file ignorati esplicitamente"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "non controllare l'albero di lavoro dopo il merge"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "non aggiornare l'indice o l'albero di lavoro"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "salta l'applicazione del filtro checkout sparse"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "esegui il debug di unpack-trees"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "non visualizzare i messaggi di feedback"
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] "
+"[<upstream>] [<branch>]"
+
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] --root "
+"[<branch>]"
+
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "elenco todo inutilizzabile: '%s'"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "impossibile scrivere '%s'."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "nessun'HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "impossibile creare un %s temporaneo"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "impossibile contrassegnare come interattivo"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "impossibile generare l'elenco todo"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+"le opzioni --upstream o --onto richiedono che sia fornito un commit di base"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase --interactive [<opzioni>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "mantieni i commit vuoti"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "consenti commit con messaggi vuoti"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "esegui il rebase dei commit di merge"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "mantieni i punti di branch originali dei cugini"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "sposta i commit che iniziano con squash!/fixup!"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "firma i commit"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "visualizza un diffstat delle modifiche upstream"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "continua il rebase"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "salta il commit"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "modifica l'elenco todo"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "visualizza la patch corrente"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "abbrevia gli ID dei commit nell'elenco todo"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "espandi gli ID dei commit nell'elenco todo"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "controlla l'elenco todo"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "ridisponi le righe fixup/squash"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "inserisci i comandi exec nell'elenco todo"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "su"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "revisioni-limite"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "limita la revisione"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-su"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "esegui lo squash su"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "il commit upstream"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "nome head"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "nome head"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "strategia di rebase"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "opzioni strategia"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "opzioni strategia"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "passa a"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "il branch o il commit di cui eseguire il checkout"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "nome"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "sul nome"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "comando"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "il comando da eseguire"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges"
+
+#: builtin/rebase.c:534
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr "%s richiede un rebase interattivo"
+
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "impossibile ottenere 'onto': '%s'"
+
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "orig-head non valida: '%s'"
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'"
+
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
+msgstr "Impossibile leggere '%s'"
+
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
+msgstr "Impossibile memorizzare %s"
+
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "impossibile determinare la revisione HEAD"
+
+#: builtin/rebase.c:950 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 ""
+"Risolvi manualmente tutti i conflitti, contrassegnali come\n"
+"risolti con \"git add/rm <file in conflitto>\", quindi esegui\n"
+"\"git rebase --continue\".\n"
+"In alternativa, puoi saltare questo commit: esegui \"git rebase\n"
+"--skip\".\n"
+"Per interrompere l'operazione e tornare allo stato precedente\n"
+"il \"git rebase\", esegui \"git rebase --abort\"."
+
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"Git ha riscontrato un errore durante la preparazione delle patch\n"
+"per applicare nuovamente queste revisioni:\n"
+"\n"
+" %s\n"
+"\n"
+"Di conseguenza, Git non può eseguirne il rebase."
+
+#: builtin/rebase.c:1318
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Specifica il branch su cui effettuare il rebase.\n"
+"Vedi git-rebase(1) per i dettagli.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+
+#: builtin/rebase.c:1334
+#, 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 ""
+"Se vuoi impostare le informazioni di tracciamento per questo branch puoi "
+"farlo con:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "i comandi exec non possono contenere caratteri di fine riga"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "comando exec vuoto"
+
+#: builtin/rebase.c:1396
+msgid "rebase onto given branch instead of upstream"
+msgstr "esegui il rebase sul branch specificato anziché su quello upstream"
+
+#: builtin/rebase.c:1398
+msgid "allow pre-rebase hook to run"
+msgstr "consenti l'esecuzione dell'hook pre-rebase"
+
+#: builtin/rebase.c:1400
+msgid "be quiet. implies --no-stat"
+msgstr "sii silenzioso. implica --no-stat"
+
+#: builtin/rebase.c:1406
+msgid "do not show diffstat of what changed upstream"
+msgstr "non visualizzare un diffstat delle modifiche upstream"
+
+#: builtin/rebase.c:1409
+msgid "add a Signed-off-by: line to each commit"
+msgstr "aggiungi una riga Signed-off-by: a ogni commit"
+
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+msgid "passed to 'git am'"
+msgstr "passato a 'git am'"
+
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
+msgid "passed to 'git apply'"
+msgstr "passato a 'git apply'"
+
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati"
+
+#: builtin/rebase.c:1428
+msgid "continue"
+msgstr "continua"
+
+#: builtin/rebase.c:1431
+msgid "skip current patch and continue"
+msgstr "salta la patch corrente e continua"
+
+#: builtin/rebase.c:1433
+msgid "abort and check out the original branch"
+msgstr "interrompi ed esegui il checkout del branch originario"
+
+#: builtin/rebase.c:1436
+msgid "abort but keep HEAD where it is"
+msgstr "interrompi ma mantieni l'HEAD dov'è"
+
+#: builtin/rebase.c:1437
+msgid "edit the todo list during an interactive rebase"
+msgstr "modifica l'elenco todo durante un rebase interattivo"
+
+#: builtin/rebase.c:1440
+msgid "show the patch file being applied or merged"
+msgstr ""
+"visualizza il file patch che sta per essere applicato o sottoposto a merge"
+
+#: builtin/rebase.c:1443
+msgid "use merging strategies to rebase"
+msgstr "usa le strategie di merge per eseguire il rebase"
+
+#: builtin/rebase.c:1447
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+"consenti all'utente di modificare l'elenco dei commit di cui eseguire il "
+"rebase"
+
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli"
+
+#: builtin/rebase.c:1455
+msgid "preserve empty commits during rebase"
+msgstr "mantieni i commit vuoti durante il rebase"
+
+#: builtin/rebase.c:1457
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "sposta i commit che iniziano con squash!/fixup! in -i"
+
+#: builtin/rebase.c:1463
+msgid "automatically stash/stash pop before and after"
+msgstr "esegui stash/stash pop automaticamente prima e dopo"
+
+#: builtin/rebase.c:1465
+msgid "add exec lines after each commit of the editable list"
+msgstr "aggiungi righe exec dopo ogni commit della lista modificabile"
+
+#: builtin/rebase.c:1469
+msgid "allow rebasing commits with empty messages"
+msgstr "consenti il rebase di commit con messaggi vuoti"
+
+#: builtin/rebase.c:1472
+msgid "try to rebase merges instead of skipping them"
+msgstr "prova ad eseguire il rebase dei merge anziché saltarli"
+
+#: builtin/rebase.c:1475
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+"usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream"
+
+#: builtin/rebase.c:1477
+msgid "use the given merge strategy"
+msgstr "usa la strategia di merge specificata"
+
+#: builtin/rebase.c:1479 builtin/revert.c:115
+msgid "option"
+msgstr "opzione"
+
+#: builtin/rebase.c:1480
+msgid "pass the argument through to the merge strategy"
+msgstr "passa l'argomento alla strategia di merge"
+
+#: builtin/rebase.c:1483
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice"
+
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"il supporto per rebase.useBuiltin è stato rimosso!\n"
+"Vedi la voce relativa in 'git help config' per i dettagli."
+
+#: builtin/rebase.c:1506
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase."
+
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges."
+
+#: builtin/rebase.c:1551
+msgid "No rebase in progress?"
+msgstr "Nessun rebase in corso?"
+
+#: builtin/rebase.c:1555
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+"L'azione --edit-todo può essere usata solo durante un rebase interattivo."
+
+#: builtin/rebase.c:1578
+msgid "Cannot read HEAD"
+msgstr "Impossibile leggere l'HEAD"
+
+#: builtin/rebase.c:1590
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Devi modificare tutti i conflitti di merge e\n"
+"quindi contrassegnarli come risolti usando\n"
+"git add"
+
+#: builtin/rebase.c:1609
+msgid "could not discard worktree changes"
+msgstr "impossibile scartare le modifiche all'albero di lavoro"
+
+#: builtin/rebase.c:1628
+#, c-format
+msgid "could not move back to %s"
+msgstr "impossibile ritornare a %s"
+
+#: builtin/rebase.c:1673
+#, 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 ""
+"Sembra che esista già una directory %s e mi domando\n"
+"se tu sia già nel bel mezzo di un altro rebase. Se questo è il caso,\n"
+"prova con il comando\n"
+"\t%s\n"
+"Se questo non è il caso, esegui\n"
+"\t%s\n"
+"ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n"
+"salvato qualcosa di importante lì.\n"
+
+#: builtin/rebase.c:1694
+msgid "switch `C' expects a numerical value"
+msgstr "l'opzione `C` richiede un valore numerico"
+
+#: builtin/rebase.c:1735
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Modo sconosciuto: %s"
+
+#: builtin/rebase.c:1757
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy richiede --merge o --interactive"
+
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec richiede --exec o --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
+msgstr "non è possibile combinare le opzioni am con quelle interactive o merge"
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
+
+#: builtin/rebase.c:1832
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+"errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-"
+"exec'"
+
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'"
+
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "impossibile combinare '--rebase-merges' con '--strategy'"
+
+#: builtin/rebase.c:1865
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "upstream non valido: '%s'"
+
+#: builtin/rebase.c:1871
+msgid "Could not create new root commit"
+msgstr "Impossibile creare il nuovo commit radice"
+
+#: builtin/rebase.c:1889
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': è necessario specificare esattamente una base per il merge"
+
+#: builtin/rebase.c:1896
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "'%s' non punta a un commit valido"
+
+#: builtin/rebase.c:1921
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "errore fatale: branch/commit '%s' inesistente"
+
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid "No such ref: %s"
+msgstr "Riferimento non esistente: %s"
+
+#: builtin/rebase.c:1940
+msgid "Could not resolve HEAD to a revision"
+msgstr "Impossibile risolvere HEAD come revisione"
+
+#: builtin/rebase.c:1981
+msgid "Cannot autostash"
+msgstr "Impossibile eseguire lo stash automatico"
+
+#: builtin/rebase.c:1984
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Risposta stash non attesa: '%s'"
+
+#: builtin/rebase.c:1990
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossibile creare la directory '%s'"
+
+#: builtin/rebase.c:1993
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Stash automatico creato: %s\n"
+
+#: builtin/rebase.c:1996
+msgid "could not reset --hard"
+msgstr "impossibile eseguire reset --hard"
+
+#: builtin/rebase.c:1997 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ora si trova a %s"
+
+#: builtin/rebase.c:2013
+msgid "Please commit or stash them."
+msgstr "Eseguine il commit o lo stash."
+
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not parse '%s'"
+msgstr "impossibile analizzare '%s'"
+
+#: builtin/rebase.c:2053
+#, c-format
+msgid "could not switch to %s"
+msgstr "impossibile passare a %s"
+
+#: builtin/rebase.c:2064
+msgid "HEAD is up to date."
+msgstr "HEAD è aggiornato."
+
+#: builtin/rebase.c:2066
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Il branch corrente %s è aggiornato.\n"
+
+#: builtin/rebase.c:2074
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD è aggiornato, forzo il rebase."
+
+#: builtin/rebase.c:2076
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n"
+
+#: builtin/rebase.c:2084
+msgid "The pre-rebase hook refused to rebase."
+msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase."
+
+#: builtin/rebase.c:2091
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Modifiche a %s:\n"
+
+#: builtin/rebase.c:2094
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Modifiche da %s a %s:\n"
+
+#: builtin/rebase.c:2119
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+"Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di "
+"esso...\n"
+
+#: builtin/rebase.c:2128
+msgid "Could not detach HEAD"
+msgstr "Impossibile scollegare l'HEAD"
+
+#: builtin/rebase.c:2137
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Fast forward da %s a %s eseguito.\n"
+
+#: builtin/receive-pack.c:32
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <directory Git>"
+
+#: builtin/receive-pack.c:832
+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 ""
+"Per impostazione predefinita, l'aggiornamento del branch corrente\n"
+"in un repository non spoglio è negato, perché renderebbe l'indice\n"
+"e l'albero di lavoro inconsistenti con i dati di cui si è eseguito\n"
+"il push e richiederebbe 'git reset --hard' per ripristinare la\n"
+"corrispondenza dell'albero di lavoro con HEAD.\n"
+"\n"
+"Puoi impostare la variabile di configurazione\n"
+"'receive.denyCurrentBranch' a 'ignore' o 'warn' nel repository\n"
+"remoto per consentire il push nel branch corrente; ciò nonostante,\n"
+"questo non è raccomandato a meno che tu non provveda ad aggiornare\n"
+"il suo albero di lavoro in modo che corrisponda a ciò di cui hai\n"
+"eseguito il push in qualche altro modo.\n"
+"\n"
+"Per non visualizzare più questo messaggio e mantenere comunque\n"
+"il comportamento predefinito, imposta la variabile di\n"
+"configurazione 'receive.denyCurrentBranch' a 'refuse'."
+
+#: builtin/receive-pack.c:852
+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 ""
+"Per impostazione predefinita, l'eliminazione del branch corrente\n"
+"è negata, perché il prossimo 'git clone' farebbe sì che non venga\n"
+"eseguito il checkout di nessun file, causando confusione.\n"
+"\n"
+"Puoi impostare la variabile di configurazione\n"
+"'receive.denyDeleteCurrent' a 'warn' o 'ignore' nel repository\n"
+"remoto per consentire l'eliminazione del branch corrente, con o\n"
+"senza un messaggio d'avviso.\n"
+"\n"
+"Per non visualizzare più questo messaggio, puoi impostarla a\n"
+"'refuse'."
+
+#: builtin/receive-pack.c:1938
+msgid "quiet"
+msgstr "non visualizzare messaggi"
+
+#: builtin/receive-pack.c:1952
+msgid "You must specify a directory."
+msgstr "Devi specificare una directory."
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<tempo>] [--expire-unreachable=<tempo>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<riferimenti>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<riferimenti>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <riferimento>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' non è un timestamp valido"
+
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Contrassegno gli oggetti raggiungibili..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s non punta a niente!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "nessun registro riferimenti da eliminare specificato"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "non è un registro riferimenti: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "log riferimenti non esistente per '%s'"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "formato riferimento non valido: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nome> <URL>"
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <vecchio> <nuovo>"
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr "git remote remove <nome>"
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)"
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nome>"
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nome>"
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]"
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nome> <branch>..."
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nome>"
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nome> <nuovo URL>"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nome> <URL>"
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opzioni>] <nome> <URL>"
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nome> <branch>..."
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nome> <branch>..."
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opzioni>] <nome>"
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opzioni>] <nome>"
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..."
+
#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
@@ -3975,6 +18204,31 @@
msgid "unknown mirror argument: %s"
msgstr "argomento di mirror sconosciuto: %s"
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr "recupera i branch remoti"
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr "importa tutti i tag e gli oggetti associati durante il recupero"
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "o non recuperare alcun tag (--no-tags)"
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr "branch da tracciare"
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr "branch master"
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+"imposta il remoto come mirror su cui eseguire push o da cui recuperare dati"
+
#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "specificare un branch master con --mirror non ha senso"
@@ -3982,94 +18236,72 @@
#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
+"specificare i branch da tracciare ha senso solo con i mirror da cui "
+"recuperare dati"
-#: builtin/remote.c:195 builtin/remote.c:646
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "il remoto %s esiste già."
-#: builtin/remote.c:199 builtin/remote.c:650
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' non è un nome di remoto valido"
-#: builtin/remote.c:243
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
-msgstr "Non è stato possibile configurare il master '%s'"
+msgstr "Impossibile configurare il master '%s'"
-#: builtin/remote.c:299
-#, c-format
-msgid "more than one %s"
-msgstr "più di un %s"
-
-#: builtin/remote.c:339
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
+"Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s"
-#: builtin/remote.c:440 builtin/remote.c:448
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "(corrispondente)"
-#: builtin/remote.c:452
+#: builtin/remote.c:455
msgid "(delete)"
msgstr "(elimina)"
-#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "Could not append '%s' to '%s'"
-msgstr "Non è stato possibile aggiungere '%s' a '%s'"
+msgid "No such remote: '%s'"
+msgstr "Remoto non esistente: '%s'"
-#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
-#, c-format
-msgid "No such remote: %s"
-msgstr "Remote non esistente: %s"
-
-#: builtin/remote.c:656
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
-msgstr "Non è stato possibile rinominare la sezione di configurazione da '%s' in '%s'"
+msgstr ""
+"Non è stato possibile ridenominare la sezione di configurazione da '%s' in "
+"'%s'"
-#: builtin/remote.c:662 builtin/remote.c:799
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr "Non è stato possibile rimuovere la sezione di configurazione '%s'"
-
-#: builtin/remote.c:677
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
+"Non aggiorno lo specificatore riferimento di recupero non predefinito\n"
+"\t%s\n"
+"\tAggiorna la configurazione manualmente se necessario."
-#: builtin/remote.c:683
-#, c-format
-msgid "Could not append '%s'"
-msgstr ""
-
-#: builtin/remote.c:694
-#, c-format
-msgid "Could not set '%s'"
-msgstr "Non è stato possibile impostare '%s'"
-
-#: builtin/remote.c:716
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "eliminazione di '%s' non riuscita"
-#: builtin/remote.c:750
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "creazione di '%s' non riuscita"
-#: builtin/remote.c:764
-#, c-format
-msgid "Could not remove branch %s"
-msgstr "Non è stato possibile rimuovere il branch %s"
-
-#: builtin/remote.c:834
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -4079,1284 +18311,6087 @@
msgstr[0] ""
"Nota: un branch al di fuori della gerarchia refs/remotes/ non è stato "
"eliminato;\n"
-"per eliminarlo, usare:"
+"per eliminarlo, usa:"
msgstr[1] ""
"Nota: alcuni branch al di fuori della gerarchia refs/remotes/ non sono stati "
"eliminati;\n"
-"per eliminarli, usare:"
+"per eliminarli, usa:"
-#: builtin/remote.c:943
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Impossibile rimuovere la sezione di configurazione '%s'"
+
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
-msgstr ""
+msgstr " nuovo (il prossimo fetch lo salverà in remotes/%s)"
-#: builtin/remote.c:946
+#: builtin/remote.c:920
msgid " tracked"
-msgstr ""
+msgstr " tracciato"
-#: builtin/remote.c:948
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
-msgstr " vecchio (usare 'git remote prune' per rimuoverlo)"
+msgstr " vecchio (usa 'git remote prune' per rimuoverlo)"
-#: builtin/remote.c:950
+#: builtin/remote.c:924
msgid " ???"
-msgstr "???"
+msgstr " ???"
-#: builtin/remote.c:991
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-"branch.%s.merge non valido; impossibile eseguire il rebase su > 1 branch"
+"valore branch.%s.merge non valido; impossibile eseguire il rebase su più di "
+"un branch"
-#: builtin/remote.c:998
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "rebase interattivo sul remoto %s"
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "rebase interattivo (con merge) sul remoto %s"
+
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
-msgstr ""
+msgstr "rebase sul remoto %s"
-#: builtin/remote.c:1001
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr " merge con il remote %s"
-#: builtin/remote.c:1002
-msgid " and with remote"
-msgstr " e con il remote"
-
-#: builtin/remote.c:1004
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "merge con il remote %s"
-#: builtin/remote.c:1005
-msgid " and with remote"
-msgstr ""
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s e con il remoto %s\n"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1032
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1054
+#: builtin/remote.c:1035
msgid "delete"
msgstr "elimina"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1039
msgid "up to date"
msgstr "aggiornato"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1042
msgid "fast-forwardable"
-msgstr ""
+msgstr "fast forward possibile"
-#: builtin/remote.c:1064
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr "locale non aggiornato"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
-msgstr ""
+msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)"
-#: builtin/remote.c:1074
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
-msgstr ""
+msgstr " %-*s esegue il push su %-*s (%s)"
-#: builtin/remote.c:1078
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
-msgstr ""
+msgstr " %-*s esegue un aggiornamento forzato su %s"
-#: builtin/remote.c:1081
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s esegue il push su %s"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr "non interrogare i remoti"
+
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
-msgstr "* remote %s"
+msgstr "* remoto %s"
-#: builtin/remote.c:1119
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
-msgstr ""
+msgstr " URL recupero: %s"
-#: builtin/remote.c:1120 builtin/remote.c:1285
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(nessun URL)"
-#: builtin/remote.c:1129 builtin/remote.c:1131
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
-msgstr ""
+msgstr " URL push: %s"
-#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " branch HEAD: %s"
-#: builtin/remote.c:1139
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr "(non interrogato)"
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr "(sconosciuto)"
+
+#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n"
-#: builtin/remote.c:1151
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branch remoto:%s"
msgstr[1] " Branch remoti:%s"
-#: builtin/remote.c:1154 builtin/remote.c:1181
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
-msgstr ""
+msgstr " (stato non richiesto)"
-#: builtin/remote.c:1163
+#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branch locale configurato per 'git pull':"
msgstr[1] " Branch locali configurati per 'git pull':"
-#: builtin/remote.c:1171
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
-msgstr ""
+msgstr " I riferimenti locali saranno copiati da 'git push'"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Ref locale configurato per 'git push'%s:"
msgstr[1] " Ref locali configurati per 'git push'%s:"
-#: builtin/remote.c:1216
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto"
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "elimina refs/remotes/<nome>/HEAD"
+
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Impossibile determinare l'HEAD remoto"
-#: builtin/remote.c:1218
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr ""
+msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:"
-#: builtin/remote.c:1228
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Non è stato possibile eliminare %s"
-#: builtin/remote.c:1236
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Non è un ref valido: %s"
-#: builtin/remote.c:1238
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Non è stato possibile configurare %s"
-#: builtin/remote.c:1274
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
-msgstr ""
+msgstr " %s diventerà pendente!"
-#: builtin/remote.c:1275
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
-msgstr ""
+msgstr " %s è diventato pendente!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
-msgstr ""
+msgstr "Eliminazione di %s in corso"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
-msgstr ""
+msgstr " * [sarebbe eliminato] %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
-msgstr ""
+msgstr " * [eliminato] %s"
-#: builtin/remote.c:1387 builtin/remote.c:1461
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr "elimina remoti dopo il fetch"
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "Remote '%s' non esistente"
-#: builtin/remote.c:1414
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr "aggiungi branch"
+
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "nessun remote specificato"
-#: builtin/remote.c:1447
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr "interroga gli URL per il push anziché gli URL per il fetch"
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr "restituisci tutti gli URL"
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "nessun URL configurato per il remoto '%s'"
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr "manipola gli URL per il push"
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr "aggiungi URL"
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr "elimina URL"
+
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add --delete non ha senso"
-#: builtin/remote.c:1487
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
-msgstr ""
+msgstr "Pattern URL vecchio non valido: %s"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "Nessuna URL trovata: %s"
-#: builtin/remote.c:1497
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
+msgstr "Non eliminerò tutti gli URL non push"
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
+"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando"
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sottocomando sconosciuto: %s"
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr "git repack [<opzioni>]"
+
+#: builtin/repack.c:27
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"I repack incrementali non sono compatibili con gli indici bitmap.\n"
+"Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
+"pack.writebitmaps."
+
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"impossibile avviare pack-objects per eseguire il repack degli oggetti "
+"promettenti"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Da pack-objects mi attendevo solo righe con gli ID completi "
+"esadecimali degli oggetti."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"impossibile portare a termine pack-objects per eseguire il repack degli "
+"oggetti promettenti"
+
+#: builtin/repack.c:284
+msgid "pack everything in a single pack"
+msgstr "esegui il pack di tutto in un singolo pack"
+
+#: builtin/repack.c:286
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "come -a e rendi sciolti gli oggetti non raggiungibili"
+
+#: builtin/repack.c:289
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed"
+
+#: builtin/repack.c:291
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects"
+
+#: builtin/repack.c:293
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects"
+
+#: builtin/repack.c:295
+msgid "do not run git-update-server-info"
+msgstr "non eseguire git-update-server-info"
+
+#: builtin/repack.c:298
+msgid "pass --local to git-pack-objects"
+msgstr "fornisci l'opzione --local a git-pack-objects"
+
+#: builtin/repack.c:300
+msgid "write bitmap index"
+msgstr "scrivi l'indice bitmap"
+
+#: builtin/repack.c:302
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "fornisci l'opzione --delta-islands a git-pack-objects"
+
+#: builtin/repack.c:303
+msgid "approxidate"
+msgstr "data approssimativa"
+
+#: builtin/repack.c:304
+msgid "with -A, do not loosen objects older than this"
+msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data"
+
+#: builtin/repack.c:306
+msgid "with -a, repack unreachable objects"
+msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
+
+#: builtin/repack.c:308
+msgid "size of the window used for delta compression"
+msgstr "dimensione della finestra usata per la compressione delta"
+
+#: builtin/repack.c:309 builtin/repack.c:315
+msgid "bytes"
+msgstr "byte"
+
+#: builtin/repack.c:310
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"come sopra, ma limita le dimensioni della memoria invece del numero di voci"
+
+#: builtin/repack.c:312
+msgid "limits the maximum delta depth"
+msgstr "limita la profondità massima dei delta"
+
+#: builtin/repack.c:314
+msgid "limits the maximum number of threads"
+msgstr "limita il numero massimo di thread"
+
+#: builtin/repack.c:316
+msgid "maximum size of each packfile"
+msgstr "dimensione massima di ogni file pack"
+
+#: builtin/repack.c:318
+msgid "repack objects in packs marked with .keep"
+msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep"
+
+#: builtin/repack.c:320
+msgid "do not repack this pack"
+msgstr "non eseguire il repack di questo pack"
+
+#: builtin/repack.c:330
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'"
+
+#: builtin/repack.c:334
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable e -A non sono compatibili"
+
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
+
+#: builtin/repack.c:478
+#, 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 ""
+"AVVISO: Alcuni pack in uso sono stati ridenominati\n"
+"AVVISO: aggiungendo il prefisso old- al loro nome\n"
+"AVVISO: per consentirne la sostituzione con la\n"
+"AVVISO: nuova versione del file. Ma l'operazione\n"
+"AVVISO: non è riuscita e anche il tentativo di\n"
+"AVVISO: ridenominarli con il loro nome originale\n"
+"AVVISO: non è riuscito. Ridenominali manualmente\n"
+"AVVISO: entro %s:\n"
+
+#: builtin/repack.c:526
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "eliminazione di '%s' non riuscita"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <oggetto> <oggetto sostitutivo>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <oggetto>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <commit> [<genitore>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <oggetto>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<formato>] [-l [<pattern>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"formato sostituzione non valido: '%s'\n"
+"i formati validi sono 'short', 'medium' e 'long'"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "riferimento sostitutivo '%s' non trovato"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Eliminato riferimento sostitutivo '%s'"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' non è un nome riferimento valido"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "il riferimento sostitutivo '%s' esiste già"
+
+#: 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 ""
+"Gli oggetti devono essere dello stesso tipo.\n"
+"'%s' punta a un oggetto sostituito di tipo '%s'\n"
+"mentre '%s' punta a un oggetto sostitutivo di tipo '%s'."
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "impossibile aprire '%s' in scrittura"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file ha segnalato un errore"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "impossibile aprire %s in lettura"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "impossibile lanciare mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "impossibile leggere da mktree"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree ha segnalato un errore"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree non ha restituito un nome oggetto"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "impossibile eseguire fstat su %s"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "impossibile scrivere l'oggetto nel database"
+
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr "nome oggetto non valido: '%s'"
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "impossibile recuperare il tipo dell'oggetto %s"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "modifica del file oggetto non riuscita"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'"
+
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "impossibile analizzare %s come commit"
+
+#: builtin/replace.c:414
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "tag merge non valido nel commit '%s'"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "tag merge malformato nel commit '%s'"
+
+#: builtin/replace.c:428
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"il commit originario '%s' contiene il tag merge '%s' che è stato scartato; "
+"usa --edit anziché --graft"
+
+#: builtin/replace.c:467
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "il commit originario '%s' ha una firma GPG"
+
+#: builtin/replace.c:468
+msgid "the signature will be removed in the replacement commit!"
+msgstr "la firma sarà rimossa nel commit sostitutivo!"
+
+#: builtin/replace.c:478
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "impossibile scrivere il commit sostitutivo per '%s'"
+
+#: builtin/replace.c:486
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "graft per '%s' non necessario"
+
+#: builtin/replace.c:490
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'"
+
+#: builtin/replace.c:525
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"impossibile convertire i seguenti graft:\n"
+"%s"
+
+#: builtin/replace.c:546
+msgid "list replace refs"
+msgstr "elenca i riferimenti sostitutivi"
+
+#: builtin/replace.c:547
+msgid "delete replace refs"
+msgstr "elimina i riferimenti sostitutivi"
+
+#: builtin/replace.c:548
+msgid "edit existing object"
+msgstr "modifica l'oggetto esistente"
+
+#: builtin/replace.c:549
+msgid "change a commit's parents"
+msgstr "cambia i genitori di un commit"
+
+#: builtin/replace.c:550
+msgid "convert existing graft file"
+msgstr "converti un file graft esistente"
+
+#: builtin/replace.c:551
+msgid "replace the ref if it exists"
+msgstr "sostituisci il riferimento se esiste"
+
+#: builtin/replace.c:553
+msgid "do not pretty-print contents for --edit"
+msgstr "non stampare i contenuti in un formato leggibile (per --edit)"
+
+#: builtin/replace.c:554
+msgid "use this format"
+msgstr "usa questo formato"
+
+#: builtin/replace.c:567
+msgid "--format cannot be used when not listing"
+msgstr "--format non può essere usato quando non si elencano voci"
+
+#: builtin/replace.c:575
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo"
+
+#: builtin/replace.c:579
+msgid "--raw only makes sense with --edit"
+msgstr "--raw ha senso solo con --edit"
+
+#: builtin/replace.c:585
+msgid "-d needs at least one argument"
+msgstr "-d richiede almeno un argomento"
+
+#: builtin/replace.c:591
+msgid "bad number of arguments"
+msgstr "numero di argomenti errato"
+
+#: builtin/replace.c:597
+msgid "-e needs exactly one argument"
+msgstr "-e richiede esattamente un argomento"
+
+#: builtin/replace.c:603
+msgid "-g needs at least one argument"
+msgstr "-g richiede almeno un argomento"
+
+#: builtin/replace.c:609
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file non richiede argomenti"
+
+#: builtin/replace.c:615
+msgid "only one pattern can be given with -l"
+msgstr "con -l può essere specificato solo un pattern"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <percorso>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr "registra le risoluzioni pulite nell'indice"
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "'git rerere forget' senza percorsi è deprecato"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "impossibile generare il diff per '%s'"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..."
+
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]"
+
+#: builtin/reset.c:40
msgid "mixed"
-msgstr ""
+msgstr "misto"
-#: builtin/reset.c:33
+#: builtin/reset.c:40
msgid "soft"
-msgstr ""
+msgstr "soft"
-#: builtin/reset.c:33
+#: builtin/reset.c:40
msgid "hard"
-msgstr ""
+msgstr "hard"
-#: builtin/reset.c:33
+#: builtin/reset.c:40
msgid "merge"
-msgstr ""
+msgstr "merge"
-#: builtin/reset.c:33
+#: builtin/reset.c:40
msgid "keep"
-msgstr ""
+msgstr "keep"
-#: builtin/reset.c:77
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
-msgstr ""
+msgstr "Non hai un HEAD valido."
-#: builtin/reset.c:79
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
-msgstr ""
+msgstr "Impossibile trovare l'albero di HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
-msgstr ""
+msgstr "Impossibile trovare l'albero di %s."
-#: builtin/reset.c:96
-msgid "Could not write new index file."
-msgstr "Non è stato possibile scrivere il nuovo index file."
-
-#: builtin/reset.c:106
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ora si trova a %s"
-
-#: builtin/reset.c:130
-msgid "Could not read index"
-msgstr "Non è stato possibile leggere index"
-
-#: builtin/reset.c:133
-msgid "Unstaged changes after reset:"
-msgstr ""
-
-#: builtin/reset.c:223
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossibile eseguire un %s reset nel corso di un merge."
-#: builtin/reset.c:297
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Non è stato possibile analizzare l'oggetto '%s'."
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
+msgid "be quiet, only report errors"
+msgstr "non visualizzare messaggi, segnala solo gli errori"
+
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
+msgstr "reimposta l'HEAD e l'indice"
+
+#: builtin/reset.c:296
+msgid "reset only HEAD"
+msgstr "reimposta solo l'HEAD"
+
+#: builtin/reset.c:298 builtin/reset.c:300
+msgid "reset HEAD, index and working tree"
+msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro"
#: builtin/reset.c:302
+msgid "reset HEAD but keep local changes"
+msgstr "reimposta l'HEAD ma mantieni le modifiche locali"
+
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente"
+
+#: builtin/reset.c:326
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Risoluzione di '%s' come revisione valida non riuscita."
+
+#: builtin/reset.c:334
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Risoluzione di '%s' come albero valido non riuscita."
+
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch non è compatibile con --{hard,mixed,soft}"
-#: builtin/reset.c:311
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'."
-#: builtin/reset.c:313
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
-msgstr ""
+msgstr "Impossibile eseguire un %s reset con dei percorsi."
-#: builtin/reset.c:325
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset non è consentito in un repository spoglio"
-#: builtin/reset.c:341
+#: builtin/reset.c:374
+msgid "-N can only be used with --mixed"
+msgstr "-N può essere usato solo con --mixed"
+
+#: builtin/reset.c:395
+msgid "Unstaged changes after reset:"
+msgstr "Modifiche non nell'area di staging dopo il reset:"
+
+#: builtin/reset.c:398
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+"\n"
+"Ci sono voluti %.2f secondi per elencare le modifiche non nell'area di\n"
+"staging dopo il reset. Puoi usare '--quiet' per non visualizzare questo\n"
+"messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n"
+"rendere tale comportamento quello predefinito.\n"
+
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
-msgstr ""
-"Non è stato possibile ripristinare index file "
-"alla revisione '%s'."
+msgstr "Impossibile ripristinare il file indice alla revisione '%s'."
-#: builtin/revert.c:70 builtin/revert.c:92
+#: builtin/reset.c:412
+msgid "Could not write new index file."
+msgstr "Impossibile scrivere il nuovo file indice."
+
+#: builtin/rev-list.c:412
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "impossibile combinare --exclude-promisor-objects e --missing"
+
+#: builtin/rev-list.c:473
+msgid "object filtering requires --objects"
+msgstr "il filtraggio oggetti richiede --objects"
+
+#: builtin/rev-list.c:476
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "valore sparse non valido: '%s'"
+
+#: builtin/rev-list.c:527
+msgid "rev-list does not support display of notes"
+msgstr "rev-list non supporta la visualizzazione delle note"
+
+#: builtin/rev-list.c:530
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]"
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr "mantieni la stringa passata `--` come argomento"
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+"termina l'analisi dopo il primo argomento non corrispondente a un'opzione"
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr "emetti l'output in forma \"stuck long\""
+
+#: builtin/rev-parse.c:551
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]\n"
+" o: git rev-parse --sq-quote [<argomento>...]\n"
+" o: git rev-parse [<opzioni>] [<argomento>...]\n"
+"\n"
+"Esegui \"git rev-parse --parseopt -h\" per ulteriori informazioni sulla "
+"prima\n"
+"modalità d'uso."
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<opzioni>] <espressione commit>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <sottocomando>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opzioni>] <espressione commit>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <sottocomando>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "l'opzione `%s' richiede un numero maggiore di zero"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s non può essere usata con %s"
-#: builtin/revert.c:131
-msgid "program error"
-msgstr "errore del programma"
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "termina la sequenza revert o cherry-pick"
-#: builtin/revert.c:221
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "riprendi la sequenza revert o cherry-pick"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "annulla la sequenza revert o cherry-pick"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "salta il commit corrente e continua"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "non eseguire il commit automaticamente"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "modifica il messaggio di commit"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "numero-genitore"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "seleziona il genitore mainline"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "strategia di merge"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "opzione per la strategia di merge"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "aggiungi il nome del commit alla fine"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "mantieni i commit inizialmente vuoti"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "mantieni i commit ridondanti e vuoti"
+
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "revert non riuscito"
-#: builtin/revert.c:236
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick non riuscito"
-#: builtin/rm.c:109
-#, c-format
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opzioni>] [--] <file>..."
+
+#: builtin/rm.c:207
msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
+"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] ""
+"il seguente file ha contenuti nell'area di staging che\n"
+"differiscono sia rispetto a quelli del file sia rispetto a HEAD:"
+msgstr[1] ""
+"i seguenti file hanno contenuti nell'area di staging che\n"
+"differiscono sia rispetto a quelli del file sia rispetto a HEAD:"
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
"(use -f to force removal)"
msgstr ""
+"\n"
+"(usa -f per forzarne la rimozione)"
-#: builtin/rm.c:115
-#, c-format
+#: 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] "il seguente file ha delle modifiche in staging nell'indice:"
+msgstr[1] "i seguenti file hanno delle modifiche in staging nell'indice:"
+
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
-"'%s' has changes staged in the index\n"
+"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
+"\n"
+"(usa --cached per mantenere il file o -f per forzarne la rimozione)"
-#: builtin/rm.c:119
-#, c-format
-msgid ""
-"'%s' has local modifications\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "il seguente file ha delle modifiche locali:"
+msgstr[1] "i seguenti file hanno delle modifiche locali:"
+
+#: builtin/rm.c:242
+msgid "do not list removed files"
+msgstr "non elencare i file rimossi"
+
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr "rimuovi solo dall'indice"
+
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr "ignora il controllo sullo stato di aggiornamento"
+
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr "consenti rimozioni ricorsive"
+
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-"'%s' contiene delle modifiche locali\n"
-"(usa --cached per mantenere il file, o -f per forzare la rimozione)"
+"esci con codice d'uscita zero anche nel caso in cui non vi siano "
+"corrispondenze"
-#: builtin/rm.c:194
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per "
+"procedere"
+
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
-msgstr ""
+msgstr "non rimuovo '%s' ricorsivamente senza -r"
-#: builtin/rm.c:230
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: non è possibile eliminare %s"
-#: builtin/shortlog.c:157
-#, c-format
-msgid "Missing author: %s"
-msgstr "Autore mancante: %s"
-
-#: builtin/tag.c:60
-#, c-format
-msgid "malformed object at '%s'"
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<riferimento>...]\n"
+" --all e uno specificatore <riferimento> sono mutualmente esclusivi."
-#: builtin/tag.c:207
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr "nome remoto"
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr "usa protocollo RPC senza stato"
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr "leggi i riferimento dallo standard input"
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr "stampa lo stato dell'helper remoto"
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opzioni>] [<intervallo revisioni>] [[--] <percorso>...]"
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opzioni>]"
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr "Raggruppa per persona che ha eseguito il commit anziché per autore"
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr "ordina l'output in base al numero di commit per autore"
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "Ometti le descrizioni dei commit, fornisci solo il numero dei commit"
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr "Visualizza l'indirizzo e-mail di ogni autore"
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr "Output a capo automatico"
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr "troppi argomenti forniti oltre al repository"
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<quando>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<revisione> | <glob>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<riferimento>]"
+
+#: builtin/show-branch.c:395
#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "nome tag troppo lungo: %.*s..."
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] "ignoro %s; non posso gestire più di %d riferimento"
+msgstr[1] "ignoro %s; non posso gestire più di %d riferimenti"
-#: builtin/tag.c:212
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr "nessun riferimento corrispondente a %s"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "visualizza i branch che ne tracciano uno remoto e quelli locali"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "visualizza i branch che ne tracciano uno remoto"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "colore '*!+-' corrispondente al branch"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "visualizza <n> commit ulteriori rispetto all'antenato comune"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "sinonimo di more=-1"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "non visualizzare le stringhe di denominazione"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "includi il branch corrente"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "denomina i commit con i loro nomi oggetto"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "visualizza le basi merge possibili"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "visualizza i riferimenti non raggiungibili da nessun altro"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "visualizza i commit in ordine topologico"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "visualizza solo i commit non sul primo branch"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "visualizza i merge raggiungibili solo dall'ultimo commit di un branch"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+"esegui un ordinamento topologico mantenendo l'ordine delle date ove possibile"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+"visualizza le <n> voci più recenti del log dei riferimenti partendo da base"
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog non è compatibile con --all, --remotes, --independent o --merge-base"
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr "nessun branch fornito e l'HEAD non è valido"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "l'opzione --reflog richiede il nome di un branch"
+
+#: 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] "può essere visualizzata solo %d voce per volta."
+msgstr[1] "possono essere visualizzate solo %d voci per volta."
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr "riferimento non esistente: %s"
+
+#: builtin/show-branch.c:831
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] "impossibile gestire più di %d revisione."
+msgstr[1] "impossibile gestire più di %d revisioni."
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' non è un riferimento valido."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "impossibile trovare il commit %s (%s)"
+
+#: builtin/show-ref.c:12
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<pattern>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "visualizza solo i tag (l'opzione può essere combinata con heads)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "visualizza solo le head (l'opzione può essere combinata con tags)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+"controllo più stringente dei riferimenti, richiede un percorso esatto al "
+"riferimento"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "visualizza il riferimento HEAD anche se filtrato"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "dereferenzia i tag in ID oggetto"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "visualizza l'hash SHA1 usando solo <n> caratteri"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "non stampare i risultati sullo standard output (utile con --verify)"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+"visualizza i riferimenti dati sullo standard input che non sono nel "
+"repository locale"
+
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opzioni>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opzioni>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <nome branch> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n"
+" [--] [<specificatore percorso>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<messaggio>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' non è un commit simile a uno stash"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Troppe revisioni specificate:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Nessuna voce di stash trovata."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s non è un riferimento valido"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear con parametri non è implementato"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "impossibile applicare uno stash nel mezzo di un merge"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "impossibile generare il diff %s^!"
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "ci sono conflitti nell'indice. Prova senza --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "impossibile salvare l'albero indice"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "non è stato possibile ripristinare i file non tracciati dallo stash"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Merge di %s con %s in corso"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "L'indice non è stato rimosso dallo stash."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "tenta di ricreare l'indice"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Ho scartato %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Impossibile scartare la voce di stash"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' non è un riferimento stash"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+"La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Nome del branch non specificato"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Impossibile aggiornare %s con %s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "messaggio di stash"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" richiede un argomento <commit>"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Nessuna modifica selezionata"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Non hai ancora un commit iniziale"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Impossibile salvare lo stato corrente di index"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Impossibile salvare i file non tracciati"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Impossibile registrare lo stato dell'albero di lavoro"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+"Impossibile usare --patch e --include-untracked o --all allo stesso tempo"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Ti sei scordato di eseguire 'git add'?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Nessuna modifica locale da salvare"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Impossibile inizializzare stash"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Impossibile salvare lo stato attuale"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Directory di lavoro e stato indice salvati: %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Impossibile rimuovere le modifiche all'albero di lavoro"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "mantieni l'indice"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "esegui lo stash in modalità patch"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "modalità silenziosa"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "includi i file non tracciati nello stash"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "includi i file ignorati"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "impossibile eseguire %s"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "anteponi il carattere commento e uno spazio a ogni riga"
+
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Atteso nome riferimento completo, ricevuto %s"
+
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote non richiede argomenti"
+
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "impossibile rimuovere un componente dall'URL '%s'"
+
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+msgid "alternative anchor for relative paths"
+msgstr "ancoraggio alternativo per i percorsi relativi"
+
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]"
+
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'"
+
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Entro in '%s'\n"
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command ha restituito un codice diverso da zero per %s\n"
+"."
+
+#: builtin/submodule--helper.c:547
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command ha restituito un codice diverso da zero durante la ricorsione "
+"nei sottomoduli innestati di %s\n"
+"."
+
+#: builtin/submodule--helper.c:563
+msgid "Suppress output of entering each submodule command"
+msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo"
+
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+msgid "Recurse into nested submodules"
+msgstr "Esegui ricorsivamente sui sottomoduli innestati"
+
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
+
+#: builtin/submodule--helper.c:597
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"impossibile trovare la configurazione '%s'. Assumo che questo repository sia "
+"il proprio repository autoritativo upstream."
+
+#: builtin/submodule--helper.c:665
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
+
+#: builtin/submodule--helper.c:669
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n"
+
+#: builtin/submodule--helper.c:679
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+"avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n"
+
+#: builtin/submodule--helper.c:686
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'"
+
+#: builtin/submodule--helper.c:708
+msgid "Suppress output for initializing a submodule"
+msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo"
+
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<opzioni>] [<percorso>]"
+
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules"
+
+#: builtin/submodule--helper.c:824
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'"
+
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "ricorsione nel sottomodulo '%s' non riuscita"
+
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+msgid "Suppress submodule status output"
+msgstr "Non visualizzare l'output dello stato del sottomodulo"
+
+#: builtin/submodule--helper.c:876
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del "
+"sottomodulo"
+
+#: builtin/submodule--helper.c:877
+msgid "recurse into nested submodules"
+msgstr "esegui ricorsivamente sui sottomoduli innestati"
+
+#: builtin/submodule--helper.c:882
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+"git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]"
+
+#: builtin/submodule--helper.c:906
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <percorso>"
+
+#: builtin/submodule--helper.c:970
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n"
+
+#: builtin/submodule--helper.c:976
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
+
+#: builtin/submodule--helper.c:990
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito"
+
+#: builtin/submodule--helper.c:1001
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito"
+
+#: builtin/submodule--helper.c:1048
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+"Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo"
+
+#: builtin/submodule--helper.c:1055
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]"
+
+#: builtin/submodule--helper.c:1109
+#, 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 ""
+"L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa "
+"'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)"
+
+#: builtin/submodule--helper.c:1121
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-"
+"f' per scartarle"
+
+#: builtin/submodule--helper.c:1129
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Directory '%s' ripulita\n"
+
+#: builtin/submodule--helper.c:1131
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n"
+
+#: builtin/submodule--helper.c:1142
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "impossibile creare la directory vuota del sottomodulo %s"
+
+#: builtin/submodule--helper.c:1158
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n"
+
+#: builtin/submodule--helper.c:1187
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+"Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche "
+"locali"
+
+#: builtin/submodule--helper.c:1188
+msgid "Unregister all submodules"
+msgstr "Annulla la registrazione di tutti i sottomoduli"
+
+#: builtin/submodule--helper.c:1193
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]"
+
+#: builtin/submodule--helper.c:1207
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli"
+
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "non è possibile aggiungere un alternato per il sottomodulo '%s': %s"
+
+#: builtin/submodule--helper.c:1341
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto"
+
+#: builtin/submodule--helper.c:1348
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto"
+
+#: builtin/submodule--helper.c:1371
+msgid "where the new submodule will be cloned to"
+msgstr "percorso in cui sarà clonato il nuovo sottomodulo"
+
+#: builtin/submodule--helper.c:1374
+msgid "name of the new submodule"
+msgstr "nome del nuovo sottomodulo"
+
+#: builtin/submodule--helper.c:1377
+msgid "url where to clone the submodule from"
+msgstr "URL da cui clonare il sottomodulo"
+
+#: builtin/submodule--helper.c:1385
+msgid "depth for shallow clones"
+msgstr "profondità per i cloni shallow"
+
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+msgid "force cloning progress"
+msgstr "forza l'indicazione d'avanzamento della clonazione"
+
+#: builtin/submodule--helper.c:1393
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference "
+"<repository>] [--name <nome>] [--depth <profondità>] --url <URL> --path "
+"<percorso>"
+
+#: builtin/submodule--helper.c:1424
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito"
+
+#: builtin/submodule--helper.c:1438
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "impossibile recuperare la directory del sottomodulo per '%s'"
+
+#: builtin/submodule--helper.c:1474
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+"Modalità aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')"
+
+#: builtin/submodule--helper.c:1478
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+"È stata configurata una modalità aggiornamento '%s' non valida per il "
+"percorso del sottomodulo ('%s')"
+
+#: builtin/submodule--helper.c:1571
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Percorso del sottomodulo ('%s') non inizializzato"
+
+#: builtin/submodule--helper.c:1575
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Potresti voler usare 'update --init'."
+
+#: builtin/submodule--helper.c:1605
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Ignoro il sottomodulo %s non sottoposto a merge"
+
+#: builtin/submodule--helper.c:1634
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Ignoro il sottomodulo '%s'"
+
+#: builtin/submodule--helper.c:1778
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato"
+
+#: builtin/submodule--helper.c:1789
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+"Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione"
+
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+msgid "path into the working tree"
+msgstr "percorso nell'albero di lavoro"
+
+#: builtin/submodule--helper.c:1854
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+"percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati"
+
+#: builtin/submodule--helper.c:1858
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout o none"
+
+#: builtin/submodule--helper.c:1864
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Crea un clone shallow limitato al numero di revisioni specificato"
+
+#: builtin/submodule--helper.c:1867
+msgid "parallel jobs"
+msgstr "processi da eseguire in parallelo"
+
+#: builtin/submodule--helper.c:1869
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "determina se il clone iniziale sarà shallow come raccomandato"
+
+#: builtin/submodule--helper.c:1870
+msgid "don't print cloning progress"
+msgstr "non stampare l'indicazione di avanzamento della clonazione"
+
+#: builtin/submodule--helper.c:1877
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]"
+
+#: builtin/submodule--helper.c:1890
+msgid "bad value for update parameter"
+msgstr "valore parametro aggiornamento errato"
+
+#: builtin/submodule--helper.c:1938
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch "
+"dal progetto al livello superiore, ma questo non è su alcun branch"
+
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'"
+
+#: builtin/submodule--helper.c:2094
+msgid "recurse into submodules"
+msgstr "esegui ricorsivamente sui sottomoduli"
+
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]"
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr "controlla se è sicuro scrivere sul file .gitmodules"
+
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "rimuovi la configurazione nel file .gitmodules"
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nome> [<valore>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nome>"
+
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro"
+
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s non supporta --super-prefix"
+
+#: builtin/submodule--helper.c:2241
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' non è un sottocomando submodule--helper valido"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<opzioni>] <nome> [<riferimento>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <nome>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr ""
+"non visualizzare messaggi d'errore se ci sono riferimenti non simbolici "
+"(scollegati)"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "elimina riferimento simbolico"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "abbrevia il riferimento nell'output"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr "motivo"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr "motivo dell'aggiornamento"
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr ""
+"git tag [-a | -s | -u <ID chiave>] [-f] [-m <messaggio> | -F <file>]\n"
+"\t\t<nome tag> [<head>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nome tag>..."
+
+#: builtin/tag.c:28
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<numero>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <oggetto>]\n"
+"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<pattern>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<formato>] <nome tag>..."
+
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' non trovato."
-#: builtin/tag.c:227
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' eliminato (era %s)\n"
-#: builtin/tag.c:239
+#: builtin/tag.c:135
#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "non è stato possibile verificare il tag '%s'"
-
-#: builtin/tag.c:249
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be ignored.\n"
-"#\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"#\n"
-"# Scrivere un messaggio associato al tag\n"
-"# Le righe che iniziano con '#' verranno ignorate.\n"
-"#\n"
+"Scrivi un messaggio per il tag:\n"
+" %s\n"
+"Le righe che iniziano con '%c' saranno ignorate.\n"
-#: builtin/tag.c:256
+#: builtin/tag.c:139
+#, c-format
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be kept; you may remove them yourself if you "
+"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"
-"#\n"
msgstr ""
"\n"
-"#\n"
-"# Scrivere un messaggio associato al tag\n"
-"# Le righe che iniziano con '#' verranno mantenute; possono essere comunque "
-"rimosse manualmente.\n"
-"#\n"
+"Scrivi un messaggio per il tag:\n"
+" %s\n"
+"Le righe che iniziano con '%c' saranno mantenute; puoi rimuoverle "
+"autonomamente se lo desideri.\n"
-#: builtin/tag.c:298
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "impossibile firmare il tag"
-#: builtin/tag.c:300
+#: builtin/tag.c:200
msgid "unable to write tag file"
-msgstr "impossibile scrivere il file di tag"
+msgstr "impossibile scrivere il file tag"
-#: builtin/tag.c:325
+#: 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 ""
+"Hai creato un tag innestato. L'oggetto a cui si riferisce il tuo nuovo\n"
+"tag è già un tag. Se intendevi aggiungere un tag all'oggetto a cui\n"
+"punta, usa:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
-msgstr "tipo di oggetto errato."
+msgstr "tipo oggetto errato."
-#: builtin/tag.c:338
-msgid "tag header too big."
-msgstr "intestazione del tag troppo grande."
-
-#: builtin/tag.c:370
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "nessun messaggio per il tag?"
-#: builtin/tag.c:376
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Il messaggio del tag è stato lasciato in %s\n"
-#: builtin/tag.c:425
-msgid "switch 'points-at' requires an object"
-msgstr "lo switch 'points-at' richiede un oggetto"
+#: builtin/tag.c:402
+msgid "list tag names"
+msgstr "elenca i nomi dei tag"
-#: builtin/tag.c:427
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nome oggetto '%s' malformato"
+#: builtin/tag.c:404
+msgid "print <n> lines of each tag message"
+msgstr "stampa le prime <n> righe di ogni messaggio tag"
-#: builtin/tag.c:506
+#: builtin/tag.c:406
+msgid "delete tags"
+msgstr "elimina tag"
+
+#: builtin/tag.c:407
+msgid "verify tags"
+msgstr "verifica tag"
+
+#: builtin/tag.c:409
+msgid "Tag creation options"
+msgstr "Opzioni creazione tag"
+
+#: builtin/tag.c:411
+msgid "annotated tag, needs a message"
+msgstr "tag annotato, richiede un messaggio"
+
+#: builtin/tag.c:413
+msgid "tag message"
+msgstr "messaggio tag"
+
+#: builtin/tag.c:415
+msgid "force edit of tag message"
+msgstr "forza modifica del messaggio tag"
+
+#: builtin/tag.c:416
+msgid "annotated and GPG-signed tag"
+msgstr "tag annotato e firmato con GPG"
+
+#: builtin/tag.c:419
+msgid "use another key to sign the tag"
+msgstr "usa un'altra chiave per firmare il tag"
+
+#: builtin/tag.c:420
+msgid "replace the tag if exists"
+msgstr "sostituisci il tag se esiste"
+
+#: builtin/tag.c:421 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr "crea un registro riferimenti"
+
+#: builtin/tag.c:423
+msgid "Tag listing options"
+msgstr "Opzioni elenco tag"
+
+#: builtin/tag.c:424
+msgid "show tag list in columns"
+msgstr "visualizza l'elenco dei tag in colonne"
+
+#: builtin/tag.c:425 builtin/tag.c:427
+msgid "print only tags that contain the commit"
+msgstr "stampa solo i tag che contengono il commit"
+
+#: builtin/tag.c:426 builtin/tag.c:428
+msgid "print only tags that don't contain the commit"
+msgstr "stampa solo i tag che non contengono i commit"
+
+#: builtin/tag.c:429
+msgid "print only tags that are merged"
+msgstr "stampa solo i tag sottoposti a merge"
+
+#: builtin/tag.c:430
+msgid "print only tags that are not merged"
+msgstr "stampa solo i tag non sottoposti a merge"
+
+#: builtin/tag.c:434
+msgid "print only tags of the object"
+msgstr "stampa solo i tag dell'oggetto"
+
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column e -n non sono compatibili"
+#: builtin/tag.c:504
+msgid "-n option is only allowed in list mode"
+msgstr "l'opzione -n è consentita solo in modalità elenco"
+
+#: builtin/tag.c:506
+msgid "--contains option is only allowed in list mode"
+msgstr "l'opzione --contains è consentita solo in modalità elenco"
+
+#: builtin/tag.c:508
+msgid "--no-contains option is only allowed in list mode"
+msgstr "l'opzione --no-contains è consentita solo in modalità elenco"
+
+#: builtin/tag.c:510
+msgid "--points-at option is only allowed in list mode"
+msgstr "l'opzione --points-at è consentita solo in modalità elenco"
+
+#: builtin/tag.c:512
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+"le opzioni --merged e --no-merged sono consentite solo in modalità elenco"
+
#: builtin/tag.c:523
-msgid "-n option is only allowed with -l."
-msgstr "l'opzione -n è consentita solo con -l."
-
-#: builtin/tag.c:525
-msgid "--contains option is only allowed with -l."
-msgstr "l'opzione --contains è consentita solo con -l."
-
-#: builtin/tag.c:527
-msgid "--points-at option is only allowed with -l."
-msgstr "l'opzione --points-at è consentita solo con -l."
-
-#: builtin/tag.c:535
msgid "only one -F or -m option is allowed."
msgstr "è consentita una sola opzione tra -F e -m."
-#: builtin/tag.c:555
+#: builtin/tag.c:542
msgid "too many params"
msgstr "troppi parametri"
-#: builtin/tag.c:561
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' non è un nome tag valido."
-#: builtin/tag.c:566
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "il tag '%s' esiste già"
#: builtin/tag.c:584
#, c-format
-msgid "%s: cannot lock the ref"
-msgstr "%s: impossibile riservare il ref"
-
-#: builtin/tag.c:586
-#, c-format
-msgid "%s: cannot update the ref"
-msgstr "%s: impossibile aggiornare il ref"
-
-#: builtin/tag.c:588
-#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aggiornato (era %s)\n"
-#: git.c:16
-msgid "See 'git help <command>' for more information on a specific command."
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr "Decompressione degli oggetti in corso"
+
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
+msgstr "creazione della directory %s non riuscita"
+
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
+msgstr "creazione del file %s non riuscita"
+
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %s"
+msgstr "eliminazione del file %s non riuscita"
+
+#: builtin/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "eliminazione della directory %s non riuscita"
+
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Test di mtime in '%s' in corso "
+
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-"Vedi 'git help <comando> per maggiori informazioni su un comando "
-"specifico."
+"le informazioni stat della directory non cambiano dopo l'aggiunta di un "
+"nuovo file"
-#: parse-options.h:133 parse-options.h:235
-msgid "n"
-msgstr "n"
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+"le informazioni stat della directory non cambiano dopo l'aggiunta di una "
+"nuova directory"
-#: parse-options.h:141
-msgid "time"
-msgstr "tempo"
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
+msgstr ""
+"le informazioni stat della directory cambiano dopo l'aggiornamento di un file"
-#: parse-options.h:149
-msgid "file"
-msgstr "file"
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+"le informazioni stat della directory cambiano dopo l'aggiunta di un file in "
+"una sottodirectory"
-#: parse-options.h:151
-msgid "when"
-msgstr "quando"
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+"le informazioni stat della directory non cambiano dopo l'eliminazione di un "
+"file"
-#: parse-options.h:156
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+"le informazioni stat della directory non cambiano dopo l'eliminazione di una "
+"directory"
+
+#: builtin/update-index.c:221
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opzioni>] [--] [<file>...]"
+
+#: builtin/update-index.c:971
+msgid "continue refresh even when index needs update"
+msgstr ""
+"continua l'aggiornamento anche nel caso in cui l'indice richieda di essere "
+"aggiornato"
+
+#: builtin/update-index.c:974
+msgid "refresh: ignore submodules"
+msgstr "aggiornamento: ignora i sottomoduli"
+
+#: builtin/update-index.c:977
+msgid "do not ignore new files"
+msgstr "non ignorare i nuovi file"
+
+#: builtin/update-index.c:979
+msgid "let files replace directories and vice-versa"
+msgstr "consenti che dei file sostituiscano delle directory e viceversa"
+
+#: builtin/update-index.c:981
+msgid "notice files missing from worktree"
+msgstr "nota se dei file mancano dall'albero di lavoro"
+
+#: builtin/update-index.c:983
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+"esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte "
+"a merge"
+
+#: builtin/update-index.c:986
+msgid "refresh stat information"
+msgstr "aggiorna le informazioni stat"
+
+#: builtin/update-index.c:990
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "come --refresh, ma ignora l'impostazione assume-unchanged"
+
+#: builtin/update-index.c:994
+msgid "<mode>,<object>,<path>"
+msgstr "<modo>,<oggetto>,<percorso>"
+
+#: builtin/update-index.c:995
+msgid "add the specified entry to the index"
+msgstr "aggiunge la voce specificata all'indice"
+
+#: builtin/update-index.c:1005
+msgid "mark files as \"not changing\""
+msgstr "contrassegna i file come \"non saranno modificati\""
+
+#: builtin/update-index.c:1008
+msgid "clear assumed-unchanged bit"
+msgstr "reimposta a zero il bit \"non saranno modificati\""
+
+#: builtin/update-index.c:1011
+msgid "mark files as \"index-only\""
+msgstr "contrassegna i file come \"solamente da indicizzare\""
+
+#: builtin/update-index.c:1014
+msgid "clear skip-worktree bit"
+msgstr "reimposta a zero il bit \"solamente da indicizzare\""
+
+#: builtin/update-index.c:1017
+msgid "add to index only; do not add content to object database"
+msgstr ""
+"aggiungi solo all'indice; non aggiungere il contenuto al database oggetti"
+
+#: builtin/update-index.c:1019
+msgid "remove named paths even if present in worktree"
+msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro"
+
+#: builtin/update-index.c:1021
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "con --stdin: le righe di input sono terminate da byte NULL"
+
+#: builtin/update-index.c:1023
+msgid "read list of paths to be updated from standard input"
+msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input"
+
+#: builtin/update-index.c:1027
+msgid "add entries from standard input to the index"
+msgstr "aggiungi le voci specificate sullo standard input all'indice"
+
+#: builtin/update-index.c:1031
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "ripopola le fasi 2 e 3 per i percorsi elencati"
+
+#: builtin/update-index.c:1035
+msgid "only update entries that differ from HEAD"
+msgstr "aggiorna solo le voci differenti rispetto all'HEAD"
+
+#: builtin/update-index.c:1039
+msgid "ignore files missing from worktree"
+msgstr "ignora i file mancanti nell'albero di lavoro"
+
+#: builtin/update-index.c:1042
+msgid "report actions to standard output"
+msgstr "stampa le azioni sullo standard output"
+
+#: builtin/update-index.c:1044
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+"(per i comandi ad alto livello) dimentica i conflitti non risolti salvati"
+
+#: builtin/update-index.c:1048
+msgid "write index in this format"
+msgstr "scrivi l'indice in questo formato"
+
+#: builtin/update-index.c:1050
+msgid "enable or disable split index"
+msgstr "abilita o disabilita l'indice suddiviso"
+
+#: builtin/update-index.c:1052
+msgid "enable/disable untracked cache"
+msgstr "abilita/disabilita la cache non tracciata"
+
+#: builtin/update-index.c:1054
+msgid "test if the filesystem supports untracked cache"
+msgstr "verifica se il filesystem supporta la cache non tracciata"
+
+#: builtin/update-index.c:1056
+msgid "enable untracked cache without testing the filesystem"
+msgstr "abilita la cache non tracciata senza testare il filesystem"
+
+#: builtin/update-index.c:1058
+msgid "write out the index even if is not flagged as changed"
+msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato"
+
+#: builtin/update-index.c:1060
+msgid "enable or disable file system monitor"
+msgstr "abilita o disabilita il monitor del filesystem"
+
+#: builtin/update-index.c:1062
+msgid "mark files as fsmonitor valid"
+msgstr "contrassegna i file come validi rispetto al monitor del filesystem"
+
+#: builtin/update-index.c:1065
+msgid "clear fsmonitor valid bit"
+msgstr ""
+"reimposta a zero il bit \"file validi rispetto al monitor del filesystem\""
+
+#: builtin/update-index.c:1168
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi "
+"veramente abilitare l'indice suddiviso"
+
+#: builtin/update-index.c:1177
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente "
+"disabilitare l'indice suddiviso"
+
+#: builtin/update-index.c:1188
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi "
+"veramente disabilitare la cache non tracciata"
+
+#: builtin/update-index.c:1192
+msgid "Untracked cache disabled"
+msgstr "Cache non tracciata disabilitata"
+
+#: builtin/update-index.c:1200
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi "
+"veramente abilitare la cache non tracciata"
+
+#: builtin/update-index.c:1204
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Cache non tracciata abilitata per '%s'"
+
+#: builtin/update-index.c:1212
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il "
+"monitor del filesystem"
+
+#: builtin/update-index.c:1216
+msgid "fsmonitor enabled"
+msgstr "monitor filesystem abilitato"
+
+#: builtin/update-index.c:1219
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente "
+"disabilitare il monitor del filesystem"
+
+#: builtin/update-index.c:1223
+msgid "fsmonitor disabled"
+msgstr "monitor filesystem disabilitato"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<opzioni>] -d <nome riferimento> [<vecchio valore>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<opzioni>] <nome riferimento> <nuovo valore> [<vecchio "
+"valore>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<opzioni>] --stdin [-z]"
+
+#: builtin/update-ref.c:364
+msgid "delete the reference"
+msgstr "elimina il riferimento"
+
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr "aggiorna <nome riferimento>, non ciò a cui punta"
+
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
+msgstr "lo standard input ha argomenti terminati da NUL"
+
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr "leggi aggiornamenti dallo standard input"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "aggiorna i file informazioni partendo da zero"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opzioni>] <directory>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "esci dopo un solo scambio richiesta/risposta"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "esci subito dopo l'annuncio iniziale del riferimento"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+"non provare a utilizzare <directory>/.git/ se <directory> non è una "
+"directory Git"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interrompi il trasferimento dopo <n> secondi di inattività"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <commit>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "stampa i contenuti del commit"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "stampa l'output grezzo dello stato di GPG"
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr "dettagliato"
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr "visualizza solo le statistiche"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "stampa i contenuti del tag"
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opzioni>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opzioni>] <percorso>"
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <albero di lavoro> <nuovo percorso>"
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opzioni>]"
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opzioni>] <albero di lavoro>"
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <percorso>"
+
+#: builtin/worktree.c:61 builtin/worktree.c:899
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "eliminazione di '%s' non riuscita"
+
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "Rimuovo worktrees/%s: non è una directory valida"
+
+#: builtin/worktree.c:86
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "Rimuovo worktrees/%s: il file gitdir non esiste"
+
+#: builtin/worktree.c:91 builtin/worktree.c:100
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
+
+#: builtin/worktree.c:110
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, "
+"%<PRIuMAX> letti)"
+
+#: builtin/worktree.c:118
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "Rimuovo worktrees/%s: file gitdir non valido"
+
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente"
+
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
+msgstr "segnala gli alberi di lavoro eliminati"
+
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
+msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>"
+
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' esiste già"
+
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'"
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' è un albero di lavoro mancante ma bloccato;\n"
+"usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per "
+"rimuoverlo"
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+"'%s' è un albero di lavoro mancante ma già registrato;\n"
+"usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo"
+
+#: builtin/worktree.c:309
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "impossibile creare la directory di '%s'"
+
+#: builtin/worktree.c:440 builtin/worktree.c:446
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')"
+
+#: builtin/worktree.c:442
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+"Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a "
+"%s)"
+
+#: builtin/worktree.c:451
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')"
+
+#: builtin/worktree.c:457
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)"
+
+#: builtin/worktree.c:498
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+"esegui il checkout di <branch> anche se tale operazione è stata eseguita in "
+"un altro albero di lavoro"
+
+#: builtin/worktree.c:501
+msgid "create a new branch"
+msgstr "crea un nuovo branch"
+
+#: builtin/worktree.c:503
+msgid "create or reset a branch"
+msgstr "crea o reimposta un branch"
+
+#: builtin/worktree.c:505
+msgid "populate the new working tree"
+msgstr "popola il nuovo albero di lavoro"
+
+#: builtin/worktree.c:506
+msgid "keep the new working tree locked"
+msgstr "mantieni bloccato il nuovo albero di lavoro"
+
+#: builtin/worktree.c:509
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "imposta la modalità tracking (vedi git-branch(1))"
+
+#: builtin/worktree.c:512
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+"tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch "
+"remoto da tracciare"
+
+#: builtin/worktree.c:520
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive"
+
+#: builtin/worktree.c:581
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+"l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch"
+
+#: builtin/worktree.c:681
+msgid "reason for locking"
+msgstr "motivo di blocco"
+
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' non è un albero di lavoro"
+
+#: builtin/worktree.c:695 builtin/worktree.c:728
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale"
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' è già bloccato per questo motivo: %s"
+
+#: builtin/worktree.c:702
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' è già bloccato"
+
+#: builtin/worktree.c:730
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' non è bloccato"
+
+#: builtin/worktree.c:771
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"gli alberi di lavoro contenenti sottomoduli non possono essere spostati o "
+"rimossi"
+
+#: builtin/worktree.c:779
+msgid "force move even if worktree is dirty or locked"
+msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato"
+
+#: builtin/worktree.c:802 builtin/worktree.c:929
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' è un albero di lavoro principale"
+
+#: builtin/worktree.c:807
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "impossibile determinare il nome destinazione da '%s'"
+
+#: builtin/worktree.c:813
+#, c-format
+msgid "target '%s' already exists"
+msgstr "la destinazione '%s' esiste già"
+
+#: builtin/worktree.c:821
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"impossibile spostare un albero di lavoro bloccato, motivazione blocco: %s\n"
+"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
+
+#: builtin/worktree.c:823
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"impossibile spostare un albero di lavoro bloccato;\n"
+"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
+
+#: builtin/worktree.c:826
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s"
+
+#: builtin/worktree.c:831
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "spostamento di '%s' in '%s' non riuscito"
+
+#: builtin/worktree.c:879
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "esecuzione di 'git status' su '%s' non riuscita"
+
+#: builtin/worktree.c:883
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr "'%s' è sporco, usa --force per eliminarlo"
+
+#: builtin/worktree.c:888
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d"
+
+#: builtin/worktree.c:911
+msgid "force removal even if worktree is dirty or locked"
+msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato"
+
+#: builtin/worktree.c:934
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"impossibile rimuovere un albero di lavoro bloccato, motivazione blocco: %s\n"
+"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
+
+#: builtin/worktree.c:936
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"impossibile rimuovere un albero di lavoro bloccato;\n"
+"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
+
+#: builtin/worktree.c:939
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefisso>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<prefisso>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "utile solo per il debug"
+
+#: 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 ""
+"I permessi sulla directory del socket sono troppo laschi; altri\n"
+"utenti potrebbero essere in grado di leggere le credenziali nella\n"
+"cache. Valuta di eseguire:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
+msgstr "stampa i messaggi di debug sullo standard error"
+
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "il commit %s non è contrassegnato come raggiungibile"
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr "troppi commit contrassegnati come raggiungibili"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opzioni>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "esci subito dopo aver annunciato le funzionalità"
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <percorso>] [-c <nome>=<valore>]\n"
+" [--exec-path[=<percorso>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<percorso>] [--work-tree=<percorso>] [--"
+"namespace=<nome>]\n"
+" <comando> [<argomenti>]"
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' e 'git help -g' elencano i sottocomandi disponibili e\n"
+"alcune guide concettuali. Vedi 'git help <comando>' o 'git help <concetto>'\n"
+"per leggere ulteriori informazioni su un sottocomando o su un concetto\n"
+"specifici.\n"
+"Vedi 'git help git' per una panoramica del sistema."
+
+#: git.c:186
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "nessuna directory specificata per --git-dir\n"
+
+#: git.c:200
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "nessuno spazio dei nomi specificato per --namespace\n"
+
+#: git.c:214
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "nessuna directory specificata per --work-tree\n"
+
+#: git.c:228
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "nessun prefisso specificato per --super-prefix\n"
+
+#: git.c:250
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c: attesa stringa di configurazione\n"
+
+#: git.c:288
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "nessuna directory specificata per -C\n"
+
+#: git.c:314
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "opzione sconosciuta: %s\n"
+
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "durante l'espansione dell'alias '%s': '%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"l'alias '%s' modifica le variabili d'ambiente.\n"
+"Puoi usare '!git' nell'alias per farlo"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vuoto per %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias ricorsivo: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "errore di scrittura sullo standard output"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "errore di scrittura sconosciuto sullo standard output"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "chiusura dello standard output non riuscita"
+
+#: git.c:793
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "rilevato ciclo alias: l'espansione di '%s' non termina:%s"
+
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "impossibile gestire %s come comando incorporato"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"uso: %s\n"
+"\n"
+
+#: git.c:876
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "espansione dell'alias '%s' non riuscita; '%s' non è un comando Git\n"
+
+#: git.c:888
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "esecuzione del comando '%s' non riuscita: %s\n"
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valore negativo per http.postbuffer; uso l'impostazione predefinita %d"
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Il controllo delegazione non è supportato con cURL < 7.22.0"
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "Il pinning delle chiavi pubbliche non è supportato con cURL < 7.44.0"
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0"
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4"
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+"Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza "
+"backend SSL"
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Impossibile impostare il backend SSL a '%s': già impostato"
+
+#: http.c:1965
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"impossibile aggiornare l'URL di base dalla redirezione:\n"
+" richiesta: %s\n"
+" redirect: %s"
+
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "virgolette non valide nel valore push-option: '%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs non valido: è un repository Git?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"risposta del server non valida; atteso servizio, ricevuto pacchetto flush"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "risposta del server non valida; ricevuto '%s'"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "repository '%s' non trovato"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Autenticazione non riuscita per '%s'"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "impossibile accedere a '%s': %s"
+
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirezione a %s in corso"
+
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+"non dovrebbe esserci un pacchetto fine file se non si è accomodanti con "
+"questi ultimi"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"impossibile ritornare a un punto precedente dei dati POST RPC - prova ad "
+"aumentare il valore di http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC non riuscita; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "impossibile gestire push così grandi"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+"impossibile eseguire il deflate della richiesta; errore deflate zlib %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "il trasporto http stupido non supporta le funzionalità shallow"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "recupero non riuscito."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+"impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP "
+"intelligente"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "il trasporto HTTP non supporta %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push non riuscito"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: tentato un fetch senza un repository locale"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git"
+
+#: list-objects-filter-options.h:61
+msgid "args"
+msgstr "argomenti"
+
+#: list-objects-filter-options.h:62
+msgid "object filtering"
+msgstr "filtraggio oggetti"
+
+#: parse-options.h:170
+msgid "expiry-date"
+msgstr "data-scadenza"
+
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
-msgstr ""
+msgstr "no-op (retrocompatibilità)"
-#: parse-options.h:228
+#: parse-options.h:305
msgid "be more verbose"
-msgstr "più dettagliato"
+msgstr "visualizza più dettagli"
-#: parse-options.h:230
+#: parse-options.h:307
msgid "be more quiet"
-msgstr "meno dettagliato"
+msgstr "visualizza meno dettagli"
-#: parse-options.h:236
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
-msgstr "usare <n> cifre per mostrare gli hash SHA-1"
+msgstr "usa <n> cifre per mostrare gli hash SHA-1"
-#: common-cmds.h:8
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "come rimuovere gli spazi e i #commenti dal messaggio"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "chiave"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "nome campo in base a cui ordinare"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"aggiorna l'indice con la tecnica di risoluzione conflitti riutilizzata se "
+"possibile"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD scollegato su "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD scollegato da "
+
+#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Aggiunge il contenuto del file a index"
+msgstr "Aggiunge i contenuti del file all'indice"
-#: common-cmds.h:9
-msgid "Find by binary search the change that introduced a bug"
-msgstr "Cerca mediante ricerca binaria la modifica che ha introdotto un bug"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Applica una serie di patch da una casella di posta"
-#: common-cmds.h:10
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Annota le righe dei file con le informazioni sui commit"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Applica una patch ai file e/o all'indice"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "Importa un repository GNU Arch in Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Crea un archivio di file da un albero con nome"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Usa la ricerca binaria per trovare il commit che ha introdotto un bug"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+"Visualizza quali revisione e autore hanno modificato ogni singola riga di un "
+"file per ultimi"
+
+#: command-list.h:58
msgid "List, create, or delete branches"
msgstr "Elenca, crea o elimina branch"
-#: common-cmds.h:11
-msgid "Checkout a branch or paths to the working tree"
-msgstr ""
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr "Sposta oggetti e riferimenti in base a un archivio"
-#: common-cmds.h:12
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+"Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gli "
+"oggetti di un repository"
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr "Visualizza le informazioni sugli attributi Git"
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr "Esegui il debug dei file gitignore/escludi file"
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Visualizza i nomi canonici e gli indirizzi e-mail dei contatti"
+
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
+msgstr ""
+"Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
+
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr "Copia dei file dall'indice all'albero di lavoro"
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr "Si assicura che un nome riferimento sia ben formato"
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr "Trova commit che devono essere ancora applicati upstream"
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Applica le modifiche introdotte da alcuni commit esistenti"
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr "Alternativa grafica a git-commit"
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr "Rimuove i file non tracciati dall'albero di lavoro"
+
+#: command-list.h:71
msgid "Clone a repository into a new directory"
msgstr "Clona un repository in una nuova directory"
-#: common-cmds.h:13
-msgid "Record changes to the repository"
-msgstr "Registra modifiche nel repository"
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr "Visualizza i dati in colonne"
-#: common-cmds.h:14
+#: command-list.h:73
+msgid "Record changes to the repository"
+msgstr "Registra modifiche al repository"
+
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
+msgstr "Scrive e verifica i file grafo dei commit di Git"
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr "Crea un nuovo oggetto commit"
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr ""
+"Conta il numero di oggetti non in un pack e la loro occupazione di spazio su "
+"disco"
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr "Recupera e salva credenziali utente"
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Helper per salvare temporaneamente password in memoria"
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr "Helper per salvare credenziali su disco"
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr "Esporta un singolo commit in un checkout CVS"
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+"Recupera i dati da un sistema di controllo di versione che le persone "
+"adorano odiare"
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr "Un emulatore di server CVS per Git"
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr "Un server veramente semplice per repository Git"
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+"Attribuisce un nome leggibile a un oggetto basandosi su un riferimento "
+"disponibile"
+
+#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
+"Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc."
-#: common-cmds.h:15
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr "Confronta file nell'albero di lavoro e nell'indice"
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr "Confronta un albero con l'albero di lavoro o l'indice"
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr ""
+"Visualizza le modifiche usando tool comuni per la visualizzazione dei diff"
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr "Esportatore di dati Git"
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr "Backend per importatori di dati Git veloci"
+
+#: command-list.h:93
msgid "Download objects and refs from another repository"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgstr "Scarica oggetti e riferimenti da un altro repository"
-#: common-cmds.h:16
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr "Riceve oggetti mancanti da un altro repository"
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr "Riscrive branch"
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr "Genera un messaggio di commit del merge"
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr "Visualizza in output le informazioni su ogni riferimento"
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr "Prepara patch per il loro invio tramite e-mail"
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Verifica la connessione e la validità degli oggetti nel database"
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Ripulisce file non necessari e ottimizza il repository locale"
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Estrae l'ID del commit da un archivio creato usando git-archive"
+
+#: command-list.h:102
msgid "Print lines matching a pattern"
-msgstr "Stampa le righe corrispondenti ad un modello"
+msgstr "Stampa le righe corrispondenti a un'espressione regolare"
-#: common-cmds.h:17
-msgid "Create an empty git repository or reinitialize an existing one"
-msgstr "Crea un repository git vuoto o reinizializza uno esistente"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr "Un'interfaccia grafica portabile per Git"
-#: common-cmds.h:18
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr "Visualizza una guida a Git"
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr "Implementazione lato server di Git su HTTP"
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Scarica dati da un repository Git remoto tramite HTTP"
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP"
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack"
+
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
+
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
+
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
+msgstr "Aggiunge o analizza informazioni strutturate nei messaggi di commit"
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr "Il browser per i repository Git"
+
+#: command-list.h:115
msgid "Show commit logs"
-msgstr "Mostra log del commit"
+msgstr "Visualizza i log dei commit"
-#: common-cmds.h:19
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr "Elenca i riferimenti in un repository remoto"
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr "Elenca i contenuti di un oggetto albero"
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+"Estrae la patch e le informazioni sull'autore da un singolo messaggio e-mail"
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr "Un semplice programma per suddividere i file UNIX mbox"
+
+#: command-list.h:121
msgid "Join two or more development histories together"
msgstr "Unisce due o più cronologie di sviluppo"
-#: common-cmds.h:20
-msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Sposta o rinomina un file, una directory o un link simbolico"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
-#: common-cmds.h:21
-msgid "Fetch from and merge with another repository or a local branch"
-msgstr "Combina fetche + merge da un altro repository o un branch locale"
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr "Esegue un merge a tre vie su file"
-#: common-cmds.h:22
-msgid "Update remote refs along with associated objects"
-msgstr "Aggiorna i ref remoti insieme agli oggetti associati"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr "Esegue un merge per i file che lo richiedono"
-#: common-cmds.h:23
-msgid "Forward-port local commits to the updated upstream head"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Il programma helper standard da usare con git-merge-index"
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
+"Esegue gli strumenti di risoluzione conflitti di merge per risolvere i "
+"conflitti di merge"
-#: common-cmds.h:24
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr "Visualizza un merge a tre vie senza modificare l'indice"
+
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
+msgstr "Scrive e verifica indici multi-pack"
+
+#: command-list.h:129
+msgid "Creates a tag object"
+msgstr "Crea un oggetto tag"
+
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Genera un oggetto albero da testo in formato ls-tree"
+
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
+
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
+msgstr "Trova i nomi simbolici per le revisioni date"
+
+#: command-list.h:133
+msgid "Add or inspect object notes"
+msgstr "Aggiunge o esamina le note agli oggetti"
+
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importa dati da, o invia dati a, repository Perforce"
+
+#: command-list.h:135
+msgid "Create a packed archive of objects"
+msgstr "Crea un archivio di oggetti sottoposto a pack"
+
+#: command-list.h:136
+msgid "Find redundant pack files"
+msgstr "Trova file pack ridondanti"
+
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Esegue il pack di head e tag per un accesso efficiente al repository"
+
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
+msgstr ""
+"Routine che aiutano ad analizzare i parametri di accesso ai repository remoti"
+
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
+msgstr "Calcola l'ID univoco per una patch"
+
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
+msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
+
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
+msgstr "Rimuove gli oggetti aggiuntivi già presenti nei file pack"
+
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr ""
+"Esegue il fetch e l'integrazione con un altro repository o un branch locale"
+
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
+msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
+
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Applica un insieme di patch quilt sul branch corrente"
+
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)"
+
+#: command-list.h:146
+msgid "Reads tree information into the index"
+msgstr "Legge le informazioni su un albero dall'indice"
+
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
+msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
+
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
+msgstr "Riceve quanto sottoposto a push nel repository"
+
+#: command-list.h:149
+msgid "Manage reflog information"
+msgstr "Gestisce le informazioni del registro dei riferimenti"
+
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr "Gestisce l'insieme dei repository tracciati"
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
+msgstr "Esegue il pack degli oggetti non sottoposti a pack in un repository"
+
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
+msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
+
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
+msgstr "Genera un riassunto delle modifiche in sospeso"
+
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
+
+#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "Ripristina l'HEAD corrente allo stato specificato"
-#: common-cmds.h:25
+#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Ripristina i file nell'albero di lavoro"
+
+#: command-list.h:157
+msgid "Revert some existing commits"
+msgstr "Esegue il revert di alcuni commit esistenti"
+
+#: command-list.h:158
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
+
+#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr "Sceglie e altera i parametri"
+
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
-msgstr ""
+msgstr "Rimuove file dall'albero di lavoro e dall'indice"
-#: common-cmds.h:26
+#: command-list.h:161
+msgid "Send a collection of patches as emails"
+msgstr "Invia un insieme di patch come e-mail"
+
+#: command-list.h:162
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
+"Esegue il push di oggetti su un altro repository tramite il protocollo Git"
+
+#: command-list.h:163
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Shell di login limitata per concedere accesso SSH solo per Git"
+
+#: command-list.h:164
+msgid "Summarize 'git log' output"
+msgstr "Riassume l'output di 'git log'"
+
+#: command-list.h:165
msgid "Show various types of objects"
-msgstr "Mostra vari tipi di oggetti"
+msgstr "Visualizza vari tipi di oggetti"
-#: common-cmds.h:27
-msgid "Show the working tree status"
+#: command-list.h:166
+msgid "Show branches and their commits"
+msgstr "Visualizza i branch e i loro commit"
+
+#: command-list.h:167
+msgid "Show packed archive index"
+msgstr "Visualizza l'indice di un archivio sottoposto a pack"
+
+#: command-list.h:168
+msgid "List references in a local repository"
+msgstr "Elenca i riferimenti in un repository locale"
+
+#: command-list.h:169
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
+"Codice di inizializzazione dell'internazionalizzazione di Git per gli script "
+"shell"
-#: common-cmds.h:28
+#: command-list.h:170
+msgid "Common Git shell script setup code"
+msgstr "Codice comune di inizializzazione di Git per gli script shell"
+
+#: command-list.h:171
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
+
+#: command-list.h:172
+msgid "Add file contents to the staging area"
+msgstr "Aggiunge i contenuti dei file all'area di staging"
+
+#: command-list.h:173
+msgid "Show the working tree status"
+msgstr "Visualizza lo stato dell'albero di lavoro"
+
+#: command-list.h:174
+msgid "Remove unnecessary whitespace"
+msgstr "Rimuove spazi bianchi non necessari"
+
+#: command-list.h:175
+msgid "Initialize, update or inspect submodules"
+msgstr "Inizializza, aggiorna o esamina sottomoduli"
+
+#: command-list.h:176
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Operatività bidirezionale tra un repository Subversion e Git"
+
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Passa da un branch a un altro"
+
+#: command-list.h:178
+msgid "Read, modify and delete symbolic refs"
+msgstr "Legge, modifica ed elimina riferimenti simbolici"
+
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
-#: git-am.sh:50
-msgid "You need to set your committer info first"
-msgstr "È necessario impostare le informazioni sul committer"
+#: command-list.h:180
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Crea un file temporaneo con i contenuti di un blob"
-#: git-am.sh:95
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: command-list.h:181
+msgid "Unpack objects from a packed archive"
+msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
+
+#: command-list.h:182
+msgid "Register file contents in the working tree to the index"
+msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice"
+
+#: command-list.h:183
+msgid "Update the object name stored in a ref safely"
+msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
+
+#: command-list.h:184
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi"
+
+#: command-list.h:185
+msgid "Send archive back to git-archive"
+msgstr "Reinvia l'archivio a git-archive"
+
+#: command-list.h:186
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack"
+
+#: command-list.h:187
+msgid "Show a Git logical variable"
+msgstr "Visualizza una variabile logica di Git"
+
+#: command-list.h:188
+msgid "Check the GPG signature of commits"
+msgstr "Verifica la firma GPG dei commit"
+
+#: command-list.h:189
+msgid "Validate packed Git archive files"
+msgstr "Convalida i file archivio sottoposti a pack di Git"
+
+#: command-list.h:190
+msgid "Check the GPG signature of tags"
+msgstr "Verifica la firma GPG dei tag"
+
+#: command-list.h:191
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
+
+#: command-list.h:192
+msgid "Show logs with difference each commit introduces"
msgstr ""
+"Visualizza i registri insieme alle differenze introdotte da ciascun commit"
-#: git-am.sh:105
-#, sh-format
-msgid ""
-"When you have resolved this problem run \"$cmdline --resolved\".\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
-msgstr ""
-"Quando hai risolto il problema esegui \"$cmdline --resolved\".\n"
-"Se vuoi saltare questa patch, esegui invece \"$cmdline --skip\".\n"
-"Per ripristinare il branch originale e interrompere l'applicazione delle "
-"patch esegui \"$cmdline --abort\"."
+#: command-list.h:193
+msgid "Manage multiple working trees"
+msgstr "Gestisce alberi di lavoro multipli"
-#: git-am.sh:121
-msgid "Cannot fall back to three-way merge."
-msgstr ""
+#: command-list.h:194
+msgid "Create a tree object from the current index"
+msgstr "Crea un oggetto albero dall'indice corrente"
-#: git-am.sh:137
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
+#: command-list.h:195
+msgid "Defining attributes per path"
+msgstr "Definizione di attributi per percorso"
-#: git-am.sh:154
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"La tua patch è stata modificata manualmente?\n"
-"Non può essere applicata ai blob registrati nel proprio index."
+#: command-list.h:196
+msgid "Git command-line interface and conventions"
+msgstr "Interfaccia a riga di comando di Git e convenzioni"
-#: git-am.sh:163
-msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
+#: command-list.h:197
+msgid "A Git core tutorial for developers"
+msgstr "Un tutorial Git di base per gli sviluppatori"
-#: git-am.sh:275
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Può essere applicata solo una serie di patch StGIT per volta"
+#: command-list.h:198
+msgid "Git for CVS users"
+msgstr "Git per utenti CVS"
-#: git-am.sh:362
-#, sh-format
-msgid "Patch format $patch_format is not supported."
-msgstr "Il formato patch $patch_format non è supportato."
+#: command-list.h:199
+msgid "Tweaking diff output"
+msgstr "Messa a punto dell'output di diff"
-#: git-am.sh:364
-msgid "Patch format detection failed."
-msgstr "Rilevamento del formato della patch non riuscito."
+#: command-list.h:200
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git"
-#: git-am.sh:418
-msgid "-d option is no longer supported. Do not use."
-msgstr "l'opzione -d non è più supportata. Non utilizzarla."
+#: command-list.h:201
+msgid "A Git Glossary"
+msgstr "Un glossario di Git"
-#: git-am.sh:481
-#, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr ""
+#: command-list.h:202
+msgid "Hooks used by Git"
+msgstr "Hook usati da Git"
-#: git-am.sh:486
-msgid "Please make up your mind. --skip or --abort?"
-msgstr "Per favore, deciditi. --skip o --abort?"
+#: command-list.h:203
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
-#: git-am.sh:513
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
+#: command-list.h:204
+msgid "Defining submodule properties"
+msgstr "Definizione proprietà sottomodulo"
-#: git-am.sh:579
-#, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr ""
+#: command-list.h:205
+msgid "Git namespaces"
+msgstr "Spazi dei nomi Git"
-#: git-am.sh:671
-#, sh-format
-msgid ""
-"Patch is empty. Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
-msgstr ""
+#: command-list.h:206
+msgid "Git Repository Layout"
+msgstr "Struttura repository Git"
-#: git-am.sh:708
-msgid "Patch does not have a valid e-mail address."
-msgstr "La patch non contiene un indirizzo email valido."
+#: command-list.h:207
+msgid "Specifying revisions and ranges for Git"
+msgstr "Come specificare revisioni e intervalli in Git"
-#: git-am.sh:755
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
+#: command-list.h:208
+msgid "A tutorial introduction to Git: part two"
+msgstr "Un tutorial introduttivo per Git: seconda parte"
-#: git-am.sh:759
-msgid "Commit Body is:"
-msgstr ""
+#: command-list.h:209
+msgid "A tutorial introduction to Git"
+msgstr "Un tutorial introduttivo per Git"
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#: git-am.sh:766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
-msgstr "Applicare? sì[y]/no[n]/modifica[e]/visualizza patch[v]/accetta tutto[a] "
+#: command-list.h:210
+msgid "An overview of recommended workflows with Git"
+msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
-#: git-am.sh:802
-#, sh-format
-msgid "Applying: $FIRSTLINE"
-msgstr ""
-
-#: git-am.sh:823
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-
-#: git-am.sh:831
-msgid ""
-"You still have unmerged paths in your index\n"
-"did you forget to use 'git add'?"
-msgstr ""
-
-#: git-am.sh:847
-msgid "No changes -- Patch already applied."
-msgstr "Nessuna modifica -- patch già applicata."
-
-#: git-am.sh:857
-#, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
-msgstr "Patch non riuscita a $msgnum $FIRSTLINE"
-
-#: git-am.sh:873
-msgid "applying to an empty history"
-msgstr ""
-
-#: git-bisect.sh:48
+#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Devi iniziare con \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:54
+#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Vuoi che me ne occupi io [Y/n]? "
-#: git-bisect.sh:95
+#: git-bisect.sh:101
#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opzione non riconosciuta: '$arg'"
+msgid "Bad rev input: $arg"
+msgstr "Revisione fornita non valida: $arg"
-#: git-bisect.sh:99
+#: git-bisect.sh:121
#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' non sembra essere una revisione valida"
-
-#: git-bisect.sh:117
-msgid "Bad HEAD - I need a HEAD"
-msgstr ""
+msgid "Bad rev input: $bisected_head"
+msgstr "Revisione fornita non valida: $bisected_head"
#: git-bisect.sh:130
#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
-msgstr ""
-"Checkout di '$start_head' non riuscito. Prova 'git bisect reset "
-"<branch-valido>'."
-
-#: git-bisect.sh:140
-msgid "won't bisect on seeked tree"
-msgstr ""
-
-#: git-bisect.sh:144
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD errato - strano ref simbolico"
-
-#: git-bisect.sh:189
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Argomento bisect_write errato: $state"
-
-#: git-bisect.sh:218
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr ""
-
-#: git-bisect.sh:232
-msgid "Please call 'bisect_state' with at least one argument."
-msgstr "Per favore, chiama 'bisect_state' con almeno un argomento."
-
-#: git-bisect.sh:244
-#, sh-format
msgid "Bad rev input: $rev"
-msgstr ""
+msgstr "Revisione fornita non valida: $rev"
-#: git-bisect.sh:250
-msgid "'git bisect bad' can take only one argument."
-msgstr "'git bisect bad' può prendere un solo argomento."
-
-#. have bad but not good. we could bisect although
-#. this is less optimum.
-#: git-bisect.sh:273
-msgid "Warning: bisecting only with a bad commit."
-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:279
-msgid "Are you sure [Y/n]? "
-msgstr "Sei sicuro? [Y/n] "
-
-#: git-bisect.sh:289
-msgid ""
-"You need to give me at least one good and one bad revisions.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
-msgstr ""
-"Devi specificare almeno una revisione corretta ed una errata.\n"
-"(Puoi usare \"git bisect bad\" e \"git bisect good\" per questo scopo.)"
-
-#: git-bisect.sh:292
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revisions.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:347 git-bisect.sh:474
-msgid "We are not bisecting."
-msgstr "Non stiamo eseguendo un bisect."
-
-#: git-bisect.sh:354
+#: git-bisect.sh:139
#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' non è un commit valido"
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' richiede un solo argomento."
-#: git-bisect.sh:363
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-
-#: git-bisect.sh:390
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Nessun file di log specificato"
-#: git-bisect.sh:391
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
-msgstr ""
+msgstr "impossibile leggere $file per rieseguire i comandi contenuti"
-#: git-bisect.sh:408
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
-msgstr "?? di cosa si sta parlando?"
+msgstr "?? di cosa stai parlando?"
-#: git-bisect.sh:420
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
+msgstr "esecuzione di bisect non riuscita: nessun comando fornito."
+
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
-msgstr "sto eseguendo $command"
+msgstr "esecuzione di $command in corso"
-#: git-bisect.sh:427
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-"bisect run non riuscito:\n"
+"esecuzione di bisect non riuscita:\n"
"il codice di uscita $res da '$command' è < 0 oppure >= 128"
-#: git-bisect.sh:453
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
-msgstr "bisect run non può più proseguire"
+msgstr "l'esecuzione di bisect non può più proseguire"
-#: git-bisect.sh:459
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-"bisect run non riuscito:\n"
-"bisect_state $state è uscito con il codice di errore $res"
+"esecuzione di bisect non riuscita:\n"
+"'bisect_state $state' è uscito con il codice di errore $res"
-#: git-bisect.sh:466
+#: git-bisect.sh:292
msgid "bisect run success"
-msgstr "bisect run eseguito con successo"
+msgstr "esecuzione di bisect completata con successo"
-#: git-pull.sh:21
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Non stiamo eseguendo una bisezione."
+
+#: git-merge-octopus.sh:46
msgid ""
-"Pull is not possible because you have unmerged files.\n"
-"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution, or use 'git commit -a'."
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
msgstr ""
+"Errore: le tue modifiche locali ai seguenti file sarebbero sovrascritte dal "
+"merge"
-#: git-pull.sh:25
-msgid "Pull is not possible because you have unmerged files."
-msgstr ""
-"Il pull non è possibile perché ci sono file di cui non è stato eseguito il "
-"merge."
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Il merge automatico non ha funzionato."
-#: git-pull.sh:197
-msgid "updating an unborn branch with changes added to the index"
-msgstr ""
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Non dovrebbe essere eseguito un merge octopus."
-#. The fetch involved updating the current branch.
-#. The working tree and the index file is still based on the
-#. $orig_head commit, but we are merging into $curr_head.
-#. First update the working tree to match $curr_head.
-#: git-pull.sh:228
+#: git-merge-octopus.sh:73
#, sh-format
-msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
-msgstr ""
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Impossibile trovare un commit comune con $pretty_name"
-#: git-pull.sh:253
-msgid "Cannot merge multiple branches into empty head"
-msgstr "Impossibile eseguire il merge di branch multipli in un head vuoto"
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Già aggiornato rispetto a $pretty_name"
-#: git-pull.sh:257
-msgid "Cannot rebase onto multiple branches"
-msgstr "Impossibile eseguire il rebase su branch multipli"
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Eseguo il fast forward a: $pretty_name"
-#: git-stash.sh:51
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear con parametri non è implementato"
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Provo un merge semplice con $pretty_name"
-#: git-stash.sh:74
-msgid "You do not have the initial commit yet"
-msgstr "Non hai ancora un commit iniziale"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Il merge semplice non ha funzionato, provo il merge automatico."
-#: git-stash.sh:89
-msgid "Cannot save the current index state"
-msgstr "Impossibile salvare lo stato corrente di index"
-
-#: git-stash.sh:123 git-stash.sh:136
-msgid "Cannot save the current worktree state"
-msgstr ""
-
-#: git-stash.sh:140
-msgid "No changes selected"
-msgstr "Nessuna modifica selezionata"
-
-#: git-stash.sh:143
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
-msgstr ""
+msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)"
-#: git-stash.sh:156
-msgid "Cannot record working tree state"
-msgstr ""
-
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:202
+#: git-legacy-stash.sh:271
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"errore: opzione sconosciuta per 'stash save': $option\n"
-" Per aggiungere un messaggio, usare git stash save -- '$option'"
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "Impossibile aggiornare $ref_stash con $w_commit"
-#: git-stash.sh:223
-msgid "No local changes to save"
-msgstr "Nessuna modifica locale da salvare"
+#: git-legacy-stash.sh:323
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "errore: opzione sconosciuta per 'stash push': $option"
-#: git-stash.sh:227
-msgid "Cannot initialize stash"
-msgstr "Impossibile inizializzare stash"
+#: git-legacy-stash.sh:355
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
-#: git-stash.sh:235
-msgid "Cannot save the current status"
-msgstr "Impossibile salvare lo stato attuale"
+#: git-legacy-stash.sh:535
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "opzione sconosciuta: $opt"
-#: git-stash.sh:253
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: git-stash.sh:352
-msgid "No stash found."
-msgstr "Nessuno stash trovato."
-
-#: git-stash.sh:359
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Troppe revisioni specificate: $REV"
-#: git-stash.sh:365
+#: git-legacy-stash.sh:570
#, sh-format
-msgid "$reference is not valid reference"
+msgid "$reference is not a valid reference"
msgstr "$reference non è un riferimento valido"
-#: git-stash.sh:393
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' non è un commit di tipo stash"
-#: git-stash.sh:404
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
-msgstr "'$args' non è un referimento a uno stash"
+msgstr "'$args' non è un riferimento a uno stash"
-#: git-stash.sh:412
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
-msgstr "impossibile aggiornare index"
+msgstr "impossibile aggiornare l'indice"
-#: git-stash.sh:416
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossibile applicare uno stash nel mezzo di un merge"
-#: git-stash.sh:424
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Ci sono conflitti in index. Prova senza --index."
-#: git-stash.sh:426
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
-msgstr ""
+msgstr "Non è stato possibile salvare l'albero indice"
-#: git-stash.sh:460
+#: git-legacy-stash.sh:640
+msgid "Could not restore untracked files from stash entry"
+msgstr ""
+"Non è stato possibile ripristinare i file non tracciati dalla voce stash"
+
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
-msgstr ""
+msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging"
-#: git-stash.sh:474
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:491
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} eliminata ($s)"
-#: git-stash.sh:492
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: non è stato possibile rimuovere la voce di stash"
-#: git-stash.sh:499
-msgid "No branch name specified"
-msgstr "Nome del branch non specificato"
-
-#: git-stash.sh:570
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per ripristinarli digita \"git stash apply\")"
-#: git-submodule.sh:56
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
+#: git-submodule.sh:200
+msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
+"Il percorso relativo può essere usato solo dal primo livello dell'albero di "
+"lavoro"
-#: git-submodule.sh:109
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:150
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
-msgstr ""
-
-#: git-submodule.sh:160
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-msgstr ""
-
-#: git-submodule.sh:249
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' deve essere assoluto o iniziare con ./|../"
+msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../"
-#: git-submodule.sh:266
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' esiste già in index"
+msgstr "'$sm_path' esiste già nell'indice"
-#: git-submodule.sh:270
+#: git-submodule.sh:232
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' esiste già nell'indice e non è un sottomodulo"
+
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' non ha un commit di cui è stato eseguito il checkout"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Use -f if you really want to add it."
msgstr ""
-"Il seguente path è ignorato da uno dei tuoi file .gitignore:\n"
+"Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n"
"$sm_path\n"
"Usa -f se vuoi davvero aggiungerlo."
-#: git-submodule.sh:281
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr ""
+msgstr "Aggiunta del repository esistente in '$sm_path' all'indice"
-#: git-submodule.sh:283
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' esiste già e non è un repository git valido"
+msgstr "'$sm_path' esiste già e non è un repository Git valido"
-#: git-submodule.sh:297
+#: git-submodule.sh:278
#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
+"È stata trovata localmente una directory Git per '$sm_name' con i seguenti "
+"remoti:"
-#: git-submodule.sh:302
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:307
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:349
-#, sh-format
-msgid "Entering '$prefix$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:363
-#, sh-format
-msgid "Stopping at '$sm_path'; script returned non-zero status."
-msgstr ""
-"Interruzione a '$sm_path'; lo script ha restituito uno stato diverso da zero."
-
-#: git-submodule.sh:406
-#, sh-format
-msgid "No url found for submodule path '$sm_path' in .gitmodules"
-msgstr ""
-
-#: git-submodule.sh:415
-#, sh-format
-msgid "Failed to register url for submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:417
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:425
-#, sh-format
-msgid "Failed to register update mode for submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:524
+#: git-submodule.sh:280
#, sh-format
msgid ""
-"Submodule path '$sm_path' not initialized\n"
-"Maybe you want to use 'update --init'?"
+"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 ""
+"Se vuoi riusare questa directory Git locale anziché clonarla nuovamente da\n"
+" $realrepo\n"
+"usa l'opzione '--force'. Se la directory Git locale non è il repository\n"
+"corretto, o se non sei sicuro di ciò che questo voglia dire, scegli un "
+"altro\n"
+"nome con l'opzione '--name'."
-#: git-submodule.sh:537
+#: git-submodule.sh:286
#, sh-format
-msgid "Unable to find current revision in submodule path '$sm_path'"
-msgstr ""
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'."
-#: git-submodule.sh:556
+#: git-submodule.sh:298
#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr ""
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'"
-#: git-submodule.sh:570
+#: git-submodule.sh:303
#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
-msgstr ""
+msgid "Failed to add submodule '$sm_path'"
+msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:571
+#: git-submodule.sh:312
#, sh-format
-msgid "Submodule path '$sm_path': rebased into '$sha1'"
-msgstr ""
+msgid "Failed to register submodule '$sm_path'"
+msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:576
+#: git-submodule.sh:573
#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
+msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-
-#: git-submodule.sh:577
-#, sh-format
-msgid "Submodule path '$sm_path': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:582
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
-msgstr ""
+"Impossibile trovare la revisione corrente nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:583
#, sh-format
-msgid "Submodule path '$sm_path': checked out '$sha1'"
-msgstr ""
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'"
-#: git-submodule.sh:605 git-submodule.sh:928
+#: git-submodule.sh:588
#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
msgstr ""
+"Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
+"percorso del sottomodulo '$sm_path'"
-#: git-submodule.sh:713
-msgid "--cached cannot be used with --files"
-msgstr "--cached non può essere usata con --files"
+#: git-submodule.sh:606
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
+"provo a recuperare direttamente $sha1:"
-#. unexpected type
-#: git-submodule.sh:753
+#: git-submodule.sh:612
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva "
+"$sha1. Fetch diretto di tale commit non riuscito."
+
+#: git-submodule.sh:619
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr ""
+"Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
+
+#: git-submodule.sh:620
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'"
+
+#: git-submodule.sh:624
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr ""
+"Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
+
+#: git-submodule.sh:625
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'"
+
+#: git-submodule.sh:630
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr ""
+"Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
+
+#: git-submodule.sh:631
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'"
+
+#: git-submodule.sh:636
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+"Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo "
+"'$displaypath'"
+
+#: git-submodule.sh:637
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
+
+#: git-submodule.sh:668
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita"
+
+#: git-submodule.sh:830
+msgid "The --cached option cannot be used with the --files option"
+msgstr "L'opzione --cached non può essere usata con l'opzione --files"
+
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modalità $mod_dst inattesa"
-#: git-submodule.sh:771
+#: git-submodule.sh:902
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_src"
-msgstr " Attenzione: $name non contiene commit $sha1_src"
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " Attenzione: $display_name non contiene il commit $sha1_src"
-#: git-submodule.sh:774
+#: git-submodule.sh:905
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_dst"
-msgstr " Attenzione: $name non contiene commit $sha1_dst"
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " Attenzione: $display_name non contiene il commit $sha1_dst"
-#: git-submodule.sh:777
+#: git-submodule.sh:908
#, sh-format
-msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " Attenzione: $name non contiene commit $sha1_src e $sha1_dst"
-
-#: git-submodule.sh:802
-msgid "blob"
-msgstr "blob"
-
-#: git-submodule.sh:803
-msgid "submodule"
-msgstr "sottomodulo"
-
-#: git-submodule.sh:840
-msgid "# Submodules changed but not updated:"
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
+" Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst"
-#: git-submodule.sh:842
-msgid "# Submodule changes to be committed:"
-msgstr ""
-
-#: git-submodule.sh:974
+#: git-parse-remote.sh:89
#, sh-format
-msgid "Synchronizing submodule url for '$name'"
+msgid "See git-${cmd}(1) for details."
+msgstr "Vedi git-${cmd}(1) per ulteriori dettagli."
+
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Stash automatico applicato."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Impossibile memorizzare $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Rebase in corso ($new_count/$total)"
+
+#: git-rebase--preserve-merges.sh:207
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
+"\n"
+"Comandi:\n"
+"p, pick <commit> = usa il commit\n"
+"r, reword <commit> = usa il commit, ma modifica il messaggio di commit\n"
+"e, edit <commit> = usa il commit, ma fermati per modificarlo\n"
+"s, squash <commit> = usa il commit, ma fondilo con il commit precedente\n"
+"f, fixup <commit> = come \"squash\", ma scarta il messaggio di log di "
+"questo\n"
+" commit\n"
+"x, exec <comando> = esegui il comando (il resto della riga) usando la shell\n"
+"d, drop <commit> = elimina il commit\n"
+"l, label <etichetta> = etichetta l'HEAD corrente con un nome\n"
+"t, reset <etichetta> = reimposta HEAD a un'etichetta\n"
+"m, merge [-C <commit> | -c <commit>] <etichetta> [# <oneline>]\n"
+". crea un commit di merge usando il messaggio del commit di merge\n"
+". originale (o la oneline se non è stato specificato un commit di "
+"merge\n"
+". originale). Usa -c <commit> per riformulare il messaggio di commit.\n"
+"\n"
+"Queste righe possono essere riordinate; saranno eseguite dalla prima "
+"all'ultima.\n"
+
+#: git-rebase--preserve-merges.sh:270
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"È possibile modificare il commit ora con\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Quando sei soddisfatto delle modifiche, esegui\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:295
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: non è un commit che possa essere scelto"
+
+#: git-rebase--preserve-merges.sh:334
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nome commit non valido: $sha1"
+
+#: git-rebase--preserve-merges.sh:364
+msgid "Cannot write current commit's replacement sha1"
+msgstr ""
+"Impossibile scrivere lo SHA1 del commit che dovrebbe sostituire quello "
+"corrente"
+
+#: git-rebase--preserve-merges.sh:415
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Fast forward a $sha1"
+
+#: git-rebase--preserve-merges.sh:417
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Impossibile eseguire il fast forward a $sha1"
+
+#: git-rebase--preserve-merges.sh:426
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Impossibile spostare l'HEAD a $first_parent"
+
+#: git-rebase--preserve-merges.sh:431
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Mi rifiuto di eseguire lo squash di un merge: $sha1"
+
+#: git-rebase--preserve-merges.sh:449
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Errore durante la riesecuzione del merge di $sha1"
+
+#: git-rebase--preserve-merges.sh:458
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Impossibile scegliere $sha1"
+
+#: git-rebase--preserve-merges.sh:467
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Questo è il messaggio di commit numero ${n}:"
+
+#: git-rebase--preserve-merges.sh:472
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Il messaggio di commit numero ${n} sarà saltato:"
+
+#: 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] "Questa è una combinazione di $count commit."
+msgstr[1] "Questa è una combinazione di $count commit."
+
+#: git-rebase--preserve-merges.sh:492
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Impossibile scrivere $fixup_msg"
+
+#: git-rebase--preserve-merges.sh:495
+msgid "This is a combination of 2 commits."
+msgstr "Questa è una combinazione di 2 commit."
+
+#: 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 "Impossibile applicare $sha1... $rest"
+
+#: git-rebase--preserve-merges.sh:611
+#, sh-format
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
+msgstr ""
+"Impossibile modificare il commit dopo la scelta di $sha1... $rest\n"
+"Molto probabilmente questo è dovuto a un messaggio di commit vuoto, oppure\n"
+"l'esecuzione dell'hook di pre-commit non è riuscita. In quest'ultimo caso,\n"
+"potrebbe essere necessario risolvere il problema evidenziato per essere in\n"
+"grado di modificare il messaggio di commit."
+
+#: git-rebase--preserve-merges.sh:626
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Fermato a $sha1_abbrev... $rest"
+
+#: git-rebase--preserve-merges.sh:641
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Impossibile eseguire '$squash_style' senza un commit precedente"
+
+#: git-rebase--preserve-merges.sh:683
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Eseguo $rest"
+
+#: git-rebase--preserve-merges.sh:691
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Esecuzione non riuscita: $rest"
+
+#: git-rebase--preserve-merges.sh:693
+msgid "and made changes to the index and/or the working tree"
+msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro"
+
+#: git-rebase--preserve-merges.sh:695
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Puoi correggere il problema e quindi eseguire\n"
+"\n"
+"\tgit rebase --continue"
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--preserve-merges.sh:708
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Esecuzione riuscita: $rest\n"
+"ma sono state mantenute modifiche all'indice e/o all'albero di lavoro\n"
+"Esegui il commit o lo stash delle modifiche, quindi esegui\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:719
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Comando sconosciuto: $command $sha1 $rest"
+
+#: git-rebase--preserve-merges.sh:720
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Correggi la situazione usando 'git rebase --edit-todo'."
+
+#: git-rebase--preserve-merges.sh:755
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Rebase e aggiornamento di $head_name eseguiti con successo."
+
+#: git-rebase--preserve-merges.sh:812
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
+
+#: git-rebase--preserve-merges.sh:817
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+"Hai modifiche in staging nell'albero di lavoro.\n"
+"Se queste modifiche devono essere sottoposte a squash nel commit\n"
+"precedente, esegui:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Se devono essere incluse in un nuovo commit, esegui:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In entrambi i casi, una volta finito, continua con:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--preserve-merges.sh:834
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Errore durante la ricerca dell'identità dell'autore per la modifica del "
+"commit"
+
+#: 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 ""
+"Ci sono modifiche di cui non è stato eseguito il commit nel tuo albero\n"
+"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
+"--continue'."
+
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+msgid "Could not commit staged changes."
+msgstr "Impossibile eseguire il commit delle modifiche in staging."
+
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+msgid "Could not execute editor"
+msgstr "Impossibile eseguire l'editor"
+
+#: git-rebase--preserve-merges.sh:900
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Impossibile eseguire il checkout di $switch_to"
+
+#: git-rebase--preserve-merges.sh:907
+msgid "No HEAD?"
+msgstr "Nessun'HEAD?"
+
+#: git-rebase--preserve-merges.sh:908
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Impossibile creare la directory temporanea $state_dir"
+
+#: git-rebase--preserve-merges.sh:911
+msgid "Could not mark as interactive"
+msgstr "Impossibile contrassegnare come interattivo"
+
+#: 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] "Rebase di $shortrevisions su $shortonto ($todocount comando)"
+msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)"
+
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+msgid "Could not init rewritten commits"
+msgstr "Impossibile inizializzare i commit riscritti"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "uso: $dashless $USAGE"
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"Impossibile modificare la directory corrente in $cdup, il primo livello "
+"dell'albero di lavoro"
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr ""
+"errore fatale: $program_name non può essere usato senza un albero di lavoro."
+
+#: git-sh-setup.sh:221
+msgid "Cannot rebase: You have unstaged changes."
+msgstr ""
+"Impossibile eseguire il rebase: ci sono delle modifiche non in staging."
+
+#: git-sh-setup.sh:224
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr ""
+"Impossibile riscrivere i branch: ci sono delle modifiche non in staging."
+
+#: git-sh-setup.sh:227
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr ""
+"Impossibile eseguire un pull seguito da un rebase: ci sono delle modifiche "
+"non in staging."
+
+#: git-sh-setup.sh:230
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Impossibile eseguire $action: ci sono delle modifiche non in staging."
+
+#: git-sh-setup.sh:243
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr ""
+"Impossibile eseguire un rebase:: l'indice contiene modifiche di cui non è "
+"stato eseguito il commit."
+
+#: git-sh-setup.sh:246
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Impossibile eseguire un pull seguito da un rebase: l'indice contiene "
+"modifiche di cui non è stato eseguito il commit."
+
+#: git-sh-setup.sh:249
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+"Impossibile eseguire $action: l'indice contiene modifiche di cui non è stato "
+"eseguito il commit."
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr ""
+"Inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit."
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Devi eseguire questo comando dal primo livello dell'albero di lavoro."
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr "Impossibile determinare il percorso assoluto della directory Git"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:210
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%20s %32s %s"
+
+#: git-add--interactive.perl:211
+msgid "staged"
+msgstr "nell'area di staging"
+
+#: git-add--interactive.perl:211
+msgid "unstaged"
+msgstr "rimosso dall'area di staging"
+
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
+msgid "binary"
+msgstr "binario"
+
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
+msgid "nothing"
+msgstr "non fare nulla"
+
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
+msgid "unchanged"
+msgstr "non modificato"
+
+#: git-add--interactive.perl:623
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "aggiunto %d percorso\n"
+msgstr[1] "aggiunti %d percorsi\n"
+
+#: git-add--interactive.perl:626
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "aggiornato %d percorso\n"
+msgstr[1] "aggiornati %d percorsi\n"
+
+#: git-add--interactive.perl:629
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "ripristinato %d percorso\n"
+msgstr[1] "ripristinati %d percorsi\n"
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "eseguito touch su %d percorso\n"
+msgstr[1] "eseguito touch su %d percorsi\n"
+
+#: git-add--interactive.perl:641
+msgid "Update"
+msgstr "Aggiorna"
+
+#: git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Esegui il revert"
+
+#: git-add--interactive.perl:676
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s ora non è tracciato.\n"
+
+#: git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Aggiungi file non tracciati"
+
+#: git-add--interactive.perl:693
+msgid "No untracked files.\n"
+msgstr "Nessun file non tracciato.\n"
+
+#: git-add--interactive.perl:1051
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per l'aggiunta all'area di staging."
+
+#: git-add--interactive.perl:1054
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per lo stash."
+
+#: git-add--interactive.perl:1057
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per la rimozione dall'area di staging."
+
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per l'applicazione."
+
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per la rimozione."
+
+#: git-add--interactive.perl:1109
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s"
+
+#: git-add--interactive.perl:1110
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Modalità manuale modifica hunt - vedi la fine del file per una guida "
+"veloce.\n"
+
+#: git-add--interactive.perl:1116
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Per rimuovere '%s' righe, rendile righe ' ' (contesto).\n"
+"Per rimuovere '%s' righe, eliminale.\n"
+"Le righe che iniziano con %s saranno rimosse.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1124
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Se non può essere applicata senza problemi, ti sarà data la possibilità\n"
+"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
+"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n"
+
+#: git-add--interactive.perl:1138
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "apertura del file di modifica hunk in lettura non riuscita: %s"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1237
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"L'hunk modificato non può essere applicato senza problemi. Modificarlo di "
+"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? "
+
+#: git-add--interactive.perl:1246
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aggiungi quest'hunk all'area di staging\n"
+"n - non aggiungere quest'hunk all'area di staging\n"
+"q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di "
+"staging\n"
+"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+"staging\n"
+"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
+"staging"
+
+#: git-add--interactive.perl:1252
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - esegui lo stash di quest'hunk\n"
+"n - non eseguire lo stash di quest'hunk\n"
+"q - esci; non eseguire lo stash di quest'hunk né di quelli rimanenti\n"
+"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
+"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file"
+
+#: git-add--interactive.perl:1258
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - rimuovi quest'hunk dall'area di staging\n"
+"n - non rimuovere quest'hunk dall'area di staging\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti dall'area di "
+"staging\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di "
+"staging\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
+"staging"
+
+#: git-add--interactive.perl:1264
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applica quest'hunk all'indice\n"
+"n - non applicare quest'hunk all'indice\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - rimuovi quest'hunk dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1276
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1282
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applica quest'hunk all'indice e all'albero di lavoro\n"
+"n - non applicare quest'hunk all'indice e all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applica quest'hunk all'albero di lavoro\n"
+"n - non applicare quest'hunk all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1309
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - seleziona un hunk a cui andare\n"
+"/ - cerca un hunk corrispondente all'espressione regolare data\n"
+"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non "
+"è stata presa una decisione\n"
+"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n"
+"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non "
+"è stata presa una decisione\n"
+"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n"
+"s - suddividi l'hunk corrente in hunk più piccoli\n"
+"e - modifica manualmente l'hunk corrente\n"
+"? - stampa una guida\n"
+
+#: git-add--interactive.perl:1340
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n"
+
+#: git-add--interactive.perl:1341
+msgid "Apply them to the worktree anyway? "
+msgstr "Vuoi comunque applicarli all'albero di lavoro? "
+
+#: git-add--interactive.perl:1344
+msgid "Nothing was applied.\n"
+msgstr "Non è stato applicato nulla.\n"
+
+#: git-add--interactive.perl:1355
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "ignoro ciò che non è stato sottoposto a merge: %s\n"
+
+#: git-add--interactive.perl:1364
+msgid "Only binary files changed.\n"
+msgstr "Sono stati modificati solo file binari.\n"
+
+#: git-add--interactive.perl:1366
+msgid "No changes.\n"
+msgstr "Nessuna modifica.\n"
+
+#: git-add--interactive.perl:1374
+msgid "Patch update"
+msgstr "Aggiornamento patch"
+
+#: git-add--interactive.perl:1426
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1427
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1428
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1431
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1432
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1433
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1436
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1437
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1438
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1441
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1442
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1443
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1451
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: git-add--interactive.perl:1452
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1453
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1456
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: git-add--interactive.perl:1457
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1458
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
+msgid "No other hunks to goto\n"
+msgstr "Nessun altro hunk a cui andare\n"
+
+#: git-add--interactive.perl:1575
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
+
+#: git-add--interactive.perl:1577
+msgid "go to which hunk? "
+msgstr "a quale hunk desideri andare? "
+
+#: git-add--interactive.perl:1586
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Numero non valido: '%s'\n"
+
+#: git-add--interactive.perl:1591
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Mi dispiace, è disponibile solo %d hunk.\n"
+msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n"
+
+#: git-add--interactive.perl:1617
+msgid "No other hunks to search\n"
+msgstr "Nessun altro hunk in cui ricercare\n"
+
+#: git-add--interactive.perl:1621
+msgid "search for regex? "
+msgstr "cercare un'espressione regolare? "
+
+#: git-add--interactive.perl:1634
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Espressione regolare di ricerca %s malformata: %s\n"
+
+#: git-add--interactive.perl:1644
+msgid "No hunk matches the given pattern\n"
+msgstr "Nessun hunk corrisponde al pattern fornito\n"
+
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+msgid "No previous hunk\n"
+msgstr "Nessun hunk precedente\n"
+
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+msgid "No next hunk\n"
+msgstr "Nessun hunk successivo\n"
+
+#: git-add--interactive.perl:1690
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Mi dispiace, non posso suddividere quest'hunk\n"
+
+#: git-add--interactive.perl:1696
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Suddiviso in %d hunk.\n"
+msgstr[1] "Suddiviso in %d hunk.\n"
+
+#: git-add--interactive.perl:1706
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Mi dispiace, non posso modificare quest'hunk\n"
+
+#: git-add--interactive.perl:1752
+msgid "Review diff"
+msgstr "Rivedi diff"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1771
+msgid ""
+"status - show paths with changes\n"
+"update - add working tree state to the staged set of changes\n"
+"revert - revert staged set of changes back to the HEAD version\n"
+"patch - pick hunks and update selectively\n"
+"diff - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status - visualizza i percorsi con modifiche\n"
+"update - aggiunge lo stato dell'albero di lavoro all'insieme delle\n"
+" modifiche nell'area di staging\n"
+"revert - ripristina l'insieme delle modifiche nell'area di staging\n"
+" alla versione HEAD\n"
+"patch - seleziona e aggiorna gli hunk in modo selettivo\n"
+"diff - visualizza le differenze fra HEAD e l'indice\n"
+"add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n"
+" modifiche nell'area di staging\n"
+
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+msgid "missing --"
+msgstr "-- mancante"
+
+#: git-add--interactive.perl:1819
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "modalità --patch sconosciuta: %s"
+
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "argomento %s non valido, atteso --"
+
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+"il fuso orario locale differisce da GMT di un intervallo non multiplo di un "
+"minuto\n"
+
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "l'offset del fuso orario locale è maggiore o uguale a 24 ore\n"
+
+#: git-send-email.perl:223 git-send-email.perl:229
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "l'editor non è terminato regolarmente, interrompo tutte le operazioni"
+
+#: git-send-email.perl:310
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contiene una versione intermedia dell'e-mail che stavi componendo.\n"
+
+#: git-send-email.perl:315
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' contiene l'e-mail composta.\n"
+
+#: git-send-email.perl:408
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases non è compatibile con altre opzioni\n"
+
+#: git-send-email.perl:481 git-send-email.perl:683
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Impossibile eseguire git format-patch al di fuori di un repository\n"
+
+#: git-send-email.perl:484
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size` e `relogin` devono essere specificati insieme (sulla riga di "
+"comando o tramite un'opzione di configurazione)\n"
+
+#: git-send-email.perl:497
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Campo --suppress-cc sconosciuto: '%s'\n"
+
+#: git-send-email.perl:528
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Impostazione --confirm sconosciuta: '%s'\n"
+
+#: git-send-email.perl:556
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "attenzione: non sono supportati alias sendmail con virgolette: %s\n"
+
+#: git-send-email.perl:558
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "attenzione: `:include:` non supportato: %s\n"
+
+#: git-send-email.perl:560
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "attenzione: redirezioni `/file` o `|pipe` non supportate: %s\n"
+
+#: git-send-email.perl:565
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "attenzione: riga sendmail non riconosciuta: %s\n"
+
+#: git-send-email.perl:649
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for. Please disambiguate by...\n"
+"\n"
+" * Saying \"./%s\" if you mean a file; or\n"
+" * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Il file '%s' esiste ma tale stringa potrebbe corrispondere\n"
+"anche all'intervallo di commit per cui generare delle patch.\n"
+"Specifica qual è il caso corretto...\n"
+"\n"
+" * ...usando \"./%s\" se intendi riferirti al file, o...\n"
+" * ...fornendo l'opzione --format-patch se ti riferisci\n"
+" a un intervallo.\n"
+
+#: git-send-email.perl:670
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "opendir di %s non riuscita: %s"
+
+#: git-send-email.perl:694
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"errore fatale: %s: %s\n"
+"attenzione: non è stata inviata alcuna patch\n"
+
+#: git-send-email.perl:705
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Nessun file patch specificato!\n"
+"\n"
+
+#: git-send-email.perl:718
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "Riga oggetto assente in %s?"
+
+#: git-send-email.perl:728
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Apertura di %s in scrittura non riuscita: %s"
+
+#: git-send-email.perl:739
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"Le righe che iniziano con \"GIT:\" saranno rimosse.\n"
+"Valuta di includere un diffstat globale o un sommario per\n"
+"la patch che stai scrivendo.\n"
+"\n"
+"Rimuovi il corpo se non vuoi inviare un sommario.\n"
+
+#: git-send-email.perl:763
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Apertura di %s non riuscita: %s"
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Apertura di %s.final non riuscita: %s"
+
+#: git-send-email.perl:823
+msgid "Summary email is empty, skipping it\n"
+msgstr "E-mail riassuntiva vuota, la ometto\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:858
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Usare <%s> [y/N]? "
+
+#: git-send-email.perl:913
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"I seguenti file sono codificati a 8 bit ma non dichiarano un Content-"
+"Transfer-Encoding.\n"
+
+#: git-send-email.perl:918
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Che codifica a 8 bit devo dichiarare [UTF-8]? "
+
+#: git-send-email.perl:926
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Mi rifiuto di eseguire l'invio perché la patch\n"
+"\t%s\n"
+"ha come oggetto nel modello '*** SUBJECT HERE ***'. Fornisci l'opzione --"
+"force se vuoi veramente procedere con l'invio.\n"
+
+#: git-send-email.perl:945
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr ""
+"A chi dovranno essere inviate le e-mail (se devono essere inviate a "
+"qualcuno)?"
+
+#: git-send-email.perl:963
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "errore fatale: l'alias '%s' si espande in se stesso\n"
+
+#: git-send-email.perl:975
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"Message-ID da usare nell'intestazione In-Reply-To per la prima e-mail (se "
+"dev'essere usato)? "
+
+#: git-send-email.perl:1033 git-send-email.perl:1041
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "errore: impossibile estrarre un indirizzo valido da %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1045
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+"Cosa devo fare con quest'indirizzo? (Esci [q]|scarta [d]|modifica [e]): "
+
+#: git-send-email.perl:1362
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "Il percorso CA \"%s\" non esiste"
+
+#: 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 ""
+" L'elenco Cc di cui sopra è stato espanso aggiungendo\n"
+" indirizzi aggiuntivi trovati nel messaggio di commit della\n"
+" patch. Per impostazione predefinita send-email richiede\n"
+" come procedere prima dell'invio ogniqualvolta si verifichi\n"
+" tale evenienza. Questo comportamento è controllato\n"
+" dall'impostazione di configurazione sendemail.confirm.\n"
+"\n"
+" Per ulteriori informazioni, esegui 'git send-email --help'.\n"
+" Per mantenere il comportamento corrente, ma non\n"
+" visualizzare più questo messaggio, esegui 'git config\n"
+" --global sendemail.confirm auto'.\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1460
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+"Inviare quest'e-mail? (Sì [y]|[n]o|modifica [e]|esci [q]|invia tutte [a]): "
+
+#: git-send-email.perl:1463
+msgid "Send this email reply required"
+msgstr "È richiesta una risposta alla richiesta di invio e-mail"
+
+#: git-send-email.perl:1491
+msgid "The required SMTP server is not properly defined."
+msgstr "Il server SMTP richiesto non è definito in modo adeguato."
+
+#: git-send-email.perl:1538
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Il server non supporta STARTTLS! %s"
+
+#: git-send-email.perl:1543 git-send-email.perl:1547
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS non riuscito! %s"
+
+#: git-send-email.perl:1556
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Impossibile inizializzare SMTP in modo adeguato. Controlla la configurazione "
+"e usa --smtp-debug."
+
+#: git-send-email.perl:1574
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Invio di %s non riuscito\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Test invio %s riuscito\n"
+
+#: git-send-email.perl:1577
+#, perl-format
+msgid "Sent %s\n"
+msgstr "%s inviato\n"
+
+#: git-send-email.perl:1579
+msgid "Dry-OK. Log says:\n"
+msgstr "Esecuzione di prova riuscita. Il registro è il seguente:\n"
+
+#: git-send-email.perl:1579
+msgid "OK. Log says:\n"
+msgstr "Operazione riuscita. Il registro è il seguente:\n"
+
+#: git-send-email.perl:1591
+msgid "Result: "
+msgstr "Risultato: "
+
+#: git-send-email.perl:1594
+msgid "Result: OK\n"
+msgstr "Risultato: OK\n"
+
+#: git-send-email.perl:1612
+#, perl-format
+msgid "can't open file %s"
+msgstr "impossibile aprire il file %s"
+
+#: git-send-email.perl:1659 git-send-email.perl:1679
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Aggiungo cc: %s dalla riga '%s'\n"
+
+#: git-send-email.perl:1665
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Aggiungo to: %s dalla riga '%s'\n"
+
+#: git-send-email.perl:1718
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non mbox) Aggiungo cc: %s dalla riga '%s'\n"
+
+#: git-send-email.perl:1753
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(corpo) Aggiungo cc: %s dalla riga '%s'\n"
+
+#: git-send-email.perl:1864
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Impossibile eseguire '%s'"
+
+#: git-send-email.perl:1871
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Aggiungo %s: %s da: '%s'\n"
+
+#: git-send-email.perl:1875
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) chiusura della pipe a '%s' non riuscita"
+
+#: git-send-email.perl:1905
+msgid "cannot send message as 7bit"
+msgstr "impossibile inviare il messaggio con codifica a 7 bit"
+
+#: git-send-email.perl:1913
+msgid "invalid transfer encoding"
+msgstr "codifica di trasferimento non valida"
+
+#: 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 "impossibile aprire %s: %s\n"
+
+#: git-send-email.perl:1957
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: la patch contiene una riga più lunga di 998 caratteri"
+
+#: git-send-email.perl:1974
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "Salto %s con il suffisso di backup '%s'.\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1978
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Inviare %s? [y|N]: "
+
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "Il fetch normalmente indica quali branch siano stati sottoposti ad "
+#~ "aggiornamento forzato, ma tale controllo è stato disabilitato."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "o eseguire 'git config fetch.showForcedUpdates false' per omettere "
+#~ "questo\n"
+#~ "controllo.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "log.mailmap non è impostato; il suo valore implicito sarà modificato\n"
+#~ "in una prossima versione. Per eliminare questo messaggio e mantenere\n"
+#~ "il comportamento attuale, imposta il valore di configurazione\n"
+#~ "log.mailmap a false.\n"
+#~ "\n"
+#~ "Per eliminare questo messaggio e adottare il nuovo comportamento ora,\n"
+#~ "imposta il valore di configurazione log.mailmap a true.\n"
+#~ "\n"
+#~ "Vedi 'git help config' e cerca 'log.mailmap' per ulteriori informazioni."
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Il server supporta multi_ack_detailes"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Il server supporta no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Il server supporta multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Il server supporta side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Il server supporta side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Il server supporta allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Il server supporta allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Il server supporta ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD scollegato su %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD scollegato da %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checkout dei file in corso"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "impossibile eseguire l'attività in modalità interattiva con lo standard "
+#~ "input non collegato a un terminale."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "apertura di '%s' non riuscita"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "stat di %s non riuscito\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Se vuoi ignorare questo commit, usa:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Quindi il comando \"git cherry-pick --continue\" farà riprendere\n"
+#~ "il cherry picking per i commit rimanenti.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verbo non riconosciuto: %s"
+
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "la versione dell'hash %X non corrisponde alla versione %X"
+
+#~ msgid "option '%s' requires a value"
+#~ msgstr "l'opzione '%s' richiede un valore"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "impossibile trasformare l'elenco todo"
+
+#~ msgid "default"
+#~ msgstr "impostazione predefinita"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "Non è stato possibile creare la directory '%s'"
+
+#, fuzzy
+#~ msgid "could not open %s"
+#~ msgstr "impossibile aprire '%s'"
+
+#, fuzzy
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "Non è stato possibile rimuovere il branch %s"
+
+#, fuzzy
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr "Impossibile combinare --no-ff con --ff-only."
+
+#, fuzzy
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "Impossibile combinare --no-ff con --ff-only."
+
+#, fuzzy
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "Impossibile combinare --no-ff con --ff-only."
+
+#, fuzzy
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr "Impossibile combinare --no-ff con --ff-only."
+
+#, fuzzy
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "'%s' non punta ad un commit"
+
+#, fuzzy
+#~ msgid "Changes to $onto:"
+#~ msgstr "Modifiche di cui verrà eseguito il commit:"
+
+#~ msgid "ignoring unknown color-moved-ws mode '%s'"
+#~ msgstr "modalità color-moved-ws sconosciuta '%s' ignorata"
+
+#~ msgid "only 'tree:0' is supported"
+#~ msgstr "è supportato solo 'tree:0'"
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Ridenomino %s in %s e %s in %s"
+
+#~ msgid "Adding merged %s"
+#~ msgstr "Aggiunta elemento sottoposto a merge %s"
+
+#~ msgid "Internal error"
+#~ msgstr "Errore interno"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr "è stato specificato mainline ma il commit %s non è un merge."
+
+#~ msgid "unable to write sha1 filename %s"
+#~ msgstr "impossibile scrivere il file sha1 con nome %s"
+
+#~ msgid "cannot read sha1_file for %s"
+#~ msgstr "impossibile leggere il file sha1 per %s"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "opzione non riconosciuta: '$arg'"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "'$invalid' non è un commit valido"
+
+#, fuzzy
+#~ msgid "could not parse '%s' (looking for '%s')"
+#~ msgstr "non è stato possibile leggere il file di log '%s'"
+
+#, fuzzy
+#~ msgid "Can't stat %s"
+#~ msgstr "impossibile eseguire lo stat di '%s'"
+
+#~ msgid "No such remote: %s"
+#~ msgstr "Remote non esistente: %s"
+
+#~ msgid " %d file changed"
+#~ msgid_plural " %d files changed"
+#~ msgstr[0] " %d file modificato"
+#~ msgstr[1] " %d file modificati"
+
+#~ msgid ", %d insertion(+)"
+#~ msgid_plural ", %d insertions(+)"
+#~ msgstr[0] ", %d inserzione(+)"
+#~ msgstr[1] ", %d inserzioni(+)"
+
+#~ msgid ", %d deletion(-)"
+#~ msgid_plural ", %d deletions(-)"
+#~ msgstr[0] ". %d rimozione(-)"
+#~ msgstr[1] ", %d rimozioni(-)"
+
+#~ msgid "could not run gpg."
+#~ msgstr "non è stato possibile eseguire gpg."
+
+#~ msgid "gpg did not accept the data"
+#~ msgstr "gpg non ha accettato i dati"
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s': %s"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "automaticamente tra %0.1f secondi..."
+
+#~ msgid "You do not have a valid HEAD"
+#~ msgstr "Non hai un HEAD valido"
+
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr "impossibile trovare l'utente corrente nel file passwd: %s"
+
+#~ msgid "no such user"
+#~ msgstr "utente non esistente"
+
+#~ msgid "bug"
+#~ msgstr "bug"
+
+#~ msgid "copied: %s -> %s"
+#~ msgstr "copiato: %s -> %s"
+
+#~ msgid "deleted: %s"
+#~ msgstr "eliminato: %s"
+
+#~ msgid "modified: %s"
+#~ msgstr "modificato: %s"
+
+#~ msgid "renamed: %s -> %s"
+#~ msgstr "rinominato: %s -> %s"
+
+#~ msgid ", behind "
+#~ msgstr ", indietro "
+
+#~ msgid "no files added"
+#~ msgstr "nessun file aggiunto"
+
+#~ msgid "oops"
+#~ msgstr "oops"
+
+#~ msgid "%s: has been deleted/renamed"
+#~ msgstr "%s: è stata eliminata/rinominata"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: avanti %d]"
+
+#~ msgid "diff_setup_done failed"
+#~ msgstr "diff_setup_done non riuscito"
+
+#~ msgid "--detach cannot be used with -b/-B/--orphan"
+#~ msgstr "--detach non può essere usata con -b/-B/--orphan"
+
+#~ msgid "--detach cannot be used with -t"
+#~ msgstr "--detach non può essere usata con -t"
+
+#~ msgid "--orphan cannot be used with -t"
+#~ msgstr "--orphan non può essere usata con -t"
+
+#~ msgid "git checkout: -f and -m are incompatible"
+#~ msgstr "git checkout: -f e -m non sono compatibili"
+
+#~ msgid "No existing author found with '%s'"
+#~ msgstr "Nessun autore esistente trovato con '%s'"
+
+#~ msgid "'%s': not a documentation directory."
+#~ msgstr "'%s': non è una directory della documentazione."
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Reinizializzato un esistente"
+
+#~ msgid "Initialized empty"
+#~ msgstr "Inizializzato un"
+
+#~ msgid " shared"
+#~ msgstr " condiviso"
+
+#~ msgid "Writing SQUASH_MSG"
+#~ msgstr "Scrittura di SQUASH_MSG"
+
+#~ msgid "Finishing SQUASH_MSG"
+#~ msgstr "Completamento di SQUASH_MSG"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "nome tag troppo lungo: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "intestazione del tag troppo grande."
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "È necessario impostare le informazioni sul committer"
+
+#~ msgid ""
+#~ "When you have resolved this problem run \"$cmdline --resolved\".\n"
+#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
+#~ msgstr ""
+#~ "Quando hai risolto il problema esegui \"$cmdline --resolved\".\n"
+#~ "Se vuoi saltare questa patch, esegui invece \"$cmdline --skip\".\n"
+#~ "Per ripristinare il branch originale e interrompere l'applicazione delle "
+#~ "patch esegui \"$cmdline --abort\"."
+
+#~ msgid "Patch format $patch_format is not supported."
+#~ msgstr "Il formato patch $patch_format non è supportato."
+
+#~ msgid "Please make up your mind. --skip or --abort?"
+#~ msgstr "Per favore, deciditi. --skip o --abort?"
+
+#~ msgid "Patch does not have a valid e-mail address."
+#~ msgstr "La patch non contiene un indirizzo email valido."
+
+#~ msgid "Patch failed at $msgnum $FIRSTLINE"
+#~ msgstr "Patch non riuscita a $msgnum $FIRSTLINE"
+
+#~ msgid "Please call 'bisect_state' with at least one argument."
+#~ msgstr "Per favore, chiama 'bisect_state' con almeno un argomento."
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "errore: opzione sconosciuta per 'stash save': $option\n"
+#~ " Per aggiungere un messaggio, usare git stash save -- '$option'"
+
+#~ msgid "Stopping at '$sm_path'; script returned non-zero status."
+#~ msgstr ""
+#~ "Interruzione a '$sm_path'; lo script ha restituito uno stato diverso da "
+#~ "zero."
#~ msgid "--"
#~ msgstr "--"
diff --git a/po/ru.po b/po/ru.po
index 653628f..a77b462 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2018
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2019
# insolor, 2014
# insolor, 2014
+# Чук Таблицоменделеев <aurum444an@gmail.com>, 2019
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-08-21 08:28+0800\n"
-"PO-Revision-Date: 2018-08-28 15:57+0000\n"
+"POT-Creation-Date: 2019-06-04 08:24+0800\n"
+"PO-Revision-Date: 2019-06-21 17:28+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -20,59 +21,59 @@
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: advice.c:97
+#: advice.c:103
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:150
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
-#: advice.c:152
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
-#: advice.c:154
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
-#: advice.c:156
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
-#: advice.c:158
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
-#: advice.c:160
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
-#: advice.c:168
+#: advice.c:174
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит."
-#: advice.c:176
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr "Выход из-за неразрешенного конфликта."
-#: advice.c:181 builtin/merge.c:1286
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
-#: advice.c:183
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr "Перед слиянием, выполните коммит ваших изменений."
-#: advice.c:184
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr "Выход из-за незавершенного слияния."
-#: advice.c:190
+#: advice.c:196
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -88,92 +89,100 @@
"\n"
msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "командная строка заканчивается символом \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "пропущена закрывающая кавычка"
+
+#: apply.c:63
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "неопознанная опция для пробелов «%s»"
-#: apply.c:75
+#: apply.c:79
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "неопознанная опция для игнорирования пробелов «%s»"
-#: apply.c:125
+#: apply.c:129
msgid "--reject and --3way cannot be used together."
msgstr "--reject и --3way нельзя использовать одновременно."
-#: apply.c:127
+#: apply.c:131
msgid "--cached and --3way cannot be used together."
msgstr "--cached и --3way нельзя использовать одновременно."
-#: apply.c:130
+#: apply.c:134
msgid "--3way outside a repository"
msgstr "--3way вне репозитория"
-#: apply.c:141
+#: apply.c:145
msgid "--index outside a repository"
msgstr "--index вне репозитория"
-#: apply.c:144
+#: apply.c:148
msgid "--cached outside a repository"
msgstr "--cached вне репозитория"
-#: apply.c:826
+#: apply.c:829
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
-#: apply.c:835
+#: apply.c:838
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec возвратил %d для ввода: %s"
-#: apply.c:909
+#: apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "не удалось найти имя файла в строке патча %d"
-#: apply.c:947
+#: apply.c:950
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
-#: apply.c:953
+#: apply.c:956
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
-#: apply.c:954
+#: apply.c:957
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
-#: apply.c:959
+#: apply.c:962
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
-#: apply.c:988
+#: apply.c:991
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "недопустимый режим %d: %s"
-#: apply.c:1306
+#: apply.c:1310
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "противоречивые строки заголовка %d и %d"
-#: apply.c:1478
+#: apply.c:1482
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: не ожидаемая строка: %.*s"
-#: apply.c:1547
+#: apply.c:1551
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
-#: apply.c:1567
+#: apply.c:1571
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
@@ -186,70 +195,70 @@
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-#: apply.c:1580
+#: apply.c:1584
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
-#: apply.c:1768
+#: apply.c:1772
msgid "new file depends on old contents"
msgstr "новый файл зависит от старого содержимого"
-#: apply.c:1770
+#: apply.c:1774
msgid "deleted file still has contents"
msgstr "удаленный файл все еще имеет содержимое"
-#: apply.c:1804
+#: apply.c:1808
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на строке %d"
-#: apply.c:1841
+#: apply.c:1845
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s зависит от старого содержимого"
-#: apply.c:1843
+#: apply.c:1847
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s все еще имеет содержимое"
-#: apply.c:1846
+#: apply.c:1850
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
-#: apply.c:1993
+#: apply.c:1997
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на строке %d: %.*s"
-#: apply.c:2030
+#: apply.c:2034
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на строке %d"
-#: apply.c:2190
+#: apply.c:2196
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч с мусором на строке %d"
-#: apply.c:2276
+#: apply.c:2282
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: apply.c:2280
+#: apply.c:2286
#, c-format
msgid "unable to open or read %s"
msgstr "не удалось открыть или прочесть %s"
-#: apply.c:2939
+#: apply.c:2945
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало строки: «%c»"
-#: apply.c:3060
+#: apply.c:3066
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -258,257 +267,258 @@
msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-#: apply.c:3072
+#: apply.c:3078
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
-#: apply.c:3078
+#: apply.c:3084
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиске:\n%.*s"
-#: apply.c:3100
+#: apply.c:3106
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча для «%s»"
-#: apply.c:3108
+#: apply.c:3114
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
-#: apply.c:3154
+#: apply.c:3161
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
-#: apply.c:3164
+#: apply.c:3171
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
-#: apply.c:3172
+#: apply.c:3179
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
-#: apply.c:3190
+#: apply.c:3197
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "не удалось прочитать необходимую посылку %s для «%s»"
-#: apply.c:3203
+#: apply.c:3210
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалось применить двоичный патч к «%s»"
-#: apply.c:3209
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
-#: apply.c:3230
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка применения изменений: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "не удалось переключить состояние на %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "не удалось прочитать %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за символической ссылкой"
-#: apply.c:3441 apply.c:3681
+#: apply.c:3449 apply.c:3692
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: apply.c:3524 apply.c:3696
+#: apply.c:3535 apply.c:3707
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индексе"
-#: apply.c:3533 apply.c:3704
+#: apply.c:3544 apply.c:3715
#, c-format
msgid "%s: does not match index"
msgstr "%s: не совпадает с индексом"
-#: apply.c:3568
+#: apply.c:3579
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
-#: apply.c:3571
+#: apply.c:3582
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Откат к трёхходовому слиянию…\n"
-#: apply.c:3587 apply.c:3591
+#: apply.c:3598 apply.c:3602
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "не удалось прочитать текущее содержимое «%s»"
-#: apply.c:3603
+#: apply.c:3614
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
-#: apply.c:3617
+#: apply.c:3628
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Патч применен к «%s» с конфликтами.\n"
-#: apply.c:3622
+#: apply.c:3633
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Патч применен к «%s» без ошибок.\n"
-#: apply.c:3648
+#: apply.c:3659
msgid "removal patch leaves file contents"
msgstr "патч удаления не удалил содержимое файла"
-#: apply.c:3721
+#: apply.c:3732
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: apply.c:3723
+#: apply.c:3734
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидался %o"
-#: apply.c:3874 apply.c:3876
+#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "неправильный путь «%s»"
-#: apply.c:3932
+#: apply.c:3943
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже содержится в индексе"
-#: apply.c:3935
+#: apply.c:3946
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже содержится в рабочем каталоге"
-#: apply.c:3955
+#: apply.c:3966
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
-#: apply.c:3960
+#: apply.c:3971
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
-#: apply.c:3980
+#: apply.c:3991
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находится за символической ссылкой"
-#: apply.c:3984
+#: apply.c:3995
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалось применить патч"
-#: apply.c:3999
+#: apply.c:4010
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: apply.c:4091
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
-#: apply.c:4098
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "изменен режим для %s, который не находится в текущем HEAD"
-#: apply.c:4101
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информация об sha1 отсутствует или бесполезна (%s)."
-#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
+#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "сбой make_cache_entry для пути «%s»"
-#: apply.c:4110
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "не удалось добавить %s во временный индекс"
-#: apply.c:4120
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "не удалось записать временный индкекс в %s"
-#: apply.c:4258
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалось удалить %s из индекса"
-#: apply.c:4292
+#: apply.c:4303
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч для подмодуля %s"
-#: apply.c:4298
+#: apply.c:4309
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалось выполнить stat для созданного файла «%s»"
-#: apply.c:4306
+#: apply.c:4317
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалось создать вспомогательный файл для созданного файла %s"
-#: apply.c:4312 apply.c:4457
+#: apply.c:4323 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалось создать запись в кэше для %s"
-#: apply.c:4355
+#: apply.c:4366
#, c-format
msgid "failed to write to '%s'"
msgstr "не удалось записать в «%s»"
-#: apply.c:4359
+#: apply.c:4370
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: apply.c:4429
+#: apply.c:4440
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалось записать файл «%s» с режимом доступа %o"
-#: apply.c:4527
+#: apply.c:4538
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: apply.c:4535
+#: apply.c:4546
msgid "internal error"
msgstr "внутренняя ошибка"
-#: apply.c:4538
+#: apply.c:4549
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -517,45 +527,45 @@
msgstr[2] "Применение патча %%s с %d отказами…"
msgstr[3] "Применение патча %%s с %d отказами…"
-#: apply.c:4549
+#: apply.c:4560
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "усечение имени .rej файла до %.*s.rej"
-#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
+#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr "не удалось открыть %s"
-#: apply.c:4571
+#: apply.c:4582
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: apply.c:4575
+#: apply.c:4586
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: apply.c:4685
+#: apply.c:4696
#, c-format
msgid "Skipped patch '%s'."
msgstr "Патч «%s» пропущен."
-#: apply.c:4693
+#: apply.c:4704
msgid "unrecognized input"
msgstr "не распознанный ввод"
-#: apply.c:4712
+#: apply.c:4724
msgid "unable to read index file"
msgstr "не удалось прочитать файл индекса"
-#: apply.c:4849
+#: apply.c:4879
#, c-format
msgid "can't open patch '%s': %s"
msgstr "не удалось открыть патч «%s»: %s"
-#: apply.c:4876
+#: apply.c:4906
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -564,7 +574,7 @@
msgstr[2] "пропущено %d ошибок в пробельных символах"
msgstr[3] "пропущено %d ошибок в пробельных символах"
-#: apply.c:4882 apply.c:4897
+#: apply.c:4912 apply.c:4927
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -573,7 +583,7 @@
msgstr[2] "%d строк добавили ошибки в пробельных символах."
msgstr[3] "%d строк добавили ошибки в пробельных символах."
-#: apply.c:4890
+#: apply.c:4920
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -582,140 +592,140 @@
msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
-#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Не удалось записать новый файл индекса"
-#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
-#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
-#: builtin/pull.c:198 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
-#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197
+#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
+#: builtin/pull.c:207 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
+#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
msgid "path"
msgstr "путь"
-#: apply.c:4934
+#: apply.c:4964
msgid "don't apply changes matching the given path"
msgstr "не применять изменения по указанному пути"
-#: apply.c:4937
+#: apply.c:4967
msgid "apply changes matching the given path"
msgstr "применять изменения по указанному пути"
-#: apply.c:4939 builtin/am.c:2263
+#: apply.c:4969 builtin/am.c:2219
msgid "num"
msgstr "количество"
-#: apply.c:4940
+#: apply.c:4970
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
-#: apply.c:4943
+#: apply.c:4973
msgid "ignore additions made by the patch"
msgstr "игнорировать добавления, сделанные этим патчем"
-#: apply.c:4945
+#: apply.c:4975
msgid "instead of applying the patch, output diffstat for the input"
msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
-#: apply.c:4949
+#: apply.c:4979
msgid "show number of added and deleted lines in decimal notation"
msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
-#: apply.c:4951
+#: apply.c:4981
msgid "instead of applying the patch, output a summary for the input"
-msgstr "вместо применения патча вывести статистику изменений для ввода"
+msgstr "вместо применения патча вывести сводку изменений для ввода"
-#: apply.c:4953
+#: apply.c:4983
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "вместо применения патча проверить подходит ли он"
-#: apply.c:4955
+#: apply.c:4985
msgid "make sure the patch is applicable to the current index"
msgstr "проверить, что патч применяется к текущему индексу"
-#: apply.c:4957
+#: apply.c:4987
msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "помечать новые файлы с «git add --intent-to-add»"
-#: apply.c:4959
+#: apply.c:4989
msgid "apply a patch without touching the working tree"
msgstr "применить патч, не изменяя рабочий каталог"
-#: apply.c:4961
+#: apply.c:4991
msgid "accept a patch that touches outside the working area"
msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
-#: apply.c:4964
+#: apply.c:4994
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "а также применить патч (используйте с --stat/--summary/--check)"
-#: apply.c:4966
+#: apply.c:4996
msgid "attempt three-way merge if a patch does not apply"
msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
-#: apply.c:4968
+#: apply.c:4998
msgid "build a temporary index based on embedded index information"
msgstr "построить временный индекс, основанный на встроенной информации об индексе"
-#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
+#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "пути, отделённые НУЛЕВЫМ символом"
-#: apply.c:4973
+#: apply.c:5003
msgid "ensure at least <n> lines of context match"
msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
-#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
-#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3205
+#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
msgid "action"
msgstr "действие"
-#: apply.c:4975
+#: apply.c:5005
msgid "detect new or modified lines that have whitespace errors"
msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
-#: apply.c:4978 apply.c:4981
+#: apply.c:5008 apply.c:5011
msgid "ignore changes in whitespace when finding context"
msgstr "игнорировать изменения в пробельных символах при поиске контекста"
-#: apply.c:4984
+#: apply.c:5014
msgid "apply the patch in reverse"
msgstr "применить патч с обращением изменений"
-#: apply.c:4986
+#: apply.c:5016
msgid "don't expect at least one line of context"
msgstr "не ожидать как минимум одной строки контекста"
-#: apply.c:4988
+#: apply.c:5018
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
-#: apply.c:4990
+#: apply.c:5020
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеся блоки изменений"
-#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
-#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124
+#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "быть многословнее"
-#: apply.c:4993
+#: apply.c:5023
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
-#: apply.c:4996
+#: apply.c:5026
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверять количеству строк из заголовка блока изменений"
-#: apply.c:4998 builtin/am.c:2251
+#: apply.c:5028 builtin/am.c:2207
msgid "root"
msgstr "корень"
-#: apply.c:4999
+#: apply.c:5029
msgid "prepend <root> to all filenames"
msgstr "добавить <корень> спереди ко всем именам файлов"
@@ -737,200 +747,224 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
-#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
-#: archive.c:446
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "нет такой ссылки: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "недопустимое имя объекта: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "недействительный объект дерева: %s"
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr "текущий рабочий каталог не отслеживается"
+
+#: archive.c:455
msgid "fmt"
msgstr "формат"
-#: archive.c:446
+#: archive.c:455
msgid "archive format"
msgstr "формат архива"
-#: archive.c:447 builtin/log.c:1473
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr "префикс"
-#: archive.c:448
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr "добавлять префикс перед каждым путем файла в архиве"
-#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
-#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
-#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119
-#: parse-options.h:165
+#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
+#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "файл"
-#: archive.c:450 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "запись архива в этот файл"
-#: archive.c:452
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr "читать .gitattributes в рабочем каталоге"
-#: archive.c:453
+#: archive.c:462
msgid "report archived files on stderr"
msgstr "отчет об архивированных файлах в stderr"
-#: archive.c:454
+#: archive.c:463
msgid "store only"
msgstr "только хранение"
-#: archive.c:455
+#: archive.c:464
msgid "compress faster"
msgstr "сжимать быстрее"
-#: archive.c:463
+#: archive.c:472
msgid "compress better"
msgstr "сжимать лучше"
-#: archive.c:466
+#: archive.c:475
msgid "list supported archive formats"
msgstr "перечислить поддерживаемые форматы архивов"
-#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr "репозиторий"
-#: archive.c:469 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "получить архив из внешнего <репозитория>"
-#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:491
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "команда"
-#: archive.c:471 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
-#: archive.c:478
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr "Неожиданная опция --remote"
-#: archive.c:480
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr "Опция --exec может использоваться только вместе с --remote"
-#: archive.c:482
+#: archive.c:491
msgid "Unexpected option --output"
msgstr "Неожиданная опция --output"
-#: archive.c:504
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Неизвестный формат архива «%s»"
-#: archive.c:511
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргумент не поддерживается для формата «%s»: -%d"
-#: archive-tar.c:125 archive-zip.c:344
+#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr "не удалось создать поток двоичного объекта %s"
-#: archive-tar.c:260 archive-zip.c:361
+#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)"
-#: archive-tar.c:287 archive-zip.c:352
+#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr "не удалось прочитать %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "не удалось запустить фильтр «%s»"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "не удалось перенаправить дескриптор"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "фильтр «%s» сообщил об ошибке"
-#: archive-zip.c:313
+#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "путь не является действительным UTF-8: %s"
-#: archive-zip.c:317
+#: archive-zip.c:318
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "путь слишком длинный (%d символов, SHA1: %s): %s"
-#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "ошибка сжатия (%d)"
-#: archive-zip.c:605
+#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>"
-#: attr.c:218
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s не является допустимым именем атрибута"
-#: attr.c:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s не разрешено: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
-#: bisect.c:467
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Плохое содержимое файла «%s»: %s"
-#: bisect.c:675
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Невозможно продолжить бинарный поиск!\n"
-#: bisect.c:729
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "Недопустимое имя коммита %s"
-#: bisect.c:753
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n"
-#: bisect.c:758
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n"
-#: bisect.c:763
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n"
-#: bisect.c:771
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -938,7 +972,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
-#: bisect.c:784
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -946,43 +980,43 @@
"We continue anyway."
msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
-#: bisect.c:817
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Бинарный поиск: база слияния должна быть проверена\n"
-#: bisect.c:857
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "нужно указать %s редакцию"
-#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "не удалось создать файл «%s»"
-#: bisect.c:927 builtin/merge.c:137
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr "не удалось прочитать файл «%s»"
-#: bisect.c:957
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "сбой при чтении ссылок двоичного поиска"
-#: bisect.c:976
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s была одновременно и %s и %s\n"
-#: bisect.c:984
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
-#: bisect.c:1003
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -993,7 +1027,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#: bisect.c:1009
+#: bisect.c:1010
#, 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"
@@ -1002,42 +1036,42 @@
msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
-#: blame.c:1786
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr "--contents и --reverse не очень сочетаются."
-#: blame.c:1800
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr "нельзя использовать --contents с указанием финального имени объекта"
-#: blame.c:1821
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
-#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
-#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
-#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963
-#: builtin/merge.c:404 builtin/pack-objects.c:3032 builtin/pack-objects.c:3047
+#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
+#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
+#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094
+#: builtin/merge.c:415 builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "сбой инициализации прохода по редакциям"
-#: blame.c:1848
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
-#: blame.c:1859
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr "нет такого пути %s в %s"
-#: blame.c:1870
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "невозможно прочитать объект %s для пути %s"
-#: branch.c:54
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1046,86 +1080,86 @@
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr "\nПосле исправления причины ошибки,\nвы можете исправить информацию об отслеживаемой\nвнешней ветке, с помощью команды\n«git branch --set-upstream-to=%s%s%s»."
-#: branch.c:68
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию."
-#: branch.c:94
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением."
-#: branch.c:95
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»."
-#: branch.c:99
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Ветка «%s» отслеживает локальную ветку «%s» перемещением."
-#: branch.c:100
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Ветка «%s» отслеживает локальную ветку «%s»."
-#: branch.c:105
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением."
-#: branch.c:106
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»."
-#: branch.c:110
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Ветка «%s» отслеживает локальную ссылку «%s» перемещением."
-#: branch.c:111
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Ветка «%s» отслеживает локальную ссылку «%s»."
-#: branch.c:120
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Не удалось записать настройки вышестоящей ветки"
-#: branch.c:157
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Не отслеживается: неоднозначная информация для ссылки %s"
-#: branch.c:190
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» не является действительным именем ветки."
-#: branch.c:209
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Ветка с именем «%s» уже существует."
-#: branch.c:214
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Не удалось принудительно обновить текущую ветку."
-#: branch.c:234
+#: branch.c:233
#, c-format
msgid ""
"Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
-#: branch.c:236
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
-#: branch.c:238
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1152,12 +1186,12 @@
msgid "Not a valid branch point: '%s'."
msgstr "Недопустимая точка ветки: «%s»."
-#: branch.c:360
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находится на «%s»"
-#: branch.c:383
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD рабочего каталога %s не обновлён"
@@ -1172,16 +1206,17 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "неопознанный заголовок: %s%s (%d)"
-#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
+#: builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr "не удалось открыть «%s»"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "В репозитории отсутствуют необходимые коммиты:"
-#: bundle.c:192
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
@@ -1190,11 +1225,11 @@
msgstr[2] "Пакет содержит эти %d ссылок:"
msgstr[3] "Пакет содержит эти %d ссылок:"
-#: bundle.c:199
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr "Пакет содержит полную историю."
-#: bundle.c:201
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
@@ -1203,38 +1238,42 @@
msgstr[2] "Пакет требует эти %d ссылок:"
msgstr[3] "Пакет требует эти %d ссылок:"
-#: bundle.c:260
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr "не удалось дублировать дескриптор пакета"
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr "Не удалось создать объекты пакета"
-#: bundle.c:271
+#: bundle.c:287
msgid "pack-objects died"
msgstr "критическая ошибка pack-objects"
-#: bundle.c:313
+#: bundle.c:329
msgid "rev-list died"
msgstr "критическая ошибка rev-list"
-#: bundle.c:362
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
+#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
-#: bundle.c:461
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr "Отклонение создания пустого пакета."
-#: bundle.c:473
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr "не удалось создать «%s»"
-#: bundle.c:501
+#: bundle.c:500
msgid "index-pack died"
msgstr "критическая ошибка index-pack"
@@ -1243,19 +1282,18 @@
msgid "invalid color value: %.*s"
msgstr "недопустимое значение цвета: %.*s"
-#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
-#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "не удалось разобрать %s"
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не является коммитом!"
-#: commit.c:191
+#: commit.c:193
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1267,82 +1305,228 @@
"\"git config advice.graftFileDeprecated false\""
msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»"
-#: commit.c:1629
+#: commit.c:1128
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
+
+#: commit.c:1134
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Коммит %s не содержит GPG подпись."
+
+#: commit.c:1137
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
+
+#: commit.c:1391
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n"
-#: commit-graph.c:83
-#, c-format
-msgid "graph file %s is too small"
-msgstr ""
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
+msgstr "файл commit-graph слишком маленький"
-#: commit-graph.c:90
+#: commit-graph.c:170
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr ""
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
-#: commit-graph.c:97
+#: commit-graph.c:177
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr ""
+msgid "commit-graph version %X does not match version %X"
+msgstr "версия commit-graph файла %X не соотвествует версии %X"
-#: commit-graph.c:104
+#: commit-graph.c:184
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr ""
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версия хеш-суммы commit-graph файла %X не соответствует версии %X"
-#: commit-graph.c:128
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr "не найдена таблица расположения частей в файле commit-graph; возможно файл повреждён"
+
+#: commit-graph.c:218
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr ""
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "некорректное смещение части в commit-graph файле %08x%08x"
-#: commit-graph.c:164
+#: commit-graph.c:255
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr ""
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "часть файла commit-graph с идентификатором %08x появляется несколько раз"
-#: commit-graph.c:261
+#: commit-graph.c:390
#, c-format
msgid "could not find commit %s"
-msgstr ""
+msgstr "не удалось найти коммит %s"
-#: commit-graph.c:565 builtin/pack-objects.c:2571
+#: commit-graph.c:732 builtin/pack-objects.c:2649
#, c-format
msgid "unable to get type of object %s"
-msgstr ""
+msgstr "не удалось получить тип объекта %s"
-#: commit-graph.c:730
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
+msgstr "Загрузка известных коммитов на граф коммитов"
+
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
+msgstr "Расширение достижимых коммитов на граф коммитов"
+
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
+msgstr "Очистка пометок коммитов на графе коммитов"
+
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
+msgstr "Вычисление номеров поколений на графе коммитов"
+
+#: commit-graph.c:930
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Поиск коммитов для графа коммитов в %d пакете"
+msgstr[1] "Поиск коммитов для графа коммитов в %d пакетах"
+msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах"
+msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах"
+
+#: commit-graph.c:943
#, c-format
msgid "error adding pack %s"
-msgstr ""
+msgstr "ошибка добавления пакета %s"
-#: commit-graph.c:732
+#: commit-graph.c:945
#, c-format
msgid "error opening index for %s"
-msgstr ""
+msgstr "ошибка открытия индекса для %s"
-#: commit-graph.c:773
+#: commit-graph.c:959
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Поиск коммитов для графа коммитов по %d ссылке"
+msgstr[1] "Поиск коммитов для графа коммитов по %d ссылкам"
+msgstr[2] "Поиск коммитов для графа коммитов по %d ссылкам"
+msgstr[3] "Поиск коммитов для графа коммитов по %d ссылкам"
+
+#: commit-graph.c:991
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
+
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
+msgstr "Вычисление количества отдельных коммитов на графе коммитов"
+
+#: commit-graph.c:1017
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "программе форматирования графа коммитов не удалось записать %d коммитов"
-#: commit-graph.c:800
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
+msgstr "Поиск дополнительных ребер на графе коммитов"
+
+#: commit-graph.c:1050
msgid "too many commits to write graph"
msgstr "слишком много коммитов для записи графа"
-#: commit-graph.c:806
+#: commit-graph.c:1057 midx.c:819
#, c-format
msgid "unable to create leading directories of %s"
msgstr "не удалось создать родительские каталоги для %s"
-#: commit-graph.c:904
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
+#: commit-graph.c:1097
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Запись графа коммитов в %d проход"
+msgstr[1] "Запись графа коммитов в %d прохода"
+msgstr[2] "Запись графа коммитов в %d проходов"
+msgstr[3] "Запись графа коммитов в %d прохода"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1162
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден"
+
+#: commit-graph.c:1172
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
+
+#: commit-graph.c:1182 commit-graph.c:1197
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1189
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "не удалось разобрать коммит %s из файла commit-graph"
+
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
+msgstr "Проверка коммитов на графе коммитов"
+
+#: commit-graph.c:1219
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
+
+#: commit-graph.c:1226
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr " в файле commit-graph OID корня дерева для коммита %s является %s != %s"
+
+#: commit-graph.c:1236
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "слишком большой список родителей файле commit-graph для коммита %s"
+
+#: commit-graph.c:1242
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "в файле commit-graph родитель для %s является %s != %s"
+
+#: commit-graph.c:1255
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано"
+
+#: commit-graph.c:1260
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях"
+
+#: commit-graph.c:1264
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях"
+
+#: commit-graph.c:1279
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u"
+
+#: commit-graph.c:1285
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "память исчерпана"
@@ -1353,7 +1537,7 @@
"\t%s\n"
"from\n"
"\t%s\n"
-"Do you have circular includes?"
+"This might be due to circular includes."
msgstr ""
#: config.c:139
@@ -1379,7 +1563,7 @@
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2206
+#: config.c:378 sequencer.c:2459
#, c-format
msgid "invalid key: %s"
msgstr "недействительный ключ: %s"
@@ -1501,149 +1685,149 @@
msgid "invalid mode for object creation: %s"
msgstr "недопустимый режим создания объекта: %s"
-#: config.c:1403
+#: config.c:1395
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1429
+#: config.c:1421
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1422
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1489 builtin/pack-objects.c:3282
+#: config.c:1483 builtin/pack-objects.c:3397
#, c-format
msgid "bad pack compression level %d"
msgstr "неправильный уровень сжатия пакета %d"
-#: config.c:1610
+#: config.c:1604
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1613
+#: config.c:1607
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1630
+#: config.c:1624
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1660
+#: config.c:1654
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1700
+#: config.c:1710
msgid "unable to parse command-line config"
msgstr "не удалось разобрать конфигурацию из командной строки"
-#: config.c:2032
+#: config.c:2059
msgid "unknown error occurred while reading the configuration files"
msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
-#: config.c:2202
+#: config.c:2229
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Недействительный %s: «%s»"
-#: config.c:2245
+#: config.c:2272
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»"
-#: config.c:2271
+#: config.c:2298
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
-#: config.c:2296
+#: config.c:2344
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-#: config.c:2298
+#: config.c:2346
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
-#: config.c:2379
+#: config.c:2427
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2411
+#: config.c:2459
#, c-format
msgid "%s has multiple values"
msgstr "%s имеет несколько значений"
-#: config.c:2440
+#: config.c:2488
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2691 config.c:3015
+#: config.c:2740 config.c:3064
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2702
+#: config.c:2751
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2737 builtin/config.c:324
+#: config.c:2786 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2762
+#: config.c:2811
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2775 config.c:3028
+#: config.c:2824 config.c:3077
#, c-format
msgid "fstat on %s failed"
msgstr "сбой при выполнении fstat на файле %s"
-#: config.c:2786
+#: config.c:2835
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2795 config.c:3033
+#: config.c:2844 config.c:3082
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2880 config.c:3130
+#: config.c:2929 config.c:3179
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2914
+#: config.c:2963
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "не удалось установить «%s» в «%s»"
-#: config.c:2916 builtin/remote.c:781
+#: config.c:2965 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "не удалось сбросить значение для «%s»"
-#: config.c:3006
+#: config.c:3055
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3173
+#: config.c:3222
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -1692,57 +1876,52 @@
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "ошибка внешнего репозитория: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr ""
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:642
+#: 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:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1750,52 +1929,52 @@
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
@@ -1804,106 +1983,106 @@
msgid "unable to fork"
msgstr ""
-#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Проверка соединения"
-#: connected.c:80
+#: connected.c:97
msgid "Could not run 'git rev-list'"
msgstr "Не удалось запустить «git rev-list»"
-#: connected.c:100
+#: connected.c:117
msgid "failed write to rev-list"
msgstr "сбой записи в rev-list"
-#: connected.c:107
+#: connected.c:124
msgid "failed to close rev-list's stdin"
msgstr "сбой закрытия стандартного ввода у rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:208
#, 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
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF будет заменен на CRLF в %s"
-#: convert.c:219
+#: convert.c:218
#, 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:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM запрещен в «%s», если кодируется как %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "
"working-tree-encoding."
msgstr "Файл «%s» содержит маркер последовательности байтов (BOM). Используйте UTF-%s как кодировку рабочего каталога."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM требуется в «%s», если кодируется как %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or "
"UTF-%sLE (depending on the byte order) as working-tree-encoding."
msgstr "Файл «%s» не содержит маркер последовательности байтов (BOM). Используйте UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку рабочего каталога."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "не удалось перекодировать «%s» из %s в %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr ""
@@ -1927,21 +2106,21 @@
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false не является допустимым значением для working-tree-encoding"
-#: convert.c:1402 convert.c:1436
+#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1480
+#: convert.c:1476
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "в будущем"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
@@ -1950,7 +2129,7 @@
msgstr[2] "%<PRIuMAX> секунд назад"
msgstr[3] "%<PRIuMAX> секунды назад"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
@@ -1959,7 +2138,7 @@
msgstr[2] "%<PRIuMAX> минут назад"
msgstr[3] "%<PRIuMAX> минуты назад"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
@@ -1968,7 +2147,7 @@
msgstr[2] "%<PRIuMAX> часов назад"
msgstr[3] "%<PRIuMAX> часа назад"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
@@ -1977,7 +2156,7 @@
msgstr[2] "%<PRIuMAX> дней назад"
msgstr[3] "%<PRIuMAX> дня назад"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
@@ -1986,7 +2165,7 @@
msgstr[2] "%<PRIuMAX> недель назад"
msgstr[3] "%<PRIuMAX> недели назад"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
@@ -1995,7 +2174,7 @@
msgstr[2] "%<PRIuMAX> месяцев назад"
msgstr[3] "%<PRIuMAX> месяца назад"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2005,7 +2184,7 @@
msgstr[3] "%<PRIuMAX> года"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
@@ -2014,7 +2193,7 @@
msgstr[2] "%s, %<PRIuMAX> месяцев назад"
msgstr[3] "%s, %<PRIuMAX> месяца назад"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
@@ -2023,141 +2202,649 @@
msgstr[2] "%<PRIuMAX> лет назад"
msgstr[3] "%<PRIuMAX> года назад"
+#: 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:466
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "сбой чтения orderfile «%s»"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr "Выполняется неточное определение переименования"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "параметр «%s» требует указания значения"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
-#: diff.c:158
+#: 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 " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "Неизвестный параметр dirstat: «%s»\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr ""
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white"
-" space modes"
+"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:394
+#: 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.submodule»: «%s»"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:4096
+#: diff.c:4210
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-#: diff.c:4427
+#: diff.c:4555
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-#: diff.c:4430
+#: diff.c:4558
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S и --find-object нельзя использовать одновременно"
-#: diff.c:4508
+#: diff.c:4636
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одного спецификатора пути"
-#: diff.c:4674
+#: diff.c:4684
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr ""
+
+#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: diff.c:4721
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: diff.c:4688
+#: diff.c:4806
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Сбой разбора параметра опции --submodule: «%s»"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr ""
-#: diff.c:5766
+#: diff.c:4830
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#: diff.c:4844
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
+#: diff.c:4894 diff.c:4900
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#: diff.c:4912
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#: diff.c:4933
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr ""
+
+#: diff.c:4952
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
+
+#: diff.c:4992
+msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
+msgstr ""
+
+#: diff.c:5028 diff.c:5048
+#, c-format
+msgid "invalid argument to %s"
+msgstr ""
+
+#: diff.c:5186
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: diff.c:5242
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr ""
+
+#: diff.c:5265
+msgid "Diff output format options"
+msgstr ""
+
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
+msgstr ""
+
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
+msgstr "не выводить список изменений"
+
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
+msgstr ""
+
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
+msgstr ""
+
+#: diff.c:5281
+msgid "generate the diff in raw format"
+msgstr ""
+
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
+msgstr ""
+
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
+msgstr ""
+
+#: diff.c:5292
+msgid "machine friendly --stat"
+msgstr ""
+
+#: diff.c:5295
+msgid "output only the last line of --stat"
+msgstr ""
+
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
+msgstr ""
+
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "краткая сводка изменений, вроде созданий, переименований или изменений режима доступа"
+
+#: diff.c:5316
+msgid "show only names of changed files"
+msgstr ""
+
+#: diff.c:5319
+msgid "show only names and status of changed files"
+msgstr ""
+
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5322
+msgid "generate diffstat"
+msgstr ""
+
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
+msgstr ""
+
+#: diff.c:5325
+msgid "generate diffstat with a given width"
+msgstr ""
+
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+#: diff.c:5333
+msgid "<count>"
+msgstr ""
+
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
+msgstr "генерация компактной сводки изменений в diffstat"
+
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5345
+msgid "show colored diff"
+msgstr ""
+
+#: diff.c:5346
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
+msgstr ""
+
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
+msgstr ""
+
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
+msgstr ""
+
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+#: diff.c:5384
+msgid "Diff rename options"
+msgstr ""
+
+#: diff.c:5385
+msgid "<n>[/<m>]"
+msgstr ""
+
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+#: diff.c:5390
+msgid "detect renames"
+msgstr ""
+
+#: diff.c:5394
+msgid "omit the preimage for deletes"
+msgstr ""
+
+#: diff.c:5397
+msgid "detect copies"
+msgstr ""
+
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+#: diff.c:5403
+msgid "disable rename detection"
+msgstr ""
+
+#: diff.c:5406
+msgid "use empty blobs as rename source"
+msgstr ""
+
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5411
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5413
+msgid "Diff algorithm options"
+msgstr ""
+
+#: diff.c:5415
+msgid "produce the smallest possible diff"
+msgstr ""
+
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
+msgstr ""
+
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
+msgstr ""
+
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
+
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5442
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5443
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5445
+msgid "<text>"
+msgstr ""
+
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
+msgstr ""
+
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5464
+msgid "Other diff options"
+msgstr ""
+
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5470
+msgid "treat all files as text"
+msgstr ""
+
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+#: diff.c:5476
+msgid "disable all output of the program"
+msgstr ""
+
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5482
+msgid "<when>"
+msgstr ""
+
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+
+#: diff.c:5486
+msgid "<format>"
+msgstr ""
+
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
+
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5496
+msgid "<string>"
+msgstr ""
+
+#: diff.c:5497
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
+
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
+msgstr ""
+
+#: diff.c:5510
+msgid "<object-id>"
+msgstr ""
+
+#: diff.c:5511
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+#: diff.c:5514
+msgid "select files by diff type"
+msgstr ""
+
+#: diff.c:5516
+msgid "<file>"
+msgstr ""
+
+#: diff.c:5517
+msgid "Output to a specific file"
+msgstr ""
+
+#: diff.c:6150
msgid "inexact rename detection was skipped due to too many files."
msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-#: diff.c:5769
+#: diff.c:6153
msgid "only found copies from modified paths due to too many files."
msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
-#: diff.c:5772
+#: diff.c:6156
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
-#: dir.c:569
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:958
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:1873
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "не удалось открыть каталог «%s»"
-#: dir.c:2115
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "не удалось получить имя ядра и информацию"
-#: dir.c:2239
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3037
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3082 dir.c:3087
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "не удалось создать каталоги для %s"
-#: dir.c:3116
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "не удалось переместить каталог git с «%s» в «%s»"
-#: editor.c:61
+#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c"
@@ -2166,7 +2853,7 @@
msgid "Filtering content"
msgstr "Фильтруется содержимое"
-#: entry.c:437
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "не удалось выполнить stat для файла «%s»"
@@ -2181,7 +2868,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
@@ -2190,244 +2877,264 @@
msgid "Remote with no URL"
msgstr "Внешний репозиторий без URL"
-#: fetch-pack.c:152
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: ожидается передача списка для получение части"
-#: fetch-pack.c:164
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
-#: fetch-pack.c:254
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr ""
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc требует multi_ack_detailed"
-#: fetch-pack.c:342 fetch-pack.c:1257
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправильная строка частичного получения: %s"
-#: fetch-pack.c:348 fetch-pack.c:1263
+#: fetch-pack.c:366 fetch-pack.c:1277
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправильная строка полного получения: %s"
-#: fetch-pack.c:350 fetch-pack.c:1265
+#: fetch-pack.c:368 fetch-pack.c:1279
#, c-format
msgid "object not found: %s"
msgstr "объект не найден: %s"
-#: fetch-pack.c:353 fetch-pack.c:1268
+#: fetch-pack.c:371 fetch-pack.c:1282
#, c-format
msgid "error in object: %s"
msgstr "ошибка в объекте: %s"
-#: fetch-pack.c:355 fetch-pack.c:1270
+#: fetch-pack.c:373 fetch-pack.c:1284
#, c-format
msgid "no shallow found: %s"
msgstr "частичный клон не найден: %s"
-#: fetch-pack.c:358 fetch-pack.c:1273
+#: fetch-pack.c:376 fetch-pack.c:1288
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "ожидалось shallow/unshallow, а получено %s"
-#: fetch-pack.c:399
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "получено %s %d %s"
-#: fetch-pack.c:416
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "недопустимый коммит %s"
-#: fetch-pack.c:447
+#: fetch-pack.c:465
msgid "giving up"
msgstr "останавливаю дальнейшие попытки"
-#: fetch-pack.c:459 progress.c:229
+#: fetch-pack.c:477 progress.c:284
msgid "done"
msgstr "готово"
-#: fetch-pack.c:471
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "получено %s (%d) %s"
-#: fetch-pack.c:517
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Помечаю %s как завершенный"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "уже есть %s (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не удалось запустить программу разбора данных"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "ошибка протокола: неправильный заголовок потока"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не удалось запустить программу %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s завершен с ошибкой"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "произошла ошибка в программе разбора данных"
-#: fetch-pack.c:926
+#: fetch-pack.c:906
msgid "Server does not support shallow clients"
msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-#: fetch-pack.c:930
+#: fetch-pack.c:910
msgid "Server supports multi_ack_detailed"
msgstr "Сервер поддерживает multi_ack_detailed"
-#: fetch-pack.c:933
+#: fetch-pack.c:913
msgid "Server supports no-done"
msgstr "Сервер поддерживает no-done"
-#: fetch-pack.c:939
+#: fetch-pack.c:919
msgid "Server supports multi_ack"
msgstr "Сервер поддерживает multi_ack"
-#: fetch-pack.c:943
+#: fetch-pack.c:923
msgid "Server supports side-band-64k"
msgstr "Сервер поддерживает side-band-64k"
-#: fetch-pack.c:947
+#: fetch-pack.c:927
msgid "Server supports side-band"
msgstr "Сервер поддерживает side-band"
-#: fetch-pack.c:951
+#: fetch-pack.c:931
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Сервер поддерживает allow-tip-sha1-in-want"
-#: fetch-pack.c:955
+#: fetch-pack.c:935
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
-#: fetch-pack.c:965
+#: fetch-pack.c:945
msgid "Server supports ofs-delta"
msgstr "Сервер поддерживает ofs-delta"
-#: fetch-pack.c:971 fetch-pack.c:1150
+#: fetch-pack.c:951 fetch-pack.c:1144
msgid "Server supports filter"
msgstr "Сервер поддерживает фильтрацию"
-#: fetch-pack.c:979
+#: fetch-pack.c:959
#, c-format
msgid "Server version is %.*s"
msgstr "Версия сервера %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:965
msgid "Server does not support --shallow-since"
msgstr "Сервер не поддерживает --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:969
msgid "Server does not support --shallow-exclude"
msgstr "Сервер не поддерживает --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:971
msgid "Server does not support --deepen"
msgstr "Сервер не поддерживает --deepen"
-#: fetch-pack.c:1004
+#: fetch-pack.c:988
msgid "no common commits"
msgstr "не общих коммитов"
-#: fetch-pack.c:1016 fetch-pack.c:1393
+#: fetch-pack.c:1000 fetch-pack.c:1449
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: ошибка при получении данных."
-#: fetch-pack.c:1145
+#: fetch-pack.c:1138
msgid "Server does not support shallow requests"
msgstr "Сервер не поддерживает частичные запросы"
-#: fetch-pack.c:1191
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
+msgstr ""
+
+#: fetch-pack.c:1189
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1197
+#: fetch-pack.c:1195
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1236
+#: fetch-pack.c:1234
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1241
+#: fetch-pack.c:1239
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1278
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1293
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1294
+#: fetch-pack.c:1340
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1304
+#: fetch-pack.c:1345
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1350
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1603
+#: fetch-pack.c:1676
msgid "no matching remote head"
msgstr "нет соотвествующего внешнего указателя на ветку"
-#: fetch-pack.c:1621 builtin/clone.c:664
+#: fetch-pack.c:1699 builtin/clone.c:673
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий прислал не все необходимые объекты"
-#: fetch-pack.c:1647
+#: fetch-pack.c:1726
#, c-format
msgid "no such remote ref %s"
msgstr "нет такой внешней ссылки %s"
-#: fetch-pack.c:1650
+#: fetch-pack.c:1729
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
-#: gpg-interface.c:253
+#: gpg-interface.c:318
msgid "gpg failed to sign the data"
msgstr "gpg не удалось подписать данные"
-#: gpg-interface.c:279
+#: gpg-interface.c:344
msgid "could not create temporary file"
msgstr "не удалось создать временный файл"
-#: gpg-interface.c:282
+#: gpg-interface.c:347
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "сбой записи отсоединенной подписи в «%s»"
@@ -2437,18 +3144,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
-#: grep.c:2115
+#: grep.c:2113
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: не удалось прочесть %s"
-#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "не удалось выполнить stat «%s»"
-#: grep.c:2143
+#: grep.c:2141
#, c-format
msgid "'%s': short read"
msgstr "«%s»: слишком мало данных прочитано"
@@ -2505,60 +3212,72 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Низкоуровневые команды / Внутренние вспомогательные"
-#: help.c:293
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "доступные команды git в «%s»"
-#: help.c:300
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "команды git, доступные в других местах вашего $PATH"
-#: help.c:309
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Стандартные команды Git используемые в различных ситуациях:"
-#: help.c:358 git.c:90
+#: help.c:363 git.c:97
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "неподдерживаемый тип списка команд «%s»"
-#: help.c:405
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Основные руководства Git:"
-#: help.c:552
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Запустите «git help <команда>», чтобы прочесть о конкретной подкоманде"
+
+#: help.c:517
+msgid "External commands"
+msgstr ""
+
+#: help.c:532
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s не работает?"
-#: help.c:611
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
-#: help.c:633
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
-#: help.c:638
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
-#: help.c:643
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
-#: help.c:651
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» не является командой git. Смотрите «git --help»."
-#: help.c:655
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2570,16 +3289,16 @@
msgstr[2] "\nСамые похожие команды:"
msgstr[3] "\nСамые похожие команды:"
-#: help.c:670
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:738
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:742
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2591,7 +3310,7 @@
msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
-#: ident.c:342
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2606,44 +3325,67 @@
"\n"
msgstr "\n*** Пожалуйста, скажите мне кто вы есть.\n\nЗапустите\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Ваше Имя\"\n\nдля указания идентификационных данных аккаунта по умолчанию.\nПропустите параметр --global для указания данных только для этого репозитория.\n\n"
-#: ident.c:366
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "адрес электронной почты не указан и автоопределение отключено"
-#: ident.c:371
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
-#: ident.c:381
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "имя не указано и автоопределение отключено"
-#: ident.c:387
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
-#: ident.c:395
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "пустое имя идентификатора (для <%s>) не разрешено"
-#: ident.c:401
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "имя состоит только из неразрешенных симоволов: %s"
-#: ident.c:416 builtin/commit.c:600
+#: ident.c:436 builtin/commit.c:608
#, c-format
msgid "invalid date format: %s"
msgstr "неправильный формат даты: %s"
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr ""
+
#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "нельзя изменить внешний репозиторий при частичном клонировании"
@@ -2664,117 +3406,118 @@
msgid "Unable to create '%s.lock': %s"
msgstr "Не удалось создать «%s.lock»: %s"
-#: merge.c:40
+#: merge.c:41
msgid "failed to read the cache"
msgstr "сбой чтения кэша"
-#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
-#: builtin/checkout.c:608 builtin/clone.c:763
+#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
+#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "не удалось записать новый файл индекса"
-#: merge-recursive.c:303
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(плохой коммит)\n"
-#: merge-recursive.c:325
+#: merge-recursive.c:345
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния."
-#: merge-recursive.c:333
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния."
-#: merge-recursive.c:415
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "ошибка при построении деревьев"
-#: merge-recursive.c:886
+#: merge-recursive.c:861
#, c-format
msgid "failed to create path '%s'%s"
msgstr "не удалось создать путь «%s»%s"
-#: merge-recursive.c:897
+#: merge-recursive.c:872
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
-#: merge-recursive.c:911 merge-recursive.c:930
+#: merge-recursive.c:886 merge-recursive.c:905
msgid ": perhaps a D/F conflict?"
msgstr ": возможно, конфликт каталогов/файлов?"
-#: merge-recursive.c:920
+#: merge-recursive.c:895
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "отказ потери неотслеживаемого файла в «%s»"
-#: merge-recursive.c:962 builtin/cat-file.c:39
+#: merge-recursive.c:936 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "невозможно прочитать объект %s «%s»"
-#: merge-recursive.c:964
+#: merge-recursive.c:939
#, c-format
msgid "blob expected for %s '%s'"
msgstr "ожидается двоичный объект для %s «%s»"
-#: merge-recursive.c:988
+#: merge-recursive.c:963
#, c-format
msgid "failed to open '%s': %s"
msgstr "не удалось открыть «%s»: %s"
-#: merge-recursive.c:999
+#: merge-recursive.c:974
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "не удалось создать символьную ссылку «%s»: %s"
-#: merge-recursive.c:1004
+#: merge-recursive.c:979
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "не понятно, что делать с %06o %s «%s»"
-#: merge-recursive.c:1191
+#: merge-recursive.c:1175
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Не удалось слить подмодуль %s (состояние не забрано)"
-#: merge-recursive.c:1198
+#: merge-recursive.c:1182
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Не удалось слить подмодуль %s (нет коммитов)"
-#: merge-recursive.c:1205
+#: merge-recursive.c:1189
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)"
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1197 merge-recursive.c:1209
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Перемотка вперед подмодуля %s до указанного коммита:"
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1200 merge-recursive.c:1212
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Перемотка вперед подмодуля %s"
-#: merge-recursive.c:1250
+#: merge-recursive.c:1235
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)"
-#: merge-recursive.c:1254
+#: merge-recursive.c:1239
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)"
-#: merge-recursive.c:1255
+#: merge-recursive.c:1240
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
-#: merge-recursive.c:1258
+#: merge-recursive.c:1243
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -2785,109 +3528,108 @@
"which will accept this suggestion.\n"
msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n"
-#: merge-recursive.c:1267
+#: merge-recursive.c:1252
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1325
msgid "Failed to execute internal merge"
msgstr "Не удалось запустить внутреннее слияние"
-#: merge-recursive.c:1331
+#: merge-recursive.c:1330
#, c-format
msgid "Unable to add %s to database"
msgstr "Не удалось добавить %s в базу данных"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1362
#, c-format
msgid "Auto-merging %s"
msgstr "Автослияние %s"
-#: merge-recursive.c:1434
+#: merge-recursive.c:1385
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Ошибка: Отказ потери неотслеживаемого файла %s; запись в %s взамен."
-#: merge-recursive.c:1501
+#: merge-recursive.c:1457
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1506
+#: merge-recursive.c:1462
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1513
+#: merge-recursive.c:1469
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1518
+#: merge-recursive.c:1474
#, 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1552
+#: merge-recursive.c:1509
msgid "rename"
msgstr "переименование"
-#: merge-recursive.c:1552
+#: merge-recursive.c:1509
msgid "renamed"
msgstr "переименовано"
-#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
-#: merge-recursive.c:3129
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
#, c-format
msgid "Refusing to lose dirty file at %s"
-msgstr "Отказ потери измененного файла %s"
+msgstr "Отказ потери изменённого файла %s"
-#: merge-recursive.c:1620
+#: merge-recursive.c:1599
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
+
+#: merge-recursive.c:1657
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1687
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-#: merge-recursive.c:1625
+#: merge-recursive.c:1692
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен."
-#: merge-recursive.c:1651
+#: merge-recursive.c:1711
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
"\"%s\"->\"%s\" in \"%s\"%s"
msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#: merge-recursive.c:1656
+#: merge-recursive.c:1716
msgid " (left unresolved)"
msgstr " (оставлено неразрешенным)"
-#: merge-recursive.c:1720
+#: merge-recursive.c:1825
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»"
-#: merge-recursive.c:1759
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Переименовываю %s в %s и %s в %s вместо этого"
-
-#: merge-recursive.c:1771
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
-
-#: merge-recursive.c:1977
+#: merge-recursive.c:2030
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -2895,134 +3637,157 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2009
+#: merge-recursive.c:2062
#, 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:2019
+#: merge-recursive.c:2072
#, 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:2111
+#: merge-recursive.c:2164
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
"%s->%s in %s"
msgstr ""
-#: merge-recursive.c:2356
+#: merge-recursive.c:2408
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2762
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
-
-#: merge-recursive.c:2777
-#, c-format
-msgid "Adding merged %s"
-msgstr "Добавление слитого %s"
-
-#: merge-recursive.c:2784 merge-recursive.c:3132
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавление вместо этого как %s"
-
-#: merge-recursive.c:2941
+#: merge-recursive.c:2929
#, c-format
msgid "cannot read object %s"
msgstr "невозможно прочитать объект «%s»"
-#: merge-recursive.c:2944
+#: merge-recursive.c:2932
#, c-format
msgid "object %s is not a blob"
msgstr "объект %s не является двоичным объектом"
-#: merge-recursive.c:3013
+#: merge-recursive.c:2996
msgid "modify"
msgstr "изменение"
-#: merge-recursive.c:3013
+#: merge-recursive.c:2996
msgid "modified"
msgstr "изменено"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3008
msgid "content"
msgstr "содержимое"
-#: merge-recursive.c:3031
+#: merge-recursive.c:3012
msgid "add/add"
msgstr "добавление/добавление"
-#: merge-recursive.c:3076
+#: merge-recursive.c:3035
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-#: merge-recursive.c:3098 git-submodule.sh:865
+#: merge-recursive.c:3057 git-submodule.sh:937
msgid "submodule"
msgstr "подмодуль"
-#: merge-recursive.c:3099
+#: merge-recursive.c:3058
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-#: merge-recursive.c:3221
+#: merge-recursive.c:3088
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Добавление вместо этого как %s"
+
+#: merge-recursive.c:3170
+#, 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:3173
+#, 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:3177
+#, 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:3180
+#, 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:3294
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: merge-recursive.c:3247
+#: merge-recursive.c:3317
msgid "file/directory"
msgstr "файл/каталог"
-#: merge-recursive.c:3253
+#: merge-recursive.c:3322
msgid "directory/file"
msgstr "каталог/файл"
-#: merge-recursive.c:3260
+#: merge-recursive.c:3329
#, c-format
msgid ""
"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
-#: merge-recursive.c:3269
+#: merge-recursive.c:3338
#, c-format
msgid "Adding %s"
msgstr "Добавление %s"
-#: merge-recursive.c:3303
+#: merge-recursive.c:3347
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3385
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-recursive.c:3314
+#: merge-recursive.c:3396
msgid "Already up to date!"
msgstr "Уже обновлено!"
-#: merge-recursive.c:3323
+#: merge-recursive.c:3405
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "сбой слияния деревьев «%s» и «%s»"
-#: merge-recursive.c:3422
+#: merge-recursive.c:3504
msgid "Merging:"
msgstr "Слияние:"
-#: merge-recursive.c:3435
+#: merge-recursive.c:3517
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -3031,41 +3796,180 @@
msgstr[2] "найдено %u общих предков:"
msgstr[3] "найдено %u общих предков:"
-#: merge-recursive.c:3474
+#: merge-recursive.c:3556
msgid "merge returned no commit"
msgstr "слияние не вернуло коммит"
-#: merge-recursive.c:3540
+#: merge-recursive.c:3622
#, c-format
msgid "Could not parse object '%s'"
msgstr "Не удалось разобрать объект «%s»"
-#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
msgid "Unable to write index."
msgstr "Не удается записать индекс."
-#: notes-merge.c:274
+#: midx.c:66
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:82
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:87
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:92
+#, c-format
+msgid "hash version %u does not match"
+msgstr "версия хеш-суммы %u не соответсвует"
+
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
+msgstr ""
+
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:163
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:208
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
+
+#: midx.c:457
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:463
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:557
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:993
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1063
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
+msgstr ""
+
+#: midx.c:1076
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:1095
+msgid "Sorting objects by packfile"
+msgstr ""
+
+#: midx.c:1101
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1117
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1123
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1132
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: name-hash.c:531
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:553
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:559
+#, 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 "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
-#: notes-merge.c:281
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Неправильное значение notes.rewriteMode: «%s»"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
@@ -3073,7 +3977,7 @@
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Неправильное значение переменной %s: «%s»"
@@ -3083,358 +3987,706 @@
msgid "invalid object type \"%s\""
msgstr ""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr ""
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "не удалось разобрать объект: %s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr ""
+msgid "hash mismatch %s"
+msgstr "несоответствие хеш-суммы %s"
-#: packfile.c:563
+#: packfile.c:617
msgid "offset before end of packfile (broken .idx?)"
msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-#: packfile.c:1745
+#: packfile.c:1868
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-#: packfile.c:1749
+#: packfile.c:1872
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
-#: parse-options.c:672
+#: 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:319
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:887
msgid "..."
msgstr "…"
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "использование: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-КОЛИЧЕСТВО"
-#: parse-options-cb.c:44
+#: parse-options.c:968
+#, 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:112
+#: 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 "Неправильное имя объекта «%s»"
-#: path.c:892
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не удалось предоставить доступ к %s на запись"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Разрешен только один спецификатор «attr:»."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "спецификатор attr не должен быть пустой"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "недопустимое имя атрибута %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать одновременно"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути "
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: «literal» и «glob» не совместимы"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: «%s» вне репозитория"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "«%s» (мнемоника: «%c»)"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "спецификатор пути «%s» находится за символической ссылкой"
-#: pkt-line.c:104
+#: 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:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr ""
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr ""
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr ""
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pretty.c:962
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "ошибка внешнего репозитория: %s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr ""
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "не удалось разобрать формат для --pretty"
-#: range-diff.c:48
+#: range-diff.c:56
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:51
+#: range-diff.c:59
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:66 sequencer.c:4540
+#: range-diff.c:74 sequencer.c:4897
#, c-format
msgid "could not parse commit '%s'"
msgstr "не удалось разобрать коммит «%s»"
-#: range-diff.c:196
+#: range-diff.c:224
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:421 range-diff.c:423
+#: range-diff.c:455 range-diff.c:457
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
-#: read-cache.c:1579
+#: 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:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1499
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
-#: read-cache.c:1589
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1776
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
+#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
+msgstr "файл индекса поврежден"
+
+#: read-cache.c:2087
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2100
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr ""
+
+#: read-cache.c:2187
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2214
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
#, c-format
msgid "could not close '%s'"
msgstr "не удалось закрыть «%s»"
-#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
#, c-format
msgid "could not stat '%s'"
msgstr "не удалось выполнить stat для «%s»"
-#: read-cache.c:2666
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "не удалось открыть каталог git: %s"
-#: read-cache.c:2678
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "не удалось отсоединить: %s"
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
+
+#: rebase-interactive.c:35
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nb, break = остановиться здесь (продолжить с помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
+
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
+
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
+
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
+
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
+
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr "Заметьте, что пустые коммиты закомментированны"
+
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
+#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#, c-format
+msgid "could not write '%s'"
+msgstr "не удалось записать «%s»"
+
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr ""
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
+
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr "Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
+
#: refs.c:192
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:579
+#: refs.c:597
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:581 ref-filter.c:2067
+#: refs.c:599 ref-filter.c:1982
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнорирую неправильную ссылку %s"
-#: refs.c:685
+#: refs.c:734
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "не удалось открыть «%s» для записи: %s"
-#: refs.c:695 refs.c:746
+#: refs.c:744 refs.c:795
#, c-format
msgid "could not read ref '%s'"
msgstr ""
-#: refs.c:701
+#: refs.c:750
#, c-format
msgid "ref '%s' already exists"
msgstr ""
-#: refs.c:706
+#: refs.c:755
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
-#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
-#: wrapper.c:656
+#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
+#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "не удалось записать в «%s»"
-#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:780
+#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:993
#, c-format
msgid "could not open '%s' for writing"
msgstr "не удалось открыть «%s» для записи"
-#: refs.c:748
+#: refs.c:797
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: refs.c:879
+#: refs.c:928
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:885
+#: refs.c:934
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:943
+#: refs.c:993
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1035
+#: refs.c:1085
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1111
+#: refs.c:1161
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:1853
+#: refs.c:1942
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:1885
+#: refs.c:1974
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновление ссылок запрещено в изолированном окружении"
-#: refs.c:1981 refs.c:2011
+#: refs.c:2070 refs.c:2100
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:1987 refs.c:2022
+#: refs.c:2076 refs.c:2111
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: refs/files-backend.c:1191
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "не удалось удалить ссылки %s"
-#: refs/files-backend.c:1205 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "не удалось удалить ссылку %s: %s"
-#: refs/files-backend.c:1208 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "не удалось удалить ссылки: %s"
@@ -3444,329 +4696,463 @@
msgid "invalid refspec '%s'"
msgstr ""
-#: ref-filter.c:38 wt-status.c:1850
+#: ref-filter.c:39 wt-status.c:1909
msgid "gone"
msgstr "исчез"
-#: ref-filter.c:39
+#: ref-filter.c:40
#, c-format
msgid "ahead %d"
msgstr "впереди %d"
-#: ref-filter.c:40
+#: ref-filter.c:41
#, c-format
msgid "behind %d"
msgstr "позади %d"
-#: ref-filter.c:41
+#: ref-filter.c:42
#, c-format
msgid "ahead %d, behind %d"
msgstr "впереди %d, позади %d"
-#: ref-filter.c:137
+#: ref-filter.c:138
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "ожидаемый формат: %%(color:<color>)"
-#: ref-filter.c:139
+#: ref-filter.c:140
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "неопознанный цвет: %%(color:%s)"
-#: ref-filter.c:161
+#: ref-filter.c:162
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Ожидается целочисленное значение refname:lstrip=%s"
-#: ref-filter.c:165
+#: ref-filter.c:166
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Ожидается целочисленное значение refname:rstrip=%s"
-#: ref-filter.c:167
+#: ref-filter.c:168
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "неопознанный аргумент %%(%s): %s"
-#: ref-filter.c:222
+#: ref-filter.c:223
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:234
+#: ref-filter.c:245
#, c-format
-msgid "%%(objectsize) does not take arguments"
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:246
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:265
#, c-format
msgid "%%(body) does not take arguments"
msgstr "параметр %%(body) не принимает аргументы"
-#: ref-filter.c:255
+#: ref-filter.c:274
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "параметр %%(subject) не принимает аргументы"
-#: ref-filter.c:275
+#: ref-filter.c:296
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "неизвестный аргумент для %%(trailers): %s"
-#: ref-filter.c:304
+#: ref-filter.c:325
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "положительное значение ожидает contents:lines=%s"
-#: ref-filter.c:306
+#: ref-filter.c:327
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "неопознанный аргумент %%(contents): %s"
-#: ref-filter.c:321
+#: ref-filter.c:342
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "ожидается положительное значение objectname:short=%s"
-#: ref-filter.c:325
+#: ref-filter.c:346
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "неопознанный аргумент %%(objectname): %s"
-#: ref-filter.c:355
+#: ref-filter.c:376
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-#: ref-filter.c:367
+#: ref-filter.c:388
#, c-format
msgid "unrecognized position:%s"
msgstr "неопознанная позиция:%s"
-#: ref-filter.c:374
+#: ref-filter.c:395
#, c-format
msgid "unrecognized width:%s"
msgstr "неопознанная ширина:%s"
-#: ref-filter.c:383
+#: ref-filter.c:404
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "неопознанный аргумент %%(align): %s"
-#: ref-filter.c:391
+#: ref-filter.c:412
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "ожидается положительная ширина с указанием частицы %%(align)"
-#: ref-filter.c:409
+#: ref-filter.c:430
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "неопознанный аргумент %%(if): %s"
-#: ref-filter.c:505
+#: ref-filter.c:531
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправильное имя поля: %.*s"
-#: ref-filter.c:532
+#: ref-filter.c:558
#, c-format
msgid "unknown field name: %.*s"
msgstr "неизвестное имя поля: %.*s"
-#: ref-filter.c:656
+#: ref-filter.c:562
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c:686
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: частица %%(if) использована без частицы %%(then)"
-#: ref-filter.c:719
+#: ref-filter.c:749
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: частица %%(then) использована без частицы %%(if)"
-#: ref-filter.c:721
+#: ref-filter.c:751
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: частица %%(then) использована более одного раза"
-#: ref-filter.c:723
+#: ref-filter.c:753
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: частица %%(then) использована после %%(else)"
-#: ref-filter.c:751
+#: ref-filter.c:781
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: частица %%(else) использована без частицы %%(if)"
-#: ref-filter.c:753
+#: ref-filter.c:783
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: частица %%(else) использована без частицы %%(then)"
-#: ref-filter.c:755
+#: ref-filter.c:785
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: частица %%(else) использована более одного раза"
-#: ref-filter.c:770
+#: ref-filter.c:800
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: частица %%(end) использована без соответствующей частицы"
-#: ref-filter.c:827
+#: ref-filter.c:857
#, c-format
msgid "malformed format string %s"
msgstr "неправильная строка формата %s"
-#: ref-filter.c:1416
+#: ref-filter.c:1453
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(нет ветки, перемещение %s)"
-#: ref-filter.c:1419
+#: ref-filter.c:1456
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(нет ветки перемещение отделённого HEAD %s)"
-#: ref-filter.c:1422
+#: ref-filter.c:1459
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(нет ветки, двоичный поиск начат на %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
-#: ref-filter.c:1430
+#: ref-filter.c:1467
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD отделён на %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
-#: ref-filter.c:1437
+#: ref-filter.c:1474
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD отделён начиная с %s)"
-#: ref-filter.c:1441
+#: ref-filter.c:1478
msgid "(no branch)"
msgstr "(нет ветки)"
-#: ref-filter.c:1475 ref-filter.c:1623
+#: ref-filter.c:1512 ref-filter.c:1669
#, c-format
msgid "missing object %s for %s"
msgstr "не найден объект %s для %s"
-#: ref-filter.c:1483
+#: ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-#: ref-filter.c:1980
+#: ref-filter.c:1888
#, c-format
msgid "malformed object at '%s'"
msgstr "Повреждённый объект «%s»"
-#: ref-filter.c:2062
+#: ref-filter.c:1977
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнорирую ссылку с неправильным именем %s"
-#: ref-filter.c:2340
+#: ref-filter.c:2263
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: пропущена частица %%(end)"
-#: ref-filter.c:2444
+#: ref-filter.c:2363
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr ""
+
+#: ref-filter.c:2366
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr ""
+
+#: ref-filter.c:2376
#, c-format
msgid "malformed object name %s"
msgstr "неправильное имя объекта %s"
-#: remote.c:606
+#: ref-filter.c:2381
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr ""
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Нельзя извлечь одновременно %s и %s в %s"
-#: remote.c:610
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s обычно отслеживает %s, а не %s"
-#: remote.c:614
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s отслеживает и %s и %s"
-#: remote.c:622
-msgid "Internal error"
-msgstr "Внутренняя ошибка"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
-#: remote.c:1536 remote.c:1637
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr ""
+
+#: remote.c:1005
+#, 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:1020
+#, 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:1040
+#, 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:1045
+#, 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:1050
+#, 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:1055
+#, 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:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr ""
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr ""
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD не указывает на ветку"
-#: remote.c:1545
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "нет такой ветки: «%s»"
-#: remote.c:1548
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "вышестоящая ветка не настроена для ветки «%s»"
-#: remote.c:1554
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
-#: remote.c:1569
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
-#: remote.c:1581
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ветка «%s» не имеет внешнего сервера для отправки"
-#: remote.c:1591
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
-#: remote.c:1604
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
-#: remote.c:1626
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
-#: remote.c:1951
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr ""
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-#: remote.c:1955
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
-#: remote.c:1958
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
-#: remote.c:1962
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
-#: remote.c:1965
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (используйте «%s» для просмотра описания)\n"
-#: remote.c:1969
+#: remote.c:2034
#, 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"
@@ -3775,11 +5161,11 @@
msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: remote.c:1975
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: remote.c:1978
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -3789,11 +5175,11 @@
msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-#: remote.c:1986
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: remote.c:1989
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -3806,198 +5192,340 @@
msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-#: remote.c:1999
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-#: replace-object.c:20
+#: remote.c:2247
+#, 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:29
+#: replace-object.c:30
#, c-format
msgid "duplicate replace ref: %s"
msgstr ""
-#: replace-object.c:72
+#: replace-object.c:73
#, c-format
msgid "replace depth too high for object %s"
msgstr ""
-#: revision.c:2305
+#: 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:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "не удалось создать каталог «%s»"
+
+#: 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:2476
msgid "your current branch appears to be broken"
msgstr "похоже, ваша текущая ветка повреждена"
-#: revision.c:2308
+#: revision.c:2479
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
-#: revision.c:2505
+#: revision.c:2679
msgid "--first-parent is incompatible with --bisect"
msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
-#: run-command.c:728
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "сбой открытия /dev/null"
-#: run-command.c:1271
+#: 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 "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "не удалось разобрать статус внешней распаковки: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "сбой при внешней распаковке %s"
-#: send-pack.c:309
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "сбой подписания сертификата отправки"
-#: send-pack.c:422
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:424
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support "
"--signed push"
msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:436
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
-#: send-pack.c:441
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "принимающая сторона не поддерживает отправку с опциями"
-#: sequencer.c:177
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "неправильный режим очистки сообщения коммита «%s»"
-#: sequencer.c:278
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "не удалось удалить «%s»"
-#: sequencer.c:304
+#: sequencer.c:318
msgid "revert"
msgstr "обратить изменения"
-#: sequencer.c:306
+#: sequencer.c:320
msgid "cherry-pick"
msgstr "копировать коммит"
-#: sequencer.c:308
+#: sequencer.c:322
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:310
+#: sequencer.c:324
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:367
+#: sequencer.c:382
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
-#: sequencer.c:370
+#: sequencer.c:385
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 "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»"
-#: sequencer.c:383 sequencer.c:2488
+#: sequencer.c:398 sequencer.c:2801
#, c-format
msgid "could not lock '%s'"
msgstr "не удалось заблокировать «%s»"
-#: sequencer.c:390
+#: sequencer.c:405
#, c-format
msgid "could not write eol to '%s'"
msgstr "не удалось записать eol в «%s»"
-#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
-#: sequencer.c:2741
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
#, c-format
msgid "failed to finalize '%s'"
msgstr "не удалось завершить «%s»"
-#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
-#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
-#: builtin/merge.c:1081
+#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
+#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
+#: builtin/merge.c:1115 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "не удалось прочитать «%s»"
-#: sequencer.c:444
+#: sequencer.c:459
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "ваши локальные изменения будут перезаписаны %s."
-#: sequencer.c:448
+#: sequencer.c:463
msgid "commit your changes or stash them to proceed."
msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-#: sequencer.c:477
+#: sequencer.c:495
#, c-format
msgid "%s: fast-forward"
msgstr "%s: перемотка вперед"
+#: sequencer.c:534 builtin/tag.c:555
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Неправильное значение режима очистки %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
-#: sequencer.c:566
+#: sequencer.c:629
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Не удалось записать файл индекса"
-#: sequencer.c:582
+#: sequencer.c:646
msgid "unable to update cache tree"
msgstr "не удалось обновить дерево кэша"
-#: sequencer.c:595
+#: sequencer.c:660
msgid "could not resolve HEAD commit"
msgstr "не удалось распознать HEAD коммит"
-#: sequencer.c:723
-#, c-format
-msgid "could not parse '%s' (looking for '%s'"
-msgstr ""
-
-#: sequencer.c:731
-#, c-format
-msgid "bad quoting on %s value in '%s'"
-msgstr ""
-
#: sequencer.c:740
#, c-format
-msgid "could not parse '%s' (looking for '%s')"
+msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:747
+#: sequencer.c:751
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "не удалось открыть «%s» для чтения"
+
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:812
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:881
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: sequencer.c:761
+#: sequencer.c:898
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4014,15 +5542,15 @@
" git rebase --continue\n"
msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
-#: sequencer.c:830
+#: sequencer.c:992
msgid "writing root commit"
msgstr "запись коневого коммита"
-#: sequencer.c:1055
+#: sequencer.c:1213
msgid "'prepare-commit-msg' hook failed"
msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
-#: sequencer.c:1062
+#: sequencer.c:1220
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4037,7 +5565,7 @@
" git commit --amend --reset-author\n"
msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: sequencer.c:1075
+#: sequencer.c:1233
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4051,304 +5579,305 @@
" git commit --amend --reset-author\n"
msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: sequencer.c:1115
+#: sequencer.c:1275
msgid "couldn't look up newly created commit"
msgstr "нельзя запросить новосозданный коммит"
-#: sequencer.c:1117
+#: sequencer.c:1277
msgid "could not parse newly created commit"
msgstr "нельзя разобрать новосозданный коммит"
-#: sequencer.c:1163
+#: sequencer.c:1323
msgid "unable to resolve HEAD after creating commit"
msgstr "не удалось найти HEAD после создания коммита"
-#: sequencer.c:1165
+#: sequencer.c:1325
msgid "detached HEAD"
msgstr "отделённый HEAD"
-#: sequencer.c:1169
+#: sequencer.c:1329
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: sequencer.c:1190
+#: sequencer.c:1350
msgid "could not parse HEAD"
msgstr "не удалось разобрать HEAD"
-#: sequencer.c:1192
+#: sequencer.c:1352
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s не является коммитом!"
-#: sequencer.c:1196 builtin/commit.c:1528
+#: sequencer.c:1356 builtin/commit.c:1551
msgid "could not parse HEAD commit"
msgstr "не удалось разобрать HEAD коммит"
-#: sequencer.c:1247 sequencer.c:1845
+#: sequencer.c:1408 sequencer.c:2001
msgid "unable to parse commit author"
msgstr "не удалось разобрать автора коммита"
-#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
msgid "git write-tree failed to write a tree"
msgstr "git write-tree не удалось записать дерево"
-#: sequencer.c:1274 sequencer.c:1329
+#: sequencer.c:1435 sequencer.c:1496
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "не удалось прочитать сообщение коммита из «%s»"
-#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631
-#: builtin/merge.c:855 builtin/merge.c:880
+#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650
+#: builtin/merge.c:882 builtin/merge.c:906
msgid "failed to write commit object"
msgstr "сбой записи объекта коммита"
-#: sequencer.c:1356
+#: sequencer.c:1523
#, c-format
msgid "could not parse commit %s"
msgstr "не удалось разобрать коммит %s"
-#: sequencer.c:1361
+#: sequencer.c:1528
#, c-format
msgid "could not parse parent commit %s"
msgstr "не удалось разобрать родительский коммит %s"
-#: sequencer.c:1457 sequencer.c:1565
+#: sequencer.c:1602 sequencer.c:1712
#, c-format
msgid "unknown command: %d"
msgstr "неизвестная команда: %d"
-#: sequencer.c:1512 sequencer.c:1537
+#: sequencer.c:1659 sequencer.c:1684
#, c-format
msgid "This is a combination of %d commits."
msgstr "Это объединение %d коммитов."
-#: sequencer.c:1522 sequencer.c:4520
+#: sequencer.c:1669
msgid "need a HEAD to fixup"
msgstr "нужен HEAD для исправления"
-#: sequencer.c:1524 sequencer.c:2768
+#: sequencer.c:1671 sequencer.c:3111
msgid "could not read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:1526
+#: sequencer.c:1673
msgid "could not read HEAD's commit message"
msgstr "не удалось прочитать сообщение коммита текущего HEAD"
-#: sequencer.c:1532
+#: sequencer.c:1679
#, c-format
msgid "cannot write '%s'"
msgstr "не удалось записать «%s»"
-#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
msgid "This is the 1st commit message:"
msgstr "Это 1-е сообщение коммита:"
-#: sequencer.c:1547
+#: sequencer.c:1694
#, c-format
msgid "could not read commit message of %s"
msgstr "не удалось прочитать сообщение коммита для %s"
-#: sequencer.c:1554
+#: sequencer.c:1701
#, c-format
msgid "This is the commit message #%d:"
msgstr "Это сообщение коммита номер #%d:"
-#: sequencer.c:1560
+#: sequencer.c:1707
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Сообщение коммита номер #%d будет пропущено:"
-#: sequencer.c:1643
+#: sequencer.c:1795
msgid "your index file is unmerged."
msgstr "ваш индекс не слит."
-#: sequencer.c:1650
+#: sequencer.c:1802
msgid "cannot fixup root commit"
msgstr "нельзя исправить корневой коммит"
-#: sequencer.c:1669
+#: sequencer.c:1821
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
-#: sequencer.c:1677
+#: sequencer.c:1829 sequencer.c:1837
#, c-format
msgid "commit %s does not have parent %d"
msgstr "у коммита %s нет предка %d"
-#: sequencer.c:1681
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "основная ветка указана, но коммит %s не является слиянием."
-
-#: sequencer.c:1687
+#: sequencer.c:1843
#, c-format
msgid "cannot get commit message for %s"
msgstr "не удалось получить сообщение коммита для %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1706
+#: sequencer.c:1862
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: не удалось разобрать родительский коммит для %s"
-#: sequencer.c:1771
+#: sequencer.c:1927
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "не удалось переименовать «%s» в «%s»"
-#: sequencer.c:1826
+#: sequencer.c:1982
#, c-format
msgid "could not revert %s... %s"
msgstr "не удалось обратить изменения коммита %s… %s"
-#: sequencer.c:1827
+#: sequencer.c:1983
#, c-format
msgid "could not apply %s... %s"
msgstr "не удалось применить коммит %s… %s"
-#: sequencer.c:1885
+#: sequencer.c:2042
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: сбой чтения индекса"
-#: sequencer.c:1892
+#: sequencer.c:2049
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: сбой обновления индекса"
-#: sequencer.c:1972
+#: sequencer.c:2118
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "параметр %s не принимает аргументы: «%s»"
-#: sequencer.c:1981
+#: sequencer.c:2127
#, c-format
msgid "missing arguments for %s"
msgstr "пропущены аргументы для %s"
-#: sequencer.c:2040
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:2226
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправильная строка %d: %.*s"
-#: sequencer.c:2048
+#: sequencer.c:2237
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
-#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "не удалось прочитать «%s»."
-#: sequencer.c:2119
+#: sequencer.c:2360
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
-#: sequencer.c:2121
+#: sequencer.c:2362
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "непригодная для использования карта с инструкциями: «%s»"
-#: sequencer.c:2126
+#: sequencer.c:2367
msgid "no commits parsed."
msgstr "коммиты не разобраны."
-#: sequencer.c:2137
+#: sequencer.c:2378
msgid "cannot cherry-pick during a revert."
msgstr "нельзя скопировать коммит во время процесса обращения коммита."
-#: sequencer.c:2139
+#: sequencer.c:2380
msgid "cannot revert during a cherry-pick."
msgstr "нельзя обратить изменения коммита во время копирования коммита."
-#: sequencer.c:2209
+#: sequencer.c:2462
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправильное значение %s: %s"
-#: sequencer.c:2285
+#: sequencer.c:2549
msgid "unusable squash-onto"
msgstr "непригодный для использования уплотнить-над"
-#: sequencer.c:2301
+#: sequencer.c:2565
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "испорченная карта с опциями: «%s»"
-#: sequencer.c:2335 sequencer.c:3775
+#: sequencer.c:2648 sequencer.c:4227
msgid "empty commit set passed"
msgstr "передан пустой набор коммитов"
-#: sequencer.c:2343
+#: sequencer.c:2656
msgid "a cherry-pick or revert is already in progress"
msgstr "копирование или обращение изменений коммита уже выполняются"
-#: sequencer.c:2344
+#: sequencer.c:2657
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
-#: sequencer.c:2347
+#: sequencer.c:2660
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-#: sequencer.c:2361
+#: sequencer.c:2674
msgid "could not lock HEAD"
msgstr "не удалось заблокировать HEAD"
-#: sequencer.c:2416 sequencer.c:3543
+#: sequencer.c:2729 sequencer.c:3979
msgid "no cherry-pick or revert in progress"
msgstr "копирование или обращение изменений коммита уже выполняются"
-#: sequencer.c:2418
+#: sequencer.c:2731
msgid "cannot resolve HEAD"
msgstr "не удалось определить HEAD"
-#: sequencer.c:2420 sequencer.c:2455
+#: sequencer.c:2733 sequencer.c:2768
msgid "cannot abort from a branch yet to be born"
msgstr "нельзя отменить изменения с ветки, которая еще не создана"
-#: sequencer.c:2441 builtin/grep.c:721
+#: sequencer.c:2754 builtin/grep.c:732
#, c-format
msgid "cannot open '%s'"
msgstr "не удалось открыть «%s»"
-#: sequencer.c:2443
+#: sequencer.c:2756
#, c-format
msgid "cannot read '%s': %s"
msgstr "не удалось прочитать «%s»: %s"
-#: sequencer.c:2444
+#: sequencer.c:2757
msgid "unexpected end of file"
msgstr "неожиданный конец файла"
-#: sequencer.c:2450
+#: sequencer.c:2763
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-#: sequencer.c:2461
+#: sequencer.c:2774
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
-#: sequencer.c:2565 sequencer.c:3461
+#: sequencer.c:2903 sequencer.c:3894
#, c-format
msgid "could not update %s"
msgstr "не удалось обновить %s"
-#: sequencer.c:2603 sequencer.c:3441
+#: sequencer.c:2941 sequencer.c:3874
msgid "cannot read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:2618
+#: sequencer.c:2958
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2626
+#: sequencer.c:2966
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -4360,26 +5889,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:2636
+#: sequencer.c:2976
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:2643
+#: sequencer.c:2983
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "не удалось скопировать «%s» в «%s»"
-#: sequencer.c:2680 sequencer.c:3095
+#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839
+#: builtin/rebase.c:1580 builtin/rebase.c:1940 builtin/rebase.c:1995
msgid "could not read index"
msgstr "не удалось прочитать индекс"
-#: sequencer.c:2685
+#: sequencer.c:3028
#, c-format
msgid ""
"execution failed: %s\n"
@@ -4389,11 +5919,11 @@
"\n"
msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n"
-#: sequencer.c:2691
+#: sequencer.c:3034
msgid "and made changes to the index and/or the working tree\n"
msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
-#: sequencer.c:2697
+#: sequencer.c:3040
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -4404,81 +5934,76 @@
"\n"
msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n"
-#: sequencer.c:2758
+#: sequencer.c:3101
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:2810
+#: sequencer.c:3155
msgid "writing fake root commit"
msgstr "запись поддельного корневого коммита"
-#: sequencer.c:2815
+#: sequencer.c:3160
msgid "writing squash-onto"
msgstr "запить уплотнить-над"
-#: sequencer.c:2850
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
#, c-format
msgid "failed to find tree of %s"
msgstr "не удалось найти дерево для %s"
-#: sequencer.c:2868
+#: sequencer.c:3216 builtin/rebase.c:863
msgid "could not write index"
msgstr "не удалось записать индекс"
-#: sequencer.c:2895
+#: sequencer.c:3243
#, c-format
msgid "could not resolve '%s'"
msgstr "не удалось распознать «%s»"
-#: sequencer.c:2921
+#: sequencer.c:3271
msgid "cannot merge without a current revision"
msgstr "нельзя слить без текущей редакции"
-#: sequencer.c:2943
+#: sequencer.c:3293
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:2952
+#: sequencer.c:3302
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:2964
+#: sequencer.c:3314
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:2979
+#: sequencer.c:3329
#, c-format
msgid "could not get commit message of '%s'"
msgstr "не удалось получить сообщение коммита для «%s»"
-#: sequencer.c:2989 sequencer.c:3015
-#, c-format
-msgid "could not write '%s'"
-msgstr "не удалось записать «%s»"
-
-#: sequencer.c:3127
+#: sequencer.c:3478
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "не удалось даже попытаться слить «%.*s»"
-#: sequencer.c:3143
+#: sequencer.c:3494
msgid "merge: Unable to write new index file"
msgstr "слияние: Не удалось записать файл индекса"
-#: sequencer.c:3211
+#: sequencer.c:3562 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Применены автоматически спрятанные изменения.\n"
-#: sequencer.c:3223
+#: sequencer.c:3574
#, c-format
msgid "cannot store %s"
msgstr "не удалось сохранить %s"
-#: sequencer.c:3226 git-rebase.sh:188
+#: sequencer.c:3577 builtin/rebase.c:727
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -4486,7 +6011,31 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-#: sequencer.c:3257
+#: sequencer.c:3638
+#, c-format
+msgid "could not checkout %s"
+msgstr ""
+
+#: sequencer.c:3652
+#, c-format
+msgid "%s: not a valid OID"
+msgstr ""
+
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr "не удалось отделить HEAD"
+
+#: sequencer.c:3672
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:3674
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:3682
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -4499,125 +6048,104 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3325
+#: sequencer.c:3759
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Остановлено на %s … %.*s\n"
-#: sequencer.c:3404
+#: sequencer.c:3837
#, c-format
msgid "unknown command %d"
msgstr "неизвестная команда %d"
-#: sequencer.c:3449
+#: sequencer.c:3882
msgid "could not read orig-head"
msgstr "не удалось прочитать orig-head"
-#: sequencer.c:3454 sequencer.c:4517
+#: sequencer.c:3887
msgid "could not read 'onto'"
msgstr "не удалось прочитать «onto»"
-#: sequencer.c:3468
+#: sequencer.c:3901
#, c-format
msgid "could not update HEAD to %s"
msgstr "не удалось обновить HEAD на %s"
-#: sequencer.c:3554
+#: sequencer.c:3991
msgid "cannot rebase: You have unstaged changes."
msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-#: sequencer.c:3563
+#: sequencer.c:4000
msgid "cannot amend non-existing commit"
msgstr "не удалось исправить несуществующий коммит"
-#: sequencer.c:3565
+#: sequencer.c:4002
#, c-format
msgid "invalid file: '%s'"
msgstr "недопустимый файл: «%s»"
-#: sequencer.c:3567
+#: sequencer.c:4004
#, c-format
msgid "invalid contents: '%s'"
msgstr "недопустимое содержимое: «%s»"
-#: sequencer.c:3570
+#: sequencer.c:4007
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова."
-#: sequencer.c:3595 sequencer.c:3633
+#: sequencer.c:4043 sequencer.c:4081
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:3648
+#: sequencer.c:4096
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "не удалось удалить CHERRY_PICK_HEAD"
-#: sequencer.c:3655
+#: sequencer.c:4103
msgid "could not commit staged changes."
msgstr "не удалось закоммитить проиндексированные изменения."
-#: sequencer.c:3752
+#: sequencer.c:4204
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не удалось скопировать коммит %s"
-#: sequencer.c:3756
+#: sequencer.c:4208
#, c-format
msgid "%s: bad revision"
msgstr "%s: плохая редакция"
-#: sequencer.c:3791
+#: sequencer.c:4243
msgid "can't revert as initial commit"
msgstr "нельзя возвратить изначальный коммит"
-#: sequencer.c:4238
+#: sequencer.c:4686
msgid "make_script: unhandled options"
msgstr "make_script: не обработанные опции"
-#: sequencer.c:4241
+#: sequencer.c:4689
msgid "make_script: error preparing revisions"
msgstr "make_script: ошибка при обновлении редакций"
-#: sequencer.c:4281 sequencer.c:4337
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "непригодный для использования список дел: «%s»"
-
-#: sequencer.c:4396
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
-
-#: sequencer.c:4466
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
-
-#: sequencer.c:4473
-#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
-
-#: sequencer.c:4486
-#, c-format
+#: sequencer.c:4847
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n"
-#: sequencer.c:4660
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
+msgstr ""
+
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:5073
msgid "the script was already rearranged."
msgstr "сценарий уже был перестроен."
@@ -4626,14 +6154,14 @@
msgid "'%s' is outside repository"
msgstr "«%s» вне репозитория"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -4641,12 +6169,12 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -4654,376 +6182,376 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:503
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-#: setup.c:511
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "обнаружены неизвестные расширения репозитория:"
-#: setup.c:530
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "ошибка открытия «%s»"
-#: setup.c:532
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "файл слишком большой как для .git файла: «%s»"
-#: setup.c:534
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "ошибка чтения %s"
-#: setup.c:536
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправильный формат файла gitfile: %s"
-#: setup.c:538
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "нет пути в gitfile: %s"
-#: setup.c:540
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "не является репозиторием git: %s"
-#: setup.c:639
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» слишком большой"
-#: setup.c:653
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "не является репозиторием git: «%s»"
-#: setup.c:682 setup.c:684 setup.c:715
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "не удалось выполнить chdir в «%s»"
-#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "не удалось вернуться в cwd"
-#: setup.c:813
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
-
-#: setup.c:824
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "не удалось выполнить stat для «%*s%s%s»"
-#: setup.c:1054
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Не удалось прочитать текущий рабочий каталог"
-#: setup.c:1066 setup.c:1072
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "не удалось изменить на «%s»"
-#: setup.c:1085
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
+
+#: setup.c:1109
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr "не найден git репозиторий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)."
-#: setup.c:1168
+#: setup.c:1220
#, 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:1211
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "сбой открытия /dev/null или дублирования дескриптора"
-#: setup.c:1226
+#: setup.c:1279
msgid "fork failed"
msgstr "сбой при выполнении fork"
-#: setup.c:1231
+#: setup.c:1284
msgid "setsid failed"
msgstr "сбой при выполнении setsid"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr ""
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr ""
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "путь «%s» не существует"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ссылаемый репозиторий «%s» не является локальным."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ссылаемый репозиторий «%s» является частичным"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ссылаемый репозиторий «%s» является сращенным"
-#: sha1-file.c:781
+#: sha1-file.c:846
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:806
+#: sha1-file.c:871
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:973
+#: sha1-file.c:1035
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1093 sha1-file.c:2206
+#: sha1-file.c:1159 sha1-file.c:2297
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1095 sha1-file.c:2210
+#: sha1-file.c:1161 sha1-file.c:2301
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1137
+#: sha1-file.c:1203
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1219
+#: sha1-file.c:1287
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1222
+#: sha1-file.c:1290
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1228
+#: sha1-file.c:1296
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1231
+#: sha1-file.c:1299
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1422
+#: sha1-file.c:1490
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1426
+#: sha1-file.c:1494
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1430
+#: sha1-file.c:1498
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1434
+#: sha1-file.c:1502
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1536
+#: sha1-file.c:1604
#, c-format
-msgid "unable to write sha1 filename %s"
+msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1543
+#: sha1-file.c:1611
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1550
+#: sha1-file.c:1618
msgid "file write error"
msgstr ""
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1635
+#: sha1-file.c:1702
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1704
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1667
+#: sha1-file.c:1734
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1671
+#: sha1-file.c:1738
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1675
+#: sha1-file.c:1742
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1685 builtin/pack-objects.c:899
+#: sha1-file.c:1752 builtin/pack-objects.c:920
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1760
+#: sha1-file.c:1827
#, c-format
-msgid "cannot read sha1_file for %s"
+msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:1805
+#: sha1-file.c:1867
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:1813
+#: sha1-file.c:1875
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:1906
+#: sha1-file.c:1974
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:1909
+#: sha1-file.c:1977
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:1980 sha1-file.c:1989
+#: sha1-file.c:2050 sha1-file.c:2059
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:1995
+#: sha1-file.c:2065
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2019
+#: sha1-file.c:2089
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2021
+#: sha1-file.c:2091
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s не является действительным объектом «%s»"
-#: sha1-file.c:2048 builtin/index-pack.c:158
+#: sha1-file.c:2118 builtin/index-pack.c:154
#, c-format
msgid "unable to open %s"
msgstr "не удалось открыть %s"
-#: sha1-file.c:2217 sha1-file.c:2269
+#: sha1-file.c:2308 sha1-file.c:2360
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr ""
+msgid "hash mismatch for %s (expected %s)"
+msgstr "несоответствие хеш-суммы %s (ожидается %s)"
-#: sha1-file.c:2241
+#: sha1-file.c:2332
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2246
+#: sha1-file.c:2337
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2252
+#: sha1-file.c:2343
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2263
+#: sha1-file.c:2354
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
-#: sha1-name.c:444
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
-#: sha1-name.c:455
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Возможно, вы имели в виду:"
-#: sha1-name.c:699
+#: sha1-name.c:800
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"
@@ -5036,96 +6564,90 @@
"running \"git config advice.objectNameWarning false\""
msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
-#: submodule.c:97 submodule.c:131
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
-#: submodule.c:101 submodule.c:135
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
-#: submodule.c:109
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr " Не удалось обновить .gitmodules запись %s"
-
-#: submodule.c:142
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Не удалось удалить запись в .gitmodules для %s"
-#: submodule.c:153
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "сбой индексирования обновленного .gitmodules"
-#: submodule.c:315
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в пустом подмодуле «%s»"
-#: submodule.c:346
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
-#: submodule.c:839
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
-#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не удалось определить HEAD как действительную ссылку."
-#: submodule.c:1377
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr ""
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» не распознан как репозиторий git"
-#: submodule.c:1515
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: submodule.c:1528
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: submodule.c:1543
+#: submodule.c:1817
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: submodule.c:1633
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "подмодуль «%s» имеет изменённый индекс"
-#: submodule.c:1685
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:1734
+#: submodule.c:2008
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
-#: submodule.c:1746 submodule.c:1802
+#: submodule.c:2020 submodule.c:2076
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "не удалось запросить имя подмодуля «%s»"
-#: submodule.c:1750 builtin/submodule--helper.c:1406
-#: builtin/submodule--helper.c:1416
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "не удалось создать каталог «%s»"
-
-#: submodule.c:1753
+#: submodule.c:2027
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5133,34 +6655,44 @@
"'%s'\n"
msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
-#: submodule.c:1837
+#: submodule.c:2111
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
-#: submodule.c:1881
+#: submodule.c:2155
msgid "could not start ls-files in .."
msgstr "не удалось выполнить stat ls-files в .."
-#: submodule.c:1920
+#: submodule.c:2194
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree вернул неожиданный код %d"
-#: submodule-config.c:231
+#: submodule-config.c:232
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "игнорирую подозрительный подмодуль с именем: %s"
-#: submodule-config.c:295
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs"
-#: submodule-config.c:468
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "неправильное значение %s"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr " Не удалось обновить .gitmodules запись %s"
+
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
@@ -5172,7 +6704,7 @@
msgid "unknown value '%s' for key '%s'"
msgstr "неизвестное значение «%s» для ключа «%s»"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:294
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
msgid "more than one %s"
msgstr "больше одного %s"
@@ -5191,26 +6723,26 @@
msgid "could not read from stdin"
msgstr "не удалось прочитать из стандартного ввода"
-#: trailer.c:1008 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "не удалось выполнить stat для %s"
-#: trailer.c:1010
+#: trailer.c:1013
#, c-format
msgid "file %s is not a regular file"
msgstr "файл %s не является обычным файлом"
-#: trailer.c:1012
+#: trailer.c:1015
#, c-format
msgid "file %s is not writable by user"
msgstr "файл %s не доступен на запись пользователю"
-#: trailer.c:1024
+#: trailer.c:1027
msgid "could not open temporary file"
msgstr "не удалось создать временный файл"
-#: trailer.c:1064
+#: trailer.c:1067
#, c-format
msgid "could not rename temporary file to %s"
msgstr "не удалось переименовать временный файл в %s"
@@ -5230,36 +6762,44 @@
msgid "transport: invalid depth option '%s'"
msgstr "транспорт: неправильный параметр глубины «%s»"
-#: transport.c:586
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "не удалось разобрать опцию transport.color.*"
-#: transport.c:659
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:785
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:851
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:903
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:998
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-#: transport.c:1002
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -5275,19 +6815,19 @@
"\n"
msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-#: transport.c:1010
+#: transport.c:1052
msgid "Aborting."
msgstr "Прерываю."
-#: transport.c:1148
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1270 transport-helper.c:643
+#: transport.c:1326 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr ""
-#: transport.c:1352
+#: transport.c:1430
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
@@ -5296,162 +6836,162 @@
msgid "full write to remote helper failed"
msgstr ""
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr ""
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr ""
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr ""
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1099
#, c-format
msgid "could not read ref %s"
msgstr ""
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr ""
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:932
+#: transport-helper.c:939
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:937
+#: transport-helper.c:944
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:984
+#: transport-helper.c:991
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:989
+#: transport-helper.c:996
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1014
+#: transport-helper.c:1021
#, 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:1077
+#: transport-helper.c:1085
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1230
+#: transport-helper.c:1238
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1257
+#: transport-helper.c:1265
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1306
+#: transport-helper.c:1314
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1310
+#: transport-helper.c:1318
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1329 transport-helper.c:1333
+#: transport-helper.c:1337 transport-helper.c:1341
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1370
+#: transport-helper.c:1378
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1374
+#: transport-helper.c:1382
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1392 transport-helper.c:1401
+#: transport-helper.c:1400 transport-helper.c:1409
msgid "can't start thread for copying data"
msgstr ""
@@ -5467,185 +7007,192 @@
msgid "empty filename in tree entry"
msgstr "пустое имя файла в записи дерева"
-#: tree-walk.c:115
+#: tree-walk.c:116
msgid "too-short tree file"
msgstr "слишком короткий файл дерева"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by checkout:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout update:\n"
"%s"
msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout update:\n"
"%s"
msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr "Не удолось обновить подмодуль:\n%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Прерываю\n"
-#: unpack-trees.c:336
+#: unpack-trees.c:318
msgid "Checking out files"
msgstr "Распаковка файлов"
+#: unpack-trees.c:350
+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 ""
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
@@ -5675,32 +7222,32 @@
msgid "invalid '..' path segment"
msgstr "неправильная часть пути «..»"
-#: worktree.c:245 builtin/am.c:2147
+#: worktree.c:255 builtin/am.c:2097
#, c-format
msgid "failed to read '%s'"
msgstr "не удалось прочитать «%s»"
-#: worktree.c:291
+#: worktree.c:301
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:302
+#: worktree.c:312
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:314
+#: worktree.c:324
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» не существует"
-#: worktree.c:320
+#: worktree.c:330
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:328
+#: worktree.c:338
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
@@ -5710,12 +7257,6 @@
msgid "could not open '%s' for reading and writing"
msgstr "не удалось открыть «%s» для чтения и записи"
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
-#: builtin/am.c:863 builtin/merge.c:1078
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "не удалось открыть «%s» для чтения"
-
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
@@ -5725,135 +7266,135 @@
msgid "unable to get current working directory"
msgstr "не удалось получить текущий рабочий каталог"
-#: wt-status.c:154
+#: wt-status.c:156
msgid "Unmerged paths:"
msgstr "Не слитые пути:"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:183 wt-status.c:210
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:185 wt-status.c:212
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
-#: wt-status.c:187
+#: wt-status.c:189
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:191 wt-status.c:195
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-#: wt-status.c:191
+#: wt-status.c:193
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:202 wt-status.c:1015
+#: wt-status.c:204 wt-status.c:1064
msgid "Changes to be committed:"
msgstr "Изменения, которые будут включены в коммит:"
-#: wt-status.c:220 wt-status.c:1024
+#: wt-status.c:222 wt-status.c:1073
msgid "Changes not staged for commit:"
msgstr "Изменения, которые не в индексе для коммита:"
-#: wt-status.c:224
+#: wt-status.c:226
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-#: wt-status.c:226
+#: wt-status.c:228
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-#: wt-status.c:227
+#: wt-status.c:229
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working "
"directory)"
msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
-#: wt-status.c:229
+#: wt-status.c:231
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-#: wt-status.c:241
+#: wt-status.c:243
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: wt-status.c:256
+#: wt-status.c:258
msgid "both deleted:"
msgstr "оба удалены:"
-#: wt-status.c:258
+#: wt-status.c:260
msgid "added by us:"
msgstr "добавлено нами:"
-#: wt-status.c:260
+#: wt-status.c:262
msgid "deleted by them:"
msgstr "удалено ими:"
-#: wt-status.c:262
+#: wt-status.c:264
msgid "added by them:"
msgstr "добавлено ими:"
-#: wt-status.c:264
+#: wt-status.c:266
msgid "deleted by us:"
msgstr "удалено нами:"
-#: wt-status.c:266
+#: wt-status.c:268
msgid "both added:"
msgstr "оба добавлены:"
-#: wt-status.c:268
+#: wt-status.c:270
msgid "both modified:"
msgstr "оба изменены:"
-#: wt-status.c:278
+#: wt-status.c:280
msgid "new file:"
msgstr "новый файл:"
-#: wt-status.c:280
+#: wt-status.c:282
msgid "copied:"
msgstr "скопировано:"
-#: wt-status.c:282
+#: wt-status.c:284
msgid "deleted:"
msgstr "удалено:"
-#: wt-status.c:284
+#: wt-status.c:286
msgid "modified:"
msgstr "изменено:"
-#: wt-status.c:286
+#: wt-status.c:288
msgid "renamed:"
msgstr "переименовано:"
-#: wt-status.c:288
+#: wt-status.c:290
msgid "typechange:"
msgstr "изменен тип:"
-#: wt-status.c:290
+#: wt-status.c:292
msgid "unknown:"
msgstr "неизвестно:"
-#: wt-status.c:292
+#: wt-status.c:294
msgid "unmerged:"
msgstr "не слитые:"
-#: wt-status.c:372
+#: wt-status.c:374
msgid "new commits, "
msgstr "новые коммиты, "
-#: wt-status.c:374
+#: wt-status.c:376
msgid "modified content, "
msgstr "изменено содержимое, "
-#: wt-status.c:376
+#: wt-status.c:378
msgid "untracked content, "
msgstr "неотслеживаемое содержимое, "
-#: wt-status.c:853
+#: wt-status.c:896
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
@@ -5862,69 +7403,69 @@
msgstr[2] "У вас сейчас спрятано %d записей"
msgstr[3] "У вас сейчас спрятаны %d записи"
-#: wt-status.c:885
+#: wt-status.c:928
msgid "Submodules changed but not updated:"
msgstr "Измененные, но не обновленные подмодули:"
-#: wt-status.c:887
+#: wt-status.c:930
msgid "Submodule changes to be committed:"
msgstr "Изменения в подмодулях, которые будут закоммичены:"
-#: wt-status.c:969
+#: wt-status.c:1012
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано."
-#: wt-status.c:1084
+#: wt-status.c:1119
msgid "You have unmerged paths."
msgstr "У вас есть не слитые пути."
-#: wt-status.c:1087
+#: wt-status.c:1122
msgid " (fix conflicts and run \"git commit\")"
msgstr " (разрешите конфликты, затем запустите «git commit»)"
-#: wt-status.c:1089
+#: wt-status.c:1124
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
-#: wt-status.c:1094
+#: wt-status.c:1128
msgid "All conflicts fixed but you are still merging."
msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
-#: wt-status.c:1097
+#: wt-status.c:1131
msgid " (use \"git commit\" to conclude merge)"
msgstr " (используйте «git commit», чтобы завершить слияние)"
-#: wt-status.c:1107
+#: wt-status.c:1140
msgid "You are in the middle of an am session."
msgstr "Вы в процессе сессии am."
-#: wt-status.c:1110
+#: wt-status.c:1143
msgid "The current patch is empty."
msgstr "Текущий патч пустой."
-#: wt-status.c:1114
+#: wt-status.c:1147
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
-#: wt-status.c:1116
+#: wt-status.c:1149
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1118
+#: wt-status.c:1151
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-#: wt-status.c:1250
+#: wt-status.c:1284
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo отсутствует."
-#: wt-status.c:1252
+#: wt-status.c:1286
msgid "No commands done."
msgstr "Команды не выполнены."
-#: wt-status.c:1255
+#: wt-status.c:1289
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -5933,16 +7474,16 @@
msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
-#: wt-status.c:1266
+#: wt-status.c:1300
#, c-format
msgid " (see more in file %s)"
msgstr " (смотрите дополнительно в файле %s)"
-#: wt-status.c:1271
+#: wt-status.c:1305
msgid "No commands remaining."
msgstr "Команд больше не осталось."
-#: wt-status.c:1274
+#: wt-status.c:1308
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -5951,154 +7492,170 @@
msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
-#: wt-status.c:1282
+#: wt-status.c:1316
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
-#: wt-status.c:1295
+#: wt-status.c:1328
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
-#: wt-status.c:1300
+#: wt-status.c:1333
msgid "You are currently rebasing."
msgstr "Вы сейчас перемещаете ветку."
-#: wt-status.c:1314
+#: wt-status.c:1346
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
-#: wt-status.c:1316
+#: wt-status.c:1348
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1318
+#: wt-status.c:1350
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-#: wt-status.c:1324
+#: wt-status.c:1357
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
-#: wt-status.c:1328
+#: wt-status.c:1361
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
-#: wt-status.c:1333
+#: wt-status.c:1366
msgid "You are currently splitting a commit during a rebase."
msgstr "Вы сейчас разделяете коммит при перемещении ветки."
-#: wt-status.c:1336
+#: wt-status.c:1369
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-#: wt-status.c:1340
+#: wt-status.c:1373
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»."
-#: wt-status.c:1345
+#: wt-status.c:1378
msgid "You are currently editing a commit during a rebase."
msgstr "Вы сейчас редактируете коммит при перемещении ветки."
-#: wt-status.c:1348
+#: wt-status.c:1381
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
-#: wt-status.c:1350
+#: wt-status.c:1383
msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
-#: wt-status.c:1360
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
+msgstr ""
+
+#: wt-status.c:1397
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Вы копируете коммит %s."
-#: wt-status.c:1365
+#: wt-status.c:1404
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-#: wt-status.c:1368
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr ""
+
+#: wt-status.c:1410
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
-#: wt-status.c:1370
+#: wt-status.c:1412
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
-#: wt-status.c:1379
+#: wt-status.c:1422
+msgid "Revert currently in progress."
+msgstr ""
+
+#: wt-status.c:1425
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Вы сейчас обращаете изменения коммита %s."
-#: wt-status.c:1384
+#: wt-status.c:1431
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
-#: wt-status.c:1387
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
+msgstr ""
+
+#: wt-status.c:1437
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
-#: wt-status.c:1389
+#: wt-status.c:1439
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
-#: wt-status.c:1400
+#: wt-status.c:1449
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
-#: wt-status.c:1404
+#: wt-status.c:1453
msgid "You are currently bisecting."
msgstr "Вы сейчас в процессе двоичного поиска."
-#: wt-status.c:1407
+#: wt-status.c:1456
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
-#: wt-status.c:1604
+#: wt-status.c:1665
msgid "On branch "
msgstr "На ветке "
-#: wt-status.c:1610
+#: wt-status.c:1672
msgid "interactive rebase in progress; onto "
msgstr "интерактивное перемещение в процессе; над "
-#: wt-status.c:1612
+#: wt-status.c:1674
msgid "rebase in progress; onto "
msgstr "перемещение в процессе; над "
-#: wt-status.c:1617
+#: wt-status.c:1679
msgid "HEAD detached at "
msgstr "HEAD отделён на "
-#: wt-status.c:1619
+#: wt-status.c:1681
msgid "HEAD detached from "
msgstr "HEAD отделён начиная с "
-#: wt-status.c:1622
+#: wt-status.c:1684
msgid "Not currently on any branch."
msgstr "Сейчас ни на одной из веток"
-#: wt-status.c:1642
+#: wt-status.c:1701
msgid "Initial commit"
msgstr "Начальный коммит"
-#: wt-status.c:1643
+#: wt-status.c:1702
msgid "No commits yet"
msgstr "Еще нет коммитов"
-#: wt-status.c:1657
+#: wt-status.c:1716
msgid "Untracked files"
msgstr "Неотслеживаемые файлы"
-#: wt-status.c:1659
+#: wt-status.c:1718
msgid "Ignored files"
msgstr "Игнорируемые файлы"
-#: wt-status.c:1663
+#: wt-status.c:1722
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -6106,221 +7663,216 @@
"new files yourself (see 'git help status')."
msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
-#: wt-status.c:1669
+#: wt-status.c:1728
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неотслеживаемые файлы не показаны%s"
-#: wt-status.c:1671
+#: wt-status.c:1730
msgid " (use -u option to show untracked files)"
msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
-#: wt-status.c:1677
+#: wt-status.c:1736
msgid "No changes"
msgstr "Нет изменений"
-#: wt-status.c:1682
+#: wt-status.c:1741
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n"
-#: wt-status.c:1685
+#: wt-status.c:1744
#, c-format
msgid "no changes added to commit\n"
msgstr "нет изменений добавленных для коммита\n"
-#: wt-status.c:1688
+#: wt-status.c:1747
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
-#: wt-status.c:1691
+#: wt-status.c:1750
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
-#: wt-status.c:1694
+#: wt-status.c:1753
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
-#: wt-status.c:1697 wt-status.c:1702
+#: wt-status.c:1756 wt-status.c:1761
#, c-format
msgid "nothing to commit\n"
msgstr "нечего коммитить\n"
-#: wt-status.c:1700
+#: wt-status.c:1759
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
-#: wt-status.c:1704
+#: wt-status.c:1763
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: wt-status.c:1817
+#: wt-status.c:1876
msgid "No commits yet on "
msgstr "Еще нет коммитов в"
-#: wt-status.c:1821
+#: wt-status.c:1880
msgid "HEAD (no branch)"
msgstr "HEAD (нет ветки)"
-#: wt-status.c:1852
+#: wt-status.c:1911
msgid "different"
msgstr "отличается"
-#: wt-status.c:1854 wt-status.c:1862
+#: wt-status.c:1913 wt-status.c:1921
msgid "behind "
msgstr "позади"
-#: wt-status.c:1857 wt-status.c:1860
+#: wt-status.c:1916 wt-status.c:1919
msgid "ahead "
msgstr "впереди "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2376
+#: wt-status.c:2443
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
-#: wt-status.c:2382
+#: wt-status.c:2449
msgid "additionally, your index contains uncommitted changes."
msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
-#: wt-status.c:2384
+#: wt-status.c:2451
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
-#: compat/precompose_utf8.c:58 builtin/clone.c:443
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "сбой отсоединения «%s»"
-
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<опции>] [--] <спецификатор-пути>…"
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
-msgstr "неожиданный статус различий %c"
+msgstr "неожиданный статус утилиты сравнения %c"
-#: builtin/add.c:88 builtin/commit.c:279
+#: builtin/add.c:89 builtin/commit.c:285
msgid "updating files failed"
msgstr "сбой при обновлении файлов"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "удалить «%s»\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Непроиндексированные изменения после обновления индекса:"
-#: builtin/add.c:233 builtin/rev-parse.c:893
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Не удалось прочитать индекс"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Не удалось открыть «%s» для записи."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Не удалось записать патч"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "сбой при редактировании патча"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Не удалось выполнить stat для «%s»"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Пустой патч. Операция прервана."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Не удалось применить «%s»"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n"
-#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "пробный запуск"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "интерактивный выбор"
-#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "интерактивный выбор блоков"
-#: builtin/add.c:294
-msgid "edit current diff and apply"
-msgstr "отредактировать текущий файл различий и применить его"
-
#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr "отредактировать текущий файл списка изменений и применить его"
+
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "разрешить добавление игнорируемых иначе файлов"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "обновить отслеживаемые файлы"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "записать только факт, что путь будет добавлен позже"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "не добавлять, только обновить индекс"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске"
-#: builtin/add.c:308 builtin/update-index.c:973
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "переопределить бит выполнения на указанных файлах"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "предупреждать при добавлении встроенного git репозитория"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -6338,12 +7890,12 @@
"See \"git help submodule\" for more information."
msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавление встроенного git репозитория: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
@@ -6352,383 +7904,382 @@
msgid "adding files failed"
msgstr "ошибка при добавлении файлов"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A и -u нельзя использовать одновременно"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметр --chmod «%s» должен быть -x или +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Ничего не указано, ничего не добавлено.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Возможно, вы имели в виду «git add .»?\n"
-#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
-#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
-#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
-#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329
-msgid "index file corrupt"
-msgstr "файл индекса поврежден"
-
-#: builtin/am.c:415
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "не удалось разобрать сценарий авторства"
-#: builtin/am.c:499
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/am.c:540
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Неправильная строка ввода: «%s»."
-#: builtin/am.c:577
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Не удалось скопировать заметку из «%s» в «%s»"
-#: builtin/am.c:603
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "сбой при выполнении fseek"
-#: builtin/am.c:791
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "не удалось разобрать патч «%s»"
-#: builtin/am.c:856
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Только серия патчей StGIT может быть применена за раз"
-#: builtin/am.c:904
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "недопустимая метка даты/времени"
-#: builtin/am.c:909 builtin/am.c:921
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "недопустимая строка даты"
-#: builtin/am.c:916
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "недопустимое смещение часового пояса"
-#: builtin/am.c:1009
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Сбой определения формата патча."
-#: builtin/am.c:1014 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:409
#, c-format
msgid "failed to create directory '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/am.c:1019
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Не удалось разделить патчи на части."
-#: builtin/am.c:1149 builtin/commit.c:364
+#: builtin/am.c:1084 builtin/commit.c:371
msgid "unable to write index file"
msgstr "не удалось записать индекс"
-#: builtin/am.c:1163
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
-#: builtin/am.c:1164
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
-#: builtin/am.c:1165
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
-#: builtin/am.c:1272
+#: builtin/am.c:1183
+msgid ""
+"Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Патч пустой."
-#: builtin/am.c:1338
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "неправильная строка идентификации: %.*s"
-#: builtin/am.c:1360
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "не удалось разобрать коммит %s"
-#: builtin/am.c:1556
+#: builtin/am.c:1495
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
-#: builtin/am.c:1558
+#: builtin/am.c:1497
msgid "Using index info to reconstruct a base tree..."
msgstr "Использую индекс для реконструкции базового дерева…"
-#: builtin/am.c:1577
+#: builtin/am.c:1516
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
-#: builtin/am.c:1583
+#: builtin/am.c:1522
msgid "Falling back to patching base and 3-way merge..."
msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
-#: builtin/am.c:1608
+#: builtin/am.c:1548
msgid "Failed to merge in the changes."
msgstr "Не удалось слить изменения."
-#: builtin/am.c:1640
+#: builtin/am.c:1580
msgid "applying to an empty history"
msgstr "применение к пустой истории"
-#: builtin/am.c:1686 builtin/am.c:1690
+#: builtin/am.c:1627 builtin/am.c:1631
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "нельзя продолжнить: %s не существует "
-#: builtin/am.c:1706
+#: builtin/am.c:1647
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
-#: builtin/am.c:1711
+#: builtin/am.c:1652
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:1721
+#: builtin/am.c:1662
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
-#: builtin/am.c:1771
+#: builtin/am.c:1712
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)"
+msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)"
-#: builtin/am.c:1811 builtin/am.c:1879
+#: builtin/am.c:1752 builtin/am.c:1820
#, c-format
msgid "Applying: %.*s"
msgstr "Применение: %.*s"
-#: builtin/am.c:1828
+#: builtin/am.c:1769
msgid "No changes -- Patch already applied."
msgstr "Нет изменений — Патч уже применен."
-#: builtin/am.c:1834
+#: builtin/am.c:1775
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Ошибка применения изменений на %s %.*s"
-#: builtin/am.c:1838
+#: builtin/am.c:1779
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1882
+#: builtin/am.c:1823
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
-#: builtin/am.c:1889
+#: builtin/am.c:1830
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Не удалось разобрать объект «%s»."
-#: builtin/am.c:2048
+#: builtin/am.c:1989
msgid "failed to clean index"
msgstr "не удалось очистить индекс"
-#: builtin/am.c:2083
+#: builtin/am.c:2033
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
-#: builtin/am.c:2174
+#: builtin/am.c:2130
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправильное значение для --patch-format: %s"
-#: builtin/am.c:2210
+#: builtin/am.c:2166
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
-#: builtin/am.c:2211
+#: builtin/am.c:2167
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/am.c:2217
+#: builtin/am.c:2173
msgid "run interactively"
msgstr "запустить в интерактивном режиме"
-#: builtin/am.c:2219
+#: builtin/am.c:2175
msgid "historical option -- no-op"
msgstr "историческая опция — ничего не делает"
-#: builtin/am.c:2221
+#: builtin/am.c:2177
msgid "allow fall back on 3way merging if needed"
msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
-#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
-#: builtin/repack.c:299
+#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:306 builtin/stash.c:805
msgid "be quiet"
msgstr "тихий режим"
-#: builtin/am.c:2224
+#: builtin/am.c:2180
msgid "add a Signed-off-by line to the commit message"
msgstr "добавить строку Signed-off-by к сообщению коммита"
-#: builtin/am.c:2227
+#: builtin/am.c:2183
msgid "recode into utf8 (default)"
msgstr "перекодировать в utf8 (по умолчанию)"
-#: builtin/am.c:2229
+#: builtin/am.c:2185
msgid "pass -k flag to git-mailinfo"
msgstr "передать флаг -k в git-mailinfo"
-#: builtin/am.c:2231
+#: builtin/am.c:2187
msgid "pass -b flag to git-mailinfo"
msgstr "передать флаг -b в git-mailinfo"
-#: builtin/am.c:2233
+#: builtin/am.c:2189
msgid "pass -m flag to git-mailinfo"
msgstr "передать флаг -m в git-mailinfo"
-#: builtin/am.c:2235
+#: builtin/am.c:2191
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
-#: builtin/am.c:2238
+#: builtin/am.c:2194
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
-#: builtin/am.c:2241
+#: builtin/am.c:2197
msgid "strip everything before a scissors line"
msgstr "обрезать все до строки обрезки"
-#: 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:2264
-#: builtin/am.c:2270
+#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
+#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
+#: builtin/am.c:2226
msgid "pass it through git-apply"
msgstr "передать его в git-apply"
-#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
-#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
-#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144
-#: parse-options.h:146 parse-options.h:258
+#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
+#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
+#: parse-options.h:141 parse-options.h:162 parse-options.h:311
msgid "n"
msgstr "n"
-#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
+#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
msgid "format"
msgstr "формат"
-#: builtin/am.c:2267
+#: builtin/am.c:2223
msgid "format the patch(es) are in"
msgstr "формат, в котором находятся патчи"
-#: builtin/am.c:2273
+#: builtin/am.c:2229
msgid "override error message when patch failure occurs"
msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
-#: builtin/am.c:2275
+#: builtin/am.c:2231
msgid "continue applying patches after resolving a conflict"
msgstr "продолжить применение изменений после разрешения конфиликта"
-#: builtin/am.c:2278
+#: builtin/am.c:2234
msgid "synonyms for --continue"
msgstr "синоним для --continue"
-#: builtin/am.c:2281
+#: builtin/am.c:2237
msgid "skip the current patch"
msgstr "пропустить текущий патч"
-#: builtin/am.c:2284
+#: builtin/am.c:2240
msgid "restore the original branch and abort the patching operation."
msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
-#: builtin/am.c:2287
+#: builtin/am.c:2243
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2246
msgid "show the patch being applied."
msgstr ""
-#: builtin/am.c:2294
+#: builtin/am.c:2250
msgid "lie about committer date"
msgstr "соврать о дате коммитера"
-#: builtin/am.c:2296
+#: builtin/am.c:2252
msgid "use current timestamp for author date"
msgstr "использовать текущее время как время авторства"
-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
-#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400
+#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
+#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
+#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2299
+#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
msgid "GPG-sign commits"
msgstr "подписать коммиты с помощью GPG"
-#: builtin/am.c:2302
+#: builtin/am.c:2258
msgid "(internal use for git-rebase)"
msgstr "(внутреннее использование для git-rebase)"
-#: builtin/am.c:2320
+#: builtin/am.c:2276
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
-#: builtin/am.c:2327
+#: builtin/am.c:2283
msgid "failed to read the index"
msgstr "сбой чтения индекса"
-#: builtin/am.c:2342
+#: builtin/am.c:2298
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
-#: builtin/am.c:2366
+#: builtin/am.c:2322
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
-#: builtin/am.c:2372
+#: builtin/am.c:2328
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
@@ -6749,221 +8300,410 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: внешний репозиторий без URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: ожидается ACK/NAK, получен пакет сброса буфера"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: ошибка протокола"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: ожидался сброс буфера"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: 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 "«%s» не является допустимым определением"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "нельзя использовать встроенную команду «%s» как определение"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "нельзя изменить значение определения «%s»"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "используйте два разных определения"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "не удалось открыть файл BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: 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:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+
+#: builtin/bisect--helper.c:289
+#, 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:321
+#, 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:329
+msgid "Are you sure [Y/n]? "
+msgstr "Вы уверены [Y - да/n - нет]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "определения не заданы"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:627
msgid "perform 'git bisect next'"
msgstr "выполнить «git bisect next»"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:629
msgid "write the terms to .git/BISECT_TERMS"
msgstr "записать определения в .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:631
msgid "cleanup the bisection state"
msgstr "очистить состояние двоичного поиска"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:633
msgid "check for expected revs"
msgstr "проверить ожидаемые редакции"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:647
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:666
msgid "--write-terms requires two arguments"
msgstr "--write-terms требует указания двух параметров"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:670
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state не требует указания параметров"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<опции-rev-list> документированы в git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:407
#, c-format
msgid "expecting a color: %s"
msgstr "ожидается цвет: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:414
msgid "must end with a color"
msgstr "должно заканчиваться на цвет"
-#: builtin/blame.c:700
+#: builtin/blame.c:701
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:718
+#: builtin/blame.c:719
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:789
+#: builtin/blame.c:794
msgid "Show blame entries as we find them, incrementally"
msgstr "Показать записи авторства постепенно, в процессе нахождения"
-#: builtin/blame.c:790
+#: builtin/blame.c:795
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
-#: builtin/blame.c:791
+#: builtin/blame.c:796
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
-#: builtin/blame.c:792
+#: builtin/blame.c:797
msgid "Show work cost statistics"
msgstr "Показать статистику расходов на выполнение запроса"
-#: builtin/blame.c:793
+#: builtin/blame.c:798
msgid "Force progress reporting"
msgstr "Принудительно выводить прогресс выполнения"
-#: builtin/blame.c:794
+#: builtin/blame.c:799
msgid "Show output score for blame entries"
msgstr "Показать оценку для записей авторства"
-#: builtin/blame.c:795
+#: builtin/blame.c:800
msgid "Show original filename (Default: auto)"
msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
-#: builtin/blame.c:796
+#: builtin/blame.c:801
msgid "Show original linenumber (Default: off)"
msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
-#: builtin/blame.c:797
+#: builtin/blame.c:802
msgid "Show in a format designed for machine consumption"
msgstr "Показать в формате для программного разбора"
-#: builtin/blame.c:798
+#: builtin/blame.c:803
msgid "Show porcelain format with per-line commit information"
msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
-#: builtin/blame.c:799
+#: builtin/blame.c:804
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/blame.c:800
+#: builtin/blame.c:805
msgid "Show raw timestamp (Default: off)"
msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:801
+#: builtin/blame.c:806
msgid "Show long commit SHA1 (Default: off)"
msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-#: builtin/blame.c:802
+#: builtin/blame.c:807
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:803
+#: builtin/blame.c:808
msgid "Show author email instead of name (Default: off)"
msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
-#: builtin/blame.c:804
+#: builtin/blame.c:809
msgid "Ignore whitespace differences"
msgstr "Игнорировать различия в пробелах"
-#: builtin/blame.c:805
+#: builtin/blame.c:810
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:806
+#: builtin/blame.c:811
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:813
+#: builtin/blame.c:818
msgid "Use an experimental heuristic to improve diffs"
-msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы различий"
+msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы списка изменений"
-#: builtin/blame.c:815
+#: builtin/blame.c:820
msgid "Spend extra cycles to find better match"
msgstr "Потратить больше времени, для нахождения лучших совпадений"
-#: builtin/blame.c:816
+#: builtin/blame.c:821
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
-#: builtin/blame.c:817
+#: builtin/blame.c:822
msgid "Use <file>'s contents as the final image"
msgstr "Использовать содержимое <файла> как финальный снимок"
-#: builtin/blame.c:818 builtin/blame.c:819
+#: builtin/blame.c:823 builtin/blame.c:824
msgid "score"
msgstr "мин-длина"
-#: builtin/blame.c:818
+#: builtin/blame.c:823
msgid "Find line copies within and across files"
msgstr "Найти копирование строк в пределах и между файлами"
-#: builtin/blame.c:819
+#: builtin/blame.c:824
msgid "Find line movements within and across files"
msgstr "Найти перемещения строк в пределах и между файлами"
-#: builtin/blame.c:820
+#: builtin/blame.c:825
msgid "n,m"
msgstr "начало,конец"
-#: builtin/blame.c:820
+#: builtin/blame.c:825
msgid "Process only line range n,m, counting from 1"
msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
-#: builtin/blame.c:869
+#: builtin/blame.c:876
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
@@ -6974,11 +8714,11 @@
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
-#: builtin/blame.c:920
+#: builtin/blame.c:927
msgid "4 years, 11 months ago"
msgstr "4 года и 11 месяцев назад"
-#: builtin/blame.c:1007
+#: builtin/blame.c:1031
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -6987,170 +8727,179 @@
msgstr[2] "файл %s содержит только %lu строк"
msgstr[3] "файл %s содержит только %lu строки"
-#: builtin/blame.c:1053
+#: builtin/blame.c:1077
msgid "Blaming lines"
msgstr "Просмотр авторов строк"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]"
-#: builtin/branch.c:30
+#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…"
-#: builtin/branch.c:31
+#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<опции>] [-r | -a] [--points-at]"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<опции>] [-r | -a] [--format]"
-#: builtin/branch.c:143
+#: builtin/branch.c:151
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:155
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:169
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Не удалось найти объект коммита для «%s»"
-#: builtin/branch.c:165
+#: builtin/branch.c:173
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»."
-#: builtin/branch.c:178
+#: builtin/branch.c:186
msgid "Update of config-file failed"
msgstr "Не удалось обновить файл конфигурации"
-#: builtin/branch.c:209
+#: builtin/branch.c:217
msgid "cannot use -a with -d"
msgstr "нельзя использовать одновременно ключи -a и -d"
-#: builtin/branch.c:215
+#: builtin/branch.c:223
msgid "Couldn't look up commit object for HEAD"
msgstr "Не удалось найти объект коммита для HEAD"
-#: builtin/branch.c:229
+#: builtin/branch.c:237
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
-#: builtin/branch.c:244
+#: builtin/branch.c:252
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "внешняя отслеживаемая ветка «%s» не найдена."
-#: builtin/branch.c:245
+#: builtin/branch.c:253
#, c-format
msgid "branch '%s' not found."
msgstr "ветка «%s» не найдена."
-#: builtin/branch.c:260
+#: builtin/branch.c:268
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
-#: builtin/branch.c:261
+#: builtin/branch.c:269
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Ошибка удаления ветки «%s»"
-#: builtin/branch.c:268
+#: builtin/branch.c:276
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
-#: builtin/branch.c:269
+#: builtin/branch.c:277
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:413 builtin/tag.c:59
+#: builtin/branch.c:421 builtin/tag.c:60
msgid "unable to parse format string"
msgstr "не удалось разобрать строку формата"
-#: builtin/branch.c:450
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
+msgstr ""
+
+#: builtin/branch.c:458
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr ""
+
+#: builtin/branch.c:473
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Производится перемещение ветки %s на %s"
-#: builtin/branch.c:454
+#: builtin/branch.c:477
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Производится двоичный поиск в ветке %s на %s"
-#: builtin/branch.c:471
+#: builtin/branch.c:494
msgid "cannot copy the current branch while not on any."
msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток."
-#: builtin/branch.c:473
+#: builtin/branch.c:496
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
-#: builtin/branch.c:484
+#: builtin/branch.c:507
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Недействительное имя ветки: «%s»"
-#: builtin/branch.c:511
+#: builtin/branch.c:534
msgid "Branch rename failed"
msgstr "Сбой переименования ветки"
-#: builtin/branch.c:513
+#: builtin/branch.c:536
msgid "Branch copy failed"
msgstr "Сбой копирования ветки"
-#: builtin/branch.c:517
+#: builtin/branch.c:540
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Создана копия неправильно названной ветки «%s»"
-#: builtin/branch.c:520
+#: builtin/branch.c:543
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно названная ветка «%s»"
-#: builtin/branch.c:526
+#: builtin/branch.c:549
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:535
+#: builtin/branch.c:558
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:537
+#: builtin/branch.c:560
msgid "Branch is copied, but update of config-file failed"
msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:553
+#: builtin/branch.c:576
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -7158,223 +8907,213 @@
"Lines starting with '%c' will be stripped.\n"
msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:610
msgid "Generic options"
msgstr "Общие параметры"
-#: builtin/branch.c:596
+#: builtin/branch.c:612
msgid "show hash and subject, give twice for upstream branch"
-msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки"
+msgstr "показывать хеш-сумму и тему, укажите дважды для вышестоящей ветки"
-#: builtin/branch.c:597
+#: builtin/branch.c:613
msgid "suppress informational messages"
msgstr "не выводить информационные сообщения"
-#: builtin/branch.c:598
+#: builtin/branch.c:614
msgid "set up tracking mode (see git-pull(1))"
msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:616
msgid "do not use"
msgstr "не используйте"
-#: builtin/branch.c:602
+#: builtin/branch.c:618 builtin/rebase.c:485
msgid "upstream"
msgstr "вышестоящая"
-#: builtin/branch.c:602
+#: builtin/branch.c:618
msgid "change the upstream info"
msgstr "изменить информацию о вышестоящей ветке"
-#: builtin/branch.c:603
+#: builtin/branch.c:619
msgid "Unset the upstream info"
msgstr "Убрать информацию о вышестоящей ветке"
-#: builtin/branch.c:604
+#: builtin/branch.c:620
msgid "use colored output"
msgstr "использовать цветной вывод"
-#: builtin/branch.c:605
+#: builtin/branch.c:621
msgid "act on remote-tracking branches"
msgstr "выполнить действия на отслеживаемых внешних ветках"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:623 builtin/branch.c:625
msgid "print only branches that contain the commit"
msgstr "вывод только веток, которые содержат коммит"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:624 builtin/branch.c:626
msgid "print only branches that don't contain the commit"
msgstr "вывод только веток, которые не содержат коммит"
-#: builtin/branch.c:613
+#: builtin/branch.c:629
msgid "Specific git-branch actions:"
msgstr "Специфичные для git-branch действия:"
-#: builtin/branch.c:614
+#: builtin/branch.c:630
msgid "list both remote-tracking and local branches"
msgstr "показать список и отслеживаемых и локальных веток"
-#: builtin/branch.c:616
+#: builtin/branch.c:632
msgid "delete fully merged branch"
msgstr "удалить полностью слитую ветку"
-#: builtin/branch.c:617
+#: builtin/branch.c:633
msgid "delete branch (even if not merged)"
msgstr "удалить ветку (даже никуда не слитую)"
-#: builtin/branch.c:618
+#: builtin/branch.c:634
msgid "move/rename a branch and its reflog"
msgstr "переместить/переименовать ветки и ее журнал ссылок"
-#: builtin/branch.c:619
+#: builtin/branch.c:635
msgid "move/rename a branch, even if target exists"
msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
-#: builtin/branch.c:620
+#: builtin/branch.c:636
msgid "copy a branch and its reflog"
msgstr "скопировать ветку и её журнал ссылок"
-#: builtin/branch.c:621
+#: builtin/branch.c:637
msgid "copy a branch, even if target exists"
msgstr "скопировать ветку, даже если целевое имя уже существует"
-#: builtin/branch.c:622
+#: builtin/branch.c:638
msgid "list branch names"
msgstr "показать список имен веток"
-#: builtin/branch.c:623
+#: builtin/branch.c:639
+msgid "show current branch name"
+msgstr ""
+
+#: builtin/branch.c:640
msgid "create the branch's reflog"
msgstr "создать журнал ссылок ветки"
-#: builtin/branch.c:626
-msgid "deprecated synonym for --create-reflog"
-msgstr ""
-
-#: builtin/branch.c:631
+#: builtin/branch.c:642
msgid "edit the description for the branch"
msgstr "изменить описание ветки"
-#: builtin/branch.c:632
+#: builtin/branch.c:643
msgid "force creation, move/rename, deletion"
msgstr "принудительное создание, перемещение или удаление ветки"
-#: builtin/branch.c:633
+#: builtin/branch.c:644
msgid "print only branches that are merged"
msgstr "вывод только слитых веток"
-#: builtin/branch.c:634
+#: builtin/branch.c:645
msgid "print only branches that are not merged"
msgstr "вывод только не слитых веток"
-#: builtin/branch.c:635
+#: builtin/branch.c:646
msgid "list branches in columns"
msgstr "показать список веток по столбцам"
-#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:413
-msgid "key"
-msgstr "ключ"
-
-#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:414
-msgid "field name to sort on"
-msgstr "имя поля, по которому выполнить сортировку"
-
-#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410
-#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
-#: builtin/tag.c:416
+#: builtin/branch.c:649 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:427
msgid "object"
msgstr "объект"
-#: builtin/branch.c:640
+#: builtin/branch.c:650
msgid "print only branches of the object"
msgstr "вывод только веток, определенного объекта"
-#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
msgid "sorting and filtering are case insensitive"
msgstr "сортировка и фильтрация не зависят от регистра"
-#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
+#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "использовать формат для вывода"
-#: builtin/branch.c:666 builtin/clone.c:739
+#: builtin/branch.c:676 builtin/clone.c:748
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
-#: builtin/branch.c:689
+#: builtin/branch.c:700
msgid "--column and --verbose are incompatible"
msgstr "--column и --verbose нельзя использовать одновременно"
-#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
msgid "branch name required"
msgstr "требуется имя ветки"
-#: builtin/branch.c:737
+#: builtin/branch.c:745
msgid "Cannot give description to detached HEAD"
msgstr "Нельзя дать описание отделённому HEAD"
-#: builtin/branch.c:742
+#: builtin/branch.c:750
msgid "cannot edit description of more than one branch"
msgstr "нельзя изменить описание более одной ветки за раз"
-#: builtin/branch.c:749
+#: builtin/branch.c:757
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/branch.c:752
+#: builtin/branch.c:760
#, c-format
msgid "No branch named '%s'."
msgstr "Нет ветки с именем «%s»."
-#: builtin/branch.c:767
+#: builtin/branch.c:775
msgid "too many branches for a copy operation"
msgstr "слишком много веток для операции копирования"
-#: builtin/branch.c:776
+#: builtin/branch.c:784
msgid "too many arguments for a rename operation"
msgstr "слишком много аргументов для операции переименования"
-#: builtin/branch.c:781
+#: builtin/branch.c:789
msgid "too many arguments to set new upstream"
msgstr "слишком много аргументов для указания новой вышестоящей ветки"
-#: builtin/branch.c:785
+#: builtin/branch.c:793
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
+#: builtin/branch.c:796 builtin/branch.c:819
#, c-format
msgid "no such branch '%s'"
msgstr "нет такой ветки «%s»"
-#: builtin/branch.c:792
+#: builtin/branch.c:800
#, c-format
msgid "branch '%s' does not exist"
msgstr "ветка «%s» не существует"
-#: builtin/branch.c:804
+#: builtin/branch.c:813
msgid "too many arguments to unset upstream"
msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
-#: builtin/branch.c:808
+#: builtin/branch.c:817
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:814
+#: builtin/branch.c:823
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
-#: builtin/branch.c:829
+#: builtin/branch.c:833
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки"
-#: builtin/branch.c:832
+#: builtin/branch.c:836
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -7393,139 +9132,144 @@
msgid "Need a repository to unbundle."
msgstr "Требуется репозиторий для распаковки."
-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:593
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
"-p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>"
-#: builtin/cat-file.c:578
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
"--filters]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:633
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<тип> может быть одним из: blob, tree, commit, tag"
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:634
msgid "show object type"
msgstr "показать тип объекта"
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:635
msgid "show object size"
msgstr "показать размер объекта"
-#: builtin/cat-file.c:619
+#: builtin/cat-file.c:637
msgid "exit with zero when there's no error"
msgstr "выйти с нулевым кодом возврата, если нет ошибки"
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:638
msgid "pretty-print object's content"
msgstr "структурированный вывод содержимого объекта"
-#: builtin/cat-file.c:622
+#: builtin/cat-file.c:640
msgid "for blob objects, run textconv on object's content"
msgstr "запустить texconv на содержимом двоичных объектов "
-#: builtin/cat-file.c:624
+#: builtin/cat-file.c:642
msgid "for blob objects, run filters on object's content"
msgstr "запуск фильтров на содержимом двоичных объектов "
-#: builtin/cat-file.c:625 git-submodule.sh:864
+#: builtin/cat-file.c:643 git-submodule.sh:936
msgid "blob"
msgstr "двоичный объект"
-#: builtin/cat-file.c:626
+#: builtin/cat-file.c:644
msgid "use a specific path for --textconv/--filters"
msgstr "использовать определенный путь для --textconv/--filters"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:646
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "разрешить -s и -t работать с повреждёнными объектами"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:647
msgid "buffer --batch output"
msgstr "буфферировать вывод --batch"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:649
msgid "show info and content of objects fed from the standard input"
msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:653
msgid "show info about objects fed from the standard input"
msgstr "показать информацию об объектах, переданных из стандартного ввода"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:657
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:659
msgid "show all objects with --batch or --batch-check"
msgstr "показать все объекты с опциями --batch или --batch-check"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:661
msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "вывести все атрибуты установленные для файла"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "использовать только .gitattributes из индекса"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: 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:24 builtin/check-ignore.c:26
+#: 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:20 builtin/checkout.c:1120 builtin/gc.c:503
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
msgid "suppress progress reporting"
msgstr "не выводить прогресс выполнения"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "показать не совпадающие введенные пути"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "игнорировать индекс при проверке"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "нельзя указывать пути вместе с параметром --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z имеет смысл только вместе с параметром --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "не указан путь"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet можно использовать только при указании одного пути"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "нельзя использовать одновременно --quiet и --verbose"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching можно использовать только вместе с --verbose"
@@ -7546,164 +9290,203 @@
msgid "no contacts specified"
msgstr "не указаны контакты"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<опции>] [--] [<файл>…]"
-#: builtin/checkout-index.c:143
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "индекс должен быть между 1 и 3 или all"
-#: builtin/checkout-index.c:159
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "переключиться на состояние всех файлов из индекса"
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "принудительная перезапись существующих файлов"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "не создавать новые файлы"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "обновить статистику доступа в файле индекса"
-#: builtin/checkout-index.c:170
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "прочитать список путей из стандартного ввода"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "записать содержимое во временные файлы"
-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
-#: builtin/worktree.c:610
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
+#: builtin/worktree.c:672
msgid "string"
msgstr "строка"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "добавить спереди <строку> при создании файлов"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "копировать файлы из указанного индекса"
-#: builtin/checkout.c:29
+#: builtin/checkout.c:32
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<опции>] <ветка>"
-#: builtin/checkout.c:30
+#: builtin/checkout.c:33
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/checkout.c:151 builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have our version"
msgstr "путь «%s» не имеет нашей версии"
-#: builtin/checkout.c:140 builtin/checkout.c:173
+#: builtin/checkout.c:153 builtin/checkout.c:192
#, c-format
msgid "path '%s' does not have their version"
msgstr "путь «%s» не имеет их версии"
-#: builtin/checkout.c:156
+#: builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "путь «%s» не имеет всех необходимых версий"
-#: builtin/checkout.c:200
+#: builtin/checkout.c:219
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "путь «%s» не имеет необходимых версий"
-#: builtin/checkout.c:217
+#: builtin/checkout.c:237
#, c-format
msgid "path '%s': cannot merge"
msgstr "путь «%s»: не удалось слить"
-#: builtin/checkout.c:233
+#: builtin/checkout.c:253
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Не удалось добавить результат слияния «%s»"
-#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
-#: builtin/checkout.c:264
+#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
+#: builtin/checkout.c:340
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» нельзя использовать при обновлении путей"
-#: builtin/checkout.c:267 builtin/checkout.c:270
+#: builtin/checkout.c:343 builtin/checkout.c:346
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» нельзя использовать одновременно с %s"
-#: builtin/checkout.c:273
+#: builtin/checkout.c:349
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:396 builtin/checkout.c:403
#, c-format
msgid "path '%s' is unmerged"
msgstr "путь «%s» не слит"
-#: builtin/checkout.c:508
+#: builtin/checkout.c:442
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: builtin/checkout.c:454
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: builtin/checkout.c:695
msgid "you need to resolve your current index first"
msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
-#: builtin/checkout.c:645
+#: builtin/checkout.c:744
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+
+#: builtin/checkout.c:848
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
-#: builtin/checkout.c:686
+#: builtin/checkout.c:890
msgid "HEAD is now at"
msgstr "HEAD сейчас на"
-#: builtin/checkout.c:690 builtin/clone.c:692
+#: builtin/checkout.c:894 builtin/clone.c:701
msgid "unable to update HEAD"
msgstr "не удалось обновить HEAD"
-#: builtin/checkout.c:694
+#: builtin/checkout.c:898
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Сброс ветки «%s»\n"
-#: builtin/checkout.c:697
+#: builtin/checkout.c:901
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:701
+#: builtin/checkout.c:905
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и сброс ветки «%s»\n"
-#: builtin/checkout.c:703 builtin/checkout.c:1052
+#: builtin/checkout.c:907 builtin/checkout.c:1283
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:705
+#: builtin/checkout.c:909
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:756
+#: builtin/checkout.c:960
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:762
+#: builtin/checkout.c:966
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -7720,7 +9503,7 @@
msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:781
+#: builtin/checkout.c:985
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -7739,166 +9522,181 @@
msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-#: builtin/checkout.c:813
+#: builtin/checkout.c:1017
msgid "internal error in revision walk"
msgstr "внутренняя ошибка при хождении по редакциям"
-#: builtin/checkout.c:817
+#: builtin/checkout.c:1021
msgid "Previous HEAD position was"
msgstr "Предыдущая позиция HEAD была"
-#: builtin/checkout.c:845 builtin/checkout.c:1047
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
msgid "You are on a branch yet to be born"
msgstr "Вы находитесь на еще не созданной ветке"
-#: builtin/checkout.c:952
+#: builtin/checkout.c:1173
#, c-format
msgid "only one reference expected, %d given."
msgstr "ожидается только одна ссылка, а передано %d."
-#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
+#: builtin/checkout.c:1209
+#, 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:1222 builtin/worktree.c:290 builtin/worktree.c:448
#, c-format
msgid "invalid reference: %s"
msgstr "неправильная ссылка: %s"
-#: builtin/checkout.c:1022
+#: builtin/checkout.c:1251
#, c-format
msgid "reference is not a tree: %s"
msgstr "в дереве нет такой ссылки: %s"
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1292
msgid "paths cannot be used with switching branches"
msgstr "нельзя использовать пути при переключении веток"
-#: builtin/checkout.c:1064 builtin/checkout.c:1068
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "нельзя использовать «%s» при переключении веток"
-#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
-#: builtin/checkout.c:1083
+#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
+#: builtin/checkout.c:1318
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» нельзя использовать одновременно с «%s»"
-#: builtin/checkout.c:1088
+#: builtin/checkout.c:1323
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Нельзя переключить ветку на не коммит «%s»"
-#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
-#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
-#: builtin/worktree.c:435
+#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
+#: builtin/worktree.c:494
msgid "branch"
msgstr "ветка"
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1357
msgid "create and checkout a new branch"
msgstr "создать и переключиться на новую ветку"
-#: builtin/checkout.c:1124
+#: builtin/checkout.c:1359
msgid "create/reset and checkout a branch"
msgstr "создать/сбросить и перключиться на новую ветку"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1360
msgid "create reflog for new branch"
msgstr "создать журнал ссылок для новой ветки"
-#: builtin/checkout.c:1126 builtin/worktree.c:437
+#: builtin/checkout.c:1361 builtin/worktree.c:496
msgid "detach HEAD at named commit"
msgstr "отсоединить HEAD на указанном коммите"
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1362
msgid "set upstream info for new branch"
msgstr "установить информацию о вышестоящей ветке для новой ветки"
-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1364
msgid "new-branch"
msgstr "новая-ветка"
-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1364
msgid "new unparented branch"
msgstr "новая ветка без родителей"
-#: builtin/checkout.c:1131
+#: builtin/checkout.c:1366
msgid "checkout our version for unmerged files"
msgstr "переключиться на нашу версию для не слитых файлов"
-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1369
msgid "checkout their version for unmerged files"
msgstr "переключиться на их версию для не слитых файлов"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1371
msgid "force checkout (throw away local modifications)"
msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1373
msgid "perform a 3-way merge with the new branch"
msgstr "выполнить трехходовое слияние с новой веткой"
-#: builtin/checkout.c:1140 builtin/merge.c:273
+#: builtin/checkout.c:1375 builtin/merge.c:284
msgid "update ignored files (default)"
msgstr "обновить игнорируемые файлы (по умолчанию)"
-#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
msgid "style"
msgstr "стиль"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1378
msgid "conflict style (merge or diff3)"
msgstr "стиль конфликтов слияния (merge или diff3)"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1381
msgid "do not limit pathspecs to sparse entries only"
msgstr "не ограничивать спецификаторы пути только частичными записями"
-#: builtin/checkout.c:1148
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "пересмотр «git checkout <нет-такой-ветки>»"
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1385
msgid "do not check if another worktree is holding the given ref"
msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
-#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
-#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572
+#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
+#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "принудительно выводить прогресс"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1390
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1422
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B и --orphan нельзя использовать одновременно"
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1442
msgid "--track needs a branch name"
msgstr "--track требует имя ветки"
-#: builtin/checkout.c:1206
+#: builtin/checkout.c:1447
msgid "missing branch name; try -b"
msgstr "пропущено имя ветки; попробуйте -b"
-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1484
msgid "invalid path specification"
msgstr "недопустимый спецификатор пути"
-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1491
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
-#: builtin/checkout.c:1254
+#: builtin/checkout.c:1495
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1499
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса."
-#: builtin/checkout.c:1278
+#: builtin/checkout.c:1519
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -7915,37 +9713,37 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/clean.c:27
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Удаление %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Будет удалено %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Пропуск репозитория %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Будет пропущен репозиторий %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "сбой удаления %s"
-#: builtin/clean.c:297 git-add--interactive.perl:579
+#: builtin/clean.c:299 git-add--interactive.perl:579
#, c-format
msgid ""
"Prompt help:\n"
@@ -7954,7 +9752,7 @@
" - (empty) select nothing\n"
msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n"
-#: builtin/clean.c:301 git-add--interactive.perl:588
+#: builtin/clean.c:303 git-add--interactive.perl:588
#, c-format
msgid ""
"Prompt help:\n"
@@ -7967,38 +9765,38 @@
" - (empty) finish selecting\n"
msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n"
-#: builtin/clean.c:517 git-add--interactive.perl:554
+#: builtin/clean.c:519 git-add--interactive.perl:554
#: git-add--interactive.perl:559
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Хм (%s)?\n"
-#: builtin/clean.c:659
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблоны игнорирования ввода>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:698
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:719
msgid "Select items to delete"
msgstr "Укажите элементы для удаления"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:760
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Удалить %s [y - да/N - нет]? "
-#: builtin/clean.c:783 git-add--interactive.perl:1717
+#: builtin/clean.c:785 git-add--interactive.perl:1717
#, c-format
msgid "Bye.\n"
msgstr "До свидания.\n"
-#: builtin/clean.c:791
+#: builtin/clean.c:793
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -8009,15 +9807,15 @@
"? - help for prompt selection"
msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению"
-#: builtin/clean.c:818 git-add--interactive.perl:1793
+#: builtin/clean.c:820 git-add--interactive.perl:1793
msgid "*** Commands ***"
msgstr "*** Команды ***"
-#: builtin/clean.c:819 git-add--interactive.perl:1790
+#: builtin/clean.c:821 git-add--interactive.perl:1790
msgid "What now"
msgstr "Что теперь"
-#: builtin/clean.c:827
+#: builtin/clean.c:829
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Удалить следующие элементы:"
@@ -8025,372 +9823,387 @@
msgstr[2] "Удалить следующие элементы:"
msgstr[3] "Удалить следующие элементы:"
-#: builtin/clean.c:843
+#: builtin/clean.c:845
msgid "No more files to clean, exiting."
msgstr "Больше нет файлов для очистки, выходим."
-#: builtin/clean.c:905
+#: builtin/clean.c:907
msgid "do not print names of files removed"
msgstr "не выводить имена удаляемых файлов"
-#: builtin/clean.c:907
+#: builtin/clean.c:909
msgid "force"
msgstr "принудительно"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "interactive cleaning"
msgstr "интерактивная очистка"
-#: builtin/clean.c:910
+#: builtin/clean.c:912
msgid "remove whole directories"
msgstr "удалить каталоги полностью"
-#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
-#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:177
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "шаблон"
-#: builtin/clean.c:912
+#: builtin/clean.c:914
msgid "add <pattern> to ignore rules"
msgstr "добавить <шаблон> в правила игнорирования"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "remove ignored files, too"
msgstr "также удалить игнорируемые файлы"
-#: builtin/clean.c:915
+#: builtin/clean.c:917
msgid "remove only ignored files"
msgstr "удалить только игнорируемые файлы"
-#: builtin/clean.c:933
+#: builtin/clean.c:935
msgid "-x and -X cannot be used together"
msgstr "нельзя использовать одновременно -x и -X"
-#: builtin/clean.c:937
+#: builtin/clean.c:939
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
" clean"
msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
-#: builtin/clean.c:940
+#: builtin/clean.c:942
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
-#: builtin/clone.c:43
+#: builtin/clone.c:44
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:90
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "создать голый репозиторий"
-#: builtin/clone.c:93
+#: builtin/clone.c:95
msgid "create a mirror repository (implies bare)"
msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
-#: builtin/clone.c:95
+#: builtin/clone.c:97
msgid "to clone from a local repository"
msgstr "для клонирования из локального репозитория"
-#: builtin/clone.c:97
+#: builtin/clone.c:99
msgid "don't use local hardlinks, always copy"
msgstr "не использовать жесткие ссылки, всегда копировать файлы"
-#: builtin/clone.c:99
+#: builtin/clone.c:101
msgid "setup as shared repository"
msgstr "настроить как общедоступный репозиторий"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:104
msgid "pathspec"
msgstr "спецификатор-пути"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:104
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:108
+#: builtin/clone.c:107
msgid "number of submodules cloned in parallel"
msgstr "количество подмодулей, которые будут клонированы парралельно"
-#: builtin/clone.c:109 builtin/init-db.c:477
+#: builtin/clone.c:108 builtin/init-db.c:486
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:110 builtin/init-db.c:478
+#: builtin/clone.c:109 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут использованы"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
-#: builtin/submodule--helper.c:1739
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
msgid "reference repository"
msgstr "ссылаемый репозиторий"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1741
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
msgid "use --reference only while cloning"
msgstr "используйте --reference только при клонировании"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3194 builtin/repack.c:320
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3306 builtin/repack.c:329
msgid "name"
msgstr "имя"
-#: builtin/clone.c:118
+#: builtin/clone.c:117
msgid "use <name> instead of 'origin' to track upstream"
msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
-#: builtin/clone.c:120
+#: builtin/clone.c:119
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
-#: builtin/clone.c:122
+#: builtin/clone.c:121
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
-#: builtin/pull.c:216
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
msgid "depth"
msgstr "глубина"
-#: builtin/clone.c:124
+#: builtin/clone.c:123
msgid "create a shallow clone of that depth"
msgstr "сделать частичный клон указанной глубины"
-#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
-#: parse-options.h:154
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
msgid "time"
msgstr "время"
-#: builtin/clone.c:126
+#: builtin/clone.c:125
msgid "create a shallow clone since a specific time"
msgstr "сделать частичный клон до определенного времени"
-#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
msgid "revision"
msgstr "редакция"
-#: builtin/clone.c:128 builtin/fetch.c:144
+#: builtin/clone.c:127 builtin/fetch.c:147
msgid "deepen history of shallow clone, excluding rev"
msgstr "углубить историю частичного клона исключая редакцию"
-#: builtin/clone.c:130
+#: builtin/clone.c:129
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:131
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
-#: builtin/clone.c:134
+#: builtin/clone.c:133
msgid "any cloned submodules will be shallow"
msgstr "все склонированные подмодули будут частичными клонами"
-#: builtin/clone.c:135 builtin/init-db.c:486
+#: builtin/clone.c:134 builtin/init-db.c:495
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:136 builtin/init-db.c:487
+#: builtin/clone.c:135 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "разместить каталог git отдельно от рабочей копии"
-#: builtin/clone.c:137
+#: builtin/clone.c:136
msgid "key=value"
msgstr "ключ=значение"
-#: builtin/clone.c:138
+#: builtin/clone.c:137
msgid "set config inside the new repository"
msgstr "установить параметры внутри нового репозитория"
-#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
-#: builtin/push.c:583
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "зависит-от-сервера"
+
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "передаваемые опции"
+
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "использовать только IPv4 адреса"
-#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
-#: builtin/push.c:585
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "использовать только IPv6 адреса"
-#: builtin/clone.c:279
+#: builtin/clone.c:280
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
-#: builtin/clone.c:332
+#: builtin/clone.c:333
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
-#: builtin/clone.c:404
+#: builtin/clone.c:405
#, c-format
msgid "failed to open '%s'"
msgstr "не удалось открыть «%s»"
-#: builtin/clone.c:412
+#: builtin/clone.c:413
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже существует и не является каталогом"
-#: builtin/clone.c:426
+#: builtin/clone.c:427
#, c-format
msgid "failed to stat %s\n"
msgstr "не удалось выполнить stat %s\n"
-#: builtin/clone.c:448
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "сбой отсоединения «%s»"
+
+#: builtin/clone.c:449
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалось создать ссылку «%s»"
-#: builtin/clone.c:452
+#: builtin/clone.c:453
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалось копировать файл в «%s»"
-#: builtin/clone.c:478
+#: builtin/clone.c:479
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:493
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n"
-#: builtin/clone.c:569
+#: builtin/clone.c:570
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Не удалось найти внешнюю ветку %s для клонирования."
-#: builtin/clone.c:680
+#: builtin/clone.c:689
#, c-format
msgid "unable to update %s"
msgstr "не удалось обновить %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:739
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
-#: builtin/clone.c:760
+#: builtin/clone.c:770
msgid "unable to checkout working tree"
msgstr "не удалось переключиться на версию в рабочем каталоге"
-#: builtin/clone.c:805
+#: builtin/clone.c:815
msgid "unable to write parameters to config file"
msgstr "не удалось записать параметры в файл конфигурации"
-#: builtin/clone.c:868
+#: builtin/clone.c:878
msgid "cannot repack to clean up"
msgstr "не удалось выполнить перепаковку для очистки"
-#: builtin/clone.c:870
+#: builtin/clone.c:880
msgid "cannot unlink temporary alternates file"
msgstr "не удалось отсоединить временные альтернативные файлы"
-#: builtin/clone.c:910 builtin/receive-pack.c:1935
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:914
+#: builtin/clone.c:924
msgid "You must specify a repository to clone."
msgstr "Вы должны указать репозиторий для клонирования."
-#: builtin/clone.c:927
+#: builtin/clone.c:937
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s нельзя использовать одновременно."
-#: builtin/clone.c:930
+#: builtin/clone.c:940
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
-#: builtin/clone.c:943
+#: builtin/clone.c:953
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не существует"
-#: builtin/clone.c:949 builtin/fetch.c:1512
+#: builtin/clone.c:959 builtin/fetch.c:1610
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не является положительным числом"
-#: builtin/clone.c:959
+#: builtin/clone.c:969
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
-#: builtin/clone.c:969
+#: builtin/clone.c:979
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже существует."
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
-#: builtin/worktree.c:246 builtin/worktree.c:276
+#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
+#: builtin/worktree.c:296 builtin/worktree.c:328
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалось создать родительские каталоги для «%s»"
-#: builtin/clone.c:989
+#: builtin/clone.c:999
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалось создать рабочий каталог «%s»"
-#: builtin/clone.c:1009
+#: builtin/clone.c:1019
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:1011
+#: builtin/clone.c:1021
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1045
msgid ""
"clone --recursive is not compatible with both --reference and --reference-"
"if-able"
msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
-#: builtin/clone.c:1096
+#: builtin/clone.c:1106
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
-#: builtin/clone.c:1098
+#: builtin/clone.c:1108
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1100
+#: builtin/clone.c:1110
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1102
+#: builtin/clone.c:1112
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1105
+#: builtin/clone.c:1115
msgid "source repository is shallow, ignoring --local"
msgstr "исходный репозиторий является частичным, --local игнорируется"
-#: builtin/clone.c:1110
+#: builtin/clone.c:1120
msgid "--local is ignored"
msgstr "--local игнорируется"
-#: builtin/clone.c:1180 builtin/clone.c:1188
+#: builtin/clone.c:1197 builtin/clone.c:1205
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
-#: builtin/clone.c:1191
+#: builtin/clone.c:1208
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пустой репозиторий."
@@ -8426,22 +10239,88 @@
msgid "--command must be the first argument"
msgstr "параметр --command должен быть первым"
-#: builtin/commit.c:38
+#: 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:520
+#, 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:1480 builtin/merge.c:268
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
+#: builtin/tag.c:406
+msgid "message"
+msgstr "сообщение"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1480
+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:1492 builtin/merge.c:283
+#: builtin/pull.c:193 builtin/revert.c:117
+msgid "GPG sign commit"
+msgstr "подписать коммит с помощью GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr ""
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr ""
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<опции>] [--] <спецификатор-пути>…"
-#: builtin/commit.c:43
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<опции>] [--] <спецификатор-пути>…"
-#: builtin/commit.c:48
+#: builtin/commit.c:51
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n"
-#: builtin/commit.c:53
+#: 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"
@@ -8450,11 +10329,11 @@
"\n"
msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:63
msgid "Otherwise, please use 'git reset'\n"
msgstr "В противном случае, используйте «git reset»\n"
-#: builtin/commit.c:63
+#: builtin/commit.c:66
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -8464,98 +10343,98 @@
"the remaining commits.\n"
msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
-#: builtin/commit.c:306
+#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "сбой распаковки объекта дерева HEAD"
-#: builtin/commit.c:347
+#: builtin/commit.c:353
msgid "unable to create temporary index"
msgstr "не удалось создать временный индекс"
-#: builtin/commit.c:353
+#: builtin/commit.c:359
msgid "interactive add failed"
msgstr "сбой интерактивного добавления"
-#: builtin/commit.c:366
+#: builtin/commit.c:373
msgid "unable to update temporary index"
msgstr "не удалось обновить временный индекс"
-#: builtin/commit.c:368
+#: builtin/commit.c:375
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении основного кэша дерева"
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
msgid "unable to write new_index file"
msgstr "не удалось записать файл new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:452
msgid "cannot do a partial commit during a merge."
msgstr "нельзя создать частичный коммит во время слияния."
-#: builtin/commit.c:447
+#: builtin/commit.c:454
msgid "cannot do a partial commit during a cherry-pick."
msgstr "нельзя создать частичный коммит во время копирования коммита."
-#: builtin/commit.c:455
+#: builtin/commit.c:462
msgid "cannot read the index"
msgstr "не удалось прочитать индекс"
-#: builtin/commit.c:474
+#: builtin/commit.c:481
msgid "unable to write temporary index file"
msgstr "не удалось записать временный файл индекса"
-#: builtin/commit.c:571
+#: builtin/commit.c:579
#, c-format
msgid "commit '%s' lacks author header"
msgstr "у коммита «%s» отсутствует автор в заголовке"
-#: builtin/commit.c:573
+#: builtin/commit.c:581
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "у коммита «%s» строка автора в неправильном формате"
-#: builtin/commit.c:592
+#: builtin/commit.c:600
msgid "malformed --author parameter"
msgstr "параметр --author в неправильном формате"
-#: builtin/commit.c:644
+#: builtin/commit.c:653
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
-#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
#, c-format
msgid "could not lookup commit %s"
msgstr "не удалось запросить коммит %s"
-#: builtin/commit.c:693 builtin/shortlog.c:317
+#: builtin/commit.c:703 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из стандартного ввода)\n"
-#: builtin/commit.c:695
+#: builtin/commit.c:705
msgid "could not read log from standard input"
msgstr "не удалось прочитать файл журнала из стандартного ввода"
-#: builtin/commit.c:699
+#: builtin/commit.c:709
#, c-format
msgid "could not read log file '%s'"
msgstr "не удалось прочитать файл журнала «%s»"
-#: builtin/commit.c:728 builtin/commit.c:736
+#: builtin/commit.c:740 builtin/commit.c:756
msgid "could not read SQUASH_MSG"
msgstr "не удалось прочитать SQUASH_MSG"
-#: builtin/commit.c:733
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "не удалось прочитать MERGE_MSG"
-#: builtin/commit.c:787
+#: builtin/commit.c:807
msgid "could not write commit template"
msgstr "не удалось записать шаблон описания коммита"
-#: builtin/commit.c:805
+#: builtin/commit.c:826
#, c-format
msgid ""
"\n"
@@ -8565,7 +10444,7 @@
"and try again.\n"
msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n"
-#: builtin/commit.c:810
+#: builtin/commit.c:831
#, c-format
msgid ""
"\n"
@@ -8575,14 +10454,14 @@
"and try again.\n"
msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n"
-#: builtin/commit.c:823
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:852
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -8590,345 +10469,320 @@
"An empty message aborts the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:869
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:877
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:884
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sКоммитер: %.*s <%.*s>"
-#: builtin/commit.c:880
+#: builtin/commit.c:902
msgid "Cannot read index"
msgstr "Не удалось прочитать индекс"
-#: builtin/commit.c:946
+#: builtin/commit.c:969
msgid "Error building trees"
msgstr "Ошибка при построении деревьев"
-#: builtin/commit.c:960 builtin/tag.c:258
+#: builtin/commit.c:983 builtin/tag.c:269
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
-#: builtin/commit.c:1004
+#: builtin/commit.c:1027
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
-#: builtin/commit.c:1018
+#: builtin/commit.c:1041
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
-#: builtin/commit.c:1032 builtin/commit.c:1269
+#: builtin/commit.c:1059 builtin/commit.c:1284
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправильный режим неотслеживаемых файлов «%s»"
-#: builtin/commit.c:1070
+#: builtin/commit.c:1097
msgid "--long and -z are incompatible"
msgstr "--long и -z нельзя использовать одновременно"
-#: builtin/commit.c:1103
+#: builtin/commit.c:1130
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
-#: builtin/commit.c:1112
+#: builtin/commit.c:1139
msgid "You have nothing to amend."
msgstr "Нечего исправлять."
-#: builtin/commit.c:1115
+#: builtin/commit.c:1142
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Вы в процессе слияния — сейчас нельзя исправлять."
-#: builtin/commit.c:1117
+#: builtin/commit.c:1144
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять."
-#: builtin/commit.c:1120
+#: builtin/commit.c:1147
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опции --squash и --fixup не могут использоваться одновременно"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1157
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1132
+#: builtin/commit.c:1159
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1140
+#: builtin/commit.c:1167
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1184
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1186
msgid "No paths with --include/--only does not make sense."
msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
-#: builtin/commit.c:1173 builtin/tag.c:544
+#: builtin/commit.c:1192
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Неправильное значение режима очистки %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr ""
-#: builtin/commit.c:1178
-msgid "Paths with -a does not make sense."
-msgstr "С опцией -a указание пути не имеет смысла."
-
-#: builtin/commit.c:1303 builtin/commit.c:1480
+#: builtin/commit.c:1319 builtin/commit.c:1503
msgid "show status concisely"
msgstr "кратко показать статус"
-#: builtin/commit.c:1305 builtin/commit.c:1482
+#: builtin/commit.c:1321 builtin/commit.c:1505
msgid "show branch information"
msgstr "показать информацию о версии"
-#: builtin/commit.c:1307
+#: builtin/commit.c:1323
msgid "show stash information"
msgstr "показать информацию о спрятанном"
-#: builtin/commit.c:1309 builtin/commit.c:1484
+#: builtin/commit.c:1325 builtin/commit.c:1507
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1311
+#: builtin/commit.c:1327
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:581
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1314 builtin/commit.c:1488
+#: builtin/commit.c:1330 builtin/commit.c:1511
msgid "show status in long format (default)"
msgstr "показать статус в длинном формате (по умолчанию)"
-#: builtin/commit.c:1317 builtin/commit.c:1491
+#: builtin/commit.c:1333 builtin/commit.c:1514
msgid "terminate entries with NUL"
msgstr "завершать записи НУЛЕВЫМ байтом"
-#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
+#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
+#: parse-options.h:331
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1320 builtin/commit.c:1494
+#: builtin/commit.c:1336 builtin/commit.c:1517
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
-#: builtin/commit.c:1324
+#: builtin/commit.c:1340
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)"
-#: builtin/commit.c:1326 parse-options.h:167
+#: builtin/commit.c:1342 parse-options.h:179
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1343
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
-msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)"
+msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (изменённые), untracked (неотслеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1329
+#: builtin/commit.c:1345
msgid "list untracked files in columns"
msgstr "показать неотслеживаемые файлы по столбцам"
-#: builtin/commit.c:1330
+#: builtin/commit.c:1346
msgid "do not detect renames"
msgstr "не определять переименования"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1348
msgid "detect renames, optionally set similarity index"
msgstr "определять переименования, опционально устанавливать рейтинг сходства"
-#: builtin/commit.c:1352
+#: builtin/commit.c:1368
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
-#: builtin/commit.c:1450
+#: builtin/commit.c:1473
msgid "suppress summary after successful commit"
-msgstr "не выводить сводку после успешного коммита"
+msgstr "не выводить сводку изменений после успешного коммита"
-#: builtin/commit.c:1451
+#: builtin/commit.c:1474
msgid "show diff in commit message template"
msgstr "добавить список изменений в шаблон сообщения коммита"
-#: builtin/commit.c:1453
+#: builtin/commit.c:1476
msgid "Commit message options"
msgstr "Опции сообщения коммита"
-#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
msgid "read message from file"
msgstr "прочитать сообщение из файла"
-#: builtin/commit.c:1455
+#: builtin/commit.c:1478
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1455
+#: builtin/commit.c:1478
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1456 builtin/gc.c:504
+#: builtin/commit.c:1479 builtin/gc.c:539
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1456
+#: builtin/commit.c:1479
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
-#: builtin/notes.c:567 builtin/tag.c:393
-msgid "message"
-msgstr "сообщение"
-
-#: builtin/commit.c:1457
-msgid "commit message"
-msgstr "сообщение коммита"
-
-#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
-#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
+#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
+#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
msgid "commit"
msgstr "коммит"
-#: builtin/commit.c:1458
+#: builtin/commit.c:1481
msgid "reuse and edit message from specified commit"
msgstr "использовать и отредактировать сообщение от указанного коммита"
-#: builtin/commit.c:1459
+#: builtin/commit.c:1482
msgid "reuse message from specified commit"
msgstr "использовать сообщение указанного коммита"
-#: builtin/commit.c:1460
+#: builtin/commit.c:1483
msgid "use autosquash formatted message to fixup specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
-#: builtin/commit.c:1461
+#: builtin/commit.c:1484
msgid "use autosquash formatted message to squash specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
-#: builtin/commit.c:1462
+#: builtin/commit.c:1485
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
-#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
-#: builtin/pull.c:154 builtin/revert.c:106
+#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
+#: builtin/pull.c:162 builtin/revert.c:109
msgid "add Signed-off-by:"
msgstr "добавить Signed-off-by:"
-#: builtin/commit.c:1464
+#: builtin/commit.c:1487
msgid "use specified template file"
msgstr "использовать указанный файл шаблона"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1488
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1466
-msgid "default"
-msgstr "по-умолчанию"
-
-#: builtin/commit.c:1466 builtin/tag.c:399
-msgid "how to strip spaces and #comments from message"
-msgstr "как удалять пробелы и #комментарии из сообщения коммита"
-
-#: builtin/commit.c:1467
+#: builtin/commit.c:1490
msgid "include status in commit message template"
msgstr "включить статус файлов в шаблон сообщения коммита"
-#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "подписать коммит с помощью GPG"
-
-#: builtin/commit.c:1472
+#: builtin/commit.c:1495
msgid "Commit contents options"
msgstr "Опции содержимого коммита"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1496
msgid "commit all changed files"
msgstr "закоммитить все измененные файлы"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1497
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в индекс для коммита"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1498
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1499
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1500
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1501
msgid "bypass pre-commit and commit-msg hooks"
msgstr "пропустить перехватчик pre-commit и commit-msg"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1502
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1515
msgid "amend previous commit"
msgstr "исправить предыдущий коммит"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1516
msgid "bypass post-rewrite hook"
msgstr "пропустить перехватчик post-rewrite"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1521
msgid "ok to record an empty change"
msgstr "разрешить запись пустого коммита"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1523
msgid "ok to record a change with an empty message"
msgstr "разрешить запись изменений с пустым сообщением"
-#: builtin/commit.c:1573
+#: builtin/commit.c:1596
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1603
msgid "could not read MERGE_MODE"
msgstr "не удалось прочитать MERGE_MODE"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1622
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалось открыть сообщение коммита: %s"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1629
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1634
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Отмена коммита; вы не изменили сообщение.\n"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1668
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -8953,236 +10807,245 @@
"|--stdin-packs|--stdin-commits]"
msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
-#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
-#: builtin/log.c:1477
+#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
+#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
+#: builtin/log.c:1561
msgid "dir"
msgstr "каталог"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:185
+#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
+#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
msgid "The object directory to store the graph"
-msgstr ""
+msgstr "Каталог объектов для сохранения графа"
-#: builtin/commit-graph.c:134
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Не удалось открыть файл commit-graph «%s»"
+
+#: builtin/commit-graph.c:150
msgid "start walk at all refs"
-msgstr ""
+msgstr "начать со всех ссылок"
-#: builtin/commit-graph.c:136
+#: builtin/commit-graph.c:152
msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
+msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе"
-#: builtin/commit-graph.c:138
+#: builtin/commit-graph.c:154
msgid "start walk at commits listed by stdin"
-msgstr ""
+msgstr "начать с коммитов, перечисленных на стандартном вводе"
-#: builtin/commit-graph.c:140
+#: builtin/commit-graph.c:156
msgid "include all commits already in the commit-graph file"
-msgstr ""
+msgstr "включить все коммиты, которые уже есть в файле commit-graph"
-#: builtin/commit-graph.c:149
+#: builtin/commit-graph.c:165
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
+msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
-#: builtin/config.c:10
+#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<опции>]"
-#: builtin/config.c:101
+#: builtin/config.c:103
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/config.c:113
+#: builtin/config.c:115
msgid "only one type at a time"
msgstr ""
-#: builtin/config.c:122
+#: builtin/config.c:124
msgid "Config file location"
msgstr "Размещение файла конфигурации"
-#: builtin/config.c:123
+#: builtin/config.c:125
msgid "use global config file"
msgstr "использовать глобальный файл конфигурации"
-#: builtin/config.c:124
+#: builtin/config.c:126
msgid "use system config file"
msgstr "использовать системный файл конфигурации"
-#: builtin/config.c:125
+#: builtin/config.c:127
msgid "use repository config file"
msgstr "использовать файл конфигурации репозитория"
-#: builtin/config.c:126
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129
msgid "use given config file"
msgstr "использовать указанный файл конфигурации"
-#: builtin/config.c:127
+#: builtin/config.c:130
msgid "blob-id"
msgstr "идент-двоичн-объекта"
-#: builtin/config.c:127
+#: builtin/config.c:130
msgid "read config from given blob object"
msgstr "прочитать настройки из указанного двоичного объекта"
-#: builtin/config.c:128
+#: builtin/config.c:131
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:129
+#: builtin/config.c:132
msgid "get value: name [value-regex]"
msgstr "получить значение: имя [шаблон-значений]"
-#: builtin/config.c:130
+#: builtin/config.c:133
msgid "get all values: key [value-regex]"
msgstr "получить все значения: ключ [шаблон-значений]"
-#: builtin/config.c:131
+#: builtin/config.c:134
msgid "get values for regexp: name-regex [value-regex]"
msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
-#: builtin/config.c:132
+#: builtin/config.c:135
msgid "get value specific for the URL: section[.var] URL"
msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
-#: builtin/config.c:133
+#: builtin/config.c:136
msgid "replace all matching variables: name value [value_regex]"
msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
-#: builtin/config.c:134
+#: builtin/config.c:137
msgid "add a new variable: name value"
msgstr "добавить новую переменную: имя значение"
-#: builtin/config.c:135
+#: builtin/config.c:138
msgid "remove a variable: name [value-regex]"
msgstr "удалить переменную: имя [шаблон-значений]"
-#: builtin/config.c:136
+#: builtin/config.c:139
msgid "remove all matches: name [value-regex]"
msgstr "удалить все совпадающие: имя [шаблон-значений]"
-#: builtin/config.c:137
+#: builtin/config.c:140
msgid "rename section: old-name new-name"
msgstr "переименовать раздел: старое-имя новое-имя"
-#: builtin/config.c:138
+#: builtin/config.c:141
msgid "remove a section: name"
msgstr "удалить раздел: имя"
-#: builtin/config.c:139
+#: builtin/config.c:142
msgid "list all"
msgstr "показать весь список"
-#: builtin/config.c:140
+#: builtin/config.c:143
msgid "open an editor"
msgstr "открыть в редакторе"
-#: builtin/config.c:141
+#: builtin/config.c:144
msgid "find the color configured: slot [default]"
msgstr "найти настроенный цвет: раздел [по-умолчанию]"
-#: builtin/config.c:142
+#: builtin/config.c:145
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
-#: builtin/config.c:143
+#: builtin/config.c:146
msgid "Type"
msgstr "Тип"
-#: builtin/config.c:144
+#: builtin/config.c:147
msgid "value is given this type"
msgstr ""
-#: builtin/config.c:145
+#: builtin/config.c:148
msgid "value is \"true\" or \"false\""
msgstr "значение — это «true» (правда) или «false» (ложь)"
-#: builtin/config.c:146
+#: builtin/config.c:149
msgid "value is decimal number"
msgstr "значение — это десятичное число"
-#: builtin/config.c:147
+#: builtin/config.c:150
msgid "value is --bool or --int"
msgstr "значение — это --bool или --int"
-#: builtin/config.c:148
+#: builtin/config.c:151
msgid "value is a path (file or directory name)"
msgstr "значение — это путь (к файлу или каталогу)"
-#: builtin/config.c:149
+#: builtin/config.c:152
msgid "value is an expiry date"
msgstr "значение - это дата окончания срока действия"
-#: builtin/config.c:150
+#: builtin/config.c:153
msgid "Other"
msgstr "Другое"
-#: builtin/config.c:151
+#: builtin/config.c:154
msgid "terminate values with NUL byte"
msgstr "завершать значения НУЛЕВЫМ байтом"
-#: builtin/config.c:152
+#: builtin/config.c:155
msgid "show variable names only"
msgstr "показывать только имена переменных"
-#: builtin/config.c:153
+#: builtin/config.c:156
msgid "respect include directives on lookup"
msgstr "учитывать директивы include (включения файлов) при запросе"
-#: builtin/config.c:154
+#: builtin/config.c:157
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
-#: builtin/config.c:155
+#: builtin/config.c:158
msgid "value"
msgstr ""
-#: builtin/config.c:155
+#: builtin/config.c:158
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:168
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/config.c:170
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/config.c:304
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/config.c:340
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/config.c:397
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/config.c:439
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "не удалось разобрать значение цвета по умолчанию"
-#: builtin/config.c:492 builtin/config.c:724
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr ""
-#: builtin/config.c:495
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/config.c:498
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/config.c:583
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -9192,74 +11055,81 @@
"#\temail = %s\n"
msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:606
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr ""
-#: builtin/config.c:611
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local можно использовать только внутри git репозитория"
-#: builtin/config.c:614
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:633
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr ""
-#: builtin/config.c:670
-msgid "--get-color and variable type are incoherent"
-msgstr ""
-
-#: builtin/config.c:675
-msgid "only one action at a time"
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
msgstr ""
#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:693
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/config.c:694
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
"--list"
msgstr ""
-#: builtin/config.c:700
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/config.c:713
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/config.c:716
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr ""
-#: builtin/config.c:726
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr ""
-#: builtin/config.c:728
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr ""
-#: builtin/config.c:742
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалось создать файл конфигурации %s"
-#: builtin/config.c:755
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr "нельзя перезаписать несколько значений одним\n Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s."
-#: builtin/config.c:829 builtin/config.c:840
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr ""
@@ -9272,194 +11142,194 @@
msgid "print sizes in human readable format"
msgstr "вывод размеров в удобочитаемом для человека виде"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<опции>] [<указатель-коммита>…]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<опции>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "указатель на ветку"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "легковесный"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "аннотированный"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "аннотированная метка %s не доступна"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "аннотированная метка %s не содержит встроенного названия"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "метка «%s» уже здесь «%s»"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "нет меток, точно соответствующих «%s»"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "поиск окончен на %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "посещено %lu коммитов\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "описать %s\n"
-#: builtin/describe.c:512 builtin/log.c:508
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "Недопустимое имя объекта %s"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s не является коммитом или двоичным объектом"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "поиск метки, которая идет после коммита"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "использовать любую ссылку"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "использовать любую метку, даже неаннотированную"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "всегда использовать длинный формат вывода"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "следовать только за первым родителем"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "выводить только точные совпадения"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "рассматривать только метки по <шаблону>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "не учитывать метки, которые соответствуют <шаблону>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:426
msgid "show abbreviated commit object as fallback"
msgstr "если не найдено, показать сокращенный номер редакции коммита"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "пометка"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)"
+msgstr "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long несовместимо с --abbrev=0"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "Имена не найдены, не могу ничего описать."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty несовместимо с указанием указателей коммитов"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken несовместимо с указанием указателей коммитов"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "«%s»: не является обычным файлом или символьной ссылкой"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "неправильный параметр: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Не найден git репозиторий"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "передан неправильный объект «%s»."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "передано больше двух двоичных объектов: «%s»"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "передан необработанный объект «%s»."
@@ -9468,93 +11338,109 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "сбой: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "не удалось прочитать файл символьной ссылки %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "не удалось прочитать объект %s для символьной ссылки %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
-msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
+msgstr "комбинированные форматы файлов списка изменений(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "оба файла изменены: «%s» и «%s»."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "рабочий каталог был покинут."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "временные файлы уже находятся в «%s»."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "возможно вы хотите их удалить или восстановить."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "использовать «diff.guitool» вместо «diff.tool»"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "выполнить пофайловое сравнение всего каталога"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "не спрашивать перед запуском утилиты сравнения"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "использовать символьные ссылки в режиме сравнения каталога"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "использовать указанную утилиту сравнения"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
" code"
msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
-msgstr "использовать особую команду для просмотра различий"
+msgstr "использовать особую команду для просмотра изменений"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "не передана <утилита> для --tool=<утилита>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не передана <команда> для --extcmd=<команда>"
@@ -9562,364 +11448,373 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [опции-rev-list]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1084
msgid "show progress after <n> objects"
msgstr "показать прогресс после <n> объектов"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1086
msgid "select handling of signed tags"
msgstr "выбор обработки подписанных меток"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1089
msgid "select handling of tags that tag filtered objects"
msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1092
msgid "Dump marks to this file"
msgstr "Записать пометки в этот файл"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1094
msgid "Import marks from this file"
msgstr "Импортировать пометки из этого файла"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1096
msgid "Fake a tagger when tags lack one"
msgstr "Подделать автора метки, если у метки он отсутствует"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1098
msgid "Output full tree for each commit"
msgstr "Вывести полное дерево для каждого коммита"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1100
msgid "Use the done feature to terminate the stream"
msgstr "Использовать пометку завершения в конце потока"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1101
msgid "Skip output of blob data"
msgstr "Пропустить вывод данных двоичных объектов"
-#: builtin/fast-export.c:1024
+#: builtin/fast-export.c:1102 builtin/log.c:1609
msgid "refspec"
msgstr "спецификатор ссылки"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1103
msgid "Apply refspec to exported refs"
msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1104
msgid "anonymize output"
msgstr "сделать вывод анонимным"
-#: builtin/fetch.c:27
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fetch.c:28
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:29
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<опции>] <группа>"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:30
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:31
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<опции>]"
-#: builtin/fetch.c:112 builtin/pull.c:193
+#: builtin/fetch.c:115 builtin/pull.c:202
msgid "fetch from all remotes"
msgstr "извлечь со всех внешних репозиториев"
-#: builtin/fetch.c:114 builtin/pull.c:196
+#: builtin/fetch.c:117 builtin/pull.c:205
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
-#: builtin/fetch.c:116 builtin/pull.c:199
+#: builtin/fetch.c:119 builtin/pull.c:208
msgid "path to upload pack on remote end"
msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
-#: builtin/fetch.c:117 builtin/pull.c:201
-msgid "force overwrite of local branch"
-msgstr "принудительная перезапись локальной ветки"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr ""
-#: builtin/fetch.c:119
+#: builtin/fetch.c:122
msgid "fetch from multiple remotes"
msgstr "извлечь с нескольких внешних репозиториев"
-#: builtin/fetch.c:121 builtin/pull.c:203
+#: builtin/fetch.c:124 builtin/pull.c:212
msgid "fetch all tags and associated objects"
msgstr "извлечь все метки и связанные объекты"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:126
msgid "do not fetch all tags (--no-tags)"
msgstr "не извлекать все метки (--no-tags)"
-#: builtin/fetch.c:125
+#: builtin/fetch.c:128
msgid "number of submodules fetched in parallel"
msgstr "количество подмодулей, которые будут скачаны парралельно"
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:130 builtin/pull.c:215
msgid "prune remote-tracking branches no longer on remote"
msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
-#: builtin/fetch.c:129
+#: builtin/fetch.c:132
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
msgid "on-demand"
msgstr "по требованию"
-#: builtin/fetch.c:131
+#: builtin/fetch.c:134
msgid "control recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:138 builtin/pull.c:223
msgid "keep downloaded pack"
msgstr "оставить загруженный пакет данных"
-#: builtin/fetch.c:137
+#: builtin/fetch.c:140
msgid "allow updating of HEAD ref"
msgstr "разрешить обновление ссылки HEAD"
-#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
msgid "deepen history of shallow clone"
msgstr "улугубить историю частичного клона"
-#: builtin/fetch.c:142
+#: builtin/fetch.c:145
msgid "deepen history of shallow repository based on time"
msgstr "углубить историю частичного клона основываясь на времени"
-#: builtin/fetch.c:148 builtin/pull.c:220
+#: builtin/fetch.c:151 builtin/pull.c:229
msgid "convert to a complete repository"
msgstr "преобразовать в полный репозиторий"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:154
msgid "prepend this to submodule path output"
msgstr "присоединять это спереди к выводу путей подмодуля"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:157
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
-#: builtin/fetch.c:158 builtin/pull.c:223
+#: builtin/fetch.c:161 builtin/pull.c:232
msgid "accept refs that update .git/shallow"
msgstr "принимать ссылки, которые обновляют .git/shallow"
-#: builtin/fetch.c:159 builtin/pull.c:225
+#: builtin/fetch.c:162 builtin/pull.c:234
msgid "refmap"
msgstr "соответствие-ссылок"
-#: builtin/fetch.c:160 builtin/pull.c:226
+#: builtin/fetch.c:163 builtin/pull.c:235
msgid "specify fetch refmap"
msgstr "указать соответствие ссылок при извлечении"
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "зависит-от-сервера"
-
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "передаваемые опции"
-
-#: builtin/fetch.c:167
+#: builtin/fetch.c:170
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:418
+#: builtin/fetch.c:469
msgid "Couldn't find remote ref HEAD"
msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
-#: builtin/fetch.c:552
+#: builtin/fetch.c:608
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "опция fetch.output содержит неправильное значение для %s"
-#: builtin/fetch.c:645
+#: builtin/fetch.c:705
#, c-format
msgid "object %s not found"
msgstr "объект %s не найден"
-#: builtin/fetch.c:649
+#: builtin/fetch.c:709
msgid "[up to date]"
msgstr "[актуально]"
-#: builtin/fetch.c:662 builtin/fetch.c:744
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
msgid "[rejected]"
msgstr "[отклонено]"
-#: builtin/fetch.c:663
+#: builtin/fetch.c:723
msgid "can't fetch in current branch"
msgstr "нельзя извлечь текущую ветку"
-#: builtin/fetch.c:672
+#: builtin/fetch.c:733
msgid "[tag update]"
msgstr "[обновление метки]"
-#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
-#: builtin/fetch.c:739
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
msgid "unable to update local ref"
msgstr "не удалось обновить локальную ссылку"
-#: builtin/fetch.c:694
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:760
msgid "[new tag]"
msgstr "[новая метка]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:763
msgid "[new branch]"
msgstr "[новая ветка]"
-#: builtin/fetch.c:700
+#: builtin/fetch.c:766
msgid "[new ref]"
msgstr "[новая ссылка]"
-#: builtin/fetch.c:739
+#: builtin/fetch.c:796
msgid "forced update"
msgstr "принудительное обновление"
-#: builtin/fetch.c:744
+#: builtin/fetch.c:801
msgid "non-fast-forward"
msgstr "без перемотки вперед"
-#: builtin/fetch.c:790
+#: builtin/fetch.c:847
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s не отправил все необходимые объекты\n"
-#: builtin/fetch.c:811
+#: builtin/fetch.c:868
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
-#: builtin/fetch.c:900 builtin/fetch.c:1011
+#: builtin/fetch.c:959 builtin/fetch.c:1081
#, c-format
msgid "From %.*s\n"
msgstr "Из %.*s\n"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:970
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
-#: builtin/fetch.c:981
+#: builtin/fetch.c:1051
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s будет висящей веткой)"
-#: builtin/fetch.c:982
+#: builtin/fetch.c:1052
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s стала висящей веткой)"
-#: builtin/fetch.c:1014
+#: builtin/fetch.c:1084
msgid "[deleted]"
msgstr "[удалено]"
-#: builtin/fetch.c:1015 builtin/remote.c:1035
+#: builtin/fetch.c:1085 builtin/remote.c:1036
msgid "(none)"
msgstr "(нет)"
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1108
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Отказ получения в текущую ветку %s не голого репозитория"
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1127
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
-#: builtin/fetch.c:1060
+#: builtin/fetch.c:1130
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Параметр «%s» игнорируется для %s\n"
-#: builtin/fetch.c:1339
+#: builtin/fetch.c:1434
#, c-format
msgid "Fetching %s\n"
msgstr "Извлечение из %s\n"
-#: builtin/fetch.c:1341 builtin/remote.c:99
+#: builtin/fetch.c:1436 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Не удалось извлечь %s"
-#: builtin/fetch.c:1387 builtin/fetch.c:1555
+#: builtin/fetch.c:1482
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in "
+"extensions.partialClone"
msgstr ""
-#: builtin/fetch.c:1410
+#: builtin/fetch.c:1506
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции."
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1543
msgid "You need to specify a tag name."
msgstr "Вам нужно указать имя метки."
-#: builtin/fetch.c:1496
+#: builtin/fetch.c:1594
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицательная грубина для --deepen не поддерживается"
-#: builtin/fetch.c:1498
+#: builtin/fetch.c:1596
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen и --depth нельзя использовать одновременно"
-#: builtin/fetch.c:1503
+#: builtin/fetch.c:1601
msgid "--depth and --unshallow cannot be used together"
msgstr "нельзя использовать одновременно --depth и --unshallow"
-#: builtin/fetch.c:1505
+#: builtin/fetch.c:1603
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow не имеет смысла на полном репозитории"
-#: builtin/fetch.c:1521
+#: builtin/fetch.c:1619
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all не принимает имя репозитория как аргумент"
-#: builtin/fetch.c:1523
+#: builtin/fetch.c:1621
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
-#: builtin/fetch.c:1532
+#: builtin/fetch.c:1630
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Нет такого внешнего репозитория или группы: %s"
-#: builtin/fetch.c:1539
+#: builtin/fetch.c:1637
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
-#: builtin/fmt-merge-msg.c:17
+#: builtin/fetch.c:1653
+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 "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "populate log with at most <n> entries from shortlog"
msgstr "отправить в журнал <n> записей из короткого журнала"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:675
msgid "alias for --log (deprecated)"
msgstr "сокращение для --log (устаревшее)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:678
msgid "text"
msgstr "текст"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:679
msgid "use <text> as start of message"
msgstr "использовать <текст> как начальное сообщение"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:680
msgid "file to read from"
msgstr "файл для чтения"
@@ -9959,90 +11854,271 @@
msgid "show only <n> matched refs"
msgstr "показать только <n> совпадающих ссылок"
-#: builtin/for-each-ref.c:39 builtin/tag.c:422
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
msgid "respect format colors"
msgstr "использовать цвета из формата"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "вывод только ссылок, которые указывают на переданный объект"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "вывод только слитых ссылок"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "вывод только не слитых ссылок"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "вывод только ссылок, которые содержат коммит"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "вывод только ссылок, которые не содержат коммит"
-#: builtin/fsck.c:574
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "не удалось закончить '%s'"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Проверка каталогов объектов"
-#: builtin/fsck.c:666
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:705 builtin/index-pack.c:841
+#, c-format
+msgid "invalid %s"
+msgstr "неправильный %s"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<опции>] [<объект>…]"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "показать недоступные объекты"
-#: builtin/fsck.c:673
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "показать объекты, на которые нет ссылок"
-#: builtin/fsck.c:674
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "вывести отчет по меткам"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "вывести отчет по корневым узлам"
-#: builtin/fsck.c:676
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "воспринимать объекты в индексе как корневые узлы"
-#: builtin/fsck.c:677
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
-#: builtin/fsck.c:678
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "также проверять пакеты и альтернативные объекты"
-#: builtin/fsck.c:679
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "только проверить соединение"
-#: builtin/fsck.c:680
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "использовать более строгую проверку"
-#: builtin/fsck.c:682
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "записать объекты на которые нет ссылок в .git/lost-found"
-#: builtin/fsck.c:683 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "показать прогресс выполнения"
-#: builtin/fsck.c:684
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "показать подробные имена для недоступных объектов"
-#: builtin/fsck.c:750
+#: builtin/fsck.c:859 builtin/index-pack.c:224
msgid "Checking objects"
msgstr "Проверка объектов"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<опции>]"
@@ -10052,12 +12128,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Не удалось выполнить fstat %s: %s"
-#: builtin/gc.c:455
+#: builtin/gc.c:126
#, c-format
-msgid "Can't stat %s"
-msgstr "Не удалось выполнить stat для %s"
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
-#: builtin/gc.c:464
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "не удалось выполнить stat для «%s»"
+
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#, c-format
+msgid "cannot read '%s'"
+msgstr "не удалось прочитать «%s»"
+
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -10067,73 +12153,73 @@
"%s"
msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
-#: builtin/gc.c:505
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "почистить объекты, на которые нет ссылок"
-#: builtin/gc.c:507
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "проверять более внимательно (занимает больше времени)"
-#: builtin/gc.c:508
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "включить режим auto-gc"
-#: builtin/gc.c:511
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
-#: builtin/gc.c:514
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:531
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:542
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:562
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
-#: builtin/gc.c:564
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
-#: builtin/gc.c:565
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
-#: builtin/gc.c:601
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)"
-#: builtin/gc.c:652
+#: builtin/gc.c:693
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove "
"them."
msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
-#: builtin/grep.c:226
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: сбой создания потока: %s"
-#: builtin/grep.c:284
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "указано недопустимое количество потоков (%d) для %s"
@@ -10141,289 +12227,297 @@
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
-#: builtin/pack-objects.c:2639
+#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
+#: builtin/pack-objects.c:2720
#, c-format
msgid "no threads support, ignoring %s"
msgstr "нет поддержки потоков, игнорирование %s"
-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
#, c-format
msgid "unable to read tree (%s)"
msgstr "не удалось прочитать дерево (%s)"
-#: builtin/grep.c:638
+#: builtin/grep.c:646
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не удалось выполнить grep из объекта типа %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:712
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "параметр «%c» ожидает числовое значение"
-#: builtin/grep.c:791
+#: builtin/grep.c:811
msgid "search in index instead of in the work tree"
msgstr "искать в индексе, а не в рабочем каталоге"
-#: builtin/grep.c:793
+#: builtin/grep.c:813
msgid "find in contents not managed by git"
msgstr "искать в содержимом не управляемым git"
-#: builtin/grep.c:795
+#: builtin/grep.c:815
msgid "search in both tracked and untracked files"
msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
-#: builtin/grep.c:797
+#: builtin/grep.c:817
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:799
+#: builtin/grep.c:819
msgid "recursively search in each submodule"
msgstr "рекурсивный поиск по всем подмодулям"
-#: builtin/grep.c:802
+#: builtin/grep.c:822
msgid "show non-matching lines"
msgstr "искать в несовпадающих строках"
-#: builtin/grep.c:804
+#: builtin/grep.c:824
msgid "case insensitive matching"
msgstr "без учета регистра"
-#: builtin/grep.c:806
+#: builtin/grep.c:826
msgid "match patterns only at word boundaries"
msgstr "искать совпадения шаблона только на границах слов"
-#: builtin/grep.c:808
+#: builtin/grep.c:828
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текста"
-#: builtin/grep.c:810
+#: builtin/grep.c:830
msgid "don't match patterns in binary files"
msgstr "не искать совпадения шаблона в двоичных файлах"
-#: builtin/grep.c:813
+#: builtin/grep.c:833
msgid "process binary files with textconv filters"
msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
-#: builtin/grep.c:815
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:837
msgid "descend at most <depth> levels"
msgstr "на глубине максиму <глубина> уровней"
-#: builtin/grep.c:819
+#: builtin/grep.c:841
msgid "use extended POSIX regular expressions"
msgstr "использовать расширенные регулярные выражения POSIX"
-#: builtin/grep.c:822
+#: builtin/grep.c:844
msgid "use basic POSIX regular expressions (default)"
msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
-#: builtin/grep.c:825
+#: builtin/grep.c:847
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фиксированные строки"
-#: builtin/grep.c:828
+#: builtin/grep.c:850
msgid "use Perl-compatible regular expressions"
msgstr "использовать Perl-совместимые регулярные выражения"
-#: builtin/grep.c:831
+#: builtin/grep.c:853
msgid "show line numbers"
msgstr "вывести номера строк"
-#: builtin/grep.c:832
+#: builtin/grep.c:854
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:833
+#: builtin/grep.c:855
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:834
+#: builtin/grep.c:856
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:836
+#: builtin/grep.c:858
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов относительно каталога репозитория"
-#: builtin/grep.c:838
+#: builtin/grep.c:860
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не совпадающие строки"
-#: builtin/grep.c:840
+#: builtin/grep.c:862
msgid "synonym for --files-with-matches"
msgstr "синоним для --files-with-matches"
-#: builtin/grep.c:843
+#: builtin/grep.c:865
msgid "show only the names of files without match"
msgstr "выводить только несовпадающие имена файлов"
-#: builtin/grep.c:845
+#: builtin/grep.c:867
msgid "print NUL after filenames"
msgstr "выводить двоичный НОЛЬ после списка имен файлов"
-#: builtin/grep.c:848
+#: builtin/grep.c:870
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:850
+#: builtin/grep.c:872
msgid "show the number of matches instead of matching lines"
msgstr "выводить количество совпадений, а не совпадающие строки"
-#: builtin/grep.c:851
+#: builtin/grep.c:873
msgid "highlight matches"
msgstr "подсвечивать совпадения"
-#: builtin/grep.c:853
+#: builtin/grep.c:875
msgid "print empty line between matches from different files"
msgstr "выводить пустую строку после совпадений из разных файлов"
-#: builtin/grep.c:855
+#: builtin/grep.c:877
msgid "show filename only once above matches from same file"
msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
-#: builtin/grep.c:858
+#: builtin/grep.c:880
msgid "show <n> context lines before and after matches"
msgstr "показать <n> строк контекста перед и после совпадения"
-#: builtin/grep.c:861
+#: builtin/grep.c:883
msgid "show <n> context lines before matches"
msgstr "показать <n> строк контекста перед совпадением"
-#: builtin/grep.c:863
+#: builtin/grep.c:885
msgid "show <n> context lines after matches"
msgstr "показать <n> строк контекста после совпадения"
-#: builtin/grep.c:865
+#: builtin/grep.c:887
msgid "use <n> worker threads"
msgstr "использовать <кол> рабочих потоков"
-#: builtin/grep.c:866
+#: builtin/grep.c:888
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:869
+#: builtin/grep.c:891
msgid "show a line with the function name before matches"
msgstr "показать строку с именем функции перед совпадением"
-#: builtin/grep.c:871
+#: builtin/grep.c:893
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:874
+#: builtin/grep.c:896
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:876
+#: builtin/grep.c:898
msgid "match <pattern>"
msgstr "поиск соответствий с <шаблоном>"
-#: builtin/grep.c:878
+#: builtin/grep.c:900
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные с помощью -e"
-#: builtin/grep.c:890
+#: builtin/grep.c:912
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
-#: builtin/grep.c:892
+#: builtin/grep.c:914
msgid "show only matches from files that match all patterns"
msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
-#: builtin/grep.c:894
+#: builtin/grep.c:916
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора для выражения поиска"
-#: builtin/grep.c:898
+#: builtin/grep.c:920
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:898
+#: builtin/grep.c:920
msgid "show matching files in the pager"
msgstr "показать совпадающие файлы с помощью программы-пейджера"
-#: builtin/grep.c:902
+#: builtin/grep.c:924
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
-#: builtin/grep.c:966
+#: builtin/grep.c:988
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1002
+#: builtin/grep.c:1024
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
-#: builtin/grep.c:1009
+#: builtin/grep.c:1032
#, c-format
msgid "unable to resolve revision: %s"
msgstr "не удалось определить редакцию: %s"
-#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
+msgstr "нет поддержки потоков, игнорирование --threads"
+
+#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "указано неправильное количество потоков (%d)"
-#: builtin/grep.c:1049 builtin/pack-objects.c:3289
-msgid "no threads support, ignoring --threads"
-msgstr "нет поддержки потоков, игнорирование --threads"
-
-#: builtin/grep.c:1073
+#: builtin/grep.c:1092
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:1096
+#: builtin/grep.c:1115
msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1102
+#: builtin/grep.c:1121
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1108
+#: builtin/grep.c:1127
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1116
+#: builtin/grep.c:1135
msgid "both --cached and trees are given"
msgstr ""
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "type"
msgstr "тип"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "тип объекта"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "запись объекта в базу данных объектов"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "прочитать объект из стандартного ввода"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "сохранить файл без использования фильтров"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
+msgstr "хешировать любой мусор и создавать поврежденные объекты для отладки Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "обработать файл так, будто он находится по указанному пути"
@@ -10463,86 +12557,91 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "неопознанный формат руководства «%s»"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Сбой при запуске emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Сбой при определении версии emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "версия emacsclient «%d» слишком старая (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "сбой при запуске «%s»"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: неизвестная программа просмотра man."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "программа просмотра man не обработала запрос"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "программа просмотра info не обработала запрос"
-#: builtin/help.c:418
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» — это сокращение для «%s»"
-#: builtin/help.c:445 builtin/help.c:475
+#: builtin/help.c:448 git.c:364
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "использование: %s%s"
-#: builtin/help.c:459
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:184
#, c-format
msgid "object type mismatch at %s"
msgstr "несоответствие типа объекта на %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:204
#, c-format
msgid "did not receive expected object %s"
msgstr "ожидаемый объект не получен на %s"
-#: builtin/index-pack.c:231
+#: builtin/index-pack.c:207
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "объект %s: ожидаемый тип %s, получен %s"
-#: builtin/index-pack.c:273
+#: builtin/index-pack.c:257
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
@@ -10551,73 +12650,73 @@
msgstr[2] "не удалось заполнить %d байтов"
msgstr[3] "не удалось заполнить %d байтов"
-#: builtin/index-pack.c:283
+#: builtin/index-pack.c:267
msgid "early EOF"
msgstr "неожиданный конец файла"
-#: builtin/index-pack.c:284
+#: builtin/index-pack.c:268
msgid "read error on input"
msgstr "ошибка чтения ввода"
-#: builtin/index-pack.c:296
+#: builtin/index-pack.c:280
msgid "used more bytes than were available"
msgstr "использовано больше байт, чем было доступно"
-#: builtin/index-pack.c:303 builtin/pack-objects.c:590
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
msgid "pack too large for current definition of off_t"
msgstr "пакет слишком большой для текущего определения off_t"
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "размер пакета превышает максимальный допустимый"
-#: builtin/index-pack.c:321
+#: builtin/index-pack.c:305 builtin/repack.c:250
#, c-format
msgid "unable to create '%s'"
msgstr "не удалось создать «%s»"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:311
#, c-format
msgid "cannot open packfile '%s'"
msgstr "не удалось открыть файл пакета «%s»"
-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:325
msgid "pack signature mismatch"
msgstr "несоответствие подписи пакета"
-#: builtin/index-pack.c:343
+#: builtin/index-pack.c:327
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "версия пакета %<PRIu32> не поддерживается"
-#: builtin/index-pack.c:361
+#: builtin/index-pack.c:345
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
-#: builtin/index-pack.c:482
+#: builtin/index-pack.c:465
#, c-format
msgid "inflate returned %d"
msgstr "программа сжатия вернула %d"
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:514
msgid "offset value overflow for delta base object"
msgstr "переполнение значения смещения у базового объекта дельты"
-#: builtin/index-pack.c:539
+#: builtin/index-pack.c:522
msgid "delta base offset is out of bound"
msgstr "смещение базовой дельты вышло за допустимые пределы"
-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:530
#, c-format
msgid "unknown object type %d"
msgstr "неизвестный тип объекта %d"
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:561
msgid "cannot pread pack file"
msgstr "не удалось выполнить pread для файла пакета"
-#: builtin/index-pack.c:580
+#: builtin/index-pack.c:563
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -10626,93 +12725,88 @@
msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-#: builtin/index-pack.c:606
+#: builtin/index-pack.c:589
msgid "serious inflate inconsistency"
msgstr "серьезное несоответствие при распаковке"
-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
-#: builtin/index-pack.c:819 builtin/index-pack.c:828
+#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
+#: builtin/index-pack.c:802 builtin/index-pack.c:811
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
-#: builtin/index-pack.c:754 builtin/pack-objects.c:143
-#: builtin/pack-objects.c:203 builtin/pack-objects.c:297
+#: builtin/index-pack.c:737 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "не удалось прочитать %s"
-#: builtin/index-pack.c:817
+#: builtin/index-pack.c:800
#, c-format
msgid "cannot read existing object info %s"
msgstr "не удалось прочитать информацию существующего объекта %s"
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:808
#, c-format
msgid "cannot read existing object %s"
msgstr "не удалось прочитать существующий объект %s"
-#: builtin/index-pack.c:839
+#: builtin/index-pack.c:822
#, c-format
msgid "invalid blob object %s"
msgstr "неправильный файл двоичного объекта %s"
-#: builtin/index-pack.c:842 builtin/index-pack.c:861
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:858
-#, c-format
-msgid "invalid %s"
-msgstr "неправильный %s"
-
-#: builtin/index-pack.c:863
+#: builtin/index-pack.c:846
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Не все дочерние объекты %s достижимы"
-#: builtin/index-pack.c:935 builtin/index-pack.c:966
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
msgid "failed to apply delta"
msgstr "сбой при применении дельты"
-#: builtin/index-pack.c:1136
+#: builtin/index-pack.c:1117
msgid "Receiving objects"
msgstr "Получение объектов"
-#: builtin/index-pack.c:1136
+#: builtin/index-pack.c:1117
msgid "Indexing objects"
msgstr "Индексирование объектов"
-#: builtin/index-pack.c:1170
+#: builtin/index-pack.c:1151
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакет поврежден (несоответствие SHA1)"
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1156
msgid "cannot fstat packfile"
msgstr "не удалось выполнить fstat для файла пакета"
-#: builtin/index-pack.c:1178
+#: builtin/index-pack.c:1159
msgid "pack has junk at the end"
msgstr "файл пакета содержит мусор в конце"
-#: builtin/index-pack.c:1190
+#: builtin/index-pack.c:1171
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "безумная путаница в parse_pack_objects()"
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1194
msgid "Resolving deltas"
msgstr "Определение изменений"
-#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
#, c-format
msgid "unable to create thread: %s"
msgstr "не удалось создать поток: %s"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1245
msgid "confusion beyond insanity"
msgstr "безумная путаница"
-#: builtin/index-pack.c:1272
+#: builtin/index-pack.c:1251
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -10721,12 +12815,12 @@
msgstr[2] "завершено с %d локальными объектами"
msgstr[3] "завершено с %d локальными объектами"
-#: builtin/index-pack.c:1284
+#: builtin/index-pack.c:1263
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1267
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -10735,59 +12829,59 @@
msgstr[2] "пакет содержит %d неразрешенных дельт"
msgstr[3] "пакет содержит %d неразрешенных дельт"
-#: builtin/index-pack.c:1312
+#: builtin/index-pack.c:1291
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "нельзя сжать присоединенный объект (%d)"
-#: builtin/index-pack.c:1389
+#: builtin/index-pack.c:1368
#, c-format
msgid "local object %s is corrupt"
msgstr "локальный объект %s поврежден"
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1382
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "имя пакета «%s» не оканчивается на «.pack»"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1407
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1415
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1460
+#: builtin/index-pack.c:1439
msgid "error while closing pack file"
msgstr "ошибка при закрытии файла пакета"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1453
msgid "cannot store pack file"
msgstr "не удалось сохранить файл пакета"
-#: builtin/index-pack.c:1482
+#: builtin/index-pack.c:1461
msgid "cannot store index file"
msgstr "не удалось сохранить файл индекса"
-#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "плохой pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1573
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Не удалось открыть существующий файл пакета «%s»"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1575
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Не удалось открыть существующий файл индекса для «%s»"
-#: builtin/index-pack.c:1645
+#: builtin/index-pack.c:1623
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -10796,7 +12890,7 @@
msgstr[2] "не дельты: %d объектов"
msgstr[3] "не дельты: %d объектов"
-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1630
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -10805,37 +12899,32 @@
msgstr[2] "длина цепочки = %d: %lu объектов"
msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1667
msgid "Cannot come back to cwd"
msgstr "Не удалось вернуться в текущий рабочий каталог"
-#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
-#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
+#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
#, c-format
msgid "bad %s"
msgstr "плохой %s"
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1755
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin нельзя использовать без --stdin"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1757
msgid "--stdin requires a git repository"
msgstr "опция --stdin требует наличия репозитория git"
-#: builtin/index-pack.c:1787
+#: builtin/index-pack.c:1763
msgid "--verify with no packfile name given"
msgstr "--verify без указания имени файла пакета"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "не удалось выполнить stat для «%s»"
-
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
@@ -10876,73 +12965,73 @@
msgid "not copying templates from '%s': %s"
msgstr "не копирую шаблоны из «%s»: %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "не удается обработать файл типа %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "не удается переместить файл %s в %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s уже существует"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Инициализирован пустой репозиторий Git в %s%s\n"
-#: builtin/init-db.c:459
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
-#: builtin/init-db.c:482
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "права-доступа"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
-#: builtin/init-db.c:517 builtin/init-db.c:522
+#: builtin/init-db.c:526 builtin/init-db.c:531
#, c-format
msgid "cannot mkdir %s"
msgstr "не удалось выполнить mkdir %s"
-#: builtin/init-db.c:526
+#: builtin/init-db.c:535
#, c-format
msgid "cannot chdir to %s"
msgstr "не удалось выполнить chdir в %s"
-#: builtin/init-db.c:547
+#: builtin/init-db.c:556
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)"
-#: builtin/init-db.c:575
+#: builtin/init-db.c:584
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
@@ -10953,505 +13042,555 @@
"<token>[(=|:)<value>])...] [<file>...]"
msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
-#: builtin/interpret-trailers.c:92
+#: builtin/interpret-trailers.c:94
msgid "edit files in place"
msgstr "редактировать файлы на месте"
-#: builtin/interpret-trailers.c:93
+#: builtin/interpret-trailers.c:95
msgid "trim empty trailers"
msgstr "удалять пустые завершители"
-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c:98
msgid "where to place the new trailer"
msgstr "где поместить новый завершитель"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100
msgid "action if trailer already exists"
msgstr "действие, если завершитель уже существует"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102
msgid "action if trailer is missing"
msgstr "действие, если завершитель не существует"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:104
msgid "output only the trailers"
msgstr "вывести только завершители"
-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c:105
msgid "do not apply config rules"
msgstr "не применять правила из файла конфигурации"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:106
msgid "join whitespace-continued values"
msgstr "объединить значения разделенные пробелом"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:107
msgid "set parsing options"
msgstr "указание опций разбора"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
msgid "trailer"
msgstr "завершитель"
-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c:111
msgid "trailer(s) to add"
msgstr "завершители для добавления"
-#: builtin/interpret-trailers.c:117
+#: builtin/interpret-trailers.c:120
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer одновременно с --only-input не имеет смысла"
-#: builtin/interpret-trailers.c:127
+#: builtin/interpret-trailers.c:130
msgid "no input file given for in-place editing"
msgstr "ничего не передано, для редактирования файлов на месте"
-#: builtin/log.c:51
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/log.c:52
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<опции>] <объект>…"
-#: builtin/log.c:96
+#: builtin/log.c:104
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправильный параметр для --decorate: %s"
-#: builtin/log.c:157
-msgid "suppress diff output"
-msgstr "не выводить различия"
-
-#: builtin/log.c:158
+#: builtin/log.c:168
msgid "show source"
msgstr "показать источник"
-#: builtin/log.c:159
+#: builtin/log.c:169
msgid "Use mail map file"
msgstr "Использовать файл соответствия почтовых адресов"
-#: builtin/log.c:161
+#: builtin/log.c:171
msgid "only decorate refs that match <pattern>"
msgstr "декорировать только ссылки соответствующие <шаблону>"
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "do not decorate refs that match <pattern>"
msgstr "не декорировать ссылки соответствующие <шаблону>"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "decorate options"
msgstr "опции формата вывода ссылок"
-#: builtin/log.c:167
+#: builtin/log.c:177
msgid "Process line range n,m in file, counting from 1"
msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
-#: builtin/log.c:265
+#: builtin/log.c:275
#, c-format
msgid "Final output: %d %s\n"
msgstr "Финальный вывод: %d %s\n"
-#: builtin/log.c:516
+#: builtin/log.c:529
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: плохой файл"
-#: builtin/log.c:531 builtin/log.c:625
+#: builtin/log.c:544 builtin/log.c:638
#, c-format
-msgid "Could not read object %s"
-msgstr "Не удалось прочитать объект %s"
+msgid "could not read object %s"
+msgstr ""
-#: builtin/log.c:649
+#: builtin/log.c:663
#, c-format
-msgid "Unknown type: %d"
-msgstr "Неизвестный тип объекта: %d"
+msgid "unknown type: %d"
+msgstr ""
-#: builtin/log.c:770
+#: builtin/log.c:784
msgid "format.headers without value"
msgstr "в format.headers не указано значение"
-#: builtin/log.c:871
+#: builtin/log.c:885
msgid "name of output directory is too long"
msgstr "слишком длинное имя выходного каталога"
-#: builtin/log.c:887
+#: builtin/log.c:901
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Ну удалось открыть файл изменений %s"
+msgid "cannot open patch file %s"
+msgstr ""
-#: builtin/log.c:904
-msgid "Need exactly one range."
-msgstr "Нужен только один диапазон."
+#: builtin/log.c:918
+msgid "need exactly one range"
+msgstr ""
-#: builtin/log.c:914
-msgid "Not a range."
-msgstr "Не является диапазоном."
+#: builtin/log.c:928
+msgid "not a range"
+msgstr ""
-#: builtin/log.c:1020
-msgid "Cover letter needs email format"
-msgstr "Сопроводительное письмо должно быть в формате электронной почты"
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
+msgstr ""
-#: builtin/log.c:1101
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1136
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1128
+#: builtin/log.c:1163
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
-#: builtin/log.c:1178
-msgid "Two output directories?"
-msgstr "Два выходных каталога?"
+#: builtin/log.c:1221
+msgid "two output directories?"
+msgstr ""
-#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
#, c-format
-msgid "Unknown commit %s"
-msgstr "Неизвестный коммит %s"
+msgid "unknown commit %s"
+msgstr ""
-#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
+#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Не удалось разрешить «%s» как ссылку."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
-#: builtin/log.c:1300
-msgid "Could not find exact merge base."
-msgstr "Не удалось найти точную базу слияния."
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
+msgstr ""
-#: builtin/log.c:1304
+#: builtin/log.c:1351
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
-"Or you could specify base commit by --base=<base-commit-id> manually."
-msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
-#: builtin/log.c:1324
-msgid "Failed to find exact merge base"
-msgstr "Не удалось найти точную базу слияния"
+#: builtin/log.c:1371
+msgid "failed to find exact merge base"
+msgstr ""
-#: builtin/log.c:1335
+#: builtin/log.c:1382
msgid "base commit should be the ancestor of revision list"
msgstr "базовый коммит должен быть предком списка редакций"
-#: builtin/log.c:1339
+#: builtin/log.c:1386
msgid "base commit shouldn't be in revision list"
msgstr "базовый коммит не должен быть в списке редакций"
-#: builtin/log.c:1392
+#: builtin/log.c:1439
msgid "cannot get patch id"
msgstr "не удалось получить идентификатор патча"
-#: builtin/log.c:1452
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1536
msgid "use [PATCH n/m] even with a single patch"
msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/log.c:1455
+#: builtin/log.c:1539
msgid "use [PATCH] even with multiple patches"
msgstr "выводить [PATCH] даже когда несколько патчей"
-#: builtin/log.c:1459
+#: builtin/log.c:1543
msgid "print patches to standard out"
msgstr "выводить патчи на стандартный вывод"
-#: builtin/log.c:1461
+#: builtin/log.c:1545
msgid "generate a cover letter"
msgstr "создать сопроводительное письмо"
-#: builtin/log.c:1463
+#: builtin/log.c:1547
msgid "use simple number sequence for output file names"
msgstr "использовать простую последовательность чисел для имен выходных файлов"
-#: builtin/log.c:1464
+#: builtin/log.c:1548
msgid "sfx"
msgstr "суффикс"
-#: builtin/log.c:1465
+#: builtin/log.c:1549
msgid "use <sfx> instead of '.patch'"
msgstr "использовать суффикс <суффикс> вместо «.patch»"
-#: builtin/log.c:1467
+#: builtin/log.c:1551
msgid "start numbering patches at <n> instead of 1"
msgstr "начать нумерацию патчей с <n>, а не с 1"
-#: builtin/log.c:1469
+#: builtin/log.c:1553
msgid "mark the series as Nth re-roll"
msgstr "пометить серию как энную попытку"
-#: builtin/log.c:1471
+#: builtin/log.c:1555
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Использовать [RFC PATCH] вместо [PATCH]"
-#: builtin/log.c:1474
+#: builtin/log.c:1558
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Использовать [<префикс>] вместо [PATCH]"
-#: builtin/log.c:1477
+#: builtin/log.c:1561
msgid "store resulting files in <dir>"
msgstr "сохранить результирующие файлы в <каталог>"
-#: builtin/log.c:1480
+#: builtin/log.c:1564
msgid "don't strip/add [PATCH]"
msgstr "не обрезать/добавлять [PATCH]"
-#: builtin/log.c:1483
+#: builtin/log.c:1567
msgid "don't output binary diffs"
-msgstr "не выводить двоичные различия"
+msgstr "не выводить двоичные изменения"
-#: builtin/log.c:1485
+#: builtin/log.c:1569
msgid "output all-zero hash in From header"
-msgstr "выводить нулевую хэш-сумму в заголовке From"
+msgstr "выводить нулевую хеш-сумму в заголовке From"
-#: builtin/log.c:1487
+#: builtin/log.c:1571
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
-#: builtin/log.c:1489
+#: builtin/log.c:1573
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
-#: builtin/log.c:1491
+#: builtin/log.c:1575
msgid "Messaging"
msgstr "Передача сообщений"
-#: builtin/log.c:1492
+#: builtin/log.c:1576
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1493
+#: builtin/log.c:1577
msgid "add email header"
msgstr "добавить заголовок сообщения"
-#: builtin/log.c:1494 builtin/log.c:1496
+#: builtin/log.c:1578 builtin/log.c:1580
msgid "email"
msgstr "почта"
-#: builtin/log.c:1494
+#: builtin/log.c:1578
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1496
+#: builtin/log.c:1580
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1498
+#: builtin/log.c:1582
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1499
+#: builtin/log.c:1583
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
-#: builtin/log.c:1501
+#: builtin/log.c:1585
msgid "message-id"
msgstr "идентификатор-сообщения"
-#: builtin/log.c:1502
+#: builtin/log.c:1586
msgid "make first mail a reply to <message-id>"
msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
-#: builtin/log.c:1503 builtin/log.c:1506
+#: builtin/log.c:1587 builtin/log.c:1590
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1504
+#: builtin/log.c:1588
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1507
+#: builtin/log.c:1591
msgid "inline the patch"
msgstr "включить патч в текст письма"
-#: builtin/log.c:1511
+#: builtin/log.c:1595
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
-#: builtin/log.c:1513
+#: builtin/log.c:1597
msgid "signature"
msgstr "подпись"
-#: builtin/log.c:1514
+#: builtin/log.c:1598
msgid "add a signature"
msgstr "добавить подпись"
-#: builtin/log.c:1515
+#: builtin/log.c:1599
msgid "base-commit"
msgstr "базовый коммит"
-#: builtin/log.c:1516
+#: builtin/log.c:1600
msgid "add prerequisite tree info to the patch series"
msgstr "добавить информацию о требовании дерева к серии патчей"
-#: builtin/log.c:1518
+#: builtin/log.c:1602
msgid "add a signature from a file"
msgstr "добавить подпись из файла"
-#: builtin/log.c:1519
+#: builtin/log.c:1603
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1521
+#: builtin/log.c:1605
msgid "show progress while generating patches"
msgstr "показать прогресс выполнения во создания патчей"
-#: builtin/log.c:1596
+#: builtin/log.c:1606
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1687
#, c-format
msgid "invalid ident line: %s"
msgstr "неправильная строка идентификации: %s"
-#: builtin/log.c:1611
+#: builtin/log.c:1702
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1613
+#: builtin/log.c:1704
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1621
+#: builtin/log.c:1712
msgid "--name-only does not make sense"
msgstr "--name-only не имеет смысла"
-#: builtin/log.c:1623
+#: builtin/log.c:1714
msgid "--name-status does not make sense"
msgstr "--name-status не имеет смысла"
-#: builtin/log.c:1625
+#: builtin/log.c:1716
msgid "--check does not make sense"
msgstr "--check не имеет смысла"
-#: builtin/log.c:1657
+#: builtin/log.c:1748
msgid "standard output, or directory, which one?"
msgstr "стандартный вывод или каталог?"
-#: builtin/log.c:1659
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Не удалось создать каталог «%s»"
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
-#: builtin/log.c:1752
+#: builtin/log.c:1841
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1842
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1860
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1861
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1872
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалось прочитать файл подписи «%s»"
-#: builtin/log.c:1785
+#: builtin/log.c:1908
msgid "Generating patches"
msgstr "Создание патчей"
-#: builtin/log.c:1829
-msgid "Failed to create output files"
-msgstr "Сбой при создании выходных файлов"
+#: builtin/log.c:1952
+msgid "failed to create output files"
+msgstr ""
-#: builtin/log.c:1880
+#: builtin/log.c:2011
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]"
+msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]"
-#: builtin/log.c:1934
+#: builtin/log.c:2065
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
"manually.\n"
msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<опции>] [<файл>…]"
-#: builtin/ls-files.c:518
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "выводить имена файлов с метками"
-#: builtin/ls-files.c:520
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов"
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "показывать кэшированные файлы при выводе (по умолчанию)"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "показывать удаленные файлы при выводе"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "показывать измененные файлы при выводе"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "показывать другие файлы при выводе"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "показывать игнорируемые файлы при выводе"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "показывать имя индексированного объекта на выводе"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "показывать файлы в файловой системе, которые должны быть удалены"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "показывать только имена у «других» каталогов"
-#: builtin/ls-files.c:541
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "показать концы строк файлов"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "не показывать пустые каталоги"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "показывать не слитые файлы на выводе"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "показывать информации о разрешении конфликтов и отмене"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "пропустить файлы, соответствующие шаблону"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "прочитать шаблоны исключения из <файл>"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "добавить стандартные исключения git"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "выводить пути относительно корневого каталога проекта"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "если какой-либо <файл> не в индексе, считать это ошибкой"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "указатель-дерева"
-#: builtin/ls-files.c:568
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "показать отладочную информацию"
@@ -11466,7 +13605,7 @@
msgid "do not print remote URL"
msgstr "не выводить URL внешних репозиториев"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
msgid "exec"
msgstr "запуск"
@@ -11490,11 +13629,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr "учитывать url.<база>.insteadOf"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "выходить с кодом 2, если соответствующие ссылки не найдены"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "показать также внутреннюю ссылку в дополнение к объекту, на который она указывает"
@@ -11539,409 +13678,402 @@
msgid "empty mbox: '%s'"
msgstr "пустой mbox: «%s»"
-#: builtin/merge.c:51
+#: builtin/merge.c:54
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<опции>] [<коммит>…]"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:110
+#: builtin/merge.c:116
msgid "switch `m' requires a value"
msgstr "при указании параметра «m» требуется указать значение"
-#: builtin/merge.c:176
+#: builtin/merge.c:139
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:185
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Не удалось найти стратегию слияния «%s».\n"
-#: builtin/merge.c:177
+#: builtin/merge.c:186
#, c-format
msgid "Available strategies are:"
msgstr "Доступные стратегии:"
-#: builtin/merge.c:182
+#: builtin/merge.c:191
#, c-format
msgid "Available custom strategies are:"
msgstr "Доступные пользовательские стратегии:"
-#: builtin/merge.c:232 builtin/pull.c:142
+#: builtin/merge.c:242 builtin/pull.c:150
msgid "do not show a diffstat at the end of the merge"
msgstr "не выводить статистику изменений после окончания слияния"
-#: builtin/merge.c:235 builtin/pull.c:145
+#: builtin/merge.c:245 builtin/pull.c:153
msgid "show a diffstat at the end of the merge"
msgstr "вывести статистику изменений после окончания слияния"
-#: builtin/merge.c:236 builtin/pull.c:148
+#: builtin/merge.c:246 builtin/pull.c:156
msgid "(synonym to --stat)"
msgstr "(синоним для --stat)"
-#: builtin/merge.c:238 builtin/pull.c:151
+#: builtin/merge.c:248 builtin/pull.c:159
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
-#: builtin/merge.c:241 builtin/pull.c:157
+#: builtin/merge.c:251 builtin/pull.c:165
msgid "create a single commit instead of doing a merge"
msgstr "создать один коммит, вместо выполнения слияния"
-#: builtin/merge.c:243 builtin/pull.c:160
+#: builtin/merge.c:253 builtin/pull.c:168
msgid "perform a commit if the merge succeeds (default)"
msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
-#: builtin/merge.c:245 builtin/pull.c:163
+#: builtin/merge.c:255 builtin/pull.c:171
msgid "edit message before committing"
msgstr "отредактировать сообщение перед выполнением коммита"
-#: builtin/merge.c:246
+#: builtin/merge.c:257
msgid "allow fast-forward (default)"
msgstr "разрешить перемотку вперед (по умолчанию)"
-#: builtin/merge.c:248 builtin/pull.c:169
+#: builtin/merge.c:259 builtin/pull.c:178
msgid "abort if fast-forward is not possible"
msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
-#: builtin/merge.c:252 builtin/pull.c:172
+#: builtin/merge.c:263 builtin/pull.c:181
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
-#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
-#: builtin/revert.c:110
+#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
+#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
msgid "strategy"
msgstr "стратегия"
-#: builtin/merge.c:254 builtin/pull.c:177
+#: builtin/merge.c:265 builtin/pull.c:186
msgid "merge strategy to use"
msgstr "используемая стратегия слияния"
-#: builtin/merge.c:255 builtin/pull.c:180
+#: builtin/merge.c:266 builtin/pull.c:189
msgid "option=value"
msgstr "опция=значение"
-#: builtin/merge.c:256 builtin/pull.c:181
+#: builtin/merge.c:267 builtin/pull.c:190
msgid "option for selected merge strategy"
msgstr "опции для выбранной стратегии слияния"
-#: builtin/merge.c:258
+#: builtin/merge.c:269
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
-#: builtin/merge.c:265
+#: builtin/merge.c:276
msgid "abort the current in-progress merge"
msgstr "отменить выполнение происходящего слияния"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "continue the current in-progress merge"
msgstr "продолжить выполнение происходящего слияния"
-#: builtin/merge.c:269 builtin/pull.c:188
+#: builtin/merge.c:280 builtin/pull.c:197
msgid "allow merging unrelated histories"
msgstr "разрешить слияние несвязанных историй изменений"
-#: builtin/merge.c:275
+#: builtin/merge.c:286
msgid "verify commit-msg hook"
msgstr "проверить перехватчик commit-msg"
-#: builtin/merge.c:300
+#: builtin/merge.c:311
msgid "could not run stash."
msgstr "не удалось выполнить stash."
-#: builtin/merge.c:305
+#: builtin/merge.c:316
msgid "stash failed"
msgstr "сбой при выполнении stash"
-#: builtin/merge.c:310
+#: builtin/merge.c:321
#, c-format
msgid "not a valid object: %s"
msgstr "неправильный объект: %s"
-#: builtin/merge.c:332 builtin/merge.c:349
+#: builtin/merge.c:343 builtin/merge.c:360
msgid "read-tree failed"
msgstr "сбой при выполнении read-tree"
-#: builtin/merge.c:379
+#: builtin/merge.c:390
msgid " (nothing to squash)"
msgstr " (нечего уплотнять)"
-#: builtin/merge.c:390
+#: builtin/merge.c:401
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Уплотнение коммита — не обновляя HEAD\n"
-#: builtin/merge.c:440
+#: builtin/merge.c:451
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Нет сообщения слияния — не обновляем HEAD\n"
-#: builtin/merge.c:491
+#: builtin/merge.c:502
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» не указывает на коммит"
-#: builtin/merge.c:578
+#: builtin/merge.c:589
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправильная строка branch.%s.mergeoptions: %s"
-#: builtin/merge.c:699
+#: builtin/merge.c:712
msgid "Not handling anything other than two heads merge."
msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/merge.c:713
+#: builtin/merge.c:726
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Неизвестный параметр merge-recursive: -X%s"
-#: builtin/merge.c:728
+#: builtin/merge.c:741
#, c-format
msgid "unable to write %s"
msgstr "не удалось записать %s"
-#: builtin/merge.c:779
+#: builtin/merge.c:793
#, c-format
msgid "Could not read from '%s'"
msgstr "Не удалось прочесть из «%s»"
-#: builtin/merge.c:788
+#: builtin/merge.c:802
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
-#: builtin/merge.c:794
-#, c-format
+#: builtin/merge.c:808
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:813
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:816
+#, c-format
+msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
-msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n"
+msgstr ""
-#: builtin/merge.c:830
+#: builtin/merge.c:857
msgid "Empty commit message."
msgstr "Пустое сообщение коммита."
-#: builtin/merge.c:849
+#: builtin/merge.c:876
#, c-format
msgid "Wonderful.\n"
msgstr "Прекрасно.\n"
-#: builtin/merge.c:902
+#: builtin/merge.c:936
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
-#: builtin/merge.c:941
+#: builtin/merge.c:975
msgid "No current branch."
msgstr "Нет текущей ветки."
-#: builtin/merge.c:943
+#: builtin/merge.c:977
msgid "No remote for the current branch."
msgstr "У текущей ветки нет внешнего репозитория."
-#: builtin/merge.c:945
+#: builtin/merge.c:979
msgid "No default upstream defined for the current branch."
msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
-#: builtin/merge.c:950
+#: builtin/merge.c:984
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
-#: builtin/merge.c:1007
+#: builtin/merge.c:1041
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Плохое значение «%s» в переменной окружения «%s»"
-#: builtin/merge.c:1110
+#: builtin/merge.c:1144
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не является тем, что можно слить в %s: %s"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1178
msgid "not something we can merge"
msgstr "не является тем, что можно слить"
-#: builtin/merge.c:1247
+#: builtin/merge.c:1281
msgid "--abort expects no arguments"
msgstr "опция --abort не принимает аргументы"
-#: builtin/merge.c:1251
+#: builtin/merge.c:1285
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
-#: builtin/merge.c:1263
+#: builtin/merge.c:1297
msgid "--continue expects no arguments"
msgstr "опция --continue не принимает аргументы"
-#: builtin/merge.c:1267
+#: builtin/merge.c:1301
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием."
-#: builtin/merge.c:1290
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1327
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1302
+#: builtin/merge.c:1341
msgid "You cannot combine --squash with --no-ff."
msgstr "Нельзя использовать одновременно --squash и --no-ff."
-#: builtin/merge.c:1310
+#: builtin/merge.c:1349
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1366
msgid "Squash commit into empty head not supported yet"
msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
-#: builtin/merge.c:1329
+#: builtin/merge.c:1368
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
-#: builtin/merge.c:1334
+#: builtin/merge.c:1373
#, c-format
msgid "%s - not something we can merge"
msgstr "%s не является тем, что можно слить"
-#: builtin/merge.c:1336
+#: builtin/merge.c:1375
msgid "Can merge only exactly one commit into empty head"
msgstr "Можно только один коммит в пустую ветку."
-#: builtin/merge.c:1370
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
-
-#: builtin/merge.c:1373
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
-
-#: builtin/merge.c:1376
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Коммит %s не содержит GPG подпись."
-
-#: builtin/merge.c:1379
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
-
-#: builtin/merge.c:1438
+#: builtin/merge.c:1454
msgid "refusing to merge unrelated histories"
msgstr "отказ слияния несвязанных историй изменений"
-#: builtin/merge.c:1447
+#: builtin/merge.c:1463
msgid "Already up to date."
msgstr "Уже обновлено."
-#: builtin/merge.c:1457
+#: builtin/merge.c:1473
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновление %s..%s\n"
-#: builtin/merge.c:1498
+#: builtin/merge.c:1515
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Попытка тривиального слияния в индексе…\n"
-#: builtin/merge.c:1505
+#: builtin/merge.c:1522
#, c-format
msgid "Nope.\n"
msgstr "Не вышло.\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1547
msgid "Already up to date. Yeeah!"
msgstr "Уже обновлено. Круто!"
-#: builtin/merge.c:1536
+#: builtin/merge.c:1553
msgid "Not possible to fast-forward, aborting."
msgstr "Перемотка вперед невозможна, отмена."
-#: builtin/merge.c:1559 builtin/merge.c:1638
+#: builtin/merge.c:1576 builtin/merge.c:1655
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Перемотка дерева к исходному состоянию…\n"
-#: builtin/merge.c:1563
+#: builtin/merge.c:1580
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Попытка слияния с помощью стратегии %s…\n"
-#: builtin/merge.c:1629
+#: builtin/merge.c:1646
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ни одна стратегия слияния не обработала слияние.\n"
-#: builtin/merge.c:1631
+#: builtin/merge.c:1648
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Сбой при слиянии с помощью стратегии %s.\n"
-#: builtin/merge.c:1640
+#: builtin/merge.c:1657
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
-#: builtin/merge.c:1652
+#: builtin/merge.c:1669
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <коммит>…"
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <коммит>…"
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <коммит> <коммит>"
-#: builtin/merge-base.c:35
+#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:153
msgid "output all common ancestors"
msgstr "вывести всех общих предков"
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:155
msgid "find ancestors for a single n-way merge"
msgstr "вывести предков для одного многоходового слияния"
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:157
msgid "list revs not reachable from others"
msgstr "вывести список редаций, которые не достижимы из друг друга"
-#: builtin/merge-base.c:227
+#: builtin/merge-base.c:159
msgid "is the first one ancestor of the other?"
msgstr "является первым предком второго указанного коммита?"
-#: builtin/merge-base.c:229
+#: builtin/merge-base.c:161
msgid "find where <commit> forked from reflog of <ref>"
msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
@@ -11951,49 +14083,49 @@
"<orig-file> <file2>"
msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr "вывести результат на стандартный вывод"
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr "использовать diff3 слияние"
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr "при возникновении конфликтов, использовать нашу версию"
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr "при возникновении конфликтов, использовать их версию"
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr "при возникновении конфликтов, использовать обе версии"
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr "при возникновении конфликтов, использовать этот размер маркера"
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr "не предупреждать о конфликтах"
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr "установить метки для файл1/ориг-файл/файл2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "неизвестная опция %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "не удалось разобрать объект «%s»"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
@@ -12002,16 +14134,16 @@
msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "не удалось распознать ссылку «%s»"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Слияние %s и %s\n"
@@ -12024,7 +14156,7 @@
msgid "input is NUL terminated"
msgstr "ввод отделённый НУЛЕВЫМИ символами"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "допустить отсутствие объектов"
@@ -12032,94 +14164,111 @@
msgid "allow creation of more than one tree"
msgstr "допустить создание более одного дерева"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:51
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<опции>] <источник>… <назначение>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Каталог %s в индексе и не является подмодулем?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s в индесе"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "принудительно перемещать/переименовать, даже если цель существует"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "пропускать ошибки при перемещении/переименовании"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целевой путь «%s» не является каталогом"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка переименования из «%s» в «%s»\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "плохой источник"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "нельзя переместить каталог в самого себя"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "нельзя переместить каталог в файл"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "исходный каталог пуст"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "не под версионным контролем"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "целевой путь уже существует"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "перезапись «%s»"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Не удалось перезаписать"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "несколько источников для одного целевого пути"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "целевой каталог не существует"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, откуда=%s, куда=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Переименование %s в %s\n"
-#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
#, c-format
msgid "renaming '%s' failed"
msgstr "сбой при переименовании «%s»"
@@ -12136,35 +14285,35 @@
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<опции>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:415
msgid "print only names (no SHA-1)"
msgstr "выводить только имена (без SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:416
msgid "only use tags to name the commits"
msgstr "использовать только метки для именования коммитов"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:418
msgid "only use refs matching <pattern>"
msgstr "использовать только ссылки, соответствующие <шаблону> "
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:420
msgid "ignore refs matching <pattern>"
msgstr "игнорировать ссылки, соответствующие <шаблону>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:422
msgid "list all commits reachable from all refs"
msgstr "вывести список всех коммитов, достижимых со всех ссылок"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:423
msgid "read from stdin"
msgstr "прочитать из стандартного ввода"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:424
msgid "allow to print `undefined` names (default)"
msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:430
msgid "dereference tags in the input (internal use)"
msgstr "разыменовывать введенные метки (для внутреннего использования)"
@@ -12304,224 +14453,219 @@
msgid "the note contents have been left in %s"
msgstr "содержимое заметки осталось в %s"
-#: builtin/notes.c:236 builtin/tag.c:508
-#, c-format
-msgid "cannot read '%s'"
-msgstr "не удалось прочитать «%s»"
-
-#: builtin/notes.c:238 builtin/tag.c:511
+#: builtin/notes.c:242 builtin/tag.c:522
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалось открыть или прочитать «%s»"
-#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
-#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
-#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не удалось разрешить «%s» как ссылку."
-#: builtin/notes.c:260
+#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr "не удалось прочитать объект «%s»."
-#: builtin/notes.c:264
+#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
-#: builtin/notes.c:304
+#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr "неправильная введенная строка: «%s»."
-#: builtin/notes.c:319
+#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "не удалось скопировать заметку из «%s» в «%s»"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:351
+#: builtin/notes.c:356
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)"
-#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
-#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
-#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975
+#: 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:384 builtin/notes.c:670
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "не найдена заметка для объекта %s."
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "текстовое содержимое заметки"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "содержимое заметки в файле"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "использовать и отредактировать указанный объект заметки"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "использовать указанный объект заметки"
-#: builtin/notes.c:417 builtin/notes.c:580
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "разрешить сохранение пустой заметки"
-#: builtin/notes.c:418 builtin/notes.c:489
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "заменить существующие заметки"
-#: builtin/notes.c:443
+#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:458 builtin/notes.c:537
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Перезапись существующих заметок у объекта %s\n"
-#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Удаление заметки у объекта %s\n"
-#: builtin/notes.c:490
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "прочитать объекты из стандартного ввода"
-#: builtin/notes.c:492
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
-#: builtin/notes.c:510
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "передано слишком мало параметров"
-#: builtin/notes.c:531
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
" existing notes"
msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:543
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "нет заметок у исходного объекта %s. Нельзя скопировать."
-#: builtin/notes.c:595
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n"
-#: builtin/notes.c:690
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:692
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
-#: builtin/notes.c:694
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "не удалось удалить рабочий каталог «git notes merge»"
-#: builtin/notes.c:714
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:716
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:718
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:731
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не удалось разрешить NOTES_MERGE_REF"
-#: builtin/notes.c:734
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "не удалось завершить слиние заметок"
-#: builtin/notes.c:760
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "неизвестная стратегия слияния заметок %s"
-#: builtin/notes.c:776
+#: builtin/notes.c:784
msgid "General options"
msgstr "Общие опции"
-#: builtin/notes.c:778
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Опции слияния"
-#: builtin/notes.c:780
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy "
"(manual/ours/theirs/union/cat_sort_uniq)"
msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:782
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Коммит не слитых заметок"
-#: builtin/notes.c:784
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "завершить слияние заметок коммитом не слитых заметок"
-#: builtin/notes.c:786
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Отмена разрешения слияния заметок"
-#: builtin/notes.c:788
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "отменить слияние заметок"
-#: builtin/notes.c:799
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
-#: builtin/notes.c:804
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "вы должны указать ссылку заметки для слияния"
-#: builtin/notes.c:828
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестный параметр для -s/--strategy: %s"
-#: builtin/notes.c:865
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "слияние заметок в %s уже выполняется на %s"
-#: builtin/notes.c:868
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
-#: builtin/notes.c:870
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
@@ -12529,418 +14673,431 @@
"--abort'.\n"
msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
-#: builtin/notes.c:892
+#: builtin/notes.c:897 builtin/tag.c:535
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Не удалось разрешить «%s» как ссылку."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "У объекта %s нет заметки\n"
-#: builtin/notes.c:904
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "попытка удаления несуществующей заметки не является ошибкой"
-#: builtin/notes.c:907
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "прочитать имена объектов из стандартного ввода"
-#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "не удалять, только показать список"
-#: builtin/notes.c:946
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "вывести список удаленных заметок"
-#: builtin/notes.c:988
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "ссылка-на-заметку"
-#: builtin/notes.c:989
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "использовать заметку из <ссылка-на-заметку>"
-#: builtin/notes.c:1024
+#: builtin/notes.c:1034 builtin/stash.c:1611
#, c-format
msgid "unknown subcommand: %s"
msgstr "неизвестная подкоманда: %s"
-#: builtin/pack-objects.c:48
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:49
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:414
+#: builtin/pack-objects.c:424
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:425
+#: builtin/pack-objects.c:435
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:556
+#: builtin/pack-objects.c:566
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:756
+#: builtin/pack-objects.c:777
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:769
+#: builtin/pack-objects.c:790
#, c-format
msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/pack-objects.c:773
+#: builtin/pack-objects.c:794
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:798
msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:809
msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/pack-objects.c:816
+#: builtin/pack-objects.c:837
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
-#: builtin/pack-objects.c:829
+#: builtin/pack-objects.c:850
msgid "Writing objects"
msgstr "Запись объектов"
-#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "не удалось выполнить stat %s"
-#: builtin/pack-objects.c:944
+#: builtin/pack-objects.c:965
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1112
+#: builtin/pack-objects.c:1161
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
-#: builtin/pack-objects.c:1489
+#: builtin/pack-objects.c:1589
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1498
+#: builtin/pack-objects.c:1598
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:1771
+#: builtin/pack-objects.c:1867
msgid "Counting objects"
msgstr "Подсчет объектов"
-#: builtin/pack-objects.c:1913
+#: builtin/pack-objects.c:1997
#, c-format
msgid "unable to get size of %s"
msgstr "не удалось получить размер %s"
-#: builtin/pack-objects.c:1928
+#: builtin/pack-objects.c:2012
#, c-format
msgid "unable to parse object header of %s"
msgstr "не удалось разобрать заголовок объекта %s"
-#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
-#: builtin/pack-objects.c:2021
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
+#: builtin/pack-objects.c:2108
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
#, c-format
-msgid "object %s inconsistent object length (%lu vs %lu)"
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2035
+#: builtin/pack-objects.c:2122
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2369
+#: builtin/pack-objects.c:2448
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "При сжатии изменений используется до %d потоков"
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2580
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2589
+#: builtin/pack-objects.c:2667
msgid "Compressing objects"
msgstr "Сжатие объектов"
-#: builtin/pack-objects.c:2595
+#: builtin/pack-objects.c:2673
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2674
+#: builtin/pack-objects.c:2754
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2680
+#: builtin/pack-objects.c:2760
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2858
msgid "invalid value for --missing"
msgstr "недопустимое значение для --missing"
-#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2948
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:2935
+#: builtin/pack-objects.c:3033
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3022
+#: builtin/pack-objects.c:3125
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:3128
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3045
+#: builtin/pack-objects.c:3153
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3095
+#: builtin/pack-objects.c:3206
#, c-format
msgid "unsupported index version %s"
msgstr "неподдерживаемая версия индекса %s"
-#: builtin/pack-objects.c:3099
+#: builtin/pack-objects.c:3210
#, c-format
msgid "bad index version '%s'"
msgstr "плохая версия индекса «%s»"
-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3240
msgid "do not show progress meter"
msgstr "не выводить прогресс выполнения"
-#: builtin/pack-objects.c:3132
+#: builtin/pack-objects.c:3242
msgid "show progress meter"
msgstr "показать прогресс выполнения"
-#: builtin/pack-objects.c:3134
+#: builtin/pack-objects.c:3244
msgid "show progress meter during object writing phase"
msgstr "показать прогресс выполнения во время записи объектов"
-#: builtin/pack-objects.c:3137
+#: builtin/pack-objects.c:3247
msgid "similar to --all-progress when progress meter is shown"
msgstr "похоже на --all-progress при включенном прогрессе выполнения"
-#: builtin/pack-objects.c:3138
+#: builtin/pack-objects.c:3248
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3139
+#: builtin/pack-objects.c:3249
msgid "write the pack index file in the specified idx format version"
msgstr "записать файл индекса пакета в указанной версии формата"
-#: builtin/pack-objects.c:3142
+#: builtin/pack-objects.c:3252
msgid "maximum size of each output pack file"
msgstr "максимальный размер каждого выходного файла пакета"
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3254
msgid "ignore borrowed objects from alternate object store"
msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
-#: builtin/pack-objects.c:3146
+#: builtin/pack-objects.c:3256
msgid "ignore packed objects"
msgstr "игнорировать упакованные объекты"
-#: builtin/pack-objects.c:3148
+#: builtin/pack-objects.c:3258
msgid "limit pack window by objects"
msgstr "ограничить окно пакета по количеству объектов"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3260
msgid "limit pack window by memory in addition to object limit"
msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
-#: builtin/pack-objects.c:3152
+#: builtin/pack-objects.c:3262
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
-#: builtin/pack-objects.c:3154
+#: builtin/pack-objects.c:3264
msgid "reuse existing deltas"
msgstr "использовать повторно существующие дельты"
-#: builtin/pack-objects.c:3156
+#: builtin/pack-objects.c:3266
msgid "reuse existing objects"
msgstr "использовать повторно существующие объекты"
-#: builtin/pack-objects.c:3158
+#: builtin/pack-objects.c:3268
msgid "use OFS_DELTA objects"
msgstr "использовать объекты OFS_DELTA"
-#: builtin/pack-objects.c:3160
+#: builtin/pack-objects.c:3270
msgid "use threads when searching for best delta matches"
msgstr "использовать многопоточность при поиске лучших совпадений дельт"
-#: builtin/pack-objects.c:3162
+#: builtin/pack-objects.c:3272
msgid "do not create an empty pack output"
msgstr "не создавать пустые выходные пакеты"
-#: builtin/pack-objects.c:3164
+#: builtin/pack-objects.c:3274
msgid "read revision arguments from standard input"
msgstr "прочитать аргументы редакций из стандартного ввода"
-#: builtin/pack-objects.c:3166
+#: builtin/pack-objects.c:3276
msgid "limit the objects to those that are not yet packed"
msgstr "ограничиться объектами, которые еще не упакованы"
-#: builtin/pack-objects.c:3169
+#: builtin/pack-objects.c:3279
msgid "include objects reachable from any reference"
msgstr "включить объекты, которые достижимы по любой из ссылок"
-#: builtin/pack-objects.c:3172
+#: builtin/pack-objects.c:3282
msgid "include objects referred by reflog entries"
msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
-#: builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3285
msgid "include objects referred to by the index"
msgstr "включить объекты, на которые ссылается индекс"
-#: builtin/pack-objects.c:3178
+#: builtin/pack-objects.c:3288
msgid "output pack to stdout"
msgstr "вывести пакет на стандартный вывод"
-#: builtin/pack-objects.c:3180
+#: builtin/pack-objects.c:3290
msgid "include tag objects that refer to objects to be packed"
msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
-#: builtin/pack-objects.c:3182
+#: builtin/pack-objects.c:3292
msgid "keep unreachable objects"
msgstr "сохранять ссылки на недоступные объекты"
-#: builtin/pack-objects.c:3184
+#: builtin/pack-objects.c:3294
msgid "pack loose unreachable objects"
msgstr "паковать недостижимые объекты"
-#: builtin/pack-objects.c:3186
+#: builtin/pack-objects.c:3296
msgid "unpack unreachable objects newer than <time>"
msgstr "распаковать недоступные объекты, которые новее, чем <время>"
-#: builtin/pack-objects.c:3189
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3301
msgid "create thin packs"
msgstr "создавать тонкие пакеты"
-#: builtin/pack-objects.c:3191
+#: builtin/pack-objects.c:3303
msgid "create packs suitable for shallow fetches"
msgstr "создавать пакеты, подходящие для частичных извлечений"
-#: builtin/pack-objects.c:3193
+#: builtin/pack-objects.c:3305
msgid "ignore packs that have companion .keep file"
msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
-#: builtin/pack-objects.c:3195
+#: builtin/pack-objects.c:3307
msgid "ignore this pack"
msgstr "игнорировать этот пакет"
-#: builtin/pack-objects.c:3197
+#: builtin/pack-objects.c:3309
msgid "pack compression level"
msgstr "уровень сжатия пакета"
-#: builtin/pack-objects.c:3199
+#: builtin/pack-objects.c:3311
msgid "do not hide commits by grafts"
msgstr "не скрывать коммиты сращениями"
-#: builtin/pack-objects.c:3201
+#: builtin/pack-objects.c:3313
msgid "use a bitmap index if available to speed up counting objects"
msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3315
msgid "write a bitmap index together with the pack index"
msgstr "запись индекса в битовых картах вместе с индексом пакета"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3318
msgid "handling for missing objects"
msgstr "обработка отсутствующих объектов"
-#: builtin/pack-objects.c:3209
+#: builtin/pack-objects.c:3321
msgid "do not pack objects in promisor packfiles"
msgstr "не упаковывать объекты в promisor файлы пакетов"
-#: builtin/pack-objects.c:3233
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3348
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
-msgstr "глубина цепочки различий %d слишком большая, использую принудительно %d"
+msgstr "глубина цепочки изменений %d слишком большая, использую принудительно %d"
-#: builtin/pack-objects.c:3238
+#: builtin/pack-objects.c:3353
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3407
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3409
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3414
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3417
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3423
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3484
msgid "Enumerating objects"
msgstr "Перечисление объектов"
-#: builtin/pack-objects.c:3385
+#: builtin/pack-objects.c:3514
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Всего %<PRIu32> (изменения %<PRIu32>), повторно использовано %<PRIu32> (изменения %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<опции>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "паковать всё"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "почистить слабые ссылки (по умолчанию)"
@@ -12954,84 +15111,88 @@
#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<ветка>…]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<редакция>…]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "вывести список удаленных объектов"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "удалить объекты старее чем <дата-окончания>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "ограничить обход объектами вне promisor файлов пакетов"
-#: builtin/prune.c:128
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
-#: builtin/pull.c:59 builtin/pull.c:61
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Неправильное значение %s: %s"
-#: builtin/pull.c:81
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/pull.c:132
+#: builtin/pull.c:140
msgid "control for recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/pull.c:136
+#: builtin/pull.c:144
msgid "Options related to merging"
msgstr "Опции, связанные со слиянием"
-#: builtin/pull.c:139
+#: builtin/pull.c:147
msgid "incorporate changes by rebasing rather than merging"
msgstr "забрать изменения с помощью перемещения, а не слияния"
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
msgid "allow fast-forward"
msgstr "разрешить перемотку вперед"
-#: builtin/pull.c:175
+#: builtin/pull.c:184
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматически выполнять stash/stash pop до и после перемещения"
-#: builtin/pull.c:191
+#: builtin/pull.c:200
msgid "Options related to fetching"
msgstr "Опции, связанные с извлечением изменений"
-#: builtin/pull.c:209
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
+msgstr "принудительная перезапись локальной ветки"
+
+#: builtin/pull.c:218
msgid "number of submodules pulled in parallel"
msgstr "количество подмодулей, которые будут получены парралельно"
-#: builtin/pull.c:304
+#: builtin/pull.c:313
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправильное значение для pull.ff: %s"
-#: builtin/pull.c:420
+#: builtin/pull.c:430
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
-#: builtin/pull.c:422
+#: builtin/pull.c:432
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
-#: builtin/pull.c:423
+#: builtin/pull.c:433
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
-#: builtin/pull.c:426
+#: builtin/pull.c:436
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -13039,69 +15200,74 @@
"for your current branch, you must specify a branch on the command line."
msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
-#: builtin/pull.c:431 git-parse-remote.sh:73
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Вы сейчас ни на одной из веток."
-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
+#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
+#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
-#: builtin/pull.c:436 builtin/pull.c:451
+#: builtin/pull.c:446 builtin/pull.c:461
msgid "See git-pull(1) for details."
msgstr "Для дополнительной информации, смотрите git-pull(1)."
-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
+#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
+#: builtin/rebase.c:1327 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<внешний-репозиторий>"
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<ветка>"
-#: builtin/pull.c:446 git-parse-remote.sh:75
+#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "У текущей ветки нет информации об отслеживании."
-#: builtin/pull.c:455 git-parse-remote.sh:95
+#: builtin/pull.c:465 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:460
+#: builtin/pull.c:470
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
-#: builtin/pull.c:829
+#: builtin/pull.c:574
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:854
msgid "ignoring --verify-signatures for rebase"
msgstr "игнорирование --verify-signatures при перемещении"
-#: builtin/pull.c:877
+#: builtin/pull.c:909
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash можно использовать только вместе с --rebase."
-#: builtin/pull.c:885
+#: builtin/pull.c:917
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
-#: builtin/pull.c:888
+#: builtin/pull.c:921
msgid "pull with rebase"
msgstr "получение с перемещением"
-#: builtin/pull.c:889
+#: builtin/pull.c:922
msgid "please commit or stash them."
msgstr "сделайте коммит или спрячьте их."
-#: builtin/pull.c:914
+#: builtin/pull.c:947
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -13109,7 +15275,7 @@
"commit %s."
msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
-#: builtin/pull.c:919
+#: builtin/pull.c:953
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -13120,15 +15286,15 @@
"to recover."
msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
-#: builtin/pull.c:934
+#: builtin/pull.c:968
msgid "Cannot merge multiple branches into empty head."
msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
-#: builtin/pull.c:938
+#: builtin/pull.c:972
msgid "Cannot rebase onto multiple branches."
msgstr "Невозможно переместить над несколькими ветками."
-#: builtin/pull.c:945
+#: builtin/pull.c:979
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
@@ -13144,13 +15310,13 @@
msgid "--delete only accepts plain target ref names"
msgstr "опция --delete принимает только простые целевые имена ссылок"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -13161,11 +15327,11 @@
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
-" git push %s %s\n"
+" git push %s HEAD\n"
"%s"
-msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s"
+msgstr ""
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -13175,7 +15341,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -13184,13 +15350,13 @@
" git push --set-upstream %s %s\n"
msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid ""
"The current branch %s has multiple upstream branches, refusing to push."
msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -13198,11 +15364,11 @@
"to update which remote branch."
msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -13210,7 +15376,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -13218,7 +15384,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -13227,33 +15393,33 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
-#: builtin/push.c:296
+#: builtin/push.c:298
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Отправка в %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "не удалось отправить некоторые ссылки в «%s»"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "плохой репозитория «%s»"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote repository using\n"
@@ -13265,104 +15431,104 @@
" git push <name>\n"
msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "репозиторий"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "отправить все ссылки"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "сделать зеркало всех ссылок"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "удалить ссылки"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "принудительное обновление"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "управление рекурсивной отправкой подмодулей"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "использовать тонкие пакеты"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "путь к программе упаковки на сервере"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "установить вышестоящую ветку для git pull/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "почистить локально удаленные ссылки"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "пропустить перехватчик pre-push"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "отправить пропущенные, но нужные метки"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "подписать отправку с помощью GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "запросить выполнение атомарной транзакции на внешней стороне"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete несовместимо с --all, --mirror и --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete не имеет смысла без указания ссылок"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all и --tags нельзя использовать одновременно"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror и --tags нельзя использовать одновременно"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all и --mirror нельзя использовать одновременно"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "опции для отправки не должны содержать символы перевода строк"
@@ -13378,163 +15544,708 @@
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:21
msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/range-diff.c:28
-msgid "color both diff and diff-between-diffs"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
msgstr ""
-#: builtin/range-diff.c:75 builtin/range-diff.c:79
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/range-diff.c:89
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/range-diff.c:104
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr ""
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
"[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])"
-#: builtin/read-tree.c:120
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "записать результирующий индекс в <файл>"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "просто очистить индекс"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Слияние"
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "выполнить слияние в дополнение к чтению"
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "трехходовое слияние, если не требуется слияние на уровне файлов"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов"
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "тоже, что и -m, но отменяет изменения не слитых записей"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<подкаталог>/"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "прочитать дерево в индекс в <подкаталог>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "обновить рабочий каталог результатом слияния"
-#: builtin/read-tree.c:140
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "разрешить перезапись явно игнорируемых файлов"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "не проверять рабочий каталог после слияния"
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "не обновлять индекс или рабочий каталог"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "пропустить применение фильтра частичного переключения на состояние"
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "отладка unpack-trees"
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
-msgstr "git rebase--helper [<опции>]"
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr ""
-#: builtin/rebase--helper.c:24
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<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:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "непригодный для использования список дел: «%s»"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase.c:449
msgid "keep empty commits"
msgstr "оставить пустые коммиты"
-#: builtin/rebase--helper.c:26 builtin/revert.c:124
+#: builtin/rebase.c:451 builtin/revert.c:127
msgid "allow commits with empty messages"
msgstr "разрешить коммиты с пустыми сообщениями"
-#: builtin/rebase--helper.c:27
+#: builtin/rebase.c:452
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase--helper.c:29
+#: builtin/rebase.c:454
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase--helper.c:30
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
msgid "continue rebase"
msgstr "продолжить перемещение"
-#: builtin/rebase--helper.c:32
-msgid "abort rebase"
-msgstr "остановить перемещение"
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr ""
-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
-msgstr "создать сценарий перемещения"
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr ""
-#: builtin/rebase--helper.c:37
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase.c:469
msgid "shorten commit ids in the todo list"
msgstr "вывести короткие идентификаторы коммитов в списке действий"
-#: builtin/rebase--helper.c:39
+#: builtin/rebase.c:471
msgid "expand commit ids in the todo list"
msgstr "вывести полные идентификаторы коммитов в списке действий"
-#: builtin/rebase--helper.c:41
+#: builtin/rebase.c:473
msgid "check the todo list"
msgstr "проверить список дел"
-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
-msgstr "пропустить ненужные команды pick"
-
-#: builtin/rebase--helper.c:45
+#: builtin/rebase.c:475
msgid "rearrange fixup/squash lines"
msgstr "переставить строки fixup/squash"
-#: builtin/rebase--helper.c:47
+#: builtin/rebase.c:477
msgid "insert exec commands in todo list"
msgstr "вставить команды исполнения коммитов в списке действий"
-#: builtin/rebase--helper.c:68
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges"
-#: builtin/receive-pack.c:32
+#: builtin/rebase.c:534 builtin/rebase.c:1787
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:940
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
+msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
+
+#: builtin/rebase.c:1021
+#, 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:1313
+#, 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:1329
+#, 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:1359
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1363
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1422
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
+msgstr "опция"
+
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
+
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
+msgstr "Нет перемещения в процессе?"
+
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
+
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
+msgstr "Не удалось прочитать HEAD"
+
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
+
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1626
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1637 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: builtin/rebase.c:1663
+#, 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:1684
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1819
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
+msgstr "Нет такой ссылки: %s"
+
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
+msgstr "Не удалось автоматически спрятать изменения"
+
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD сейчас на %s"
+
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
+msgstr "Сделайте коммит или спрячьте их."
+
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
+msgstr "HEAD уже в актуальном состоянии."
+
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
+
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Перехватчик pre-rebase отказал в перемещении."
+
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2106
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:2115
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:2124
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <каталог-git>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:833
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"
@@ -13551,7 +16262,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:853
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"
@@ -13563,189 +16274,235 @@
"To squelch this message, you can set it to 'refuse'."
msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»."
-#: builtin/receive-pack.c:1923
+#: builtin/receive-pack.c:1940
msgid "quiet"
msgstr "тихий режим"
-#: builtin/receive-pack.c:1937
+#: builtin/receive-pack.c:1954
msgid "You must specify a directory."
msgstr "Вы должны указать каталог."
-#: builtin/reflog.c:536 builtin/reflog.c:541
+#: 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:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» не является допустимой меткой даты/времени"
-#: builtin/remote.c:15
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:16
+#: builtin/remote.c:17
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
"[--mirror=<fetch|push>] <name> <url>"
msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>"
-#: builtin/remote.c:17 builtin/remote.c:37
+#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote rename <старое-название> <новое-название>"
-#: builtin/remote.c:18 builtin/remote.c:42
+#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr "git remote remove <имя>"
-#: builtin/remote.c:19 builtin/remote.c:47
+#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)"
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <имя>"
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <имя>"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <имя> <ветка>…"
-#: builtin/remote.c:24 builtin/remote.c:73
+#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <имя>"
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]"
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <имя> <новый-url>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <имя> <url>"
-#: builtin/remote.c:32
+#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<опции>] <имя> <url>"
-#: builtin/remote.c:52
+#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <имя> <ветка>…"
-#: builtin/remote.c:53
+#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <имя> <ветка>…"
-#: builtin/remote.c:58
+#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<опции>] <имя>"
-#: builtin/remote.c:63
+#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<опции>] <имя>"
-#: builtin/remote.c:68
+#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…"
-#: builtin/remote.c:97
+#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr "Обновление %s"
-#: builtin/remote.c:129
+#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push"
-#: builtin/remote.c:146
+#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr "неизвестный аргумент для mirror: %s"
-#: builtin/remote.c:162
+#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr "извлечь внешние ветки"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr "импортировать все метки и ассоциированные объекты при извлечении"
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "или не извлекать метки вообще (--no-tags)"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr "отслеживаемые ветки"
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "master branch"
msgstr "мастер ветка"
-#: builtin/remote.c:171
-msgid "push|fetch"
-msgstr "push|fetch"
-
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений"
-#: builtin/remote.c:184
+#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "указание мастер ветки не имеет смысла с параметром --mirror"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
-#: builtin/remote.c:193 builtin/remote.c:635
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже существует"
-#: builtin/remote.c:197 builtin/remote.c:639
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» не является допустимым именем внешнего репозитория."
-#: builtin/remote.c:237
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr "Не удалось настроить мастер ветку «%s»"
-#: builtin/remote.c:343
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Не удалось извлечь карту для спецификатора ссылки %s"
-#: builtin/remote.c:442 builtin/remote.c:450
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "(соответствующая)"
-#: builtin/remote.c:454
+#: builtin/remote.c:455
msgid "(delete)"
msgstr "(удаленная)"
-#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "No such remote: %s"
-msgstr "Нет такого внешнего репозитория: %s"
+msgid "No such remote: '%s'"
+msgstr ""
-#: builtin/remote.c:645
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
-#: builtin/remote.c:665
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -13753,17 +16510,17 @@
"\tPlease update the configuration manually if necessary."
msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
-#: builtin/remote.c:701
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалось удалить «%s»"
-#: builtin/remote.c:735
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "не удалось создать «%s»"
-#: builtin/remote.c:801
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -13775,148 +16532,148 @@
msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-#: builtin/remote.c:815
+#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Не удалось удалить секцию файла конфигурации «%s»"
-#: builtin/remote.c:916
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
-#: builtin/remote.c:919
+#: builtin/remote.c:920
msgid " tracked"
msgstr " отслеживается"
-#: builtin/remote.c:921
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:923
+#: builtin/remote.c:924
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:964
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "перемещается интерактивно над внешней веткой %s"
-#: builtin/remote.c:975
+#: builtin/remote.c:976
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:978
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr "перемещается над внешней веткой %s"
-#: builtin/remote.c:982
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr " будет слита с внешней веткой %s"
-#: builtin/remote.c:985
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "будет слита с внешней веткой %s"
-#: builtin/remote.c:988
+#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с внешней веткой %s\n"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
msgid "create"
msgstr "создана"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1035
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr "локальная ветка устарела"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1054
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1129
+#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1157
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr " URL для извлечения: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(нет URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr " URL для отправки: %s"
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1177
msgid "(not queried)"
msgstr "(не запрашивался)"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1179
msgid "(unknown)"
msgstr "(неизвестно)"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -13925,11 +16682,11 @@
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (статус не запрашивался)"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локальная ветка, настроенная для «git pull»:"
@@ -13937,11 +16694,11 @@
msgstr[2] " Локальные ветки, настроенные для «git pull»:"
msgstr[3] " Локальные ветки, настроенные для «git pull»:"
-#: builtin/remote.c:1214
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
-#: builtin/remote.c:1220
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -13950,231 +16707,263 @@
msgstr[2] " Локальные ссылки, настроенные для «git push»%s:"
msgstr[3] " Локальные ссылки, настроенные для «git push»%s:"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имя>/HEAD"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Не удалось определить внешний HEAD"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
-#: builtin/remote.c:1270
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Не удалось удалить %s"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Недопустимая ссылка: %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Не удалось настроить %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет висящей веткой!"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s стала висящей веткой!"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Очистка %s"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1329
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1374
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "почистить внешние репозитории после извлечения"
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "Нет такого внешнего репозитория «%s»"
-#: builtin/remote.c:1453
+#: builtin/remote.c:1454
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1477
+#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr "запросить URL отправки, вместо URL извлечения"
-#: builtin/remote.c:1479
+#: builtin/remote.c:1480
msgid "return all URLs"
msgstr "вернуть все URL"
-#: builtin/remote.c:1507
+#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не настроены для внешнего репозитория «%s»"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1536
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1538
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1544
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add нельзя использовать одновременно с --delete"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправильный шаблон старого URL: %s"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "Не найдены совпадения URL: %s"
-#: builtin/remote.c:1593
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr "Нельзя удалить все URL не-отправки"
-#: builtin/remote.c:1609
+#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многословнее; должно стоять перед подкомандой"
-#: builtin/remote.c:1640
+#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Неизвестная подкоманда: %s"
-#: builtin/repack.c:20
+#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr "git repack [<опции>]"
-#: builtin/repack.c:25
+#: builtin/repack.c:27
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах. Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps."
-#: builtin/repack.c:287
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:414
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr "упаковать всё в один пакет"
-#: builtin/repack.c:289
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
-#: builtin/repack.c:292
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr "удалите лишние пакеты и запустите git-prune-packed"
-#: builtin/repack.c:294
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "передать опцию --no-reuse-delta в git-pack-objects"
-#: builtin/repack.c:296
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "передать опцию --no-reuse-object в git-pack-objects"
-#: builtin/repack.c:298
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "не запускать git-update-server-info"
-#: builtin/repack.c:301
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "передать опцию --local в git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "запись индекса в битовых картах"
-#: builtin/repack.c:304
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "примерная-дата"
-#: builtin/repack.c:305
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
-#: builtin/repack.c:307
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr "с параметром -a, перепаковать недоступные объекты"
-#: builtin/repack.c:309
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr "размер окна, используемый для компрессии дельт"
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr "количество-байт"
-#: builtin/repack.c:311
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
-#: builtin/repack.c:313
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr "ограничение на максимальную глубину дельт"
-#: builtin/repack.c:315
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "ограничение на максимальное количество потоков"
-#: builtin/repack.c:317
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "максимальный размер каждого из файлов пакета"
-#: builtin/repack.c:319
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
-#: builtin/repack.c:321
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:331
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "нельзя удалять пакеты в precious-objects репозитории"
-#: builtin/repack.c:335
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable и -A нельзя использовать одновременно"
-#: builtin/repack.c:510 builtin/worktree.c:139
+#: builtin/repack.c:423
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:484
+#, 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:532
#, c-format
msgid "failed to remove '%s'"
msgstr "сбой удаления «%s»"
@@ -14203,39 +16992,34 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<формат>] [-l [<шаблон>]]"
-#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr ""
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr ""
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr ""
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr ""
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr ""
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -14243,178 +17027,183 @@
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr ""
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr ""
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "плохая метка слияния в коммите «%s»"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "повреждённая метка слияния в коммите «%s»"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "подпись будет удалена в замененном коммите!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "не удалось записать замену для коммита: «%s»"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:514
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:535
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "вывести список заменяемых ссылок"
-#: builtin/replace.c:536
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "удаление заменяемых ссылок"
-#: builtin/replace.c:537
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "изменение существующего объекта"
-#: builtin/replace.c:538
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "изменение родителя коммита"
-#: builtin/replace.c:539
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:540
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "замена ссылки, если она существует"
-#: builtin/replace.c:542
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "не делать структурированный вывод содержимого для --edit"
-#: builtin/replace.c:543
+#: builtin/replace.c:554
msgid "use this format"
msgstr "использовать этот формат"
-#: builtin/replace.c:556
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:564
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:568
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:574
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:580
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:586
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:592
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:598
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:604
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr ""
@@ -14422,173 +17211,187 @@
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]"
-#: builtin/rerere.c:59
+#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "записать чистые разрешения конфликтов в индекс"
-#: builtin/reset.c:29
+#: 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 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
-#: builtin/reset.c:30
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…"
-#: builtin/reset.c:31
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "mixed"
msgstr "смешанный"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "soft"
msgstr "мягкий"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "hard"
msgstr "жесткий"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "merge"
msgstr "слиянием"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "keep"
msgstr "оставлением"
-#: builtin/reset.c:78
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "У вас нет верного HEAD."
-#: builtin/reset.c:80
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Не удалось найти дерево у HEAD."
-#: builtin/reset.c:86
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Не удалось найти дерево у %s."
-#: builtin/reset.c:111
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD сейчас на %s"
-
-#: builtin/reset.c:189
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния."
-#: builtin/reset.c:289
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "тихий режим, выводить только ошибки"
-#: builtin/reset.c:291
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "сбросить HEAD и индекс"
-#: builtin/reset.c:292
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "сбросить только HEAD"
-#: builtin/reset.c:294 builtin/reset.c:296
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "сбросить HEAD, индекс и рабочий каталог"
-#: builtin/reset.c:298
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "сбросить HEAD, но оставить локальные изменения"
-#: builtin/reset.c:304
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "записать только факт того, что удаленные пути будут добавлены позже"
-#: builtin/reset.c:321
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Не удалось распознать «%s» как действительную редакцию."
-#: builtin/reset.c:329
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Не удалось распознать «%s» как действительное дерево."
-#: builtin/reset.c:338
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}"
-#: builtin/reset.c:347
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead."
-#: builtin/reset.c:349
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути."
-#: builtin/reset.c:359
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "сброс «%s» разрешен только с голым репозиторием"
-#: builtin/reset.c:363
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N можно использовать вместе с --mixed"
-#: builtin/reset.c:380
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Непроиндексированные изменения после сброса:"
-#: builtin/reset.c:386
+#: builtin/reset.c:398
+#, 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:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Не удалось сбросить файл индекса на редакцию «%s»."
-#: builtin/reset.c:390
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Не удалось записать новый файл индекса."
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:405
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:457
+#: builtin/rev-list.c:466
msgid "object filtering requires --objects"
msgstr "фильтрация объектов требует указания параметра --objects"
-#: builtin/rev-list.c:460
+#: builtin/rev-list.c:469
#, c-format
msgid "invalid sparse value '%s'"
msgstr "недопустимое частичное значение «%s»"
-#: builtin/rev-list.c:501
+#: builtin/rev-list.c:510
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-list.c:504
+#: builtin/rev-list.c:513
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "нельзя использовать --use-bitmap-index одновременно с фильтрацией объектов"
-#: builtin/rev-parse.c:406
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
-#: builtin/rev-parse.c:411
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "передавать далее «--» как аргумент"
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "остановить разбор после первого аргумента не являющегося опцией"
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "выводить аргументы в длинном формате"
-#: builtin/rev-parse.c:549
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -14613,76 +17416,77 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <подкоманда>"
-#: builtin/revert.c:91
+#: 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 "%s: %s нельзя использовать одновременно с %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "конец последовательности копирования или обращения изменений коммитов"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "продолжить последовательность копирования или обращения изменений коммитов"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "отмена последовательности копирования или обращения изменений коммитов"
-#: builtin/revert.c:103
+#: builtin/revert.c:106
msgid "don't automatically commit"
msgstr "не коммитить автоматически"
-#: builtin/revert.c:104
+#: builtin/revert.c:107
msgid "edit the commit message"
msgstr "изменить сообщение коммита"
-#: builtin/revert.c:107
+#: builtin/revert.c:110
msgid "parent-number"
msgstr "номер-родителя"
-#: builtin/revert.c:108
+#: builtin/revert.c:111
msgid "select mainline parent"
msgstr "выбор основного родителя"
-#: builtin/revert.c:110
+#: builtin/revert.c:113
msgid "merge strategy"
msgstr "стратегия слияния"
-#: builtin/revert.c:111
-msgid "option"
-msgstr "опция"
-
-#: builtin/revert.c:112
+#: builtin/revert.c:115
msgid "option for merge strategy"
msgstr "опция для стратегии слияния"
-#: builtin/revert.c:121
+#: builtin/revert.c:124
msgid "append commit name"
msgstr "добавить имя коммита"
-#: builtin/revert.c:123
+#: builtin/revert.c:126
msgid "preserve initially empty commits"
msgstr "сохранить изначально пустые коммиты"
-#: builtin/revert.c:125
+#: builtin/revert.c:128
msgid "keep redundant, empty commits"
msgstr "оставить избыточные, пустые коммиты"
-#: builtin/revert.c:219
+#: builtin/revert.c:227
msgid "revert failed"
msgstr "сбой обращения изменений коммита"
-#: builtin/revert.c:232
+#: builtin/revert.c:240
msgid "cherry-pick failed"
msgstr "сбой при копировании коммита"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<опции>] [--] <файл>…"
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -14694,13 +17498,13 @@
msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
msgstr[3] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr "\n(используйте опцию «-f» для принудительного удаления)"
-#: builtin/rm.c:215
+#: 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] "следующие файлы содержат проиндексированные изменения в индексе:"
@@ -14708,13 +17512,13 @@
msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:"
msgstr[3] "следующие файлы содержат проиндексированные изменения в индексе:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "следующие файлы содержат локальные изменения:"
@@ -14722,45 +17526,40 @@
msgstr[2] "следующие файлы содержат локальные изменения:"
msgstr[3] "следующие файлы содержат локальные изменения:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "не выводить список удаленных файлов"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "удалить только из индекса"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "пропустить проверку актуальности"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "разрешить рекурсивное удаление"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "выход с нулевым кодом возврата, даже если ничего не найдено"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "не удаляю рекурсивно «%s» без указания опции -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: не удалось удалить %s"
-#: builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "не удалось удалить «%s»"
-
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
@@ -14783,18 +17582,6 @@
msgid "print status from remote helper"
msgstr "вывести статус от скрипта внешнего сервера"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<опции>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "выход после обмена одним запросом/ответом"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
@@ -14827,7 +17614,7 @@
msgid "Linewrap output"
msgstr "Перенос строк на выводе"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
@@ -14857,85 +17644,85 @@
msgid "no matching refs with %s"
msgstr "нет совпадающих записей с %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:646
msgid "show remote-tracking and local branches"
msgstr "показать список и отслеживаемых внешних и локальных веток"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:648
msgid "show remote-tracking branches"
msgstr "показать список отслеживаемых внешних веток"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:650
msgid "color '*!+-' corresponding to the branch"
msgstr "окрашивать «*!+-» в соответствии с веткой"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:652
msgid "show <n> more commits after the common ancestor"
msgstr "показать <n> коммитов после общего предка"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:654
msgid "synonym to more=-1"
msgstr "синоним для more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:655
msgid "suppress naming strings"
msgstr "не выводить именованные строки"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:657
msgid "include the current branch"
msgstr "включить в вывод текущую ветку"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:659
msgid "name commits with their object names"
msgstr "именовать коммиты их именами объектов"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:661
msgid "show possible merge bases"
msgstr "вывести возможные базы слияния"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:663
msgid "show refs unreachable from any other ref"
msgstr "вывести ссылки, недоступные из любых других ссылок"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:665
msgid "show commits in topological order"
msgstr "вывести коммиты в топологическом порядке"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:668
msgid "show only commits not on the first branch"
msgstr "вывести только коммиты, отсутствующие в первой ветке"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:670
msgid "show merges reachable from only one tip"
msgstr "вывести слияния, достижимые только из одной из верхушек"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:672
msgid "topologically sort, maintaining date order where possible"
msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:675
msgid "<n>[,<base>]"
msgstr "<n>[,<база>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:676
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:712
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-"
"base"
msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:736
msgid "no branches given, and HEAD is not valid"
msgstr "не указаны ветки и HEAD не действительный"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:739
msgid "--reflog option needs one branch name"
msgstr "параметр --reflog требует указания имени одной ветки"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:742
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
@@ -14944,12 +17731,12 @@
msgstr[2] "только %d записей могут быть показаны одновременно."
msgstr[3] "только %d записи могут быть показаны одновременно."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:746
#, c-format
msgid "no such ref %s"
msgstr "нет такой ссылки %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:832
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
@@ -14958,58 +17745,279 @@
msgstr[2] "невозможно обработать больше %d редакций."
msgstr[3] "невозможно обработать больше %d редакции."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:836
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» не является допустимой ссылкой на коммит."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:839
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "не удалось найти коммит %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<шаблон>]"
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "вывести только метки (можно использовать одновременно с --heads)"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "вывести только головы (можно использовать одновременно с --tags)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "более строгая проверка ссылок, требует точный путь ссылки"
-#: builtin/show-ref.c:165 builtin/show-ref.c:167
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "вывести ссылку HEAD, даже если она будет отфильтрована"
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "разыменовать метки в идентификаторы объектов"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
-msgstr "использовать <n> цифр для вывода SHA-1"
+msgstr "использовать <n> символов для вывода SHA-1 хеш-суммы"
-#: builtin/show-ref.c:175
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)"
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<опции>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<опциии>] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <имя-ветки> [<спрятанные-изменения>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n [--] [<спецификатор-пути>…]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [<сообщение>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <сообщение>] [-q|--quiet] <коммит>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "«%s» не является коммитом со спрятанными изменениями"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Передано слишком много редакций:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Не найдены спрятанные изменения."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s не является допустимой ссылкой на коммит"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash очистка с параметрами не реализована"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "нельзя применить спрятанные изменения во время выполнения слияния"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "не удалось сгенерировать список изменений %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "конфликты в индексе. Попробуйте без --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "не удалось сохранить дерево индекса"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "невозможно восстановить неотслеживаемые файлы из спрятанных файлов"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Слияние %s и %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Индекс не был извлечён из спрятанных изменений."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "попытка пересоздания индекса"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Отброшено %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Не удалось отбросить запись из спрятанных изменений"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "«%s» не является ссылкой на спрятанные изменения"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Не указано имя ветки"
+
+#: builtin/stash.c:789 builtin/stash.c:826
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Не удолось обновить %s с %s"
+
+#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+msgid "stash message"
+msgstr "описание спрятанных изменений"
+
+#: builtin/stash.c:817
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "«git stash store» требует указания одного аргумента <коммит>"
+
+#: builtin/stash.c:1039 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Изменения не выбраны"
+
+#: builtin/stash.c:1135 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "У вас еще нет начального коммита"
+
+#: builtin/stash.c:1162 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Не удалось сохранить текущее состояние индекса"
+
+#: builtin/stash.c:1171 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Невозможно сохранить неотслеживаемые файлы"
+
+#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Не удалось сохранить текущее состояние рабочего каталога"
+
+#: builtin/stash.c:1219 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Не удалось записать состояние рабочего каталога"
+
+#: builtin/stash.c:1268 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
+
+#: builtin/stash.c:1284
+msgid "Did you forget to 'git add'?"
+msgstr "Возможно, вы забыли выполнить «git add»?"
+
+#: builtin/stash.c:1299 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Нет локальных изменений для сохранения"
+
+#: builtin/stash.c:1306 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Не удалось инициализировать спрятанные изменения"
+
+#: builtin/stash.c:1321 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Не удалось сохранить текущий статус"
+
+#: builtin/stash.c:1326
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Рабочий каталог и состояние индекса сохранены %s"
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Не удалось удалить изменения рабочего каталога"
+
+#: builtin/stash.c:1465 builtin/stash.c:1501
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1467 builtin/stash.c:1503
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1468 builtin/stash.c:1504
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1470 builtin/stash.c:1506
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1568
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -15018,366 +18026,401 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "пропустить и удалить все строки, начинающиеся с символа комметария"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой строкой символ комметария и пробел"
-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
-#, c-format
-msgid "No such ref: %s"
-msgstr "Нет такой ссылки: %s"
-
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Ожидалось полное имя ссылки, а получено %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "не удалось обрезать один компонент url «%s»"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
msgid "alternative anchor for relative paths"
msgstr "альтернативный символ для относительных путей"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:546
#, c-format
msgid ""
-"run_command returned non-zero status whilerecursing in the nested submodules of %s\n"
+"run_command returned non-zero status while recursing in the nested submodules of %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:562
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <команда>"
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
-msgstr "не удалось запросить конфигурацию «%s». Предполагаю, что этот репозиторий имеет свой собственный вышестоящий репозиторий."
+msgstr ""
-#: builtin/submodule--helper.c:655
+#: builtin/submodule--helper.c:664
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:659
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n"
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:678
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
-#: builtin/submodule--helper.c:676
+#: builtin/submodule--helper.c:685
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:698
+#: builtin/submodule--helper.c:707
msgid "Suppress output for initializing a submodule"
msgstr "Не выводить информацию о инициализации подмодуля"
-#: builtin/submodule--helper.c:703
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<путь>]"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr ""
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»"
-#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "не удалось перейти вглубь подмодуля «%s»"
-#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
msgid "Suppress submodule status output"
msgstr "Не выводить статус подмодуля"
-#: builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:875
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля"
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:876
msgid "recurse into nested submodules"
msgstr "проходить вглубь вложенных подмодулей"
-#: builtin/submodule--helper.c:872
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
-#: builtin/submodule--helper.c:896
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <путь>"
-#: builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:969
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:966
+#: builtin/submodule--helper.c:975
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1000
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1047
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1045
+#: builtin/submodule--helper.c:1054
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]"
-#: builtin/submodule--helper.c:1099
+#: builtin/submodule--helper.c:1108
#, 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:1111
+#: builtin/submodule--helper.c:1120
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1128
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1130
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1132
+#: builtin/submodule--helper.c:1141
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1157
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1177
+#: builtin/submodule--helper.c:1186
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1178
+#: builtin/submodule--helper.c:1187
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1192
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]"
-#: builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1206
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
-#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "подмодулю «%s» не удалось добавить альтернативу: %s"
-#: builtin/submodule--helper.c:1329
+#: builtin/submodule--helper.c:1340
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
-#: builtin/submodule--helper.c:1359
+#: builtin/submodule--helper.c:1370
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1362
+#: builtin/submodule--helper.c:1373
msgid "name of the new submodule"
msgstr "имя нового подмодуля"
-#: builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1376
msgid "url where to clone the submodule from"
msgstr "url откуда должен был склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1384
msgid "depth for shallow clones"
msgstr "глубина для частичного клона"
-#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
msgid "force cloning progress"
msgstr "принудительно выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1392
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1423
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:1426
+#: builtin/submodule--helper.c:1437
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "не удалось получить каталог для подмодуля «%s»"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Подмодуль по пути «%s» не инициализирован"
-#: builtin/submodule--helper.c:1496
+#: builtin/submodule--helper.c:1574
msgid "Maybe you want to use 'update --init'?"
msgstr "Возможно, вы хотели использовать «update --init»?"
-#: builtin/submodule--helper.c:1525
+#: builtin/submodule--helper.c:1604
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Пропуск не слитого подмодуля %s"
-#: builtin/submodule--helper.c:1554
+#: builtin/submodule--helper.c:1633
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Пропуск подмодуля «%s»"
-#: builtin/submodule--helper.c:1689
+#: builtin/submodule--helper.c:1777
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
-#: builtin/submodule--helper.c:1700
+#: builtin/submodule--helper.c:1788
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
-#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
msgid "path into the working tree"
msgstr "путь в рабочем каталоге"
-#: builtin/submodule--helper.c:1733
+#: builtin/submodule--helper.c:1853
msgid "path into the working tree, across nested submodule boundaries"
msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
-#: builtin/submodule--helper.c:1737
+#: builtin/submodule--helper.c:1857
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout или none"
-#: builtin/submodule--helper.c:1743
+#: builtin/submodule--helper.c:1863
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1866
msgid "parallel jobs"
msgstr "параллельные задачи"
-#: builtin/submodule--helper.c:1748
+#: builtin/submodule--helper.c:1868
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c:1869
msgid "don't print cloning progress"
msgstr "вы выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1876
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:1769
+#: builtin/submodule--helper.c:1889
msgid "bad value for update parameter"
msgstr "плохое значение для параметра update"
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1937
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "Ветка подмодуля (%s) настроена на наследование ветки из родительского проекта, но он не находится ни на одной ветке"
-#: builtin/submodule--helper.c:1954
+#: builtin/submodule--helper.c:2060
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2093
msgid "recurse into submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/submodule--helper.c:1960
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<путь>…]"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>…]"
-#: builtin/submodule--helper.c:2071
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <имя> [<значение>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <имя>"
+
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s не поддерживает параметр --super-prefix"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» не является подкомандой submodule--helper"
@@ -15412,35 +18455,35 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
-msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr "git tag [-a | -s | -u <key-id>] [-f] [-m <сообщение> | -F <файл>]\n\t\t<имя-метка> [<редакция>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <имя-метки>…"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<формат>] <имя-метки>…"
-#: builtin/tag.c:87
+#: builtin/tag.c:88
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:103
+#: builtin/tag.c:104
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:134
#, c-format
msgid ""
"\n"
@@ -15449,7 +18492,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:138
#, c-format
msgid ""
"\n"
@@ -15458,146 +18501,155 @@
"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:192
msgid "unable to sign the tag"
msgstr "не удалось подписать метку"
-#: builtin/tag.c:193
+#: builtin/tag.c:194
msgid "unable to write tag file"
msgstr "не удалось записать файл метки"
-#: builtin/tag.c:218
+#: builtin/tag.c:210
+#, 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:226
msgid "bad object type."
msgstr "неправильный тип объекта"
-#: builtin/tag.c:267
+#: builtin/tag.c:278
msgid "no tag message?"
msgstr "нет описания метки?"
-#: builtin/tag.c:274
+#: builtin/tag.c:285
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Сообщение метки было оставлено в %s\n"
-#: builtin/tag.c:383
+#: builtin/tag.c:396
msgid "list tag names"
msgstr "список названий меток"
-#: builtin/tag.c:385
+#: builtin/tag.c:398
msgid "print <n> lines of each tag message"
msgstr "печатать <n> строк описания от каждой метки"
-#: builtin/tag.c:387
+#: builtin/tag.c:400
msgid "delete tags"
msgstr "удалить метки"
-#: builtin/tag.c:388
+#: builtin/tag.c:401
msgid "verify tags"
msgstr "проверить метки"
-#: builtin/tag.c:390
+#: builtin/tag.c:403
msgid "Tag creation options"
msgstr "Настройки создания метки"
-#: builtin/tag.c:392
+#: builtin/tag.c:405
msgid "annotated tag, needs a message"
msgstr "для аннотированной метки нужно сообщение"
-#: builtin/tag.c:394
+#: builtin/tag.c:407
msgid "tag message"
msgstr "описание метки"
-#: builtin/tag.c:396
+#: builtin/tag.c:409
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:397
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "аннотированная и подписанная с помощью GPG метка"
-#: builtin/tag.c:401
+#: builtin/tag.c:413
msgid "use another key to sign the tag"
msgstr "использовать другой ключ для подписания метки"
-#: builtin/tag.c:402
+#: builtin/tag.c:414
msgid "replace the tag if exists"
msgstr "замена метки, если она существует"
-#: builtin/tag.c:403 builtin/update-ref.c:369
+#: builtin/tag.c:415 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "создать журнал ссылок"
-#: builtin/tag.c:405
+#: builtin/tag.c:417
msgid "Tag listing options"
msgstr "Настройки вывода списка меток"
-#: builtin/tag.c:406
+#: builtin/tag.c:418
msgid "show tag list in columns"
msgstr "показать список меток по столбцам"
-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:419 builtin/tag.c:421
msgid "print only tags that contain the commit"
msgstr "вывод только меток, которые содержат коммит"
-#: builtin/tag.c:408 builtin/tag.c:410
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that don't contain the commit"
msgstr "вывод только меток, которые не содержат коммит"
-#: builtin/tag.c:411
+#: builtin/tag.c:423
msgid "print only tags that are merged"
msgstr "вывод только слитых меток"
-#: builtin/tag.c:412
+#: builtin/tag.c:424
msgid "print only tags that are not merged"
msgstr "вывод только не слитых меток"
-#: builtin/tag.c:417
+#: builtin/tag.c:428
msgid "print only tags of the object"
msgstr "вывод только меток, определенного объекта"
-#: builtin/tag.c:461
+#: builtin/tag.c:472
msgid "--column and -n are incompatible"
msgstr "--column и -n нельзя использовать одновременно"
-#: builtin/tag.c:483
+#: builtin/tag.c:494
msgid "-n option is only allowed in list mode"
msgstr "опцию -n можно использовать только в режиме списка"
-#: builtin/tag.c:485
+#: builtin/tag.c:496
msgid "--contains option is only allowed in list mode"
msgstr "опцию --contains можно использовать только в режиме списка"
-#: builtin/tag.c:487
+#: builtin/tag.c:498
msgid "--no-contains option is only allowed in list mode"
msgstr "опцию --no-contains можно использовать только в режиме списка"
-#: builtin/tag.c:489
+#: builtin/tag.c:500
msgid "--points-at option is only allowed in list mode"
msgstr "опцию --points-at можно использовать только в режиме списка"
-#: builtin/tag.c:491
+#: builtin/tag.c:502
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
-#: builtin/tag.c:502
+#: builtin/tag.c:513
msgid "only one -F or -m option is allowed."
msgstr "-F и -m нельзя использовать одновременно."
-#: builtin/tag.c:521
+#: builtin/tag.c:532
msgid "too many params"
msgstr "передано слишком много параметров"
-#: builtin/tag.c:527
+#: builtin/tag.c:538
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не является допустимым именем метки."
-#: builtin/tag.c:532
+#: builtin/tag.c:543
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже существует"
-#: builtin/tag.c:563
+#: builtin/tag.c:574
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
@@ -15606,242 +18658,242 @@
msgid "Unpacking objects"
msgstr "Распаковка объектов"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "не удалось создать каталог %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "не удалось создать файл %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "не удалось удалить файл %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "не удалось удалить каталог %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка mtime в «%s» "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "информация статистики каталога не изменяется после добавления нового файла"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "информация статистики каталога не изменяется после добавления нового каталога"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "информация статистики каталога изменяется после добавления нового файла"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "информация статистики каталога не изменяется после удаления файла"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "информация статистики каталога не изменяется после удаления каталога"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<опции>] [--] [<файл>…]"
-#: builtin/update-index.c:944
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "продолжить обновление, даже если индекс требует обновления"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "обновление: игнорировать подмодули"
-#: builtin/update-index.c:950
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "не игнорировать новые файлы"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "разрешить файлам заменять каталоги и наоборот"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "замечать файлы отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:956
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "обновить, даже если в индексе имеются не слитые записи"
-#: builtin/update-index.c:959
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "обновить информацию о статусе файлов"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "как --refresh, но игнорировать настройку assume-unchanged"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<режим доступа>,<объект>,<путь>"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "добавить указанную запись в индекс"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "пометить файлы как «не измененные»"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "убрать пометку assumed-unchanged"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "пометить файлы как «только в индексе»"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "убрать пометку skip-worktree"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "прочитать список обновляемых путей из стандартного ввода"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "добавить записи из стандартного ввода в индекс"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "заново заполнить индекс #2 и #3 для указанных путей"
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "обновить только записи, которые отличаются от HEAD"
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "вывести выполняемые действия на стандартный вывод"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "записать индекс в указанном формате"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "разрешить или запретить раздельный индекс"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "включить/отключить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "записать индекс, даже если он не помечен как измененный"
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "включить или выключить мониторинг файловой системы"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "пометить файл как действительный в мониторе файловой системы"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "снять пометку действительности мониторе файловой системы"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr "параметр core.splitIndex установлен в false; удалите или измените его, если вы действительно хотите включить разделенный индекс"
-#: builtin/update-index.c:1145
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr "параметр core.splitIndex установлен в true; удалите или измените его, если вы действительно хотите отключить разделенный индекс"
-#: builtin/update-index.c:1156
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1160
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Кэш неотслеживаемых файлов отключен"
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want"
" to enable the untracked cache"
msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1172
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кэш неотслеживаемых файлов включен для «%s»"
-#: builtin/update-index.c:1180
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "мониторинг файловой системы включён"
-#: builtin/update-index.c:1187
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы"
-#: builtin/update-index.c:1191
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "мониторинг файловой системы выключён"
@@ -15885,6 +18937,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<опции>] <каталог>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "выход после обмена одним запросом/ответом"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "выходить сразу после начального объявления списка ссылок"
@@ -15929,262 +18985,293 @@
msgid "print tag contents"
msgstr "вывести содержимое метки"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<опции>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<опции>] <путь>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <рабочий-каталог> <новый-путь>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<опции>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<опции>] <рабочий-каталог>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <путь>"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не является каталогом"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует"
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)"
-#: builtin/worktree.c:88
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
-#: builtin/worktree.c:96
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
-#: builtin/worktree.c:105
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
-#: builtin/worktree.c:152
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "вывести список удаленных рабочих каталогов"
-#: builtin/worktree.c:154
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "удалить рабочие каталоги старее чем <дата-окончания>"
-#: builtin/worktree.c:229
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже существует"
-#: builtin/worktree.c:260
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, 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:302
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/worktree.c:373 builtin/worktree.c:379
+#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:375
+#: builtin/worktree.c:434
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:384
+#: builtin/worktree.c:443
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:390
+#: builtin/worktree.c:449
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:431
+#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:493
msgid "create a new branch"
msgstr "создать новую ветку"
-#: builtin/worktree.c:436
+#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr "создать или перейти на ветку"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr "наполнить новый рабочий каталог"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr "держать рабочий каталог заблокированным"
-#: builtin/worktree.c:441
+#: builtin/worktree.c:501
msgid "set up tracking mode (see git-branch(1))"
msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))"
-#: builtin/worktree.c:444
+#: builtin/worktree.c:504
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки"
-#: builtin/worktree.c:452
+#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach нельзя использовать одновременно"
-#: builtin/worktree.c:511
+#: builtin/worktree.c:573
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку"
-#: builtin/worktree.c:611
+#: builtin/worktree.c:673
msgid "reason for locking"
msgstr "причина блокировки"
-#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
-#: builtin/worktree.c:850
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» не является рабочим каталогом"
-#: builtin/worktree.c:625 builtin/worktree.c:658
+#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
-#: builtin/worktree.c:630
+#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» уже заблокирован, причина: %s"
-#: builtin/worktree.c:632
+#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» уже заблокирован"
-#: builtin/worktree.c:660
+#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» не заблокирован"
-#: builtin/worktree.c:685
+#: builtin/worktree.c:763
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:712 builtin/worktree.c:852
+#: 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:717
+#: builtin/worktree.c:799
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:723
+#: builtin/worktree.c:805
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:730
+#: builtin/worktree.c:813
#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:732
-msgid "cannot move a locked working tree"
+#: 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:735
+#: builtin/worktree.c:818
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:740
+#: builtin/worktree.c:823
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:788
+#: builtin/worktree.c:871
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:792
+#: builtin/worktree.c:875
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:797
+#: builtin/worktree.c:880
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:808 builtin/worktree.c:822
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:926
#, c-format
-msgid "failed to delete '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: builtin/worktree.c:834
-msgid "force removing even if the worktree is dirty"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:856
-#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+#: 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:858
-msgid "cannot remove a locked working tree"
-msgstr ""
-
-#: builtin/worktree.c:861
+#: builtin/worktree.c:931
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<префикс>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "вывести объект дерева для подкаталога с <префикс>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "используется только при отладке"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -16193,10 +19280,27 @@
"\tchmod 0700 %s"
msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "вывод отладочных сообщений на stderr"
+#: 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"
@@ -16213,65 +19317,139 @@
"to read about a specific subcommand or concept."
msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
-#: git.c:173
+#: git.c:185
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:187
+#: git.c:199
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:201
+#: git.c:213
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:215
+#: git.c:227
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:237
+#: git.c:249
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:275
+#: git.c:287
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:300
+#: git.c:313
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:770
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:368
+#, 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:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:880
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:782
+#: git.c:892
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http.c:348
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d"
-#: http.c:369
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
-#: http.c:378
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning не поддерживается с cURL < 7.44.0"
-#: http.c:1854
+#: 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:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -16279,94 +19457,214 @@
" redirect: %s"
msgstr "не удалось обновить базовый url из переадресации:\n запрошено: %s\n переадресовано: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "«%s» недоступно: %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "переадресация на %s"
-#: list-objects-filter-options.h:59
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "аргументы"
-#: list-objects-filter-options.h:60
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "фильтрация объектов"
-#: parse-options.h:157
+#: parse-options.h:170
msgid "expiry-date"
msgstr "дата-окончания"
-#: parse-options.h:172
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "ничего не делает (оставлено для обратной совместимости)"
-#: parse-options.h:251
+#: parse-options.h:304
msgid "be more verbose"
msgstr "быть многословнее"
-#: parse-options.h:253
+#: parse-options.h:306
msgid "be more quiet"
msgstr "тихий режим"
-#: parse-options.h:259
+#: parse-options.h:312
msgid "use <n> digits to display SHA-1s"
msgstr "использовать <n> цифр для вывода SHA-1"
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
+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 "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
+
#: 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 "Применить серию патчей из почтового сообщения"
+msgstr "Применение серии патчей из почтового сообщения"
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr "Аннотировать строки файла информацией о коммитах"
+msgstr "Аннотирование строк файла информацией о коммитах"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
-msgstr "Применить патч к файлам и/или индексу"
+msgstr "Применение патча к файлам и/или индексу"
#: command-list.h:54
-msgid "Import an Arch repository into Git"
-msgstr "Импортировать репозиторий Arch в Git"
+msgid "Import a GNU Arch repository into Git"
+msgstr "Импортирование GNU Arch репозитория в Git"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
-msgstr "Сделать архив файлов из указанного дерева"
+msgstr "Создание архива файлов из указанного дерева"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Выполнить двоичный поиск изменения, которое вносит ошибку"
+msgstr "Выполнение двоичного поиска коммита, который вносит ошибку"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
-msgstr ""
+msgstr "Показ редакции и автора последнего изменившего каждую строку файла"
#: command-list.h:58
msgid "List, create, or delete branches"
-msgstr "Вывод списка веток, их создание или удаление"
+msgstr "Вывод списка, создание или удаление веток"
#: command-list.h:59
msgid "Move objects and refs by archive"
-msgstr ""
+msgstr "Перемещение объектов и ссылок по архиву"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
-msgstr ""
+msgstr "Вывод содержимого или типа и информации о размере для объектов репозитория"
#: command-list.h:61
msgid "Display gitattributes information"
-msgstr ""
+msgstr "Вывод информации из gitattributes"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
-msgstr ""
+msgstr "Отладка файлов gitignore / exclude"
#: command-list.h:63
msgid "Show canonical names and email addresses of contacts"
-msgstr ""
+msgstr "Вывод каноничных имён и адресов электронной почты контактов"
#: command-list.h:64
msgid "Switch branches or restore working tree files"
@@ -16374,27 +19672,27 @@
#: command-list.h:65
msgid "Copy files from the index to the working tree"
-msgstr ""
+msgstr "Копирование файлов из индекса в рабочий каталог"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
-msgstr ""
+msgstr "Удостовериться, что имя ссылки правильно сформировано"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
-msgstr ""
+msgstr "Поиск коммитов которые еще не применены вышестоящим репозиторием"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
-msgstr ""
+msgstr "Применение изменений, сделанных в каком-то существующем коммите"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
-msgstr ""
+msgstr "Графическая альтернатива для git-commit"
#: command-list.h:70
msgid "Remove untracked files from the working tree"
-msgstr ""
+msgstr "Удаление неотслеживаемых файлов из рабочего каталога"
#: command-list.h:71
msgid "Clone a repository into a new directory"
@@ -16402,59 +19700,59 @@
#: command-list.h:72
msgid "Display data in columns"
-msgstr ""
+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 ""
+msgid "Write and verify Git commit-graph files"
+msgstr "Запись и проверка commit-graph файлов Git"
#: command-list.h:75
msgid "Create a new commit object"
-msgstr ""
+msgstr "Создание нового объекта коммита"
#: command-list.h:76
msgid "Get and set repository or global options"
-msgstr ""
+msgstr "Получение и установка глобальных опций или опций репозитория"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
+msgstr "Подсчет количества неупакованных объектов и их потребления диска"
#: command-list.h:78
msgid "Retrieve and store user credentials"
-msgstr ""
+msgstr "Получение и сохранение учетных записей пользователя"
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
-msgstr ""
+msgstr "Помощник для временного хранения паролей в памяти"
#: command-list.h:80
msgid "Helper to store credentials on disk"
-msgstr ""
+msgstr "Помощник для хранения учетных записей на диске"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
-msgstr ""
+msgstr "Экспорт единственного коммита в виде рабочей копии CVS"
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
+msgstr "Спасение ваших данных из другой СКВ которую люди любят ненавидеть"
#: command-list.h:83
msgid "A CVS server emulator for Git"
-msgstr ""
+msgstr "Эмулятор сервера CVS для Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
-msgstr ""
+msgstr "Очень простой сервер для Git репозиториев"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
-msgstr ""
+msgstr "Присвоение объекту удобочитаемое имя на основе доступной ссылки"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
@@ -16462,27 +19760,27 @@
#: command-list.h:87
msgid "Compares files in the working tree and the index"
-msgstr ""
+msgstr "Сравнение седержимого файлов в рабочем каталоге с файлами в индексе"
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
-msgstr ""
+msgstr "Сравнение дерева файлов с рабочим каталогом или индексом"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr ""
+msgstr "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева"
#: command-list.h:90
msgid "Show changes using common diff tools"
-msgstr ""
+msgstr "Показ изменений с помощью распространенных утилит сравнения"
#: command-list.h:91
msgid "Git data exporter"
-msgstr ""
+msgstr "Экспорт данных Git"
#: command-list.h:92
msgid "Backend for fast Git data importers"
-msgstr ""
+msgstr "Внутренний интерфейс для быстрого импорта данных Git"
#: command-list.h:93
msgid "Download objects and refs from another repository"
@@ -16490,35 +19788,35 @@
#: command-list.h:94
msgid "Receive missing objects from another repository"
-msgstr ""
+msgstr "Получение недостающих объектов из другого репозитория"
#: command-list.h:95
msgid "Rewrite branches"
-msgstr ""
+msgstr "Перезапись веток"
#: command-list.h:96
msgid "Produce a merge commit message"
-msgstr ""
+msgstr "Создание сообщения коммита для слияния"
#: command-list.h:97
msgid "Output information on each ref"
-msgstr ""
+msgstr "Вывод информации о каждой ссылке"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
-msgstr ""
+msgstr "Подготовка патчей для отправки по электронной почте"
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr ""
+msgstr "Проверка связности и валидности объектов в базе данных"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "Очистка ненужных файлов и оптимизация локального репозитория"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
+msgstr "Извлечение идентификатора коммита из архива, созданного с помощью git-archive"
#: command-list.h:102
msgid "Print lines matching a pattern"
@@ -16526,35 +19824,35 @@
#: command-list.h:103
msgid "A portable graphical interface to Git"
-msgstr ""
+msgstr "Портативный графический интерфейс для Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
+msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла"
#: command-list.h:105
msgid "Display help information about Git"
-msgstr ""
+msgstr "Отображение справочной информации о Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "Серверная реализация протокола Git над HTTP"
#: command-list.h:107
msgid "Download from a remote Git repository via HTTP"
-msgstr ""
+msgstr "Загрузка из внешнего репозитория Git с помощью HTTP"
#: command-list.h:108
msgid "Push objects over HTTP/DAV to another repository"
-msgstr ""
+msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV"
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
+msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP"
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
-msgstr ""
+msgstr "Построение файла индекса для существующего упакованного архива"
#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
@@ -16562,15 +19860,15 @@
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
-msgstr ""
+msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
-msgstr ""
+msgid "Add or parse structured information in commit messages"
+msgstr "Добавление или разбор структурированной информации в сообщениях коммита"
#: command-list.h:114
msgid "The Git repository browser"
-msgstr ""
+msgstr "Браузер репозитория Git"
#: command-list.h:115
msgid "Show commit logs"
@@ -16578,23 +19876,23 @@
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
-msgstr ""
+msgstr "Вывод информации о файлах в индексе и в рабочем каталоге"
#: command-list.h:117
msgid "List references in a remote repository"
-msgstr ""
+msgstr "Вывод списка ссылок во внешнем репозитории"
#: command-list.h:118
msgid "List the contents of a tree object"
-msgstr ""
+msgstr "Вывод содержимого объекта дерева"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
+msgstr "Извлекает патч и авторство из одного сообщения электронной почты"
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
-msgstr ""
+msgstr "Простая программа UNIX для разбора файла mbox"
#: command-list.h:121
msgid "Join two or more development histories together"
@@ -16602,352 +19900,352 @@
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
-msgstr ""
+msgstr "Поиск подходящих общих предков для возможного слияния"
#: command-list.h:123
msgid "Run a three-way file merge"
-msgstr ""
+msgstr "Запуск трёхходового слияния файлов"
#: command-list.h:124
msgid "Run a merge for files needing merging"
-msgstr ""
+msgstr "Запуск слияния для файлов, которые требуют слияния"
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
-msgstr ""
+msgstr "Стандартная программа-помощник для использования совместно с git-merge-index"
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
+msgstr "Запуск инструментов разрешения конфликтов слияния"
#: command-list.h:127
msgid "Show three-way merge without touching index"
-msgstr ""
+msgstr "Вывод трёхходового слияние без затрагивания индекса"
#: command-list.h:128
-msgid "Creates a tag object"
-msgstr ""
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запись и проверка файлов multi-pack-index"
#: command-list.h:129
-msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
+msgid "Creates a tag object"
+msgstr "Создание объектов меток"
#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Построение объекта дерева из текста формата ls-tree"
+
+#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Перемещение или переименование файла, каталога или символьной ссылки"
-#: command-list.h:131
-msgid "Find symbolic names for given revs"
-msgstr ""
-
#: command-list.h:132
-msgid "Add or inspect object notes"
-msgstr ""
+msgid "Find symbolic names for given revs"
+msgstr "Поиск символьных имён для указанных редакций"
#: command-list.h:133
-msgid "Import from and submit to Perforce repositories"
-msgstr ""
+msgid "Add or inspect object notes"
+msgstr "Добавление или просмотр заметок объекта"
#: command-list.h:134
-msgid "Create a packed archive of objects"
-msgstr ""
+msgid "Import from and submit to Perforce repositories"
+msgstr "Импорт и отправка в репозитории Perforce"
#: command-list.h:135
-msgid "Find redundant pack files"
-msgstr ""
+msgid "Create a packed archive of objects"
+msgstr "Создание упакованного архива объектов"
#: command-list.h:136
-msgid "Pack heads and tags for efficient repository access"
-msgstr ""
+msgid "Find redundant pack files"
+msgstr "Поиск избыточных файлов пакетов"
#: command-list.h:137
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
#: command-list.h:138
-msgid "Compute unique ID for a patch"
-msgstr ""
+msgid "Routines to help parsing remote repository access parameters"
+msgstr "Подпрограммы для помощи разбора параметров доступа внешнего репозитория"
#: command-list.h:139
-msgid "Prune all unreachable objects from the object database"
-msgstr ""
+msgid "Compute unique ID for a patch"
+msgstr "Вычисление уникального идентификатора для патча"
#: command-list.h:140
-msgid "Remove extra objects that are already in pack files"
-msgstr ""
+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:142
+#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr "Обновление внешних ссылок и связанных объектов"
-#: command-list.h:143
-msgid "Applies a quilt patchset onto the current branch"
-msgstr ""
-
#: command-list.h:144
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Применение упорядоченного списка патчей над текущей веткой"
#: command-list.h:145
-msgid "Reads tree information into the index"
-msgstr ""
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)"
#: command-list.h:146
-msgid "Reapply commits on top of another base tip"
-msgstr "Повторно применить коммиты над верхушкой другой ветки"
+msgid "Reads tree information into the index"
+msgstr "Чтение информации о дереве в индекс"
#: command-list.h:147
-msgid "Receive what is pushed into the repository"
-msgstr ""
+msgid "Reapply commits on top of another base tip"
+msgstr "Повторное применение коммитов над верхушкой другой ветки"
#: command-list.h:148
-msgid "Manage reflog information"
-msgstr ""
+msgid "Receive what is pushed into the repository"
+msgstr "Получение того, что было отправлено в репозиторий"
#: command-list.h:149
-msgid "Manage set of tracked repositories"
-msgstr ""
+msgid "Manage reflog information"
+msgstr "Управление информацией журнала ссылок"
#: command-list.h:150
-msgid "Pack unpacked objects in a repository"
-msgstr ""
+msgid "Manage set of tracked repositories"
+msgstr "Управление набором отслеживаемых репозиториев"
#: command-list.h:151
-msgid "Create, list, delete refs to replace objects"
-msgstr ""
+msgid "Pack unpacked objects in a repository"
+msgstr "Упаковка неупакованных объектов в репозитории"
#: command-list.h:152
-msgid "Generates a summary of pending changes"
-msgstr ""
+msgid "Create, list, delete refs to replace objects"
+msgstr "Создание, вывод списка, удаление ссылок для замены объектов"
#: command-list.h:153
-msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+msgid "Generates a summary of pending changes"
+msgstr "Генерация сводки предстоящих изменений"
#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Повторное использование записанных разрешений конфликтов при слияниях"
+
+#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "Сброс текущего состояния HEAD на указанное состояние"
-#: command-list.h:155
-msgid "Revert some existing commits"
-msgstr ""
-
#: command-list.h:156
-msgid "Lists commit objects in reverse chronological order"
-msgstr ""
+msgid "Revert some existing commits"
+msgstr "Обращение изменений существующих коммитов"
#: command-list.h:157
-msgid "Pick out and massage parameters"
-msgstr ""
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Вывод списка объектов коммита в обратном хронологическом порядке"
#: command-list.h:158
+msgid "Pick out and massage parameters"
+msgstr "Разбор и обработка параметров"
+
+#: command-list.h:159
msgid "Remove files from the working tree and from the index"
msgstr "Удаление файлов из рабочего каталога и индекса"
-#: command-list.h:159
-msgid "Send a collection of patches as emails"
-msgstr ""
-
#: command-list.h:160
-msgid "Push objects over Git protocol to another repository"
-msgstr ""
+msgid "Send a collection of patches as emails"
+msgstr "Отправка коллекции патчей на электронную почту"
#: command-list.h:161
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
+msgid "Push objects over Git protocol to another repository"
+msgstr "Отправка объектов в другой репозиторий с помощью протокола Git"
#: command-list.h:162
-msgid "Summarize 'git log' output"
-msgstr ""
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH"
#: command-list.h:163
+msgid "Summarize 'git log' output"
+msgstr "Обобщение вывода «git log»"
+
+#: command-list.h:164
msgid "Show various types of objects"
msgstr "Вывод различных типов объектов"
-#: command-list.h:164
-msgid "Show branches and their commits"
-msgstr ""
-
#: command-list.h:165
-msgid "Show packed archive index"
-msgstr ""
+msgid "Show branches and their commits"
+msgstr "Вывод веток и их коммитов"
#: command-list.h:166
-msgid "List references in a local repository"
-msgstr ""
+msgid "Show packed archive index"
+msgstr "Вывод индекса упакованного архива"
#: command-list.h:167
-msgid "Git's i18n setup code for shell scripts"
-msgstr ""
+msgid "List references in a local repository"
+msgstr "Вывод ссылок в локальном репозитории"
#: command-list.h:168
-msgid "Common Git shell script setup code"
-msgstr ""
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Код настройки интернационализации для сценариев оболочки Git"
#: command-list.h:169
-msgid "Stash the changes in a dirty working directory away"
-msgstr ""
+msgid "Common Git shell script setup code"
+msgstr "Общий код настройки для сценариев оболочки Git"
#: command-list.h:170
-msgid "Add file contents to the staging area"
-msgstr ""
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Спрятать изменения в изменённом рабочем каталоге"
#: command-list.h:171
+msgid "Add file contents to the staging area"
+msgstr "Добавление содержимого файлов в индекс"
+
+#: command-list.h:172
msgid "Show the working tree status"
msgstr "Вывод состояния рабочего каталога"
-#: command-list.h:172
-msgid "Remove unnecessary whitespace"
-msgstr ""
-
#: command-list.h:173
-msgid "Initialize, update or inspect submodules"
-msgstr ""
+msgid "Remove unnecessary whitespace"
+msgstr "Удаление ненужных пробелов"
#: command-list.h:174
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
+msgid "Initialize, update or inspect submodules"
+msgstr "Инициализация, обновление или просмотр подмодулей"
#: command-list.h:175
-msgid "Read, modify and delete symbolic refs"
-msgstr ""
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Двухсторонние операции между репозиториями Subversion и Git"
#: command-list.h:176
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Создание метки, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
+msgid "Read, modify and delete symbolic refs"
+msgstr "Чтение, изменение и удаление символических ссылок"
#: command-list.h:177
-msgid "Creates a temporary file with a blob's contents"
-msgstr ""
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
#: command-list.h:178
-msgid "Unpack objects from a packed archive"
-msgstr ""
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Создание временного файла с содержимым двоичного объекта"
#: command-list.h:179
-msgid "Register file contents in the working tree to the index"
-msgstr ""
+msgid "Unpack objects from a packed archive"
+msgstr "Распаковка объектов из упакованного архива"
#: command-list.h:180
-msgid "Update the object name stored in a ref safely"
-msgstr ""
+msgid "Register file contents in the working tree to the index"
+msgstr "Регистрация содержимого файла из рабочего каталога в индекс"
#: command-list.h:181
-msgid "Update auxiliary info file to help dumb servers"
-msgstr ""
+msgid "Update the object name stored in a ref safely"
+msgstr "Безопасное обновление имени объекта хранящегося в ссылке"
#: command-list.h:182
-msgid "Send archive back to git-archive"
-msgstr ""
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Обновление файла со вспомогательной информацией для глупых серверов"
#: command-list.h:183
-msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
+msgid "Send archive back to git-archive"
+msgstr "Отправка архива обратно в git-archive"
#: command-list.h:184
-msgid "Show a Git logical variable"
-msgstr ""
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Отправка упакованных объектов обратно в git-fetch-pack"
#: command-list.h:185
-msgid "Check the GPG signature of commits"
-msgstr ""
+msgid "Show a Git logical variable"
+msgstr "Вывод логической переменной Git"
#: command-list.h:186
-msgid "Validate packed Git archive files"
-msgstr ""
+msgid "Check the GPG signature of commits"
+msgstr "Проверка подписи GPG коммитов"
#: command-list.h:187
-msgid "Check the GPG signature of tags"
-msgstr ""
+msgid "Validate packed Git archive files"
+msgstr "Проверка файлов упакованных архивов Git"
#: command-list.h:188
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
+msgid "Check the GPG signature of tags"
+msgstr "Проверка подписи GPG меток"
#: command-list.h:189
-msgid "Show logs with difference each commit introduces"
-msgstr ""
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)"
#: command-list.h:190
-msgid "Manage multiple working trees"
-msgstr ""
+msgid "Show logs with difference each commit introduces"
+msgstr "Вывод журнала с изменениями, которые вводил каждый из коммитов"
#: command-list.h:191
-msgid "Create a tree object from the current index"
-msgstr ""
+msgid "Manage multiple working trees"
+msgstr "Управление несколькими рабочими каталогами"
#: command-list.h:192
+msgid "Create a tree object from the current index"
+msgstr "Создание объекта дерева из текущего индекса"
+
+#: command-list.h:193
msgid "Defining attributes per path"
msgstr "Определение атрибутов для путей файлов или каталогов"
-#: command-list.h:193
-msgid "Git command-line interface and conventions"
-msgstr ""
-
#: command-list.h:194
-msgid "A Git core tutorial for developers"
-msgstr ""
+msgid "Git command-line interface and conventions"
+msgstr "Интерфейс коммандной строки Git и соглашения"
#: command-list.h:195
-msgid "Git for CVS users"
-msgstr ""
+msgid "A Git core tutorial for developers"
+msgstr "Учебник по ядру Git для разработчиков"
#: command-list.h:196
-msgid "Tweaking diff output"
-msgstr ""
+msgid "Git for CVS users"
+msgstr "Git для пользователей CVS"
#: command-list.h:197
-msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
+msgid "Tweaking diff output"
+msgstr "Подстройка вывода списка изменений"
#: command-list.h:198
-msgid "A Git Glossary"
-msgstr ""
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Полезный минимум команд для каждодневного использования Git"
#: command-list.h:199
-msgid "Hooks used by Git"
-msgstr ""
+msgid "A Git Glossary"
+msgstr "Глоссарий Git"
#: command-list.h:200
+msgid "Hooks used by Git"
+msgstr "Перехватчики используемые Git"
+
+#: command-list.h:201
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание специально игнорируемых файлов"
-#: command-list.h:201
+#: command-list.h:202
msgid "Defining submodule properties"
msgstr "Определение свойств подмодулей"
-#: command-list.h:202
-msgid "Git namespaces"
-msgstr ""
-
#: command-list.h:203
-msgid "Git Repository Layout"
-msgstr ""
+msgid "Git namespaces"
+msgstr "Пространства имён Git"
#: command-list.h:204
+msgid "Git Repository Layout"
+msgstr "Содержимое репозитория Git"
+
+#: command-list.h:205
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов для Git"
-#: command-list.h:205
-msgid "A tutorial introduction to Git: part two"
-msgstr ""
-
#: command-list.h:206
-msgid "A tutorial introduction to Git"
-msgstr ""
+msgid "A tutorial introduction to Git: part two"
+msgstr "Обучающее введение в Git: часть вторая"
#: command-list.h:207
+msgid "A tutorial introduction to Git"
+msgstr "Обучающее введение в Git"
+
+#: command-list.h:208
msgid "An overview of recommended workflows with Git"
msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
-msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Вам нужно начать с помощью «git bisect start»"
@@ -16959,161 +20257,73 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "неопознанная опция: «$arg»"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "«$arg» не похоже на действительную редакцию"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Плохой указатель HEAD — Необходим указатель HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Плохой указатель HEAD — странная символьная ссылка"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Плохой аргумент bisect_write: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Плохой ввод номера редакции: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Плохой ввод номера редакции: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Предупреждение: попытка двоичного поиска с указанием только $TERM_BAD коммита."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Вы уверены [Y - да/n - нет]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr "Вам нужно передать мне как минимум одну $bad_syn и одну $good_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $bad_syn» и «git bisect $good_syn».)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr "Для начала нужно запустить «git bisect start».\nПосле этого, вам нужно передать мне как минимум одну $good_syn и одну $bad_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $good_syn» и «git bisect $good_syn».)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "Вы сейчас не в процессе бинарного поиска."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "«$invalid» не является действительным коммитом"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr "Не удалось перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запустить «git bisect reset <коммит>»."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Не передан файл журнала"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "не удалось прочитать $file для повтора изменений"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? вы о чем?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "сбой при выполнении двоичного поиска: не передана команда."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "запускаю $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "bisect run больше не может продолжать"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "bisect run выполнен успешно"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Недопустимая команда: вы сейчас находитесь на $TERM_BAD/$TERM_GOOD двоичном поиске."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "определения не заданы"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr "недопустимый аргумент $arg для «git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Вы сейчас не в процессе бинарного поиска."
#: git-merge-octopus.sh:46
msgid ""
@@ -17153,321 +20363,113 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простое слияние не удалось, попытка автоматического слияния."
-#: git-rebase.sh:61
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
-msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
-
-#: git-rebase.sh:173 git-rebase.sh:454
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Не удалось перейти назад на $head_name"
-
-#: git-rebase.sh:184
-msgid "Applied autostash."
-msgstr "Применены автоматически спрятанные изменения."
-
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Не удалось сохранить $stash_sha1"
-
-#: git-rebase.sh:236
-msgid "The pre-rebase hook refused to rebase."
-msgstr "Перехватчик pre-rebase отказал в перемещении."
-
-#: git-rebase.sh:241
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
-
-#: git-rebase.sh:415
-msgid "No rebase in progress?"
-msgstr "Нет перемещения в процессе?"
-
-#: git-rebase.sh:426
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
-
-#: git-rebase.sh:433
-msgid "Cannot read HEAD"
-msgstr "Не удалось прочитать HEAD"
-
-#: git-rebase.sh:436
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
-
-#: git-rebase.sh:480
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное."
-
-#: git-rebase.sh:545
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-
-#: git-rebase.sh:556
-msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
-msgstr ""
-
-#: git-rebase.sh:562
-msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
-msgstr ""
-
-#: git-rebase.sh:564
-msgid "error: cannot combine '--rebase_merges' with '--strategy'"
-msgstr ""
-
-#: git-rebase.sh:590
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "недействительная вышестоящая ветка «$upstream_name»"
-
-#: git-rebase.sh:614
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: имеется больше одной базы слияния"
-
-#: git-rebase.sh:617 git-rebase.sh:621
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: нет базы слияния"
-
-#: git-rebase.sh:626
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Не указывает на действительный коммит: $onto_name"
-
-#: git-rebase.sh:652
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "критическая ошибка: нет такой ветки/коммита «$branch_name»"
-
-#: git-rebase.sh:685
-msgid "Cannot autostash"
-msgstr "Не удалось автоматически спрятать изменения"
-
-#: git-rebase.sh:690
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Изменения автоматически спрятаны: $stash_abbrev"
-
-#: git-rebase.sh:694
-msgid "Please commit or stash them."
-msgstr "Сделайте коммит или спрячьте их."
-
-#: git-rebase.sh:717
-#, sh-format
-msgid "HEAD is up to date."
-msgstr "HEAD уже в актуальном состоянии."
-
-#: git-rebase.sh:719
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Текущая ветка $branch_name уже в актуальном состоянии."
-
-#: git-rebase.sh:727
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
-msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
-
-#: git-rebase.sh:729
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Текущая ветка $branch_name уже в актуальном состоянии, принудительное перемещение."
-
-#: git-rebase.sh:741
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Изменения от $mb до $onto:"
-
-#: git-rebase.sh:750
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…"
-
-#: git-rebase.sh:760
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Перемотана вперед $branch_name до $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash очистка с параметрами не реализована"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "У вас еще нет начального коммита"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Не удалось сохранить текущее состояние индекса"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Невозможно сохранить неотслеживаемые файлы"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Не удалось сохранить текущее состояние рабочего каталога"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Изменения не выбраны"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Не удалось удалить временный индекс (не должно случаться)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Не удалось записать состояние рабочего каталога"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Не удалось обновить $ref_stash с помощью $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "ошибка: неизвестный параметр для «stash push»: $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Нет локальных изменений для сохранения"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Не удалось инициализировать спрятанные изменения"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Не удалось сохранить текущий статус"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Не удалось удалить изменения рабочего каталога"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "неизвестная опция: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Не найдены спрятанные изменения."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Передано слишком много редакций: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference не является действительной ссылкой"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» не похоже на коммит со спрятанными изменениями"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» не является ссылкой на спрятанные изменения"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "не удалось обновить индекс"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Нельзя применить спрятанные изменения во время выполнения слияния"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Конфликты в индексе. Попробуйте без --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Не удалось сохранить дерево индекса"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Невозможно убрать из индекса измененные файлы"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Индекс не был извлечён из спрятанных изменений."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Отброшено ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Не указано имя ветки"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы восстановить их, наберите «git stash apply»)"
-#: git-submodule.sh:188
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога"
-#: git-submodule.sh:198
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../"
-#: git-submodule.sh:217
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже содержится в индексе"
-#: git-submodule.sh:220
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "«$sm_path» уже содержится в индексе и не является подмодулем"
-#: git-submodule.sh:226
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -17475,22 +20477,22 @@
"Use -f if you really want to add it."
msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить."
-#: git-submodule.sh:249
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
-#: git-submodule.sh:251
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» уже существует и не является действительным репозиторием git"
-#: git-submodule.sh:259
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:"
-#: git-submodule.sh:261
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -17499,120 +20501,122 @@
"or you are unsure what this means choose another name with the '--name' option."
msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»."
-#: git-submodule.sh:267
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
-#: git-submodule.sh:279
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
-#: git-submodule.sh:284
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой добавления подмодуля «$sm_path»"
-#: git-submodule.sh:293
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
-#: git-submodule.sh:565
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:575
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:580
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:603
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита."
-#: git-submodule.sh:616
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:617
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
-#: git-submodule.sh:621
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:622
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:627
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:628
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
-#: git-submodule.sh:633
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:634
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:665
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:761
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached нельзя использовать одновременно с опцией --files"
-#: git-submodule.sh:813
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвестный режим $mod_dst"
-#: git-submodule.sh:833
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_src"
-#: git-submodule.sh:836
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst"
-#: git-submodule.sh:839
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst"
@@ -17622,100 +20626,6 @@
msgid "See git-${cmd}(1) for details."
msgstr "Для дополнительной информации, смотрите git-${cmd}(1)."
-#: git-rebase--interactive.sh:43
-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"
-"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--interactive.sh:64 git-rebase--preserve-merges.sh:173
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
-
-#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
-
-#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
-msgid "could not detach HEAD"
-msgstr "не удалось отделить HEAD"
-
-#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
-
-#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
-msgid "Could not execute editor"
-msgstr "Не удалось запустить редактор"
-
-#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Не удалось перейти на версию $switch_to"
-
-#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
-msgid "No HEAD?"
-msgstr "Нет указателя HEAD?"
-
-#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Не удалось создать временный каталог $state_dir"
-
-#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
-msgid "Could not mark as interactive"
-msgstr "Не удалось пометить как интерактивный"
-
-#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)"
-msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)"
-msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-
-#: git-rebase--interactive.sh:224
-msgid ""
-"\n"
-"\tHowever, if you remove everything, the rebase will be aborted.\n"
-"\n"
-"\t"
-msgstr ""
-
-#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
-msgid "Note that empty commits are commented out"
-msgstr "Заметьте, что пустые коммиты закомментированны"
-
-#: git-rebase--interactive.sh:280
-msgid "Could not generate todo list"
-msgstr "Не удалось сгенерировать список дел"
-
#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
@@ -17740,7 +20650,7 @@
". 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 ""
+msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
#: git-rebase--preserve-merges.sh:215
#, sh-format
@@ -17839,7 +20749,7 @@
"This is most likely due to an empty commit message, or the pre-commit hook\n"
"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
"you are able to reword the commit."
-msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
+msgstr "Не удалось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
#: git-rebase--preserve-merges.sh:571
#, sh-format
@@ -17933,12 +20843,36 @@
msgid "Could not commit staged changes."
msgstr "Не удалось закоммитить проиндексированные изменения."
-#: git-rebase--preserve-merges.sh:893
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr "Не удалось запустить редактор"
+
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Не удалось перейти на версию $switch_to"
+
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr "Нет указателя HEAD?"
+
+#: git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Не удалось создать временный каталог $state_dir"
+
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr "Не удалось пометить как интерактивный"
+
+#: git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)"
+msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)"
+msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
+msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
msgid "Could not init rewritten commits"
@@ -17949,55 +20883,55 @@
msgid "usage: $dashless $USAGE"
msgstr "использование: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "Не удалось выполнить chdir в $cdup, вершину рабочего каталога"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "критическая ошибка: $program_name нельзя использовать не имея рабочего каталога."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Не удалось выполнить перезапись веток: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Не удалось выполнить $action: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "Не удалось выполнить перемещение коммитов: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "К тому же, в вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Вам нужно запускать эту команду находясь на вершине рабочего каталога."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Не удалось определить абсолютный путь к каталогу git"
@@ -18449,7 +21383,7 @@
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of changes\n"
-msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть различия между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
+msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть изменения между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
@@ -18467,73 +21401,73 @@
msgid "invalid argument %s, expecting --"
msgstr "недопустимый аргумент %s, ожидается --"
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "локальный часовой пояс отличается от GMT на не минутный интервал\n"
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "локальный сдвиг времени больше или равен 24 часа\n"
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr "редактор был завершен с ошибкой, отменяю всё"
-#: git-send-email.perl:294
+#: git-send-email.perl:302
#, perl-format
msgid "'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n"
-#: git-send-email.perl:299
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» содержит подготовленное письмо.\n"
-#: git-send-email.perl:317
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases не совместимо с другими опциями\n"
-#: git-send-email.perl:383 git-send-email.perl:638
+#: git-send-email.perl:395 git-send-email.perl:656
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Нельзя запускать git format-patch вне репозитория\n"
-#: git-send-email.perl:386
+#: git-send-email.perl:398
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:456
+#: git-send-email.perl:470
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Неизвестное поле --suppress-cc: «%s»\n"
-#: git-send-email.perl:485
+#: git-send-email.perl:501
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Неизвестный параметр --confirm: «%s»\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:529
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
-#: git-send-email.perl:515
+#: git-send-email.perl:531
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "предупреждение: «:include:» не поддерживается: %s\n"
-#: git-send-email.perl:517
+#: git-send-email.perl:533
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
-#: git-send-email.perl:522
+#: git-send-email.perl:538
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "предупреждение: строка sendmail не распознана: %s\n"
-#: git-send-email.perl:604
+#: git-send-email.perl:622
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -18543,75 +21477,75 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
-#: git-send-email.perl:625
+#: git-send-email.perl:643
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Не удалось выполнить opendir %s: %s"
-#: git-send-email.perl:649
+#: git-send-email.perl:667
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
-#: git-send-email.perl:660
+#: git-send-email.perl:678
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr "\nФайл с патчем не указан!\n\n"
-#: git-send-email.perl:673
+#: git-send-email.perl:691
#, perl-format
msgid "No subject line in %s?"
msgstr "Нет строки с темой в %s?"
-#: git-send-email.perl:683
+#: git-send-email.perl:701
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Не удалось открыть для записи %s: %s"
-#: git-send-email.perl:694
+#: git-send-email.perl:712
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"for the patch you are writing.\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
-msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого в патч, который вы пишете.\n\nОчистите содержимое, если вы не хотите отправлять письмо с краткой информацией.\n"
+msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого к создаваемому патчу.\n\nОчистите содержимое, если вы не хотите отправлять письмо со сводкой изменений.\n"
-#: git-send-email.perl:718
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Не удалось открыть %s: %s"
-#: git-send-email.perl:735
+#: git-send-email.perl:753
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Не удалось открыть %s.final: %s"
-#: git-send-email.perl:778
+#: git-send-email.perl:796
msgid "Summary email is empty, skipping it\n"
-msgstr "Письмо с краткой информацией пустое, попускаю его\n"
+msgstr "Письмо со сводкой изменений пустое, попускаю его\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:813
+#: git-send-email.perl:831
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Вы уверены, что хотите использовать <%s> [y/N]? "
-#: git-send-email.perl:868
+#: git-send-email.perl:886
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n"
-#: git-send-email.perl:873
+#: git-send-email.perl:891
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
-#: git-send-email.perl:881
+#: git-send-email.perl:899
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -18619,20 +21553,20 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n"
-#: git-send-email.perl:900
+#: git-send-email.perl:918
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Кому должны быть отправлены письма (если нужно)?"
-#: git-send-email.perl:918
+#: git-send-email.perl:936
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
-#: git-send-email.perl:930
+#: git-send-email.perl:948
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID который нужно использовать в поле In-Reply-To для первого письма (если нужно)? "
-#: git-send-email.perl:988 git-send-email.perl:996
+#: git-send-email.perl:1006 git-send-email.perl:1014
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ошибка: не удалось выделить действительный адрес из: %s\n"
@@ -18640,16 +21574,16 @@
#. 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:1000
+#: git-send-email.perl:1018
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): "
-#: git-send-email.perl:1317
+#: git-send-email.perl:1335
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "путь CA «%s» не существует"
-#: git-send-email.perl:1400
+#: git-send-email.perl:1418
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -18666,128 +21600,128 @@
#. 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:1415
+#: git-send-email.perl:1433
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - все): "
-#: git-send-email.perl:1418
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr "Отправка этого ответа на письмо обязательна"
-#: git-send-email.perl:1446
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr "Требуемый SMTP сервер не был правильно объявлен."
-#: git-send-email.perl:1493
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сервер не поддерживает STARTTLS! %s"
-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Ошибка STARTTLS! %s"
-#: git-send-email.perl:1511
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug."
-#: git-send-email.perl:1529
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr "Не удалось отправить %s\n"
-#: git-send-email.perl:1532
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Имитация отправки %s\n"
-#: git-send-email.perl:1532
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr "Отправлено %s\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr "Имитация OK. Журнал содержит:\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr "OK. Журнал содержит:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1564
msgid "Result: "
msgstr "Результат: "
-#: git-send-email.perl:1549
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr "Результат: OK\n"
-#: git-send-email.perl:1567
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr "не удалось открыть файл %s"
-#: git-send-email.perl:1614 git-send-email.perl:1634
+#: git-send-email.perl:1632 git-send-email.perl:1652
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1620
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавление to: %s со строки «%s»\n"
-#: git-send-email.perl:1673
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1698
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1809
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не удалось выполнить «%s»"
-#: git-send-email.perl:1816
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавление %s: %s из: «%s»\n"
-#: git-send-email.perl:1820
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) не удалось закрыть поток к «%s»"
-#: git-send-email.perl:1850
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr "не удалось отправить сообщение в 7 битной кодировке"
-#: git-send-email.perl:1858
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr "недопустимая кодировка передачи"
-#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
+#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "не удалось открыть %s: %s\n"
-#: git-send-email.perl:1902
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: патч содержит строку длиннее чем 998 символов"
-#: git-send-email.perl:1919
+#: git-send-email.perl:1947
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Пропускаю %s с окончанием резервной копии «%s».\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1923
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: "
diff --git a/po/sv.po b/po/sv.po
index 98244c0..4ad206d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translations for Git.
-# Copyright (C) 2010-2018 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2019 Peter Krefting <peter@softwolves.pp.se>
# This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.20.0\n"
+"Project-Id-Version: git 2.23.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-02 15:41+0100\n"
+"POT-Creation-Date: 2019-07-30 09:59+0800\n"
+"PO-Revision-Date: 2019-07-31 12:40+0200\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -16,49 +16,49 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.2\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:170
+#: advice.c:180
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -66,137 +66,159 @@
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
"Observera: checkar ut \"%s\".\n"
"\n"
"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"
"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"
-"i det här läget utan att det påverkar grenar genom att checka ut på\n"
-"nytt.\n"
+"i det här läget utan att det påverkar grenar genom att växla tillbaka\n"
+"till en gren.\n"
"\n"
"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"
-"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n"
-"med -b. Till exempel:\n"
+"du göra det (nu eller senare) genom att använda switch-kommandot med -c.\n"
+"Exempel:\n"
"\n"
-" git checkout -b <namn-på-ny-gren>\n"
+" git switch -c <namn-på-ny-gren>\n"
+"\n"
+"Eller gör den här ändringen ogjord med:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Stäng av den här hjälptexten genom att sätta konfigurationsvariabeln\n"
+"advice.detachedHead till false\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "kommandorad avslutas med \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "citat ej stängt"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject och --3way kan inte användas samtidigt."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached och --3way kan inte användas samtidigt."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "ogiltigt läge på rad %d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -212,82 +234,82 @@
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -296,25 +318,25 @@
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
"\""
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -322,426 +344,426 @@
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Faller tillbaka på trevägssammanslagning...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
-msgstr "ogiltig sökväg ”%s”"
+msgstr "ogiltig sökväg \"%s\""
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "sökväg"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "antal"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
msgid "action"
msgstr "åtgärd"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "rot"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
@@ -764,99 +786,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "ingen sådan referens: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "objektnamnet är inte giltigt: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "inte ett trädobjekt: %s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "aktuell arbetskatalog är inte spårad"
+
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1597
msgid "prefix"
msgstr "prefix"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fil"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "endast spara"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "arkiv"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "kommando"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
@@ -876,16 +917,16 @@
msgid "cannot read %s"
msgstr "kan inte läsa %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "kunde inte starta filtret \"%s\""
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "kan inte omdirigera handtag"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "filtret \"%s\" rapporterade fel"
@@ -900,7 +941,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
@@ -910,12 +951,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%-*s är inte ett giltigt namn på attribut"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s inte tillåtet: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -928,17 +974,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -947,7 +993,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -956,7 +1002,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -965,7 +1011,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -976,7 +1022,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -988,22 +1034,22 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
@@ -1043,46 +1089,46 @@
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
+#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
"kedjan"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1095,92 +1141,92 @@
"fjärrspårningsinformationen genom att utföra\n"
"\"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
"ombasering."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
"ombasering."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
"ombasering."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Kan inte skriva inställningar för uppströmsgren"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Spårar inte: tvetydig information för referensen %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "\"%s\" är inte ett giltigt grennamn."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter ”%s”."
+msgstr "Det finns redan en gren som heter \"%s\"."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1200,27 +1246,27 @@
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
"för att ställa in uppströmskonfigurationen när du sänder in."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: ”%s”."
+msgstr "Avgreningspunkten är inte giltig: \"%s\"."
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -1235,70 +1281,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "kan inte duplicera pakethandtag"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack dog"
@@ -1307,9 +1357,8 @@
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -1319,7 +1368,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1339,29 +1388,29 @@
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1371,96 +1420,264 @@
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "graffilen %s är för liten"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "incheckningsgraffilen %s är för liten"
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "grafsignaturen %X stämmer inte med signaturen %X"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "grafversionen %X stämmer inte med versionen %X"
+msgid "commit-graph version %X does not match version %X"
+msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "hash-versionen %X stämmer inte med versionen %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
+"ofullständig"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "felaktigt offset för stycke %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "stycke-id %08x förekommer flera gånger"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "incheckningsgrafen har inga bas-graf-stycken"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "incheckningsgrafens kedja stämmer inte"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "kan inte hitta alla incheckingsgraffiler"
+
+#: commit-graph.c:553 commit-graph.c:613
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
+
+#: commit-graph.c:574
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1001 builtin/pack-objects.c:2651
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Dekorerar incheckningar i incheckningsgraf"
+#: commit-graph.c:1033
+msgid "Loading known commits in commit graph"
+msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:691
+#: commit-graph.c:1050
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1069
+msgid "Clearing commit marks in commit graph"
+msgstr "Rensar incheckningsmärken i incheckningsgraf"
+
+#: commit-graph.c:1088
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Söker incheckningar för incheckingsgraf"
+#: commit-graph.c:1162
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
+msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-#: commit-graph.c:812
+#: commit-graph.c:1175
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:814
+#: commit-graph.c:1179
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:868
+#: commit-graph.c:1203
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
+msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "för många incheckningar för att skriva graf"
+#: commit-graph.c:1237
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1252
+msgid "Counting distinct commits in commit graph"
+msgstr "Räknar olika incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1283
+msgid "Finding extra edges in commit graph"
+msgstr "Söker ytterligare kanter i incheckingsgraf"
+
+#: commit-graph.c:1331
+msgid "failed to write correct number of base graph ids"
+msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
+
+#: commit-graph.c:1364 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1002
+#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
+#: commit-graph.c:1436
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Skriver ut incheckningsgraf i %d pass"
+msgstr[1] "Skriver ut incheckningsgraf i %d pass"
+
+#: commit-graph.c:1477
+msgid "unable to open commit-graph chain file"
+msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
+
+#: commit-graph.c:1489
+msgid "failed to rename base commit-graph file"
+msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
+
+#: commit-graph.c:1509
+msgid "failed to rename temporary commit-graph file"
+msgstr "kunde inte byta namn på temporär incheckningsgraffil"
+
+#: commit-graph.c:1620
+msgid "Scanning merged commits"
+msgstr "Söker sammanslagna incheckningar"
+
+#: commit-graph.c:1631
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "oväntat duplicerat inchecknings-id %s"
+
+#: commit-graph.c:1656
+msgid "Merging commit-graph"
+msgstr "Slår ihop incheckningsgraf"
+
+#: commit-graph.c:1842
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#: commit-graph.c:1853
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+#: commit-graph.c:1943
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
-#: commit-graph.c:1046
-msgid "Verifying commits in commit graph"
-msgstr "Bekräftar incheckningar i incheckningsgraf"
+#: commit-graph.c:1953
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1963 commit-graph.c:1978
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1970
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
+
+#: commit-graph.c:1987
+msgid "Verifying commits in commit graph"
+msgstr "Bekräftar incheckningar i incheckningsgrafen"
+
+#: commit-graph.c:2000
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
+
+#: commit-graph.c:2007
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
+
+#: commit-graph.c:2017
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
+
+#: commit-graph.c:2026
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "incheckningsgrafens förälder för %s är %s != %s"
+
+#: commit-graph.c:2039
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
+
+#: commit-graph.c:2044
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
+"noll på annan plats"
+
+#: commit-graph.c:2048
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
+"%s, men noll på annan plats"
+
+#: commit-graph.c:2063
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
+
+#: commit-graph.c:2069
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
+"= %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1475,302 +1692,302 @@
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:348
+#: config.c:375
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:354
+#: config.c:381
#, c-format
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:378 sequencer.c:2296
+#: config.c:405 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:384
+#: config.c:411
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:420 config.c:432
+#: config.c:447 config.c:459
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:467
+#: config.c:494
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:793
+#: config.c:820
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:797
+#: config.c:824
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:801
+#: config.c:828
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:805
+#: config.c:832
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:809
+#: config.c:836
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:813
+#: config.c:840
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:952
+#: config.c:977
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:952
+#: config.c:977
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:958
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:963
+#: config.c:997
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:966
+#: config.c:1000
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:969
+#: config.c:1003
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:972
+#: config.c:1006
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:975
+#: config.c:1009
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:978
+#: config.c:1012
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1073
+#: config.c:1107
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1082
+#: config.c:1116
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1173
+#: config.c:1207
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1221 config.c:1232
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1290
+#: config.c:1324
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1323
+#: config.c:1357
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1395
+#: config.c:1429
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1421
+#: config.c:1455
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1422
+#: config.c:1456
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1517 builtin/pack-objects.c:3399
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1602
+#: config.c:1638
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1605
+#: config.c:1641
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1622
+#: config.c:1658
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1652
+#: config.c:1688
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1705
+#: config.c:1744
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2037
+#: config.c:2093
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2207
+#: config.c:2263
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2250
+#: config.c:2306
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
-#: config.c:2276
+#: config.c:2332
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:2322
+#: config.c:2378
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2324
+#: config.c:2380
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2405
+#: config.c:2461
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2437
+#: config.c:2493
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2466
+#: config.c:2522
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2717 config.c:3041
+#: config.c:2774 config.c:3098
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2728
+#: config.c:2785
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2820 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:2788
+#: config.c:2845
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:2801 config.c:3054
+#: config.c:2858 config.c:3111
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2812
+#: config.c:2869
#, c-format
msgid "unable to mmap '%s'"
msgstr "kunde inte utföra mmap på \"%s\""
-#: config.c:2821 config.c:3059
+#: config.c:2878 config.c:3116
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:2906 config.c:3156
+#: config.c:2963 config.c:3213
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:2940
+#: config.c:2997
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2942 builtin/remote.c:782
+#: config.c:2999 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3032
+#: config.c:3089
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3199
+#: config.c:3256
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -1823,50 +2040,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "arkivet på andra sidan kan inte vara grunt"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "fjärrfel: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "ogiltigt paket"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokollfel: förväntade inte \"%s\""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ogiltigt svar på ls-refs: %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "oväntad \"flush\" efter ref-listan"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokollet \"%s\" stöds inte"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "Slår upp %s..."
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "kan inte slå upp %s (port %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1875,7 +2087,7 @@
"klart.\n"
"Ansluter till %s (port %s)..."
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1885,52 +2097,52 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "klart."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "kunde inte slå upp %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "okänd port %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "konstigt värdnamn \"%s\" blockerat"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "konstig port \"%s\" blockerad"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "kan inte starta mellanserver (proxy) %s"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh-varianten \"simple\" stöder inte -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh-varianten \"simple\" stöder inte -6"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh-varianten \"simple\" stöder inte val av port"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "konstigt sökvägsnamn \"%s\" blockerat"
@@ -1941,33 +2153,33 @@
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "felaktig crlf_action %d"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF skulle ersättas av LF i %s"
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -1976,12 +2188,12 @@
"CRLF kommer att ersättas av LF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF skulle ersättas av CRLF i %s"
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -1990,12 +2202,12 @@
"LF kommer att ersättas av CRLF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -2004,12 +2216,12 @@
"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "
"teckenkodning i arbetskatalogen."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM krävs om \"%s\" kodas som %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2018,38 +2230,38 @@
"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
"(beroende på byteordning) som teckenkodning i arbetskatalogen."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "misslyckades omkoda \"%s\" från %s till %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "kan inte grena (fork) för att köra externt filter \"%s\""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "kunde inte skicka indata till externt filter \"%s\""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "externt filter \"%s\" misslyckades %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "läsning från externt filter \"%s\" misslyckades"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "externt filter \"%s\" misslyckades"
@@ -2085,53 +2297,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "i framtiden"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> sekund sedan"
msgstr[1] "%<PRIuMAX> sekunder sedan"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> minut sedan"
msgstr[1] "%<PRIuMAX> minuter sedan"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> timme sedan"
msgstr[1] "%<PRIuMAX> timmar sedan"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> dag sedan"
msgstr[1] "%<PRIuMAX> dagar sedan"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> vecka sedan"
msgstr[1] "%<PRIuMAX> veckor sedan"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> månad sedan"
msgstr[1] "%<PRIuMAX> månader sedan"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2139,40 +2351,40 @@
msgstr[1] "%<PRIuMAX> år"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, %<PRIuMAX> månad sedan"
msgstr[1] "%s, %<PRIuMAX> månader sedan"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> år sedan"
msgstr[1] "%<PRIuMAX> år sedan"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Sprider ö-markeringar"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "felaktigt trädobjektet %s"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "kunde inte hämta ö-regex för \"%s\": %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Markerade %d öar, klar.\n"
@@ -2186,22 +2398,29 @@
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "flaggan \"%s\" behöver ett värde"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
+"en arbetskatalog."
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2209,25 +2428,30 @@
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "ignorerar okänt läge för color-mode-ws \"%s\""
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change"
+"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
+"\""
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
"blankstegslägen"
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2236,24 +2460,35 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "ogiltigt värde för --stat: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s förväntar ett numeriskt värde"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2262,61 +2497,543 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "okänt värde efter ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "kunde inte slå upp \"%s\""
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s förväntar formen <n>/<m>"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s förväntar ett tecken, fick \"%s\""
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "felaktigt argument till --color-moved: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "ogiltigt läge %s\" i --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
+"\"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "ogiltigt argument för %s"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "felaktigt argument --word-diff: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Formatflaggor för diff-utdata"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "skapar patch"
+
+#: diff.c:5275 builtin/log.c:182
+msgid "suppress diff output"
+msgstr "undertryck diff-utdata"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "skapa diffar med <n> rader sammanhang"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "generera diff i råformat"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "synonym till \"-p --raw\""
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "synonym till \"-p --stat\""
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "maskinläsbar --stat"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "skriv bara ut den sista raden för --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "synonym för --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonym för --dirstat=filer,param1,param2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "visa endast namnen på ändrade filer"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "visa endast namn och status för ändrade filer"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "skapa diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<bredd>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "generera en diffstat med given bredd"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "generera en diffstat med given namnbredd"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "generera en diffstat med given grafbredd"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<antal>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "generera diffstat med begränsade rader"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "skapa kompakt översikt i diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "skapa en binärdiff som kan appliceras"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "visa färgad diff"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<typ>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
+"\"new\" (nya) rader i diffen"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
+"eller --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<prefix>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "visa givet källprefix istället för \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "visa givet målprefix istället för \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "lägg till ytterligare prefix på alla rader i utdata"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "visa inte käll- eller målprefix"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<tecken>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "ange tecken för att ange ny rad istället för \"+\""
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "ange tecken för att ange gammal rad istället för \"-\""
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "ange tecken för att ange sammanhang istället för \" \""
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Diff-namnbytesflaggor"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "detektera namnändringar"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "ta bort för-version för borttagningar"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "detektera kopior"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "använd oförändrade som källa för att hitta kopior"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "inaktivera detektering av namnbyten"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "använd tomma blob:ar som namnändringskälla"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "fortsätt lista historiken för en fil bortom namnändringar"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
+"given gräns"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Alternativ för diff-algoritm"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "skapa minsta möjliga diff"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorera blanktecken vid radjämförelse"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorera blanktecken vid radslut"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignorera CR-tecken vid radslut"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignorera ändringar i rader som är helt blanka"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "heuristik för att flytta diff-gränser för lättare läsning"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"patience diff\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"histogram diff\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algoritm>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "välj en diff-algoritm"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<text>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"anchored diff\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<läge>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<reguttr>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "använd <reguttr> för att bestämma vad som är ett ord"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "flyttade kodrader färgas på annat sätt"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "hur blanktecken ignoreras i --color-moved"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Andra diff-flaggor"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
+"sökvägar"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "hantera alla filer som text"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "växla två indatafiler, vänd diffen"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "avsluta med 1 vid ändringar, annars 0"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "slå av alla utdata från programmet"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "tillåt köra en extern diff-hjälpare"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<när>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignorera ändringar i undermoduler när diffen skapas"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "ange hur ändringar i undermoduler visas"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "dölj \"git add -N\"-poster från indexet"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "tolka \"git add -N\"-poster som äkta i indexet"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<sträng>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
+"uttryck"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "styr ordningen i vilken filer visas i utdata"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<objekt-id>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "välj filter efter diff-typ"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<fil>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Skriv utdata till en specifik fil"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -2330,7 +3047,7 @@
msgid "Filtering content"
msgstr "Filtrerar innehåll"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
@@ -2345,7 +3062,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "kunde inte ställa in GIT_DIR till \"%s\""
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
@@ -2358,249 +3075,237 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:253
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
+
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "klart"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Servern stöder inte klienter med grunda arkiv"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Servern stöder \"multi_ack_detailed\""
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "Servern stöder \"no-done\""
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Servern stöder \"multi_ack\""
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Servern stöder \"side-band-64k\""
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Servern stöder \"side-band\""
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Servern stöder \"ofs-delta\""
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "Servern stöder filter"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Servern stöder %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Servern stöder inte klienter med grunda arkiv"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "kunde inte skriva anrop till fjärren"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "förväntade bekräftelserad: \"%s\""
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "väntade att paketfil skulle sändas efter \"ready\""
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
@@ -2610,18 +3315,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
@@ -2678,41 +3383,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Lågnivåkommandon / interna hjälpare"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "okänd kommandolisttyp \"%s\""
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "De vanliga Git-vägledningarna är:"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Externa kommandon"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Kommadoalias"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2721,32 +3426,32 @@
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Fortsätter under förutsättningen att du menade ”%s”."
+msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."
+"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2760,16 +3465,16 @@
"\n"
"Mest lika kommandon är"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2783,7 +3488,7 @@
"\n"
"Menade du ett av dessa?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2809,48 +3514,72 @@
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
"\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "ingen e-post angavs och autodetektering är inaktiverad"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "inget namn angavs och autodetektering är inaktiverad"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "kunde inte autodetektera namn (fick \"%s\")"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "tomt ident-namn (för <%s>) ej tillåtet"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "flera filterspecifikationer kan inte kombineras"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "endast \"tree:0\" stöds"
+msgid "expected 'tree:<depth>'"
+msgstr "förväntade \"tree:<djup>\""
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:sökväg-filter stöds inte längre"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "felaktig filterspecifikation: \"%s\""
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
@@ -2883,12 +3612,13 @@
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
@@ -2898,105 +3628,105 @@
msgstr ""
"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
"sammanslagningen."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
"sammanslagningsbasen)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Snabbspolar undermodulen %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
"hittades inte)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3013,32 +3743,32 @@
"\n"
"vilket godtar lösningen.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3047,7 +3777,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3056,7 +3786,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3065,7 +3795,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3074,31 +3804,40 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet vid %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Vägrar förlora lortig fil vid \"%s\""
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3107,27 +3846,17 @@
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Byter namn på %s till %s och %s till %s istället"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3138,7 +3867,7 @@
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
"destination fick en majoritet av filerna."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3147,7 +3876,7 @@
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3156,7 +3885,7 @@
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3165,7 +3894,7 @@
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
"%s->%s i %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3174,86 +3903,117 @@
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
"bytt namn."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Lägger till sammanslagen %s"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Lägger till som %s istället"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2937
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2940
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3004
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3004
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:3017
+#: merge-recursive.c:3016
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3020
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3043
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3065 git-submodule.sh:937
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3066
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3096
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Lägger till som %s istället"
+
+#: merge-recursive.c:3178
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
+"flyttar den till %s."
+
+#: merge-recursive.c:3181
+#, 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 ""
+"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
+"%s, föreslår att den bör flyttas till%s."
+
+#: merge-recursive.c:3185
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
+"namn i %s; flyttar den till %s."
+
+#: merge-recursive.c:3188
+#, 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 ""
+"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
+"bytte namn i %s; flyttar den till %s."
+
+#: merge-recursive.c:3302
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3325
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3330
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3337
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3346
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3355
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
+
+#: merge-recursive.c:3393
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3263,152 +4023,177 @@
"sammanslagning:\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3404
msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3413
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3512
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3525
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3564
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3630
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "hash-versionen %u stämmer inte"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "felaktigt offset för stycke (för stort)"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Ser efter refererade packfiler"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Bekräftar OID-ordning i MIDX"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Sorterar objekt efter packfil"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "kunde inte starta pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "kunde inte avsluta pack-objects"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3424,7 +4209,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "misslyckades utföra join på lazy_name-tråd: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3436,21 +4221,21 @@
"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
"ny antecknings-sammanslagning."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
@@ -3459,7 +4244,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
@@ -3469,45 +4254,100 @@
msgid "invalid object type \"%s\""
msgstr "ogiltig objekttyp \"%s\""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "objektet %s är en %s, inte en %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "objektet %s har okänd typ-id %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "sha1 stämmer inte överens %s"
+msgid "hash mismatch %s"
+msgstr "hashvärde stämmer inte överens %s"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s behöver ett värde"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s är inkompatibel med %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s: inkompatibelt med något annat"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s tar inget värde"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s är inte tillgängligt"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "menade du \"--%s\" (med två bindestreck?)"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "okänd flagga \"%s\""
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "okänd flagga \"%c\""
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -3515,58 +4355,74 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-TAL"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias för --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "flaggan \"%s\" antar ett numeriskt värde"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
-msgstr "trasigt utlöpsdatum: ”%s”"
+msgstr "trasigt utlöpsdatum: \"%s\""
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "Endast en \"attr:\"-angivelse tillåten."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "attr-angivelse kan inte vara tom"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "ogiltigt attributnamn %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3574,128 +4430,186 @@
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
"globala sökvägsinställningar"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”"
+msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: \"%s\" är utanför arkivet"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "kan inte skriva flush-paket"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "kan inte skriva delim-paket"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "fel vid skrivning av \"flush\"-paket"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "protokollfel: omöjligt lång rad"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "paketskrivning med format misslyckades"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "paketskrivning misslyckades"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "läsfel"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "fjärren lade på oväntat"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "protokollfel: felaktig radlängdstecken: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "protokollfel: felaktig radlängd: %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "fjärrfel: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Uppdaterar indexet"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "kunde inte skapa trådad lstat: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "kunde inte tolka git-huvudet \"%.*s\""
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "kunde inte tolka loggen för \"%s\""
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "kan inte skapa tom blob i objektdatabasen"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "\"%s\" har inte någon utcheckad incheckning"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "kan inte indexera filen \"%s\""
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "kan inte lägga till \"%s\" till indexet"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "kan inte ta status på \"%s\""
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "\"%s\" finns både som en fil och en katalog"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Uppdatera indexet"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3704,7 +4618,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3713,60 +4627,150 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "felaktig signatur 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "felaktig indexversion %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "felaktig sha1-signatur för indexfil"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorerar filtillägget %.4s"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "okänt format 0x%08x på indexpost"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "osorterade köposter i index"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "flera köposter för den sammanslagna filen \"%s\""
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "osorterade köposter för \"%s\""
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "kunde inte läsa in cache_entries-tråden: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "kunde inte utföra join på cache_entries-tråden: %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: öppning av indexfilen misslyckades"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: kan inte ta startus på det öppna indexet"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indexfilen mindre än förväntat"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: kan inte koppla indexfilen"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "kunde inte uppdatera delat index \"%s\""
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "trasigt index, förväntade %s i %s, fick %s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "kan inte rätta behörighetsbitar på \"%s\""
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: kan inte återgå till kö 0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3810,7 +4814,14 @@
"\n"
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Ombasera %s på %s (%d kommando)"
+msgstr[1] "Ombasera %s på %s (%d kommandon)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3819,7 +4830,7 @@
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3827,7 +4838,7 @@
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3841,7 +4852,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3851,125 +4862,158 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
+msgid "could not write '%s'"
+msgstr "kunde inte skriva \"%s\""
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Varning: vissa incheckningar kan av misstag ha tappats.\n"
+"Tappade incheckningar (nyaste först):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"För att undvika det här meddelandet kan du använda \"drop\" för att "
+"explicit\n"
+"kasta en incheckning.\n"
+"\n"
+"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
+"varningsnivån.\n"
+"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
+"\" (fel).\n"
+"\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "\"%s\" pekar inte på ett giltigt objekt!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorerar dinglande symbolisk referens %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "kunde inte öppna \"%s\" för skrivning: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "Kunde inte läsa referensen \"%s\""
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "referensen \"%s\" finns redan"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "oväntat objekt-id vid skrivning \"%s\""
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "oväntat objekt-id vid borttagning \"%s\""
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "loggen för referensen %s har lucka efter %s"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "loggen för referensen %s slutade oväntat på %s"
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "loggen för %s är tom"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
@@ -3979,349 +5023,483 @@
msgid "invalid refspec '%s'"
msgstr "felaktig referensspecifikation: \"%s\""
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "försvunnen"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "före %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "bakom %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) tar inte argument"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "okänt %%(objectsize)-argument: %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) tar inte argument"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "positivt värde förväntat objectname:short=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(ingen gren, ombaserar %s)"
+msgid "no branch, rebasing %s"
+msgstr "ingen gren, ombaserar %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(ingen gren, \"bisect\" startad på %s)"
+msgid "no branch, bisect started on %s"
+msgstr "ingen gren, \"bisect\" startad på %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD frånkopplat vid %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "ingen gren"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD frånkopplat från %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(ingen gren)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "flaggan \"%s\" är inkompatibel med --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "flaggan \"%s\" måste peka på en incheckning"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "mer än en receivepack angavs, använder den första"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "mer än en uploadpack angavs, använder den första"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kan inte hämta både %s och %s till %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Internt fel"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "käll-referensspecifikationen %s motsvarar ingen"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "käll-referensspecifikationen %s motsvarar mer än en"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"Målet du angav är inte ett komplett referensamn (dvs.,\n"
+"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n"
+"\n"
+"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n"
+"- Se om <källan> som sänds (\"%s\")\n"
+" är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n"
+" motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n"
+"\n"
+"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
+
+#: remote.c:1040
+#, 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 ""
+"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n"
+"Var det meningen att skapa en ny gren genom att sända\n"
+"till \"%s:refs/heads/%s\"?"
+
+#: remote.c:1045
+#, 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 ""
+"<Källa>-delen av ref.spec-en är ett taggobjekt.\n"
+"Var det meningen att skapa en ny tagg genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#: remote.c:1050
+#, 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 ""
+"<Källa>-delen av ref.spec-en är ett trädobjekt.\n"
+"Var det meningen att tagga ett nytt träd genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#: remote.c:1055
+#, 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 ""
+"<Källa>-delen av ref.spec-en är ett blobobjekt.\n"
+"Var det meningen att tagga en ny blob genom att sända\n"
+"till \"%s:refs/tags/%s\"?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s kan inte slås upp till en gren"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "Kunde inte hitta fjärr-referensen %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorerar märklig referens \"%s\" lokalt"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (använd \"%s\" för detaljer)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4331,11 +5509,11 @@
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4350,10 +5528,15 @@
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "kan inte tolka förväntat objektnamn \"%s\""
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4377,11 +5560,6 @@
msgid "unable to write rerere record"
msgstr "kunde inte skriva rerere-post"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "kunde inte skriva \"%s\""
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4432,8 +5610,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
@@ -4467,29 +5645,33 @@
msgid "unable to open rr-cache directory"
msgstr "kan inte uppdatera katalogen rr-cache"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L stöder ännu inte andra diff-format än -p och -s"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "kan inte skapa asynkron tråd: %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4498,29 +5680,29 @@
"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4528,42 +5710,47 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
+#: sequencer.c:321
msgid "revert"
msgstr "revert"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4571,7 +5758,7 @@
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4581,110 +5768,115 @@
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Felaktigt städningsläge %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "ogiltigt datumformat \"%s\" i \"%s\""
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4713,15 +5905,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "skriver rotincheckning"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4748,7 +5940,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4773,301 +5965,350 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "kunde inte tolka \"%.*s\""
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "avbryter pågående \"cherry-pick\""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "avbryter pågående \"revert\""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr "oanvändbart manus: ”%s”"
+msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr "trasigt manus: ”%s”"
+msgstr "trasigt manus: \"%s\""
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "en \"revert\" pågår redan"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "en \"cherry-pick\" pågår redan"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "ingen \"revers\" pågår"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "ingen \"cherry-pick\" pågår"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "kunde inte hoppa över incheckningen"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "ingenting att hoppa över"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"har du redan checkat in?\n"
+"testa \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5086,27 +6327,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5121,11 +6362,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5142,76 +6383,76 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "kunde inte hitta trädet för %s."
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "kunde inte skriva indexet"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5222,31 +6463,31 @@
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "kunde inte checka ut %s"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: inte ett giltigt OID"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5267,48 +6508,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5316,86 +6557,44 @@
msgstr ""
"\n"
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
-"först och kör sedan \"git rebase --continute\" igen."
+"först och kör sedan \"git rebase --continue\" igen."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
+msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "oanvändbar todo-lista: %s"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Varning: vissa incheckningar kan av misstag ha tappats.\n"
-"Tappade incheckningar (nyaste först):\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"För att undvika det här meddelandet kan du använda \"drop\" för att "
-"explicit\n"
-"kasta en incheckning.\n"
-"\n"
-"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
-"varningsnivån.\n"
-"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
-"\" (fel).\n"
-"\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5405,31 +6604,15 @@
"continue\".\n"
"Avbryt ombaseringen med \"git rebase --abort\".\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Ombasera %s på %s (%d kommando)"
-msgstr[1] "Ombasera %s på %s (%d kommandon)"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "kunde inte kopiera \"%s\" till \"%s\"."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "kunde inte transformera att göra-listan"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
@@ -5438,7 +6621,7 @@
msgid "'%s' is outside repository"
msgstr "\"%s\" är utanför arkivet"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5448,7 +6631,7 @@
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5460,12 +6643,12 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5476,91 +6659,91 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "funktionen måste köras i en arbetskatalog"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "fel vid öppning av \"%s\""
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "för stor för att vara en .git-fil: \"%s\""
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "fel vid läsning av %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "ogiltigt gitfilformat: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "ingen sökväg i gitfil: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "inte ett git-arkiv: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "\"$%s\" för stor"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "inte ett git-arkiv: \"%s\""
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "kan inte byta katalog (chdir) till \"%s\""
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "kan inte byta till \"%s\""
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5571,7 +6754,7 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5580,284 +6763,289 @@
"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "misslyckades öppna /dev/null eller \"dup\""
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "kunde inte normalisera alternativ objektsökväg: %s"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "kan inte normalisera objektkatalogen: %s"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\""
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "kan inte läsa \"alternates\"-filen"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
+
+#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:968
msgid "mmap failed"
msgstr "mmap misslyckades"
-#: sha1-file.c:973
+#: sha1-file.c:1132
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1256 sha1-file.c:2395
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1258 sha1-file.c:2399
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: sha1-file.c:1137
+#: sha1-file.c:1300
msgid "invalid object type"
msgstr "felaktig objekttyp"
-#: sha1-file.c:1219
+#: sha1-file.c:1384
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1222
+#: sha1-file.c:1387
#, c-format
msgid "unable to unpack %s header"
msgstr "kan inte packa upp %s-huvudet"
-#: sha1-file.c:1228
+#: sha1-file.c:1393
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1231
+#: sha1-file.c:1396
#, c-format
msgid "unable to parse %s header"
msgstr "kan inte tolka %s-huvud"
-#: sha1-file.c:1422
+#: sha1-file.c:1587
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: sha1-file.c:1426
+#: sha1-file.c:1591
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: sha1-file.c:1430
+#: sha1-file.c:1595
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1434
+#: sha1-file.c:1599
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1536
+#: sha1-file.c:1702
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "kan inte skriva sha1-filnamn %s"
+msgid "unable to write file %s"
+msgstr "kunde inte skriva filen %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1709
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: sha1-file.c:1550
+#: sha1-file.c:1716
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "fel vid stängning av sha1-fil"
+#: sha1-file.c:1735
+msgid "error when closing loose object file"
+msgstr "fel vid stängning av fil för löst objekt"
-#: sha1-file.c:1635
+#: sha1-file.c:1800
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1802
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "kan inte skriva sha1-filen"
+#: sha1-file.c:1826
+msgid "unable to write loose object file"
+msgstr "kunde inte skriva fil för löst objekt"
-#: sha1-file.c:1667
+#: sha1-file.c:1832
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: sha1-file.c:1671
+#: sha1-file.c:1836
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: sha1-file.c:1675
+#: sha1-file.c:1840
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1850 builtin/pack-objects.c:920
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: sha1-file.c:1760
+#: sha1-file.c:1925
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "kan inte läsa sha1_file för %s"
+msgid "cannot read object for %s"
+msgstr "kan inte läsa objekt för %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1965
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: sha1-file.c:1813
+#: sha1-file.c:1973
msgid "corrupt tag"
msgstr "trasig tagg"
-#: sha1-file.c:1912
+#: sha1-file.c:2072
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: sha1-file.c:1915
+#: sha1-file.c:2075
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2148 sha1-file.c:2157
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: sha1-file.c:2003
+#: sha1-file.c:2163
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: sha1-file.c:2027
+#: sha1-file.c:2187
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: sha1-file.c:2029
+#: sha1-file.c:2189
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2216 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2406 sha1-file.c:2458
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "sha1 stämmer inte för %s (förväntade %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash stämmer inte för %s (förväntade %s)"
-#: sha1-file.c:2250
+#: sha1-file.c:2430
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2435
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: sha1-file.c:2261
+#: sha1-file.c:2441
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: sha1-file.c:2272
+#: sha1-file.c:2452
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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"
@@ -5867,77 +7055,139 @@
"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
"referenser kan skapas av misstag. Till exempel, för\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u,%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u,%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u,%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u,%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u,%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u,%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "i ej utcheckad undermodul \"%s\""
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "kunde inte komma åt undermodulen \"%s\""
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -5945,12 +7195,12 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5961,16 +7211,16 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
@@ -5980,21 +7230,21 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "ignorerar misstänkt undermodulnamn: %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
@@ -6029,7 +7279,7 @@
msgid "could not read from stdin"
msgstr "kunde inte läsa från standard in"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
@@ -6066,31 +7316,39 @@
#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: ”%s”"
+msgstr "transport: ogiltig flagga för depth: \"%s\""
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "se protocol.version i \"git help config\" för mer information"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "serverflaggor kräver protokollversion 2 eller senare"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "kunde inte tolka inställningen för transport.color.*"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "stöd för protokoll v2 ännu ej implementerat"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "okänt värde för inställningen \"%s\": %s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporten \"%s\" tillåts inte"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync stöds inte längre"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6099,7 +7357,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6126,37 +7384,32 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Avbryter."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "komplett skrivning till fjärrhjälpare misslyckades"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "kan inte hitta fjärrhjälpare för \"%s\""
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr "kunde inte duplicera utdata-filhandtag"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6165,101 +7418,101 @@
"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
"nyare version av Git"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
"fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
"(refspec)"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s sade oväntat: \"%s\""
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s låste också %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "kunde inte köra fast-import"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "fel när fast-import kördes"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "kunde inte läsa referensen %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "okänt svar på ansluntning: %s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "kan inte ansluta till undertjänsten %s"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "hjälparen returnerade oväntad status %s"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "hjälparen %s stöder inte dry-run"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "hjälparen %s stöder inte --signed"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "hjälparen %s stöder inte --signed=if-asked"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "hjälparen %s stöder inte \"push-option\""
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "hjälparen %s stöder inte \"force\""
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "kunde inte köra fast-export"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "fel vid körning av fast-export"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6268,47 +7521,47 @@
"Inga gemensamma referenser och inga angavs; gör inget.\n"
"Du kanske borde ange en gren såsom \"master\".\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "felformat svar i referenslistan: %s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "läs(%s) misslyckades"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "skriv(%s) misslyckades"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "%s-tråden misslyckades"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s-tråden misslyckades ansluta: %s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "kan inte starta tråd för kopiering av data: %s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "processen %s misslyckades vänta"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "processen %s misslyckades"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "kan inte skapa tråd för kopiering av data"
@@ -6324,11 +7577,11 @@
msgid "empty filename in tree entry"
msgstr "tomt filnamn i trädpost"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6337,7 +7590,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6346,7 +7599,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6356,7 +7609,7 @@
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6366,7 +7619,7 @@
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6375,7 +7628,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6384,7 +7637,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6394,7 +7647,7 @@
"dem:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6403,7 +7656,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6412,7 +7665,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6422,7 +7675,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6432,7 +7685,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6441,7 +7694,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6450,7 +7703,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6461,7 +7714,7 @@
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6472,7 +7725,7 @@
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6482,7 +7735,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6492,7 +7745,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6501,7 +7754,7 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6510,12 +7763,12 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6524,7 +7777,7 @@
"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6535,7 +7788,7 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6546,7 +7799,7 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6555,16 +7808,16 @@
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Checkar ut filer"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Uppdaterar filer"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6603,32 +7856,32 @@
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
@@ -6647,155 +7900,161 @@
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (använd \"git restore --staged <fil>...\" för att ta bort från kö)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från "
+"kö)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
+" (använd \"git restore <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Stashen innehåller just nu %d post"
msgstr[1] "Stashen innehåller just nu %d poster"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6803,107 +8062,118 @@
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
+"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1284
+#: 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] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -6911,126 +8181,134 @@
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick pågår."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Ångring pågår."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (kör \"git revert --continue\" för att fortsätta)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7042,32 +8320,32 @@
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7076,186 +8354,186 @@
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "olika"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "efter "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Kunde inte öppna \"%s\" för skrivning."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7284,14 +8562,14 @@
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Se ”git help submodule” för ytterligare information."
+"Se \"git help submodule\" för ytterligare information."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
@@ -7300,136 +8578,136 @@
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Patchen är tom."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7437,30 +8715,25 @@
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -7468,45 +8741,46 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
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 ""
-"Inga ändringar - glömde du använda \"git add\"?\n"
+"Inga ändringar - glömde du att använda \"git add\"?\n"
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7514,21 +8788,21 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Du har fortfarande ej sammanslagna sökvägar i indexet.\n"
-"Du bör köra ”git add” på filer med lösta konflikter för att ange dem som "
+"Du bör köra \"git add\" på filer med lösta konflikter för att ange dem som "
"lösta.\n"
-"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
+"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
-msgstr "Kan inte tolka objektet ”%s”."
+msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7536,143 +8810,143 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:307 builtin/stash.c:806
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "avbryt patchningen men behåll HEAD där det är."
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "visa patchen som tillämpas."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7680,16 +8954,16 @@
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7698,10 +8972,14 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "interaktivt läge kräver patchar på kommandoraden"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
@@ -7719,221 +8997,453 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Fjärr utan URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: förväntade en tömning (flush)"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<incheckning>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
+"för-rätt> <term-för-fel>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> "
+"<term-för-fel>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<fel> [<rätt>...]] [--] [<sökvägar>...]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "\"%s\" är inte en giltig term"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "kan inte ändra betydelsen av termen \"%s\""
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "termerna måste vara olika"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "kunde inte öppna filen BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Vi utför ingen bisect för tillfället.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "\"%s\" är inte en giltig incheckning"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
+"<incheckning>\"."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Felaktigt argument till bisect_write: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "kan inte läsa oid för referensen \"%s\""
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "kunde inte öppna filen \"%s\""
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Du måste ange åtminstone en %s och en %s version.\n"
+"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Du måste starta med \"git bisect start\".\n"
+"Du måste sedan ange åtminstone en %s och en %s version.\n"
+"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "utför bisect med endast en %s incheckning"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Är du säker [Y=ja/N=nej]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "inga termer angivna"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Aktuella termer är %s för det gamla tillståndet\n"
+"och %s för det nya tillståndet.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"ogiltigt argument %s för \"git bisect terms\".\n"
+"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "okänd flagga: %s"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "\"%s\" verkar inte vara en giltig revision"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "felaktigt HEAD - Jag behöver ett HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
+
+# cogito-relaterat
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "felaktigt HEAD - konstig symbolisk referens"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "ogiltig referens: \"%s\""
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "utför 'git bisect next'"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "skriv termerna i .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "städar upp bisect-tillstånd"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "kontrollera för förväntade versioner"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "återställ bisect-tillstånd"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "skriver bisect-tillståndet i BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "visa och ange termer för bisect-tillstånd"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "se efter om termer för rätt och fel finns"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "skriv ut termer för bisect"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "påbörja bisect-körningen"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "ingen logg för BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms kräver två argument"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state tar inga argument"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write kräver antingen 4 eller 5 argument"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms kräver tre argument"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check kräver 2 eller 3 argument"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms kräver noll eller ett argument"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "förväntade en färg: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "måste sluta med en färg"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "ogiltigt värde för blame.coloring"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "kan inte hitta revision %s att ignorera"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1646
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignorera <rev> vid klandren"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorera revisioner från <fil>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "färglägg redundant metadata från tidigare rader annorlunda"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "färglägg rader efter ålder"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Använd en experimentell algoritm för att förbättra diffar"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
@@ -7945,18 +9455,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Klandra rader"
@@ -7988,7 +9498,7 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -7997,7 +9507,7 @@
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8006,12 +9516,12 @@
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8020,113 +9530,122 @@
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "kunde inte slå upp HEAD"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) pekar utenför refs/heads/"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8137,223 +9656,219 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Ta bort uppströmsinformationen"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "visa namn på aktuell gren"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "nyckel"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "fältnamn att sortera på"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "objekt"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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 ""
-"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
-"grennamn"
+"Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
+"Menade du att använda: -a|-r --list <mönster>?"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8374,7 +9889,7 @@
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8382,7 +9897,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8390,133 +9905,133 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "endast en buntflagga kan anges"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör filter på objektets innehåll"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "ordna inte --batch-all-objects output"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "visa alla attribut som satts på filen"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "visa indatasökvägar som inte träffas"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "ignorera index vid kontroll"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "kan inte ange sökvägsnamn med --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z kan endast användas tillsammans med --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "ingen sökväg angavs"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "kan inte använda både --quiet och --verbose"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching är endast giltig med --verbose"
@@ -8537,54 +10052,54 @@
msgid "no contacts specified"
msgstr "inga kontakter angavs"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "checka ut alla filer i indexet"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "tvinga överskrivning av befintliga filer"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr "ingen varning för existerande filer och filer ej i indexet"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "checka inte ut nya filer"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "uppdatera stat-information i indexfilen"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "läs listan över sökvägar från standard in"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "sträng"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "när filer skapas, lägg till <sträng> först"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
@@ -8596,105 +10111,163 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<flaggor>] [<gren>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Återskapade %d sammanslagningskonflikt"
+msgstr[1] "Återskapade %d sammanslagningskonflikter"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Uppdaterade %d sökväg från %s"
+msgstr[1] "Uppdaterade %d sökvägar från %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Uppdaterade %d sökväg från indexet"
+msgstr[1] "Uppdaterade %d sökvägar från indexet"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "varken \"%s\" eller \"%s\" har angivits"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "\"%s\" måste användas när \"%s\" inte anges"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"kan inte fortsätta med köade ändringar i följande filer:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr "köade ändringar i följande filer kan gå förlorade: %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8717,7 +10290,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8744,161 +10317,238 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "endast en referens förväntades"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
+"Använd -- (och möjligen --no-guess) för att göra otvetydig"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "förväntade gren, fick taggen \"%s\""
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "förväntade gren, fick fjärrgrenen \"%s\""
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "förväntade gren, fick \"%s\""
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "förväntade gren, fick incheckningen \"%s\""
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren vid sammanslagning\n"
+"Överväg \"git merge --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren mitt i en \"am\"-körning\n"
+"Överväg \"git am --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren vid ombasering\n"
+"Överväg \"git rebase --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren i en \"cherry-pick\"\n"
+"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren i en \"revert\"\n"
+"Överväg \"git revert --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "då växlar grenar medan du gör en \"bisect\""
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "\"%s\" kan inte ta <startpunkt>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "gren"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "skapa och checka ut en ny gren"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "skapa/nollställ och checka ut en gren"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "skapa reflogg för ny gren"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "koppla från HEAD vid namngiven incheckning"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "sätt uppströmsinformation för ny gren"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "ny-gren"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "ny gren utan förälder"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "checka ut vår version för ej sammanslagna filer"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "checka ut deras version för ej sammanslagna filer"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "utför en 3-vägssammanslagning för den nya grenen"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "uppdatera ignorerade filer (standard)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "stil"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "konfliktstil (merge eller diff3)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "begränsa inte sökvägar till endast glesa poster"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "förutspå \"git checkout <gren-saknas>\""
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "utför en 3-vägssammanslagning för den nya grenen"
+
+#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+msgid "style"
+msgstr "stil"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "konfliktstil (merge eller diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "koppla från HEAD vid namngiven incheckning"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "sätt uppströmsinformation för ny gren"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "ny-gren"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "ny gren utan förälder"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "uppdatera ignorerade filer (standard)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "checka ut vår version för ej sammanslagna filer"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "checka ut deras version för ej sammanslagna filer"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "begränsa inte sökvägar till endast glesa poster"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p och --overlay är ömsesidigt uteslutande"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "grennamn saknas; försök med -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "kunde inte upplösa %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "du måste ange katalog(er) att återställa"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den"
+msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -8906,7 +10556,7 @@
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -8935,39 +10585,106 @@
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
"checkout.defaultRemote=origin i din konfiguration."
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "gren"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "skapa och checka ut en ny gren"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "skapa/nollställ och checka ut en gren"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "skapa reflogg för ny gren"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "använd överläggsläge (standard)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "skapa och växla till en ny gren"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "skapa/nollställ och växla till en gren"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "förutspå \"git checkout <gren-saknas>\""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "kasta bort lokala ändringar"
+
+#: builtin/checkout.c:1772
+msgid "where the checkout from"
+msgstr "källa till utcheckning"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "återställ indexet"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "återställ arbetskatalogen (förval)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorera ej sammanslagna poster"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "använd överläggsläge"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "
"<sökvägar>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Tar bort %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Skulle ta bort %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Hoppar över arkivet %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Skulle hoppa över arkivet %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "kunde inte ta status (\"lstat\") på %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -8980,7 +10697,7 @@
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9001,38 +10718,38 @@
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9050,64 +10767,64 @@
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9115,7 +10832,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9123,146 +10840,162 @@
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3308 builtin/repack.c:330
msgid "name"
msgstr "namn"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
msgid "time"
msgstr "tid"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "serverspecifik"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+"inget att checka in\n"
+"flagga att sända"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9270,183 +11003,183 @@
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "misslyckades öppna \"%s\""
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "misslyckades ta status på %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "misslyckades iterera över \"%s\""
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Klonen lyckades, men utcheckningen misslyckades.\n"
"Du kan inspektera det som checkades ut med \"git status\"\n"
-"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
+"och försöka med \"git restore -source=HEAD :/\"\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1653
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -9482,15 +11215,83 @@
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m "
+"<meddelande>)...] [(-F <fil>)...] <träd>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "duplicerad förälder %s ignorerades"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
+#, c-format
+msgid "not a valid object name %s"
+msgstr "objektnamnet är inte giltigt: %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: misslyckades öppna \"%s\""
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: misslyckades läsa \"%s\""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: misslyckades stänga \"%s\""
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "förälder"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "id på ett förälderincheckningsobjekt"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "meddelande"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "incheckningsmeddelande"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "läs incheckningsloggmeddelande från fil"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "GPG-signera incheckning"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "måste ange exakt ett träd"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: misslyckades läsa"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:50
+#: 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"
@@ -9500,7 +11301,7 @@
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9514,81 +11315,87 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Använd annars \"git reset\"\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Använd annars \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Om du vill hoppa över incheckningen, använd:\n"
+"och sedan:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
-"cherry-pick för återstående incheckningar.\n"
+"för att fortsätta \"cherry-pick\" med resterande incheckningar.\n"
+"Om du vill hoppa över den här incheckningen, använd:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9596,38 +11403,38 @@
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9642,7 +11449,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9657,7 +11464,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9667,7 +11474,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9678,148 +11485,144 @@
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Felaktigt städningsläge %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Kan inte ange sökvägar med -a."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -9827,11 +11630,11 @@
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "när"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -9839,252 +11642,252 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "meddelande"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "incheckningsmeddelande"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "standard"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "GPG-signera incheckning"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"arkivet har uppdaterats, men kunde inte skriva filen\n"
"new_index. Kontrollera att disken inte är full och\n"
"att kvoten inte har överskridits, och kör sedan\n"
-"\"git reset HEAD\" för att återställa."
+"\"git restore --staged :/\" för att återställa."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objkat>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objkat>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objkat>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1601
msgid "dir"
msgstr "kat"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Objektkatalogen där grafen skall lagras"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "starta traversering vid alla referenser"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "sök paketindex listade på standard in efter incheckningar"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "börja gå genom incheckningar listade på standard in"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "ta med alla incheckningar redan i filen commit-graph"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "tillåt skriva en inkrementell incheckningsgraffil"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"
@@ -10092,7 +11895,7 @@
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "okänt argument för --type, %s"
@@ -10197,7 +12000,7 @@
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "värdet har givits denna typ"
@@ -10241,7 +12044,7 @@
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "värde"
@@ -10249,48 +12052,48 @@
msgid "with --get, use default value when missing entry"
msgstr "med --get, använd standardvärde vid saknad post"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "fel antal argument, skulle vara %d"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "fel antal argument, skulle vara från %d till %d"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "felaktigt nyckelmönster: %s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "kan inte tolka färgen \"%s\""
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "inte i en git-katalog"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "skriva till standard in stöds inte"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
-msgstr "skriva konfigurations-blobar stöds inte"
+msgstr "skriva konfigurations-blobbar stöds inte"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10305,23 +12108,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "endast en konfigurationsfil åt gången"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME inte satt"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10331,52 +12134,52 @@
"konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n"
"\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color och variabeltyp stämmer inte överens"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "endast en åtgärd åt gången"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only gäller bara för --list eller --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin gäller bara för --get, --get-all, --get-regexp och --list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default gäller bara för --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "kan inte konfigurationsfil \"%s\""
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "fel vid hantering av konfigurationsfil(er)"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "redigering av standard in stöds ej"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
-msgstr "redigering av blobar stöds ej"
+msgstr "redigering av blobbar stöds ej"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10385,7 +12188,7 @@
"kan inte skriva över flera värden med ett ensamt värde\n"
" Använd en regexp, --add eller --replace-all för att ändra %s."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "ingen sådan sektion: %s"
@@ -10398,58 +12201,58 @@
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<flaggor>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "huvud"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "lättviktig"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annoterad"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "den annoterade taggen %s inte tillgänglig"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "den annoterade taggen %s har inget inbäddat namn"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10458,7 +12261,7 @@
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10467,12 +12270,12 @@
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10481,118 +12284,118 @@
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "beskriva %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s är varken incheckning eller blob"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "\"%s\": inte en normal fil eller symbolisk länk"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
@@ -10602,27 +12405,27 @@
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10630,53 +12433,53 @@
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"
+msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10684,160 +12487,220 @@
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "sändes till \"diff\""
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool kräver en arbetskatalog eller --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff är inkompatibelt med --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "typ"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "standard för git_env_*(...) att falla tillbaka på"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "var tyst, använd bara git_env_*() som resultatvärde"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte "
+"\"%s\""
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"flaggan \"--default\" förväntar ett teckenlöst långt värde med \"--type=ulong"
+"\", inte \"%s\""
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1014
-msgid "Dump marks to this file"
-msgstr "Dump märken till filen"
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1135
+msgid "Dump marks to this file"
+msgstr "Dumpa märken till filen"
+
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1649
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -10845,109 +12708,105 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "serverspecifik"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr ""
-"inget att checka in\n"
-"flagga att sända"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "kör \"gc --auto\" efter hämtning"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:879
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:900
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:991 builtin/fetch.c:1124
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1002
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -10956,56 +12815,89 @@
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1008
+msgid ""
+"Fetch normally indicates which branches had a forced update, but that check "
+"has been disabled."
+msgstr ""
+"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men "
+"det testet har slagits av."
+
+#: builtin/fetch.c:1009
+msgid ""
+"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
+"showForcedUpdates true'."
+msgstr ""
+"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör "
+"\"git config fetch.showForcedUpdates true\"."
+
+#: builtin/fetch.c:1011
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
+"updates'\n"
+msgstr ""
+"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda "
+"\"--no-show-forced-updates\"\n"
+
+#: builtin/fetch.c:1013
+msgid ""
+"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+msgstr ""
+"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n"
+
+#: builtin/fetch.c:1094
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1095
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1127
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1128 builtin/remote.c:1036
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1151
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1170
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1173
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1477
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1479 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1525
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-"--filter kan endast användas med fjärren konfigurerad i core.partialClone"
+"--filter kan endast användas med fjärren konfigurerad i extensions."
+"partialClone"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1549
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11013,43 +12905,51 @@
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1586
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1637
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1639
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1644
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1646
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1662
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1664
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1673
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1680
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
+#: builtin/fetch.c:1696
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter kan endast användas med fjärren konfigurerad i extensions."
+"partialclone"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11113,92 +13013,277 @@
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "använd formatfärger"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "visa endast referenser som slagits samman"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "visa endast referenser som ej slagits samman"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "okänd"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "fel i %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "varning i %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "trasig länk från %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "fel objekttyp i länk"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"trasig länk från %7s %s\n"
+" till %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "saknat %s %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "onåbart %s %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "hängande %s %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "kunde inte skapa lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "kunde inte avsluta \"%s\""
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Kontrollerar %s"
+
+# Vague original, not networking-related, but rather related to the actual
+# objects in the database.
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Kontrollerar konnektivitet (%d objekt)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Kontrollerar %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "trasiga länkar"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "roten %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "taggad %s %s (%s) i %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objekt trasigt eller saknas"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: ogiltig reflog-post %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Kontrollerar reflog %s->%s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: ogiltig sha1-pekare %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: inte en incheckning!"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "obs: Inga förvalda referenser"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objektet trasigt eller saknas: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: objektet kunde inte tolkas: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "ogiltig sha1-fil: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Kontrollerar objektkatalog"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:693
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Kontrollerar %s-länk"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "ogiltigt %s"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s pekar på något konstigt (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: frånkopplat HEAD pekar på ingenting"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "obs: %s pekar på en ofödd gren (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Kontrollerar cacheträd"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: ogiltig sha1-pekare i cacheträd"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "icke-träd i cacheträd"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Kontrollerar objekt"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: objekt saknas"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
@@ -11208,17 +13293,22 @@
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "misslyckades tolka \"%s\" värde \"%s\""
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11233,52 +13323,52 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "packa om alla paket förutom det största paketet"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "kunde inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "kunde inte tolka värdet %s för prune expiry"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11286,23 +13376,23 @@
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -11311,262 +13401,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2722
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3405
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "flaggan stöds inte med --recurse-submodules"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached och --untracked kan inte användas med --no-index"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11574,37 +13664,33 @@
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "typ"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
@@ -11644,30 +13730,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "okänt hjälpformat: ”%s”"
+msgstr "okänt hjälpformat: \"%s\""
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11676,7 +13762,7 @@
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11685,327 +13771,317 @@
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "felaktig alias.%s-sträng: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "\"git help config\" för mer information"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:600
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:555
+#: 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] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "fsck-fel i packat objekt"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "ogiltigt %s"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "kan inte ta skriva %s-fil \"%s\""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "kan inte stänga skriven %s-fil \"%s\""
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "fsck-fel i packat objekt"
@@ -12049,42 +14125,42 @@
msgid "not copying templates from '%s': %s"
msgstr "kopierade inte mallar från \"%s\": %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Initierade tomt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12092,25 +14168,25 @@
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12119,12 +14195,12 @@
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12132,562 +14208,573 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbol>[(=|:)<värde>])...] [<fil>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "redigera filer på plats"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "ta bort tomma släprader"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "var nya släprader skall placeras"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "att göra om släprader redan finns"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "att göra om släprader saknas"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "visa endast släprader"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "använd inte regler från konfigurationen"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "slå ihop värden avdelade med blanksteg"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "välj tolkningsalternativ"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "tolka inte --- speciellt"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "släprad"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "släprad(er) att lägga till"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer med --only-input ger ingen mening"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "undertryck diff-utdata"
+#: builtin/log.c:160
+msgid ""
+"log.mailmap is not set; its implicit value will change in an\n"
+"upcoming release. To squelch this message and preserve current\n"
+"behaviour, set the log.mailmap configuration value to false.\n"
+"\n"
+"To squelch this message and adopt the new behaviour now, set the\n"
+"log.mailmap configuration value to true.\n"
+"\n"
+"See 'git help config' and search for 'log.mailmap' for further information."
+msgstr ""
+"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
+"version. För att dölja det här meddelandet och behålla nuvarande\n"
+"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
+"\n"
+"För att dölja det här meddelandet och använda det nya beteendet,\n"
+"sätt konfigurationsvariabeln log.mailmap till true.\n"
+"\n"
+"Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
-#: builtin/log.c:163
+#: builtin/log.c:183
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:164
+#: builtin/log.c:184
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:166
+#: builtin/log.c:186
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:168
+#: builtin/log.c:188
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:169
+#: builtin/log.c:189
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:172
+#: builtin/log.c:192
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:270
+#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:551
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:566 builtin/log.c:660
#, c-format
-msgid "Could not read object %s"
-msgstr "Kunde inte läsa objektet %s"
+msgid "could not read object %s"
+msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:655
+#: builtin/log.c:685
#, c-format
-msgid "Unknown type: %d"
-msgstr "Okänd typ: %d"
+msgid "unknown type: %d"
+msgstr "okänd typ: %d"
-#: builtin/log.c:776
+#: builtin/log.c:808
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:877
+#: builtin/log.c:925
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:893
+#: builtin/log.c:941
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Kan inte öppna patchfilen %s"
+msgid "cannot open patch file %s"
+msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "Behöver precis ett intervall."
+#: builtin/log.c:958
+msgid "need exactly one range"
+msgstr "behöver precis ett intervall"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "Inte ett intervall."
+#: builtin/log.c:968
+msgid "not a range"
+msgstr "inte ett intervall"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "Omslagsbrevet behöver e-postformat"
+#: builtin/log.c:1091
+msgid "cover letter needs email format"
+msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1119
+#: builtin/log.c:1097
+msgid "failed to create cover-letter file"
+msgstr "misslyckades skapa fil för omslagsbrev"
+
+#: builtin/log.c:1176
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1203
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
-msgstr "Två utdatakataloger?"
+#: builtin/log.c:1261
+msgid "two output directories?"
+msgstr "två utdatakataloger?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
#, c-format
-msgid "Unknown commit %s"
-msgstr "Okänd incheckning %s"
+msgid "unknown commit %s"
+msgstr "okänd incheckning %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "Kunde inte hitta exakt sammanslagningsbas."
+#: builtin/log.c:1387
+msgid "could not find exact merge base"
+msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1330
+#: builtin/log.c:1391
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n"
+"kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n"
"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
-"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
-"manuellt."
+"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
-msgstr "Kunde inte hitta exakt sammanslagningsbas"
+#: builtin/log.c:1411
+msgid "failed to find exact merge base"
+msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1361
+#: builtin/log.c:1422
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1365
+#: builtin/log.c:1426
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1418
+#: builtin/log.c:1479
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1470
+#: builtin/log.c:1531
msgid "failed to infer range-diff ranges"
msgstr "misslyckades räkna ut intervall range-diff"
-#: builtin/log.c:1515
+#: builtin/log.c:1576
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1518
+#: builtin/log.c:1579
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1522
+#: builtin/log.c:1583
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1524
+#: builtin/log.c:1585
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1526
+#: builtin/log.c:1587
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1527
+#: builtin/log.c:1588
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1528
+#: builtin/log.c:1589
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1530
+#: builtin/log.c:1591
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1532
+#: builtin/log.c:1593
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1534
+#: builtin/log.c:1595
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1537
+#: builtin/log.c:1598
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1540
+#: builtin/log.c:1601
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1543
+#: builtin/log.c:1604
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1546
+#: builtin/log.c:1607
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1548
+#: builtin/log.c:1609
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1550
+#: builtin/log.c:1611
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1552
+#: builtin/log.c:1613
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1554
+#: builtin/log.c:1615
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1555
+#: builtin/log.c:1616
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1556
+#: builtin/log.c:1617
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1618 builtin/log.c:1620
msgid "email"
msgstr "epost"
-#: builtin/log.c:1557
+#: builtin/log.c:1618
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1559
+#: builtin/log.c:1620
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1561
+#: builtin/log.c:1622
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1562
+#: builtin/log.c:1623
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1564
+#: builtin/log.c:1625
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1565
+#: builtin/log.c:1626
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1627 builtin/log.c:1630
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1567
+#: builtin/log.c:1628
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1570
+#: builtin/log.c:1631
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1574
+#: builtin/log.c:1635
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1576
+#: builtin/log.c:1637
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1577
+#: builtin/log.c:1638
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1578
+#: builtin/log.c:1639
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1579
+#: builtin/log.c:1640
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1581
+#: builtin/log.c:1642
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1582
+#: builtin/log.c:1643
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1584
+#: builtin/log.c:1645
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1647
msgid "show changes against <rev> in cover letter or single patch"
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1589
+#: builtin/log.c:1650
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1591
+#: builtin/log.c:1652
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1666
+#: builtin/log.c:1727
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1742
msgid "-n and -k are mutually exclusive"
msgstr "-n och -k kan inte användas samtidigt"
-#: builtin/log.c:1683
+#: builtin/log.c:1744
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-#: builtin/log.c:1691
+#: builtin/log.c:1752
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1693
+#: builtin/log.c:1754
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1695
+#: builtin/log.c:1756
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1727
+#: builtin/log.c:1788
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Kunde inte skapa katalogen \"%s\""
-
-#: builtin/log.c:1816
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1820
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1821
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:1827
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor kräver --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1839
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:1840
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:1851
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1887
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
-msgstr "Misslyckades skapa utdatafiler"
+#: builtin/log.c:1992
+msgid "failed to create output files"
+msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:1989
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -12705,7 +14792,7 @@
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exec"
@@ -12729,11 +14816,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr "ta hänsyn till url.<bas>.insteadOf"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
@@ -12776,263 +14863,284 @@
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
-msgstr "tom mbox: ”%s”"
+msgstr "tom mbox: \"%s\""
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "flaggan \"%s\" behöver ett värde"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort men lämna index och arbetskatalog ensamma"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "bekräfta commit-msg-krok"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"
"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"
"temagren.\n"
"\n"
+
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Ett tomt meddelande avbryter incheckningen.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit tar inga argument"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13040,7 +15148,7 @@
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13048,92 +15156,96 @@
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Du kan inte kombinera --squash med --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Redan à jour."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13219,33 +15331,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "okänd flagga %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "kunde inte tolka objektet \"%s\""
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s."
msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
-msgstr "kunde inte bestämma referensen ”%s”"
+msgstr "kunde inte bestämma referensen \"%s\""
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Slår ihop %s med %s\n"
@@ -13258,7 +15370,7 @@
msgid "input is NUL terminated"
msgstr "indata är NUL-terminerad"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "tillåt saknade objekt"
@@ -13266,157 +15378,173 @@
msgid "allow creation of more than one tree"
msgstr "tillåt skapa mer än ett träd"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<kat>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --"
+"batch-size=<storlek>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
+"storlekt"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "för många argument"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "okänt verb: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "okänt underkommando: %s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<flaggor>] <källa>... <mål>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Katalogen %s är i indexet och inte en undermodul?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s är i indexet"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "tvinga flytta/ändra namn även om målet finns"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorera referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
@@ -13563,14 +15691,14 @@
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 "kunde inte slå upp \"%s\" som en giltig referens."
@@ -13603,38 +15731,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "för många parametrar"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
@@ -13647,29 +15775,29 @@
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13678,12 +15806,12 @@
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13692,52 +15820,52 @@
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -13745,48 +15873,48 @@
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13797,171 +15925,176 @@
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:424
#, c-format
msgid "bad packed object CRC for %s"
msgstr "felaktig CRC för packat objekt %s"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:435
#, c-format
msgid "corrupt packed object for %s"
msgstr "trasigt packat objekt för %s"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:566
#, c-format
msgid "recursive delta detected for object %s"
msgstr "rekursivt delta upptäcktes för objektet %s"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:777
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "ordnade %u objekt, förväntade %<PRIu32>"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:790
#, c-format
msgid "packfile is invalid: %s"
msgstr "packfil är ogiltig: %s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:794
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "kan inte öppna packfil för återanvändning: %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:798
msgid "unable to seek in reused packfile"
msgstr "kan inte söka i återanvänd packfil"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:809
msgid "unable to read from reused packfile"
msgstr "kan inte läsa från återanvänd packfil"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:837
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:850
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:965
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1161
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1591
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "deltabasoffset utanför gränsen i pack för %s"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1600
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "deltabasoffset utanför gränsvärden för %s"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1869
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:1999
#, c-format
msgid "unable to get size of %s"
msgstr "kan inte hämta storlek på %s"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2014
#, c-format
msgid "unable to parse object header of %s"
msgstr "kunde inte tolka objekthuvud för %s"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
+#: builtin/pack-objects.c:2110
#, c-format
msgid "object %s cannot be read"
msgstr "objektet %s kunde inte läsas"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2124
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2450
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Deltakomprimering använder upp till %d trådar"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2582
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "kan inte packa objekt nåbara från taggen %s"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2669
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2675
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2756
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -13970,7 +16103,7 @@
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -13979,249 +16112,253 @@
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2860
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
msgid "cannot open pack index"
-msgstr "kan inte öppna paketfilen"
+msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2950
#, c-format
msgid "loose object at %s could not be examined"
msgstr "lösa objekt på %s kunde inte underökas"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3035
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3127
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3130
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3155
msgid "unable to add recent objects"
-msgstr "kan inte lägga till nya objekt"
+msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3208
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3212
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3242
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3244
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3246
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3249
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3250
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3251
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3254
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3256
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3258
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3260
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3262
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3264
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3266
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3268
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3270
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3272
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3274
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3276
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3278
msgid "limit the objects to those that are not yet packed"
-msgstr "begränsa objekt till de som ännu inte packats"
+msgstr "begränsa objekt till dem som ännu inte packats"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3281
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3284
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3287
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3290
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3292
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3294
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3296
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3298
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3301
+msgid "use the sparse reachability algorithm"
+msgstr "använd gles-nåbarhetsalgoritmen"
+
+#: builtin/pack-objects.c:3303
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3305
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3307
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3309
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3311
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3313
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3315
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3317
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3320
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3323
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3325
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3350
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3355
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3409
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kan inte användas för att bygga ett paket som skall överföras"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3411
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3416
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3419
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3425
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3486
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3516
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<flaggor>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "packa allt"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
@@ -14237,69 +16374,69 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14307,14 +16444,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14322,7 +16459,7 @@
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14333,42 +16470,42 @@
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14377,32 +16514,32 @@
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14413,7 +16550,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14430,15 +16567,15 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -14454,7 +16591,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14463,7 +16600,7 @@
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14488,7 +16625,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14503,7 +16640,7 @@
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14516,12 +16653,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14532,14 +16669,14 @@
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14551,7 +16688,7 @@
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14563,7 +16700,7 @@
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14577,11 +16714,11 @@
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14592,22 +16729,22 @@
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14628,104 +16765,104 @@
"\n"
" git push <namn>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<refnamn>:<förvänta>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
@@ -14750,20 +16887,20 @@
msgid "use simple diff colors"
msgstr "använd enkla diff-färger"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr ".. saknas i intervall: \"%s\""
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "ensamt argument måste vara symmetriskt intervall"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "behöver två incheckningsintervall"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -14773,71 +16910,75 @@
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "undertryck återkopplingsmeddelanden"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
@@ -14845,47 +16986,226 @@
"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppström>] "
"[<gren>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "oanvändbar todo-lista: %s"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "kunde inte skriva \"%s\"."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "inget HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "kunde inte skapa temporär %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "kunde inte markera som interaktiv"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "Kunde inte skapa attgöra-lista"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "en basincheckning måste anges med --upstream eller --onto"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<flaggor>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "behåll tomma incheckningar"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "ombasera sammanslagningar"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "flytta incheckningar som inleds med squash!/fixup!"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "signera incheckningar"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "vis diffstat för vad som ändrats uppströms"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "fortsätt ombasering"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "hoppa över incheckning"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "redigera attgöra-listan"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "visa nuvarande patch"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "förkorta inchecknings-id i todo-listan"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "utöka inchecknings-id i todo-listan"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "kontrollera todo-listan"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "ordna om fixup-/squash-rader"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "lägg in exec-kommandon i todo-listan"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "ovanpå"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "begränsa revision"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "tryck ihop ovanpå"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "uppströmsincheckningen"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "head-name"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "namn på huvud"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "sammanslagningsstrategi"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "strategy-opts"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "strategiflaggor"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "switch-to"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "gren eller inchecking att checka ut"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "onto-name"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "på-namn"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "kmd"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "kommando att köra"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s kräver en interaktiv ombasering"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "kunde inte hämta \"onto\": \"%s\""
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "ogiltigt orig-head: \"%s\""
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "Kunde inte läsa \"%s\""
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "Kan inte spara %s"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "kunde inte bestämma HEAD-revision"
+
+#: builtin/rebase.c:950 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"
@@ -14899,11 +17219,26 @@
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "kunde inte bestämma HEAD-revision"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git upptäckte ett fel när det skulle förbereda patchar för att\n"
+"återskapa dessa revisioner:\n"
+"\n"
+" %s\n"
+"\n"
+"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -14920,7 +17255,7 @@
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -14933,148 +17268,158 @@
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "exec-kommandon kan inte innehålla nyradstecken"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "tomt exec-kommando"
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "ombasera mot given grenen istället för uppström"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "vis diffstat för vad som ändrats uppströms"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "sänds till \"git am\""
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "avbryt men behåll HEAD där det är"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "visa patchen som tillämpas eller slås samman"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för sammanslagning"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "låt användaren redigera listan över incheckningar att ombasera"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "försök återskapa sammanslagningar istället för att ignorera dem"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "tillåt rerere att uppdatera index med lösa konflikter"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "behåll tomma incheckningar under ombasering"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "utför automatiskt stash/stash pop före och efter"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "kunde inte köra %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"stödet för rebase.useBuiltin har tagits bort!\n"
+"Se posten för det i \"git help config\" för detaljer."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15082,21 +17427,16 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "kunde inte ta bort \"%s\""
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15117,342 +17457,176 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-"fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) med am-flaggor (%s)"
+"kan inte kombinera am-flaggor med varken interaktiv- eller "
+"sammanslagningsflaggor"
-#: builtin/rebase.c:1231
-#, c-format
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --"
-"strategy-option) med am-flaggor (%s)"
+"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
+"\""
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "fel: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "fel: kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\""
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "fel: kan inte kombinera \"--rebase-merges\" med \"--strategy\""
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
-msgstr "felaktig uppström ”%s”"
+msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Pekar inte på en giltig incheckning: \"%s\""
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Kunde inte bestämma HEAD:s incheckning"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Oväntat svar från stash: \"%s\""
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Kunde inte skapa katalog för \"%s\""
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Skapade autostash: %s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "kunde inte utföra \"reset --hard\""
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "kunde inte växla till %s"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktuell gren %s är à jour.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Snabbspolade %s till %s.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "inget HEAD?"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "kunde inte skapa temporär %s"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "kunde inte markera som interaktiv"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "kunde inte öppna %s"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "Kunde inte skapa attgöra-lista"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<flaggor>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "behåll tomma incheckningar"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "ombasera sammanslagningar"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "flytta incheckningar som inleds med squash!/fixup!"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "signera incheckningar"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "fortsätt ombasering"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "hoppa över incheckning"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "redigera attgöra-listan"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "visa nuvarande patch"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "förkorta inchecknings-id i todo-listan"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "utöka inchecknings-id i todo-listan"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "kontrollera todo-listan"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "ordna om fixup-/squash-rader"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "lägg in exec-kommandon i todo-listan"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "ovanpå"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "begränsa revision"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "tryck ihop ovanpå"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "uppströmsincheckningen"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "namn på huvud"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "sammanslagningsstrategi"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "strategiflaggor"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "gren eller inchecking att checka ut"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "på-namn"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "kmd"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "kommando att köra"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "en basincheckning måste anges med --upstream eller --onto"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15482,7 +17656,7 @@
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15503,19 +17677,74 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<tid>] [--expire-unreachable=<tid>] [--rewrite] "
+"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<referenser>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<referenser>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <referens>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Markerar nåbara objekt..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s pekar ingenstans!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "ingen referenslogg att ta bort angavs"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "inte en referenslogg: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "ingen referenslogg för \"%s\""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "felaktigt referensformat: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -16035,95 +18264,131 @@
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:294
+#: builtin/repack.c:201
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
+
+#: builtin/repack.c:240 builtin/repack.c:418
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects."
+
+#: builtin/repack.c:257
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
+
+#: builtin/repack.c:295
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:296
+#: builtin/repack.c:297
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:299
+#: builtin/repack.c:300
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:302
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:306
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:314
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:320 builtin/repack.c:326
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:322
+#: builtin/repack.c:323
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:324
+#: builtin/repack.c:325
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:326
+#: builtin/repack.c:327
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:328
+#: builtin/repack.c:329
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:331
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:340
+#: builtin/repack.c:341
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:344
+#: builtin/repack.c:345
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:527
+#: builtin/repack.c:427
+msgid "Nothing new to pack."
+msgstr "Inget nytt att packa."
+
+#: builtin/repack.c:488
+#, 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 ""
+"VARNING: Namnen på några paket har bytts genom att\n"
+"VARNING: lägga till old- före namnen, för att byta\n"
+"VARNING: dem mot den nya versionen av filen. Men\n"
+"VARNING: operationen misslyckades, och försöket att\n"
+"VARNING: byta tillbaka till det ursprungliga\n"
+"VARNING: namnet misslyckades också.\n"
+"VARNING: Byt namn på dem i %s manuellt:\n"
+
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
@@ -16152,12 +18417,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16166,27 +18426,27 @@
"ogiltigt ersättningsformat \"%s\"\n"
"giltiga format är \"short\", \"medium\" och \"long\""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "ersättningsreferensen \"%s\" hittades inte"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Tog bort ersättningsreferensen \"%s\""
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "\"%s\" är inte ett giltigt referensnamn"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "ersättningsreferensen \"%s\" finns redan"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16197,76 +18457,81 @@
"\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n"
"medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "kan inte öppna %s för skrivning"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file rapporterade misslyckande"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "kan inte öppna %s för läsning"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "kan inte starta mktree"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "kan inte läsa från mktree"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree rapporterade misslyckande"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree returnerade inte ett objektnamn"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "kan inte utföra \"fstat\" på %s"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "kan inte skriva objektet till databasen"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "objektnamnet är inte giltigt: \"%s\""
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "kan inte läsa objekttyp för %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "misslyckades redigera objektfilen"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "nytt objekt är samma som det gamla: \"%s\""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "kunde inte tolka %s som incheckning"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16275,31 +18540,31 @@
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "ympning för \"%s\" behövs inte"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "ny incheckning är samma som den gamla: \"%s\""
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16308,71 +18573,71 @@
"kunde inte konvertera följande ympning(ar):\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "konvertera befintlig ympningsfil"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "använd detta format"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "--format kan inte användas utanför listning"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "-f kan endast användas vid skrivning av ersättning"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw kan bara användas med --edit"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d behöver minst ett argument"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "fel antal argument"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e tar exakt ett argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g tar minst ett argument"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file tar inga argument"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "endast ett mönster kan anges med -l"
@@ -16388,125 +18653,126 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "\"git rerere forget\" utan sökvägar är föråldrat"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "misslyckades skapa diff för \"%s\""
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "blandad"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "mjuk"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "hård"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "sammanslagning"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta trädet för HEAD."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta trädet för %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16520,53 +18786,53 @@
"konfigurationsvariabeln\n"
"reset.quiet till true för att göra detta till förval.\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "objektfiltrering kräver --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "ogiltigt värde för sparse: \"%s\""
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16597,72 +18863,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <underkommando>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "flaggan \"%s\" antar ett numeriskt värde större än noll"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kan inte användas med %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "avsluta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "återuppta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "avbryt revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "hoppa över nuvarande incheckning och fortsätt"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "checka inte in automatiskt"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "redigera incheckningsmeddelandet"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "nummer-på-förälder"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "välj förälder för huvudlinje"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<flaggor>] [--] <fil>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -16674,7 +18949,7 @@
msgstr[1] ""
"följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -16682,13 +18957,13 @@
"\n"
"(använd -f för att tvinga borttagning)"
-#: builtin/rm.c:215
+#: 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] "följande fil har ändringar köade i indexet:"
msgstr[1] "följande filer har ändringar köade i indexet:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -16696,43 +18971,43 @@
"\n"
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
@@ -16765,18 +19040,6 @@
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<flaggor>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
@@ -16809,7 +19072,7 @@
msgid "Linewrap output"
msgstr "Radbryt utdata"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "för många flaggor givna utanför arkivet"
@@ -16836,120 +19099,120 @@
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "inga motsvarande referenser med %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "visa referenser som inte kan nås från någon annan referens"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
"base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog behöver ett namn på en gren"
-#: builtin/show-branch.c:742
+#: 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] "maximalt %d poster kan visas samtidigt."
msgstr[1] "maximalt %d poster kan visas samtidigt."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -16957,42 +19220,268 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<mönster>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "visa endast taggar (kan kombineras med huvuden)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "visa endast huvuden (kan kombineras med taggar)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "avreferera taggar till objekt-id"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "visa SHA1-hash endast med <n> siffror"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "visa inte resultat på standard ut (användbart med --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<flaggor>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<flaggor>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <grennamn> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
+" [--] [<sökväg>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<meddelande>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "För många revisioner angivna:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Inga \"stash\"-poster hittades."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s är inte en giltigt referens"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "\"git stash clear\" med parametrar har inte implementerats"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "kunde inte skapa diff %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "konflikter i indexet. Testa utan --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "kunde inte spara indexträd"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "kunde inte återställa ospårade filer från stash-post"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Slår ihop %s med %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Indexet har inte tagits upp ur \"stash\":en"
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "försök återskapa indexet"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Kastade %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Kunde inte kasta \"stash\"-post"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "\"%s\" är inte en \"stash\"-referens"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Stash-posten behålls ifall du behöver den igen."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Inget grennamn angavs"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Kan inte uppdatera %s med %s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "\"stash\"-meddelande"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" kräver ett <incheckning>-argument"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Inga ändringar valda"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Du har inte den första incheckningen ännu"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Kan inte spara aktuellt tillstånd för indexet"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Kan inte spara ospårade filer"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Kan inte registrera tillstånd för arbetskatalog"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Glömde du använda \"git add\"?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Inga lokala ändringar att spara"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Kan inte initiera \"stash\""
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Kan inte spara aktuell status"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Sparade arbetskatalogen och indexstatus %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Kan inte ta bort ändringar i arbetskatalogen"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "behåll indexet"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "\"stash\" i \"patch\"-läge"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "tyst läge"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "ta med ospårade filer i \"stash\""
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "ta med ignorerade filer"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "kunde inte köra %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17001,48 +19490,48 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote tar inga argument"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Går in i \"%s\"\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17051,7 +19540,7 @@
"run_command returnerade icke-nollstatus för %s\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17062,19 +19551,19 @@
"undermoduler för %s\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Dölj utdata från för varje undermodulskommando som startas"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<kommando>]"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17083,54 +19572,54 @@
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
"officiella uppström."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<sökväg>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -17138,47 +19627,47 @@
"Visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Dölj utdata från synkroniering av undermodul-url"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17187,7 +19676,7 @@
"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
"\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17196,81 +19685,81 @@
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "kunde inte skapa tom undermodulskatalog %s"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17278,93 +19767,93 @@
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”"
+msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17373,42 +19862,50 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "se om det är säkert att skriva till .gitmodules-filen"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config name <värde>"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "ta bort konfigurationen från .gitmodules-filen"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <namn> [<värde>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <namn>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "se till att .gitmodules finns i arbetskatalogen"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -17444,17 +19941,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "
-"[<huvud>]"
+"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
+"\t\t<taggnamn> [<huvud>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <taggnamn>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17464,21 +19961,21 @@
"<incheckning>] [--points-at <objekt>]\n"
"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17491,7 +19988,7 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17506,146 +20003,159 @@
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:218
+#: 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 ""
+"Du har skapat en nästlad tagg. Objektet som refereras av din nya tagg är\n"
+"redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -17654,199 +20164,199 @@
msgid "Unpacking objects"
msgstr "Packar upp objekt"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "misslyckades skapa katalogen %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "misslyckades skapa filen %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "misslyckades ta bort katalogen %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testar mtime i \"%s\" "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"stat-informationen för en katalog ändras när filer läggs till i en "
"underkatalog"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "skriv ut indexet även om det inte angivits som ändrat"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "aktivera eller inaktivera filsystemsövervakning"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "markera filer som \"fsmonitor valid\""
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "töm \"fsmonitor valid\"-bit"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -17854,7 +20364,7 @@
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
"vill aktivera delat index"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -17862,7 +20372,7 @@
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
"vill inaktivera delat index"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -17870,11 +20380,11 @@
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -17882,26 +20392,26 @@
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor aktiverat"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor inaktiverat"
@@ -17945,6 +20455,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
@@ -17961,11 +20475,11 @@
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <incheckning>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:69
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "visa råa gpg-statusdata"
@@ -17989,55 +20503,55 @@
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -18046,35 +20560,35 @@
"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
"%<PRIuMAX>)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18084,7 +20598,7 @@
"använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
"\"remove\" för att rensa"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18099,116 +20613,116 @@
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "målet \"%s\" finns redan"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18217,7 +20731,7 @@
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18225,36 +20739,36 @@
"kan inte flytta en låst arbetskatalog;\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "\"%s\" är smutsigt, använd --force för att ta bort det"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18263,7 +20777,7 @@
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18271,28 +20785,28 @@
"kan inte ta bort en låst arbetskatalog;\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<prefix>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "visa trädobjekt för underkatalogen <prefix>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18305,7 +20819,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
@@ -18318,6 +20832,14 @@
msgid "too many commits marked reachable"
msgstr "för många incheckningar markerade nåbara"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<flaggor>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18339,100 +20861,152 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
-"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
+"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
+"See \"git help git\" för en översikt över systemet."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "ingen katalog angavs för --git-dir\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "ingen katalog angavs för --work-tree\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "inget prefix angavs för --super-prefix\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c förväntar en konfigurationssträng\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "ingen katalog angavs för -C\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "okänd flagga: %s\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "vid expandering av aliaset \"%s\": \"%s\""
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"aliaset \"%s\" ändrar miljövariabler.\n"
+"Du kan använda \"!git\" i aliaset för att göra det"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "tomt alias för %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekursivt alias: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "skrivfel på standard ut"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "okänt skrivfel på standard ut"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "stäng misslyckades på standard ut"
+
+#: git.c:796
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
-#: git.c:802
+#: git.c:846
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "kan inte hantera %s som inbyggd"
+
+#: git.c:859
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"användning: %s\n"
+"\n"
+
+#: git.c:879
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
-#: git.c:814
+#: git.c:891
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "misslyckades köra kommandot \"%s\": %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer har negativt värde; använder förvalet %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18443,39 +21017,167 @@
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "felaktig citering på värde för push-option: \"%s\""
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "ogiltigt svar från servern; fick \"%s\""
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "arkivet \"%s\" hittades inte"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Autentisering misslyckades \"%s\""
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "kan inte komma åt \"%s\": %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "borde inte ha EOF när inte försiktig på EOF"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC misslyckades; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "kan inte hantera så stora sändningar"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "kan inte packa upp anrop; zlib-slutfel %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "dum http-transport stöder inte grunda arkiv"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "mottagning misslyckades."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "kan inte hämta med sha1 över smart http"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http-transporten stöder inte %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push misslyckades"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: fel vid läsning av kommandoström från git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: okänt kommando \"%s\" från git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "argument"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "objektfiltrering"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "nyckel"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "fältnamn att sortera på"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
+
+#: wt-status.h:68
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
+
+#: wt-status.h:69
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Lägg filinnehåll till indexet"
@@ -18519,7 +21221,7 @@
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr ""
-"Visa innehåller eller typ- och storleksinformation för objekt i arkivet."
+"Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
#: command-list.h:61
msgid "Display gitattributes information"
@@ -18635,7 +21337,7 @@
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt"
+msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt"
#: command-list.h:90
msgid "Show changes using common diff tools"
@@ -18730,9 +21432,9 @@
msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
-"lägg till eller tolka strukturerad information i incheckningsmeddelanden"
+"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
#: command-list.h:114
msgid "The Git repository browser"
@@ -18904,221 +21606,225 @@
msgstr "Återställ aktuell HEAD till angivet tillstånd"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Återställ filer i arbetskatalogen"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Återställ några befintliga incheckningar"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Plocka ut och massera parametrar"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Sänd en uppsättning patchar som e-post"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Sänd objekt över Git-protokollet till annat arkiv"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Summera \"git log\"-utdata"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Visa grenar och deras incheckningar"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Skapa packat arkivindex"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Visa referenser i ett lokalt arkiv"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Git:s i18n-startkod för skalskript"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Gemensam skriptstartkod för Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Spara undan ändringar i en lortig arbetskatalog"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Lägg filinnehållet till indexet"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Ta bort onödiga blanksteg"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Initiera, uppdatera eller inspektera undermoduler"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Byt gren"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Läs, modifiera eller ta bort symbolisk referens"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Skapar temporära filer med innehållet från en blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Packa upp objekt från ett pakat arkiv"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Sänd arkivet tillbaka till git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Visa en logisk Git-variabel"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Kontrollera GPG-signaturer för incheckningar"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Bekräfta packade Git-arkivfiler"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Kontrollera GPG-signaturer i taggar"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Skapa ett trädobjekt från aktuellt index"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git för CVS-användare"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "En Git-ordlista"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git-namnrymder"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Gits arkivlayout"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Introduktion till Git: del två"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Introduktion till Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Du måste starta med \"git bisect start\""
@@ -19130,140 +21836,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "flaggan känns inte igen: \"$arg\""
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "\"$arg\" verkar inte vara en giltig revision"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
-"<giltig_gren>”."
-
-# cogito-relaterat
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Felaktigt HEAD - konstig symbolisk referens"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Felaktigt argument till bisect_write: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Felaktig rev-indata: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Felaktig rev-indata: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Felaktig rev-indata: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr ""
-"Varning: utför \"bisect\" med endast en dålig (\"$TERM_BAD\") incheckning."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Är du säker [Y=ja/N=nej]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Du måste ange åtminstone en dålig (\"$bad_syn\") och en bra (\"$good_syn\") "
-"version.\n"
-"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
-"detta.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Du måste starta med \"git bisect start\".\n"
-"Du måste sedan ange åtminstone en bra (\"$good_syn\") och en dålig "
-"(\"$bad_syn\") version.\n"
-"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
-"detta.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "Vi utför ingen bisect för tillfället."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "\"$invalid\" är inte en giltig incheckning"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"Kunde inte checka ut original-HEAD \"$branch\".\n"
-"Försök \"git bisect reset <incheckning>\"."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Ingen loggfil angiven"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kan inte läsa $file för uppspelning"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? vad menar du?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "bisect-körning misslyckades: inget kommando gavs."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19272,11 +21887,11 @@
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19285,28 +21900,13 @@
"\"bisect\"-körningen misslyckades:\n"
"\"bisect_state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-"Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "inga termer angivna"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"ogiltigt argument $arg för \"git bisect terms\".\n"
-"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Vi utför ingen bisect för tillfället."
#: git-merge-octopus.sh:46
msgid ""
@@ -19348,262 +21948,113 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Kunde inte flytta tillbaka till $head_name"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Det verkar som katalogen $state_dir_base redan existerar, och\n"
-"jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
-"fallet, försök\n"
-"\t$cmd_live_rebase\n"
-"Om så inte är fallet, kör\n"
-"\t$cmd_clear_stale_rebase\n"
-"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
-"något av värde där."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "fel: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "ogiltig uppström \"$upstream_name\""
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: mer än en sammanslagningsbas finns"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: ingen sammanslagningsbas finns"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Peka på en giltig incheckning: $onto_name"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Skapade autostash: $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Aktuell gren $branch_name är à jour."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Ändringar till $onto:"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Ändringar från $mb till $onto:"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Snabbspolade $branch_name till $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "\"git stash clear\" med parametrar har inte implementerats"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Du har inte den första incheckningen ännu"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Kan inte spara aktuellt tillstånd för indexet"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Kan inte spara ospårade filer"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Inga ändringar valda"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Kan inte registrera tillstånd för arbetskatalog"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "fel: okänd flagga för \"stash push\": $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Inga lokala ändringar att spara"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Kan inte initiera \"stash\""
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Kan inte spara aktuell status"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Inga \"stash”-poster hittades."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "Kunde inte återställa ospårade filer från stash-post"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Indexet har inte tagits ur kön."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Stash-posten behålls ifall du behöver den igen."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Inget grennamn angavs"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -19614,22 +22065,22 @@
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -19647,37 +22098,37 @@
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -19686,12 +22137,16 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
+"direkt:"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -19700,72 +22155,72 @@
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -19777,12 +22232,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "Se git-${cmd}(1) för detaljer."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Tillämpade autostash."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Kan inte spara $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Ombaserar ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -19823,7 +22287,7 @@
"\n"
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -19842,83 +22306,83 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: inte en incheckning som kan väljas"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Felaktigt incheckningsnamn: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Snabbspolade till $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kan inte snabbspola till $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kan inte flytta HEAD till $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Kunde inte välja $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Det här är incheckningsmeddelande ${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Det här är en kombination av $count incheckning."
msgstr[1] "Det här är en kombination av $count incheckningar."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kan inte skriva $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Det här är en kombination av 2 incheckningar."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "Kunde inte tillämpa $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -19932,31 +22396,31 @@
"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Stoppade på $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Kör: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Körning misslyckades: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -19967,7 +22431,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -19982,25 +22446,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Okänt kommando: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Rätta det med \"git rebase --edit-todo\"."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Lyckades ombasera och uppdatera $head_name."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20031,52 +22495,52 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-#: git-rebase--preserve-merges.sh:784
+#: 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 ""
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
-"först och kör sedan \"git rebase --continute\" igen."
+"först och kör sedan \"git rebase --continue\" igen."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
@@ -20085,137 +22549,137 @@
msgid "usage: $dashless $USAGE"
msgstr "använd: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Kan inte ombasera: Du har oköade ändringar."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Kan inte $action: Du har oköade ändringar."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "köad"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "ej köad"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binär"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "ingenting"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "oändrad"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Uppdatera"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Återställ"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -20223,7 +22687,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -20231,7 +22695,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -20239,7 +22703,8 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -20247,7 +22712,8 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -20255,16 +22721,16 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20278,7 +22744,7 @@
"Rader som börjar med %s kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20288,7 +22754,7 @@
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
@@ -20299,14 +22765,14 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20320,7 +22786,7 @@
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20334,7 +22800,7 @@
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20348,7 +22814,7 @@
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20362,7 +22828,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20376,7 +22842,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20390,7 +22856,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20404,7 +22870,21 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applicera stycket på arbetskatalogen\n"
+"n - applicera inte stycket på arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"a - applicera stycket och alla följande i filen\n"
+"d - applicera inte stycket eller något av de följande i filen"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20426,211 +22906,226 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Inga andra stycken att gå till\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Inga andra stycken att söka efter\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Beklagar, kan inte dela stycket\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Beklagar, kan inte redigera stycket\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Granska diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -20647,18 +23142,19 @@
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
@@ -20671,31 +23167,31 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -20703,37 +23199,37 @@
"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
"eller konfigurationsflagga)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -20748,12 +23244,12 @@
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -20762,7 +23258,7 @@
"ödesdigert: %s: %s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -20772,17 +23268,17 @@
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -20796,38 +23292,38 @@
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -20840,21 +23336,21 @@
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem skall breven sändas (om någon)?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
@@ -20862,16 +23358,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1412
+#: 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"
@@ -20898,124 +23394,124 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
@@ -21023,21 +23519,225 @@
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Servern stöder \"multi_ack_detailed\""
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Servern stöder \"no-done\""
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Servern stöder \"multi_ack\""
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Servern stöder \"side-band-64k\""
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Servern stöder \"side-band\""
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Servern stöder \"allow-tip-sha1-in-want\""
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Servern stöder \"ofs-delta\""
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD frånkopplat vid %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD frånkopplat från %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checkar ut filer"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "misslyckades öppna \"%s\""
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "misslyckades ta status på %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Om du vill hoppa över incheckningen, använd:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
+#~ "cherry-pick för återstående incheckningar.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "okänt verb: %s"
+
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "hash-versionen %X stämmer inte med versionen %X"
+
+#~ msgid "option '%s' requires a value"
+#~ msgstr "flaggan \"%s\" behöver ett värde"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "kunde inte transformera att göra-listan"
+
+#~ msgid "default"
+#~ msgstr "standard"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "Kunde inte skapa katalogen \"%s\""
+
+#~ msgid "allow rerere to update index with resolved conflict"
+#~ msgstr "tillåt rerere att uppdatera index med lösa konflikter"
+
+#~ msgid "could not open %s"
+#~ msgstr "kunde inte öppna %s"
+
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "Kunde inte flytta tillbaka till $head_name"
+
+#~ msgid ""
+#~ "It seems that there is already a $state_dir_base directory, and\n"
+#~ "I wonder if you are in the middle of another rebase. If that is the\n"
+#~ "case, please try\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "If that is not the case, please\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "and run me again. I am stopping in case you still have something\n"
+#~ "valuable there."
+#~ msgstr ""
+#~ "Det verkar som katalogen $state_dir_base redan existerar, och\n"
+#~ "jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
+#~ "fallet, försök\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "Om så inte är fallet, kör\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
+#~ "något av värde där."
+
+#~ msgid ""
+#~ "fatal: cannot combine am options with either interactive or merge options"
+#~ msgstr ""
+#~ "ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller "
+#~ "sammanslagningsflaggor"
+
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr ""
+#~ "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
+
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr ""
+#~ "ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges"
+#~ "\""
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr ""
+#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option"
+#~ "\""
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr ""
+#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\""
+
+#~ msgid "invalid upstream '$upstream_name'"
+#~ msgstr "ogiltig uppström \"$upstream_name\""
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: mer än en sammanslagningsbas finns"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: ingen sammanslagningsbas finns"
+
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "Peka på en giltig incheckning: $onto_name"
+
+#~ msgid "fatal: no such branch/commit '$branch_name'"
+#~ msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
+
+#~ msgid "Created autostash: $stash_abbrev"
+#~ msgstr "Skapade autostash: $stash_abbrev"
+
+#~ msgid "Current branch $branch_name is up to date."
+#~ msgstr "Aktuell gren $branch_name är à jour."
+
+#~ msgid "Current branch $branch_name is up to date, rebase forced."
+#~ msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
+
+#~ msgid "Changes to $onto:"
+#~ msgstr "Ändringar till $onto:"
+
+#~ msgid "Changes from $mb to $onto:"
+#~ msgstr "Ändringar från $mb till $onto:"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "Snabbspolade $branch_name till $onto_name."
+
+#~ msgid "First, rewinding head to replay your work on top of it..."
+#~ msgstr ""
+#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
+
+#~ msgid "ignoring unknown color-moved-ws mode '%s'"
+#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\""
+
+#~ msgid "only 'tree:0' is supported"
+#~ msgstr "endast \"tree:0\" stöds"
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Byter namn på %s till %s och %s till %s istället"
+
+#~ msgid "Adding merged %s"
+#~ msgstr "Lägger till sammanslagen %s"
+
+#~ msgid "Internal error"
+#~ msgstr "Internt fel"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
+
+#~ msgid "unable to write sha1 filename %s"
+#~ msgstr "kan inte skriva sha1-filnamn %s"
+
+#~ msgid "cannot read sha1_file for %s"
+#~ msgstr "kan inte läsa sha1_file för %s"
+
+#~ msgid ""
+#~ "error: cannot combine interactive options (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
+#~ "options (%s)"
+#~ msgstr ""
+#~ "fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) med am-"
+#~ "flaggor (%s)"
+
+#~ msgid ""
+#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
+#~ "option) with am options (%s)"
+#~ msgstr ""
+#~ "fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --"
+#~ "strategy-option) med am-flaggor (%s)"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "flaggan känns inte igen: \"$arg\""
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "\"$invalid\" är inte en giltig incheckning"
+
#~ msgid "could not parse '%s' (looking for '%s')"
#~ msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")"
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "felaktig citering på %s-värde i \"%s\""
-
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr ""
-#~ "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
-
#~ msgid "deprecated synonym for --create-reflog"
#~ msgstr "avrådd synonym för --create-reflog"
@@ -21059,12 +23759,6 @@
#~ msgid "cannot remove a locked working tree"
#~ msgstr "kan inte ta bort en låst arbetskatalog"
-#~ msgid "Applied autostash."
-#~ msgstr "Tillämpade autostash."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Kan inte spara $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
@@ -21158,9 +23852,6 @@
#~ msgid "could not truncate '%s'"
#~ msgstr "kunde inte trunkera \"%s\""
-#~ msgid "could not finish '%s'"
-#~ msgstr "kunde inte avsluta \"%s\""
-
#~ msgid "could not close %s"
#~ msgstr "kunde inte stänga %s"
@@ -21173,9 +23864,6 @@
#~ msgid "Don't know how to clone %s"
#~ msgstr "Vet inte hur man klonar %s"
-#~ msgid "show ignored files"
-#~ msgstr "visa ignorerade filer"
-
#~ msgid "Don't know how to fetch from %s"
#~ msgstr "Vet inte hur man hämtar från %s"
@@ -21229,9 +23917,6 @@
#~ msgid "basename"
#~ msgstr "basnamn"
-#~ msgid "prepend parent project's basename to output"
-#~ msgstr "lägg till föräldraprojektets basnamn i utdata"
-
#~ msgid ""
#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
#~ " - $line"
@@ -21249,9 +23934,6 @@
#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
-#~ msgid "Could not open file '%s'"
-#~ msgstr "Kunde inte öppna filen \"%s\""
-
#~ msgid "in %0.1f seconds automatically..."
#~ msgstr "automatiskt om %0.1f sekunder..."
@@ -21269,7 +23951,7 @@
#~ "Did you forget to use 'git add'?"
#~ msgstr ""
#~ "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
-#~ "Glömde du använda \"git add\"?"
+#~ "Glömde du att använda \"git add\"?"
#~ msgid ""
#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -21320,9 +24002,6 @@
#~ msgid "ref '%s' does not have %ld components to :strip"
#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "okänt \"%.*s\"-format %s"
-
#~ msgid "[%s: gone]"
#~ msgstr "[%s: försvunnen]"
@@ -21413,9 +24092,6 @@
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
-#~ msgid "cannot open %s: %s"
-#~ msgstr "kan inte öppna %s: %s"
-
#~ msgid "You need to set your committer info first"
#~ msgstr "Du måste ställa in din incheckarinformation först"
@@ -21645,9 +24321,6 @@
#~ msgid "'%s': %s"
#~ msgstr "\"%s\": %s"
-#~ msgid "unable to access '%s': %s"
-#~ msgstr "kan inte komma åt \"%s\": %s"
-
#~ msgid " git branch -d %s\n"
#~ msgstr " git branch -d %s\n"
@@ -21664,9 +24337,6 @@
#~ msgid "failed to remove: %s"
#~ msgstr "misslyckades ta bort: %s"
-#~ msgid "The --exec option must be used with the --interactive option"
-#~ msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
-
#~ msgid ""
#~ "Submodule path '$displaypath' not initialized\n"
#~ "Maybe you want to use 'update --init'?"
@@ -21898,9 +24568,6 @@
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s: kan inte låsa referensen"
-#~ msgid "%s: cannot update the ref"
-#~ msgstr "%s: kan inte uppdatera referensen"
-
#~ msgid "commit has empty message"
#~ msgstr "incheckningen har ett tomt meddelande"
diff --git a/po/vi.po b/po/vi.po
index bbdeb5c..b8aa93a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,14 +2,14 @@
# Bản dịch tiếng Việt dành cho GIT-CORE.
# This file is distributed under the same license as the git-core package.
# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.20.0 round 3\n"
+"Project-Id-Version: git v2.23.0-rc2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-02 14:12+0700\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-11 07:08+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -19,48 +19,48 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: ../\n"
+"X-Poedit-Basepath: ..\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sgợi ý: %.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-"Nó là không thể thực hiện với %s bởi vì bạn có những tập tin chưa được hòa "
-"trộn."
+"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
+"hòa trộn."
-#: advice.c:170
+#: advice.c:180
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -68,140 +68,161 @@
"Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\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 ""
-"Chú ý: đang lấy ra “%s”.\n"
+"Chú ý: đang chuyển sang “%s”.\n"
"\n"
"Bạn đang ở tình trạng “detached HEAD”. Bạn có thể xem qua, tạo các thay\n"
"đổi thử nghiệm và chuyển giao chúng, bạn có thể loại bỏ bất kỳ lần chuyển\n"
-"giao nào trong tình trạng này mà không cần đụng chậm đến bất kỳ nhánh nào\n"
-"bằng cách thực hiện lần lấy ra khác nữa.\n"
+"giao nào trong tình trạng này mà không cần đụng chạm đến bất kỳ nhánh nào\n"
+"bằng cách chuyển trở lại một nhánh.\n"
"\n"
"Nếu bạn muốn tạo một nhánh mới để giữ lại các lần chuyển giao bạn tạo,\n"
-"bạn có thể làm thế (ngay bây giờ hay sau này) bằng cách chạy lệnh checkout\n"
-"lần nữa với tùy chọn -b. Ví dụ:\n"
+"bạn có thể làm thế (ngay bây giờ hay sau này) bằng cách dùng tùy chọn\n"
+"dòng lệnh -b. Ví dụ:\n"
"\n"
-" git checkout -b <tên-nhánh-mới>\n"
+" git checkout -c <tên-nhánh-mới>\n"
+"\n"
+"Hoàn lại thao tác này bằng:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Tắt hướng dẫn này bằng cách đặt biến advice.detachedHead thành false\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "cmdline kết thúc với \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "chưa có dấu nháy đóng"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "không nhận ra tùy chọn về khoảng trắng “%s”"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject và --3way không thể dùng cùng nhau."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached và --3way không thể dùng cùng nhau."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way ở ngoài một kho chứa"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index ở ngoài một kho chứa"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached ở ngoài một kho chứa"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) "
"%s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "chế độ không hợp lệ trên dòng %d: %s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "phần đầu mâu thuẫn dòng %d và %d"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -213,81 +234,81 @@
"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong "
"thành phần dẫn đầu tên của đường dẫn (dòng %d)"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá hỏng tại dòng %d"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác” tại dòng %d"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay đọc %s"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%c”"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -296,459 +317,459 @@
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành "
+"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành "
"“%s”"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy "
"đủ"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại."
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "không thể đọc postimage %s cần thiết cho “%s”"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận "
"%s)"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
+msgstr "kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Đang trở lại hòa trộn “3-đường”…\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "không thể đọc nội dung hiện hành của “%s”"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Đã áp dụng miếng vá %s với các xung đột.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "loại bỏ miếng vá để lại nội dung tập tin"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "đường dẫn không hợp lệ “%s”"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
-msgstr "không thểghi mục lục tạm vào %s"
+msgstr "không thể ghi mục lục tạm vào %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo"
+msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…"
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
-msgstr "đoạn dữ liệu #%d bị từ chối."
+msgstr "Đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
-msgstr "bỏ qua đường dẫn “%s”."
+msgstr "Bỏ qua đường dẫn “%s”."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "đường-dẫn"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "số"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "hành động"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng nội dung"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "chi tiết"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "gốc"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+msgstr "git archive [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
#: archive.c:15
msgid "git archive --list"
@@ -758,106 +779,125 @@
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <kho> [--exec <lệnh>] [<các-tùy-chọn>] <tree-ish> "
-"[<đường-dẫn>…]"
+"git archive --remote <kho> [--exec <lệnh>] [<các tùy chọn>] <tree-ish> [</"
+"đường/dẫn>…]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "không có tham chiếu nào như thế: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "không phải là tên đối tượng hợp lệ: “%s”"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "không phải là đối tượng cây: “%s”"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "thư mục làm việc hiện hành chưa được theo dõi"
+
+#: archive.c:457
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "tập_tin"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "nén nhỏ hơn"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "kho"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "lệnh"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
-msgstr "Gặp tùy chọn --remote không cần"
+msgstr "Gặp tùy chọn không cần --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
@@ -877,16 +917,16 @@
msgid "cannot read %s"
msgstr "không thể đọc %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "không thể bắt đầu bộ lọc “%s”"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "không thể chuyển hướng mô tả"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "bộ lọc “%s” đã báo cáo lỗi"
@@ -901,7 +941,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
@@ -911,12 +951,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "dấu vết thời gian là quá lớn cho hệ thống này: %<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s không phải tên thuộc tính hợp lệ"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s không được phép: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -927,19 +972,19 @@
#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
-msgstr "nội dung được trích dẫn sai tập tin “%s”: %s"
+msgstr "Nội dung được trích dẫn sai trong tập tin “%s”: %s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -948,7 +993,7 @@
"Hòa trộn trên %s là sai.\n"
"Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -957,7 +1002,7 @@
"Hòa trộn trên %s là mới.\n"
"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -966,7 +1011,7 @@
"Hòa trộn trên %s là %s.\n"
"Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -977,7 +1022,7 @@
"git bisect không thể làm việc đúng đắn trong trường hợp này.\n"
"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -989,22 +1034,22 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
@@ -1024,7 +1069,7 @@
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-"không tìm thấy lần chuyển giao kiểm tra được nào.\n"
+"Không tìm thấy lần chuyển giao kiểm tra được nào.\n"
"Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n"
#: bisect.c:1004
@@ -1042,45 +1087,45 @@
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "tùy chọn--contents và --reverse không được trộn vào nhau."
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
+"cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-"--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
+"cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
"tiên"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "không có đường dẫn %s trong “%s”"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "không thể đọc blob %s cho đường dẫn “%s”"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1093,90 +1138,90 @@
"thông tin theo dõi máy chủ bằng cách gọi lệnh\n"
"\"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
"Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s” bằng cách rebase."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Nhánh “%s” cài đặt để theo dõi nhánh máy chủ “%s” từ “%s”."
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s” bằng cách rebase."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Nhánh “%s” cài đặt để theo dõi nhánh nội bộ “%s”."
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
"Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s” bằng cách rebase."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s”."
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
"Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s” bằng cách rebase."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s”."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Không thể ghi cấu hình nhánh thượng nguồn"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "“%s” không phải là một tên nhánh hợp lệ."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Đã có nhánh mang tên “%s”."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Không thể cài đặt thông tin theo dõi; điểm bắt đầu “%s” không phải là một "
"nhánh."
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "nhánh thượng nguồn đã yêu cầu “%s” không tồn tại"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1196,27 +1241,27 @@
"sẽ theo dõi bản đối chiếu máy chủ của nó, bạn cần dùng lệnh\n"
"\"git push -u\" để đặt cấu hình thượng nguồn bạn muốn push."
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Không phải tên đối tượng hợp lệ: “%s”."
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Tên đối tượng chưa rõ ràng: “%s”."
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%s”."
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD của cây làm việc %s chưa được cập nhật"
@@ -1231,68 +1276,72 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "cần một kho chứa để thẩm tra một bundle"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "không thể nhân đôi bộ mô tả bundle"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list đã chết"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%s”"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "mục lục gói đã chết"
@@ -1301,9 +1350,8 @@
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -1313,7 +1361,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1333,28 +1381,28 @@
"Tắt lời nhắn này bằng cách chạy\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1364,96 +1412,278 @@
"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "tập tin đồ thị %s quá nhỏ"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "chữ ký đồ họa %X không khớp chữ ký %X"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "phiên bản đồ họa %X không khớp phiên bản %X"
+msgid "commit-graph version %X does not match version %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "phiên bản băm “%X” không có phiên bản khớp %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
+"bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể sẽ "
+"không hoàn thiện"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "bù mảnh không đúng chỗ %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "mã mảnh %08x xuất hiện nhiều lần"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần"
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng '%s' không phải là "
+"một mã băm"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
+"bị hỏng"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "không thể tìm thấy lần chuyển giao %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "không thể lấy kiểu của đối tượng “%s”"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Diễn giải các lần chuyển giao trong đồ thị lần chuyển giao"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+"Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
+"chuyển giao"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
-msgstr "Đang tính toán số tạo sơ đồ các lần chuyển giao"
+msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "gặp lỗi thêm gói %s"
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "gặp lỗi khi mở mục lục cho “%s”"
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
+"tượng đã đóng gói"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở"
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s”"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Đang quét các lần chuyển giao đã hòa trộn"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-"tập tin sơ đồ chuyển giao có tổng kiểm không đúng và có vẻ như là đã hỏng"
+"tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
+"đã hỏng"
-#: commit-graph.c:1046
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
+"%u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
+"thị lần chuyển giao"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
+"%s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
+"dứt quá sớm"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
+"nhưng không phải số không ở chỗ khác"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
+"giao %s, nhưng số không ở chỗ khác"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là "
+"%<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1468,297 +1698,297 @@
"\t%s\n"
"Nguyên nhân có thể là gồm quẩn vòng."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "không thể khai triển đường dẫn “%s”"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "các bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "khóa không chứa một phần: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "khóa không chứa bất kỳ một tên biến nào: %s"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "khóa không hợp lệ (dòng mới): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "tham số cấu hình không có thực: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "định dạng không có thực trong %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "cấu hình sai tại dòng %d trong %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "“%s” dành cho “%s” không phải là dấu vết thời gian hợp lệ"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar chỉ được có một ký tự"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "giá trị cho %s sai dạng"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "giá trị cho %s sai dạng: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "không thể tải đối tượng blob cấu hình “%s”"
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "tham chiếu “%s” không chỉ đến một blob nào cả"
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "không thể phân giải điểm xét duyệt “%s”"
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "gặp lỗi khi phân tích cú pháp %s"
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "tên của phần không hợp lệ “%s”"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”"
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "không thể khóa tập tin cấu hình %s"
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "đang mở “%s”"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "mẫu không hợp lệ: %s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "tập tin cấu hình “%s” không hợp lệ"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "không thể mmap “%s”"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod trên %s gặp lỗi"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "không thể ghi tập tin cấu hình “%s”"
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "tên của phần không hợp lệ: %s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "thiếu giá trị cho cho “%s”"
@@ -1811,50 +2041,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "kho đã ở điểm cuối khoác nên không thể được shallow"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "lỗi máy chủ: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "gói không hợp lệ"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "lỗi giao thức: không cần “%s”"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "trả về của ls-refs không hợp lệ: %s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "cần đẩy dữ liệu lên đĩa sau khi liệt kê tham chiếu"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "giao thức “%s” chưa được hỗ trợ"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
-msgstr "Đang tìm kiếm %s …"
+msgstr "Đang tìm kiếm %s … "
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "không tìm được %s (cổng %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1863,7 +2088,7 @@
"xong.\n"
"Đang kết nối đến %s (cổng %s) … "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1873,52 +2098,52 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "hoàn tất."
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "không thể tìm thấy %s (%s)"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "không hiểu cổng %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "đã khóa tên máy lạ “%s”"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "đã khóa cổng lạ “%s”"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "không thể khởi chạy ủy nhiệm “%s”"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "chưa chỉ định đường dẫn; xem'git help pull” để biết cú pháp url hợp lệ"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh biến thể “simple” không hỗ trợ -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh biến thể “simple” không hỗ trợ -6"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "đã khóa tên đường dẫn lạ “%s”"
@@ -1927,33 +2152,33 @@
msgid "unable to fork"
msgstr "không thể rẽ nhánh tiến trình con"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "crlf_action %d không hợp lệ"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "CRLF nên được thay bằng LF trong %s"
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -1962,12 +2187,12 @@
"CRLF sẽ bị thay thế bằng LF trong %s.\n"
"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF nên thay bằng CRLF trong %s"
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -1976,12 +2201,12 @@
"LF sẽ bị thay thế bằng CRLF trong %s.\n"
"Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM bị cấm trong “%s” nếu được mã hóa là %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
@@ -1990,12 +2215,12 @@
"Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%s như là "
"bảng mã cây làm việc."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM là bắt buộc trong “%s” nếu được mã hóa là %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2004,37 +2229,37 @@
"Tập tin “%s” còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay "
"UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "gặp lỗi khi mã hóa “%s” từ “%s” sang “%s”"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "không thể rẽ nhánh tiến trình để chạy bộ lọc bên ngoài “%s”"
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "không thể cấp đầu vào cho bộ lọc bên ngoài “%s”"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "chạy bộ lọc bên ngoài “%s” gặp lỗi %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "đọc từ bộ lọc bên ngoài “%s” gặp lỗi"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "gặp lỗi khi chạy bộ lọc bên ngoài “%s”"
@@ -2058,7 +2283,7 @@
#: convert.c:1228
msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false là không phải bảng mã cây làm việc hợp lệ "
+msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ"
#: convert.c:1398 convert.c:1432
#, c-format
@@ -2070,86 +2295,86 @@
msgid "%s: smudge filter %s failed"
msgstr "%s: smudge bộ lọc %s gặp lỗi"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "ở thời tương lai"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> giây trước"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> phút trước"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> giờ trước"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> ngày trước"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> tuần trước"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> tháng trước"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> năm"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s, %<PRIuMAX> tháng trước"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> năm trước"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "Đang lan truyền các đánh dấu island"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "đối tượng cây sai “%s”"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "gặp lỗi khi tải biểu thức chính quy island cho “%s”: %s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
"biểu thức chính quy island từ cấu hình có quá nhiều nhóm chụp (tối đa=%d)"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Đã đánh dấu %d island, xong.\n"
@@ -2163,22 +2388,29 @@
msgid "Performing inexact rename detection"
msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "tùy chọn “%s” yêu cầu một giá trị"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Không phải là một thư mục git. Dùng --no-index để so sánh hai đường dẫn bên "
+"ngoài một cây làm việc"
+
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%s”\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2186,25 +2418,30 @@
"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “blocks”, "
"“zebra”, “dimmed_zebra”, “plain”"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "bỏ qua chế độ color-moved-ws chưa biết “%s”"
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"không hiểu chế độ color-moved-ws “%s”, các giá trị có thể là “ignore-space-"
+"change”, “ignore-space-at-eol”, “ignore-all-space”, “allow-indentation-"
+"change”"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
"color-moved-ws: allow-indentation-change không thể tổ hợp cùng với các chế "
"độ khoảng trắng khác"
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2213,24 +2450,35 @@
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "giá trị --stat không hợp lệ: “%s”"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "tùy chọn “%s” cần một giá trị bằng số"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2239,22 +2487,514 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s"
-#: diff.c:5823
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "không thể phân giải “%s”"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s cần dạng <n>/<m>"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s cần một ký tự, nhưng lại nhận được “%s”"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "đối số --color-moved sai: %s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
+"\"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "tham số cho %s không hợp lệ"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
+
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "đối số --word-diff sai: %s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "tạo miếng vá"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "chặn mọi kết xuất từ diff"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "tạo khác biệt ở định dạng thô"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "đồng nghĩa với “-p --raw”"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "đồng nghĩa với “-p --stat”"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "--stat thuận tiện cho máy đọc"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "chỉ xuất những dòng cuối của --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<tham_số_1,tham_số_2>…"
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "đồng nghĩa với --dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "chỉ hiển thị tên của các tập tin đổi"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "tạo diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<rộng>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "tạo diffstat với độ rộng đã cho"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "tạo diffstat với tên độ rộng đã cho"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "tạo diffstat với độ rộng đồ thị đã cho"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<số_lượng>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "tạo diffstat với các dòng bị giới hạn"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "tạo tổng hợp xúc tích trong diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
+"\""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "hiển thị thay đổi được tô màu"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<kiểu>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"tô sang các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” "
+"trong khác biệt"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra "
+"trong --raw hay --numstat"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<tiền_tố>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
+"định"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<ký_tự>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Tùy chọn khác biệt đổi tên"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "dò tìm các tên thay đổi"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "dò bản sao"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "tắt dò tìm đổi tên"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "dung các blob trống rống như là nguồn đổi tên"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
+"quá giới hạn đưa ra"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Tùy chọn thuật toán khác biệt"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "sản sinh khác biệt ít nhất có thể"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<thuật toán>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "chọn một thuật toán khác biệt"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<văn bản>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<chế độ>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"hiển thị khác biệt từ, sử dung <chế độ> để bỏ giới hạn các từ bị thay đổi"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "dùng <regex> để quyết định từ là cái gì"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "bỏ qua khoảng trắng như thế nào trong --color-moved"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "Các tùy chọn khác biệt khác"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"khi chạy từ thư mục con, thự thi các thay đổi bên ngoài và hiển thị các "
+"đường dẫn liên quan"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "coi mọi tập tin là dạng văn bản thường"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "tắt mọi kết xuất của chương trình"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị "
+"phân"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<khi>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<định dạng>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "ẩn các mục “git add -N” từ bảng mục lục"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<chuỗi>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
+"chuỗi được chỉ ra"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
+"thức chính quy được chỉ ra"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<mã-số-đối-tượng>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
+"tượng được chỉ ra"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "chọn các tập tin theo kiểu khác biệt"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<tập_tin>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Xuất ra một tập tin cụ thể"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -2262,40 +3002,40 @@
"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
"nữa."
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào mà git biết"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "không thể dùng %s như là một tập tin loại trừ"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "không thể mở thư mục “%s”"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "gặp lỗi khi lấy tên và thông tin của nhân"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
-msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này."
+msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "không thể tạo thư mục cho %s"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di cư thư mục git từ “%s” sang “%s”"
@@ -2309,7 +3049,7 @@
msgid "Filtering content"
msgstr "Nội dung lọc"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "không thể lấy thống kê tập tin “%s”"
@@ -2324,7 +3064,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "không thể đặt GIT_DIR thành “%s”"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "quá nhiều tham số để chạy %s"
@@ -2337,249 +3077,237 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "không thể ghi lên máy phục vụ"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
-msgstr "Không tìm thấy đối tượng: %s"
+msgstr "không tìm thấy đối tượng: %s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "xong"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Máy chủ không hỗ trợ máy khách shallow"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "Máy chủ hỗ trợ no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Máy chủ hỗ trợ multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Máy chủ hỗ trợ side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Máy chủ hỗ trợ side-band"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Máy chủ hỗ trợ ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "Máy chủ hỗ trợ bộ lọc"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Máy chủ hỗ trợ %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Máy chủ không hỗ trợ máy khách shallow"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Máy chủ hỗ trợ bộ lọc"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "không thể ghi các yêu cầu lên máy phục vụ"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "cần “%s”, nhưng lại nhận “%s”"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "gặp dòng không được thừa nhận: “%s”"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "cần tập tin gói để gửi sau “ready”"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "không cần thêm phần nào để gửi sau “ready”"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "lỗi xử lý thông tin shallow: %d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "không cần wanted-ref: “%s”"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "lỗi khi xử lý wanted refs: %d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
-msgstr "Không có máy chủ tham chiếu nào như %s"
+msgstr "không có máy chủ tham chiếu nào như %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
@@ -2589,18 +3317,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
@@ -2657,41 +3385,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "các lệnh git sẵn có trong thư mục “%s”:"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:"
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "không hỗ trợ liệt kê lệnh kiểu “%s”"
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Các chỉ dẫn chung về Git là:"
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Xem “git help <lệnh>” để đọc các đặc tả của lệnh con"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "Các lệnh bên ngoài"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "Các bí danh lệnh"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2700,31 +3428,31 @@
"“%s” trông như là một lệnh git, nhưng chúng tôi không\n"
"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả."
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn."
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Tiếp tục và coi rằng ý bạn là “%s”."
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Tiếp tục trong %0.1f giây,và coi rằng ý bạn là “%s”."
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”."
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2735,16 +3463,16 @@
"\n"
"Những lệnh giống nhất là"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
-msgstr "git version [<các-tùy-chọn>]"
+msgstr "git version [<các tùy chọn>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2755,7 +3483,7 @@
"\n"
"Có phải ý bạn là một trong số những cái này không?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2781,48 +3509,72 @@
"Bỏ tùy chọn --global nếu chỉ định danh riêng cho kho này.\n"
"\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s”)"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "không thể dò-tìm-tự động tên (đã nhận “%s”)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là một cây"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "không thể tải cây gốc cho lần chuyển giao “%s”"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "chỉ “tree:0” là được hỗ trợ"
+msgid "expected 'tree:<depth>'"
+msgstr "cần “tree:<depth>”"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "đặc tả bộ lọc không hợp lệ “%s”"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor"
@@ -2854,12 +3606,13 @@
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(commit sai)\n"
@@ -2868,105 +3621,105 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ."
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
"addinfo_cache gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị "
"bãi bỏ."
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "gặp lỗi khi xây dựng cây"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể đọc đối tượng %s “%s”"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "mong đợi đối tượng blob cho %s “%s”"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "gặp lỗi khi mở “%s”: %s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì với %06o %s “%s”"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-"
"trộn)"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:"
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao "
"theo sau hòa trộn)"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -2983,33 +3736,33 @@
"\n"
"cái mà sẽ chấp nhận gợi ý này.\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào "
"%s."
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3018,7 +3771,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3027,7 +3780,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree)."
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3036,7 +3789,7 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3045,33 +3798,45 @@
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên "
+"đường."
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm "
"thành %s"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3080,29 +3845,17 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên "
-"đường."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3113,7 +3866,7 @@
"vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến "
"nhận một phần nhiều của các tập tin."
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3122,16 +3875,16 @@
"XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
"của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s."
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, 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 ""
"XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; "
-"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s."
+"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3140,7 +3893,7 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
"%s->%s trong %s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -3149,37 +3902,21 @@
"CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
"bị đổi tên."
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Thêm hòa trộn %s"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Thay vào đó thêm vào %s"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "đã sửa"
@@ -3187,50 +3924,96 @@
msgid "content"
msgstr "nội dung"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Thay vào đó thêm vào %s"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
+"đã được đổi tên trong %s; di chuyển nó đến %s."
+
+#: merge-recursive.c:3182
+#, 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 ""
+"XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
+"đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
+"thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
+
+#: merge-recursive.c:3189
+#, 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 ""
+"XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
+"mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
"%s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3240,151 +4023,176 @@
"hòa trộn:\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Đã cập nhật rồi!"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
-msgstr "Không thể ghi bảng mục lục"
+msgstr "Không thể ghi bảng mục lục."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "không nhận ra phiên bản %d của multi-pack-index"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "phiên bản băm “%u” không khớp"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "mã mảnh kết thúc multi-pack-index xuất hiện sớm hơn bình thường"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id sai: %u (%u các gói tổng)"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gặp lỗi khi mở pack-index “%s”"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "đã không thấy tập tin gói %s để mà xóa"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "Đang khóa cho các gói bị tham chiếu"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "Thẩm tra thứ tự OID trong MIDX"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Đang thẩm tra các khoảng bù đối tượng"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "không thể lấy thông tin thống kê về các đối tượng gói"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "không thể hoàn thiện các đối tượng gói"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3400,7 +4208,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "không thể gia nhập tuyến lazy_name: %s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3412,23 +4220,23 @@
"chuyển giao hay bãi bỏ lần hòa trộn trước đây và bắt đầu một hòa trộn ghi "
"chú mới."
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn ghi chú (%s vẫn tồn tại)."
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
"Không thể chuyển giao cây ghi chú chưa được khởi tạo hoặc không được tham "
"chiếu"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Giá trị notes.rewriteMode sai: “%s”"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)"
@@ -3437,7 +4245,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
@@ -3447,46 +4255,101 @@
msgid "invalid object type \"%s\""
msgstr "kiểu đối tượng \"%s\" không hợp lệ"
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "đối tượng %s là một %s, không phải là một %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "đối tượng %s có mã kiểu %d chưa biết"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%s”"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "sha1 không khớp %s"
+msgid "hash mismatch %s"
+msgstr "mã băm không khớp %s"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "“%s” yêu cầu một giá trị"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s là xung khắc với %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : xung khắc với các cái khác"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s k nhận giá trị"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s không sẵn có"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy chọn k/m/g"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "tùy chọn chưa rõ rang: %s (nên là --%s%s hay --%s%s)"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang?)"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "không hiểu tùy chọn “%s”"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "không hiểu tùy chọn “%c”"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "không hiểu tùy chọn non-ascii trong chuỗi: “%s”"
+
+#: parse-options.c:887
msgid "..."
msgstr "…"
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
@@ -3494,59 +4357,74 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-SỐ"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "bí danh của --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "tùy chọn “%s” cần một giá trị bằng số"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "ngày tháng hết hạn dị hình “%s”"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "tùy chọn “%s” cần \"always\", \"auto\", hoặc \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%s”"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
"Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
-msgstr "chỉ có một đặc tả “attr:” là được phép."
+msgstr "Chỉ có một đặc tả “attr:” là được phép."
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "đặc tả attr phải không được để trống"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "tên thuộc tính không hợp lệ %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -3554,128 +4432,187 @@
"cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc "
"tả đường dẫn toàn cục khác"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: “%s” ngoài một kho chứa"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "“%s” (mnemonic: “%c”)"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "không thể đẩy dữ liệu của gói lên đĩa"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "không thể ghi gói delim"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "gặp lỗi khi ghi vào tập tin gói lúc đẩy dữ liệu lên bộ nhớ"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "lỗi giao thức: không thể làm được dòng dài"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "gặp lỗi khi ghi gói có định dạng"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "gặp lỗi khi ghi gói"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "lỗi đọc"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "máy chủ bị treo bất ngờ"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "lỗi giao thức: ký tự chiều dài dòng bị sai: %.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "lỗi giao thức: chiều dài dòng bị sai %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "lỗi máy chủ: %s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "Làm mới bảng mục lục"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "không thể tạo tuyến trình lstat: %s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "không thể lấy thông tin thống kê về “log“"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "không thể đọc kết xuất “log”"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "không thể phân tích cú pháp phần đầu git “%.*s”"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "gặp lỗi khi tạo khác biệt"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "không thể phân tích nhật ký cho “%s”"
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+"sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "“%s” không có một lần chuyển giao nào được lấy ra"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "không thể đánh mục lục tập tin “%s”"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "không thể thêm %s vào bảng mục lục"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "không thể lấy thống kê “%s”"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Làm tươi mới bảng mục lục"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3684,7 +4621,7 @@
"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3693,60 +4630,150 @@
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "chữ ký sai 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "phiên bản mục lục sai %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được"
+
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "đang lờ đi phần mở rộng %.4s"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "không hiểu định dạng mục lục 0x%08x"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”"
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "các mục tin stage không đúng thứ tự trong mục lục"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "nhiều mục stage cho tập tin hòa trộn “%s”"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "các mục tin stage không đúng thứ tự cho “%s”"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "không thể tạo tuyến load_cache_entries: %s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "không thể gia nhập tuyến load_cache_entries: %s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: mở tập tin mục lục gặp lỗi"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: không thể lấy thống kê bảng mục lục đã mở"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: tập tin mục lục nhỏ hơn mong đợi"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: không thể ánh xạ tập tin mục lục"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "không thể tạo tuyến load_index_extensions: %s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "không thể gia nhập tuyến load_index_extensions: %s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "không thể mở thư mục git: %s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "không thể bỏ liên kết (unlink): “%s”"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "không thể sửa các bít phân quyền trên “%s”"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: không thể xóa bỏ stage #0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua."
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3792,7 +4819,13 @@
"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
"đáy.\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3801,7 +4834,7 @@
"Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần "
"chuyển giao.\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3809,7 +4842,7 @@
"\n"
"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3823,7 +4856,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3833,125 +4866,156 @@
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "không thể đọc “%s”."
+msgid "could not write '%s'"
+msgstr "không thể ghi “%s”"
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "không thể chép “%s” sang “%s”."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
+"Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
+
+#: rebase-interactive.c:180
+#, 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 ""
+"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
+"chuyển giao.\n"
+"\n"
+"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
+"báo.\n"
+"Cánh ứng xử có thể là: ignore, warn, error.\n"
+"\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "“%s” không chỉ đến một lần chuyển giao hợp lệ nào cả!"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "đang lờ đi tham chiếu mềm thừa %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "không thể mở “%s” để ghi: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "không thể đọc tham chiếu “%s”"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "tham chiếu “%s” đã có từ trước rồi"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "không cần ID đối tượng khi ghi “%s”"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s” để ghi"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "gặp ID đối tượng không cần khi xóa “%s”"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
-msgstr "Nhật ký cho tham chiếu %s có khoảng trống sau %s"
+msgstr "nhật ký cho tham chiếu %s có khoảng trống sau %s"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "nhật ký cho tham chiếu %s kết thúc bất ngờ trên %s"
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "nhật ký cho %s trống rỗng"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "từ chối cập nhật tham chiếu với tên sai “%s”"
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref bị lỗi cho ref “%s”: %s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "không cho phép đa cập nhật cho tham chiếu “%s”"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "“%s” sẵn có; không thể tạo “%s”"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
-msgstr "Không thể xử lý “%s” và “%s” cùng một lúc"
+msgstr "không thể xử lý “%s” và “%s” cùng một lúc"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "không thể xóa bỏ tham chiếu %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỏ tham chiếu: %s"
@@ -3961,136 +5025,141 @@
msgid "invalid refspec '%s'"
msgstr "refspec không hợp lệ “%s”"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "đã ra đi"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "phía trước %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "đằng sau %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "không nhận ra màu: %%(màu:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) không nhận các đối số"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) không nhận các đối số"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "tham số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) không nhận các đối số"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) không nhận các đối số"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "cần nội dung mang giá trị dương:shot=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "đối số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "đối số không được thừa nhận %%(if): %s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -4098,214 +5167,345 @@
"không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu "
"đối tượng"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(không nhánh, đang cải tổ %s)"
+msgid "no branch, rebasing %s"
+msgstr "không nhánh, đang cải tổ %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "không nhánh, đang cải tổ HEAD %s đã tách rời"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
+msgid "no branch, bisect started on %s"
+msgstr "không nhánh, di chuyển nửa bước được bắt đầu tại %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD được tách rời tại %s)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "không nhánh"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời từ %s)"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "(không nhánh)"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "tùy chọn “%s” là xung khắc với tùy chọn --merged"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "tùy chọn “%s” là xung khắc với tùy chọn --no-merged"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/”: %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "đã đưa ra nhiều hơn một gói nhận về, đang sử dụng cái đầu tiên"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "đã đưa ra nhiều hơn một gói tải lên, đang sử dụng cái đầu tiên"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Không thể lấy về cả %s và %s cho %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s thường theo dõi %s, không phải %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "Lỗi nội bộ"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "khóa “%s” của mẫu k có “*”"
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "giá trị “%s” của mẫu k có “*”"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "refspec %s nguồn khớp nhiều hơn một"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, 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 ""
+"Đích bạn đã cung cấp không phải tên tham chiếu đầy đủ (tức là\n"
+"bắt đầu bằng \"refs/\"). Chúng tôi đã cố suy luận rằng ý của bạn là:\n"
+"\n"
+"- Tìm kiếm một tham chiếu mà nó khớp “%s” bên phía máy chủ.\n"
+"- Kiểm tra xem <src> được đẩy lên (“%s”)\n"
+" là một tham chiếu trong \"refs/{heads,tags}/\". Nếu thế chúng tôi thêm một "
+"tiền tố\n"
+" refs/{heads,tags}/ tương ứng bên phía máy chủ.\n"
+"\n"
+"Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
+"chiếu dạng đầy đủ."
+
+#: remote.c:1040
+#, 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 ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng lần chuyển giao.\n"
+"Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
+"“%s:refs/heads/%s”?"
+
+#: remote.c:1045
+#, 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 ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng thẻ.\n"
+"Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#: remote.c:1050
+#, 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 ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng cây.\n"
+"Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#: remote.c:1055
+#, 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 ""
+"Phần <src> của đặc tả đường dẫn là một đối tượng blob.\n"
+"Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
+"“%s:refs/tags/%s”?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "“%s” không thể được phân giải thành nhánh"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s khớp nhiều hơn một"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s nhận từ hơn một nguồn"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào như thế: “%s”"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "nhánh “%s” không có máy chủ để đẩy lên"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "không thể tìm thấy tham chiếu máy chủ %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (dùng \"%s\" để biết thêm chi tiết)\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4314,11 +5514,11 @@
"Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-"
"tiếp-nhanh.\n"
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4331,12 +5531,17 @@
"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
"tương ứng với mỗi lần.\n"
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
"bạn)\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "không thể phân tích tên đối tượng mong muốn “%s”"
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4360,11 +5565,6 @@
msgid "unable to write rerere record"
msgstr "không thể ghi bản ghi rerere"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "không thể ghi “%s”"
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4393,7 +5593,7 @@
#: rerere.c:714
#, c-format
msgid "Staged '%s' using previous resolution."
-msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước"
+msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước."
#: rerere.c:753
#, c-format
@@ -4413,10 +5613,10 @@
#: rerere.c:807
#, c-format
msgid "Recorded preimage for '%s'"
-msgstr "preimage đã được ghi lại cho “%s”"
+msgstr "Preimage đã được ghi lại cho “%s”"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
@@ -4450,29 +5650,33 @@
msgid "unable to open rr-cache directory"
msgstr "không thể mở thư mục rr-cache"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "gặp lỗi khi mở “/dev/null”"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "không thể tạo tuyến async: %s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4481,30 +5685,30 @@
"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "máy chủ gặp lỗi unpack: %s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -4512,163 +5716,173 @@
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”"
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "không thể xóa bỏ “%s”"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "không thể gỡ bỏ “%s”"
+
+#: sequencer.c:321
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "không nhận ra thao tác: %d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”"
+"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”"
-#: sequencer.c:379
+#: sequencer.c:388
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 ""
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
+"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
"và chuyển giao kết quả bằng lệnh “git commit”"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "gặp lỗi khi hoàn thành “%s”"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
-msgstr "Không thể đọc “%s”."
+msgstr "không thể đọc “%s”"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Chế độ dọn dẹp không hợp lệ %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "không có khóa hiện diện trong “%.*s”"
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "không thể giải trích dẫn giá trị của “%s”"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "không hiểu biến “%s”"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "thiếu “GIT_AUTHOR_NAME”"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "thiếu “GIT_AUTHOR_DATE”"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "định dạng ngày tháng không hợp lệ “%s” trong “%s”"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4697,15 +5911,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "ghi chuyển giao gốc"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "móc “prepare-commit-msg” bị lỗi"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4736,7 +5950,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4764,304 +5978,351 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (root-commit)"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "không thể phân tích HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s không phải là một lần chuyển giao!"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "không thể phân tích tác giả của lần chuyển giao"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "không thể đọc phần chú thích (message) từ “%s”"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "không thể sửa chữa lần chuyển giao gốc"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr ""
-"luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
-"hòa trộn."
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s không nhận các đối số: “%s”"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "thiếu đối số cho %s"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "không thể phân tích cú pháp “%.*s”"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "không thể đọc “%s”."
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "squash-onto không dùng được"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "có thao tác hoàn nguyên đang được thực hiện"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "có thao tác “cherry-pick” đang được thực hiện"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "không có tiến trình hoàn nguyên nào"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "không có cherry-pick đang được thực hiện"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "ở đây không có gì để mà bỏ qua cả"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"bạn đã sẵn sàng chuyển giao chưa?\n"
+"thử \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5080,27 +6341,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Không thể áp dụng %s… %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Không hòa trộn %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5115,11 +6376,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5136,76 +6397,76 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "tên nhãn dị hình: “%.*s”"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "ghi lần chuyển giao gốc giả"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "đang ghi squash-onto"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "gặp lỗi khi tìm cây của %s"
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "không thể ghi bảng mục lục"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "không thể phân tích “%.*s”"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "chẳng có gì để hòa trộn: “%.*s”"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "không thể lấy chú thích của lần chuyển giao của “%s”"
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5217,31 +6478,31 @@
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "không thể lấy ra %s"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s không phải là một OID hợp lệ"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Dừng lại ở HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Dừng lại ở %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5262,48 +6523,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5313,82 +6574,42 @@
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "không thể ghi tập tin: “%s”"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: các tùy chọn được không xử lý"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "danh sách cần làm không dùng được: “%s”"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua."
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
-"Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
-
-#: sequencer.c:4697
-#, 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 ""
-"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
-"chuyển giao.\n"
-"\n"
-"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
-"báo.\n"
-"Cánh ứng xử có thể là: ignore, warn, error.\n"
-"\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5398,30 +6619,15 @@
"continue”.\n"
"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "không có gì để làm"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "không thể chép “%s” sang “%s”."
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "không thể chuyển dạng danh sách cần làm"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "văn lệnh đã sẵn được sắp đặt rồi."
@@ -5430,7 +6636,7 @@
msgid "'%s' is outside repository"
msgstr "“%s” ở ngoài một kho chứa"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5440,7 +6646,7 @@
"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
"một cách nội bộ."
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5452,12 +6658,12 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "tùy chọn “%s” phải trước các đối số đầu tiên không có tùy chọn"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5468,91 +6674,91 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
-msgstr "Không thể đặt thư mục làm việc hiện hành sử dụng cấu hình không hợp lệ"
+msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "tìm thấy phần mở rộng kho chưa biết:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "tập tin .git là quá lớn: “%s”"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "gặp lỗi khi đọc %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "định dạng tập tin git không hợp lệ: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "không có đường dẫn trong tập tin git: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
-msgstr "Không phải là kho git: %s"
+msgstr "không phải là kho git: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "“$%s” quá lớn"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "không phải là kho git: “%s”"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "không thể quay lại cwd"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”"
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "Không thể đọc thư mục làm việc hiện hành"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "không thể chuyển sang “%s”"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5563,7 +6769,7 @@
"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
"đặt)."
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5572,285 +6778,290 @@
"gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
"người sở hữu tập tin phải luôn có quyền đọc và ghi."
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "gặp lỗi khi mở “/dev/null” hay dup"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "gặp lỗi khi rẽ nhánh tiến trình"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "setsid gặp lỗi"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "không thể fdopen tập tin khóa thay thế"
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "không thể đọc tập tin thay thế"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "đường dẫn “%s” không tồn tại"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s” là nông"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap gặp lỗi"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "tập tin đối tượng %s trống rỗng"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "đối tượng mất hỏng “%s”"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gặp rác tại cuối của đối tượng bị mất “%s”"
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "kiểu đối tượng không hợp lệ"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "không thể giải gói phần đầu %s"
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "không thể phân tích phần đầu của “%s”"
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "gặp lỗi khi đọc đối tượng “%s”"
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "c%s thay thế không được tìm thấy cho %s"
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "không thể ghi vào tên tập tin sha1 %s"
+msgid "unable to write file %s"
+msgstr "không thể ghi tập tin %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "không thể đặt quyền thành “%s”"
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "lỗi ghi tập tin"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "gặp lỗi trong khi đóng tập tin sha1"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "không thể ghi vào tập tin sha1"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "không thể ghi tập tin đối tượng đã mất"
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "không thể xả nén đối tượng mới %s (%d)"
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "gặp lỗi utime() trên “%s”"
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "không thể đọc sha1_file cho %s"
+msgid "cannot read object for %s"
+msgstr "không thể đọc đối tượng cho %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "lần chuyển giao sai hỏng"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "thẻ sai hỏng"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "gặp lỗi đọc khi đánh mục lục %s"
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "không đọc ngắn khi đánh mục lục %s"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: kiểu tập tin không được hỗ trợ"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s không phải là một đối tượng hợp lệ"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "sha1 không khớp cho %s (cần %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "mã băm không khớp cho %s (cần %s)"
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "không thể mmap %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "không thể giải gói phần đầu của “%s”"
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "không thể phân tích phần đầu của “%s”"
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "không thể giải gói nội dung của “%s”"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "tóm lược SHA1 %s chưa rõ ràng"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Các ứng cử là:"
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\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"
@@ -5860,7 +7071,7 @@
"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
"\n"
-" git checkout -b $br $(git rev-parse …)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
"tạo ra.\n"
@@ -5868,72 +7079,132 @@
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/giây"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
"trước"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Không thể tìm thấy phần trong .gitmodules nơi mà đường_dẫn=%s"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "Trong mô-đun-con không có gì “%s”"
+msgstr "trong mô-đun-con không có gì “%s”"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "Không thể truy cập mô-đun-con “%s”"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Mô-đun-con “%s” không thể được cập nhật."
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -5941,12 +7212,12 @@
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5957,16 +7228,16 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "không thể lấy thông tin thống kê về ls-files trong .."
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
@@ -5976,23 +7247,23 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
"đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng "
"lệnh: %s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "giá trị cho %s không hợp lệ"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
@@ -6027,7 +7298,7 @@
msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "không thể lấy thông tin thống kê về %s"
@@ -6066,29 +7337,37 @@
msgid "transport: invalid depth option '%s'"
msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "xem protocol.version trong “git help config” để có thêm thông tin"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "không cho phép phương thức vận chuyển “%s”"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync không còn được hỗ trợ nữa"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -6097,7 +7376,7 @@
"Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
"có thể được tìm thấy trên mọi máy phục vụ:\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6124,37 +7403,32 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "thao tác không được gia thức hỗ trợ"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s”"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
@@ -6163,99 +7437,99 @@
"không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn "
"là cần phiên bản Git mới hơn"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s said bất ngờ: “%s”"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s cũng khóa %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "không thể chạy fast-import"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "gặp lỗi trong khi chạy fast-import"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "không thể đọc tham chiếu %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "không hiểu đáp ứng để kết nối: %s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch vụ máy chủ"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "không thể kết nối đến dịch vụ phụ %s"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s không hỗ trợ dry-run"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s không hỗ trợ --signed"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s không hỗ trợ --signed=if-asked"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s không hỗ trợ “push-option”"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s không hỗ trợ “force”"
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "không thể chạy fast-export"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "gặp lỗi trong khi chạy fast-export"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6265,47 +7539,47 @@
"cả.\n"
"Tuy nhiên bạn nên chỉ định một nhánh như “master” chẳng hạn.\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) gặp lỗi"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) gặp lỗi"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "tuyến trình %s gặp lỗi"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "xử lý %s gặp lỗi khi đợi"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "xử lý %s gặp lỗi"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
@@ -6321,11 +7595,11 @@
msgid "empty filename in tree entry"
msgstr "tên tập tin trống rỗng trong mục tin cây"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6336,7 +7610,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
"chuyển nhánh."
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6346,7 +7620,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6357,7 +7631,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
"trộn."
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6367,7 +7641,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6377,7 +7651,7 @@
"%s:\n"
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6387,7 +7661,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6397,7 +7671,7 @@
"trong nó:\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6407,7 +7681,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6417,7 +7691,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6427,7 +7701,7 @@
"trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6437,7 +7711,7 @@
"trộn:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6446,7 +7720,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6455,7 +7729,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6466,7 +7740,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6477,7 +7751,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6487,7 +7761,7 @@
"hòa trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6497,7 +7771,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6507,7 +7781,7 @@
"%s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6517,12 +7791,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Mục “%s” đè lên “%s”. Không thể buộc."
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6531,7 +7805,7 @@
"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6542,7 +7816,7 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6553,7 +7827,7 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6562,16 +7836,16 @@
"Không thể cập nhật mô-đun-con:\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "Bãi bỏ\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "Đang lấy ra các tập tin"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "Đang cập nhật các tập tin"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6596,7 +7870,7 @@
#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
-msgstr "URL kiểu “file:” không được chứa cổng"
+msgstr "một URL kiểu “file:” không được chứa cổng"
#: urlmatch.c:247
msgid "invalid characters in host name"
@@ -6610,33 +7884,33 @@
msgid "invalid '..' path segment"
msgstr "đoạn đường dẫn “..” không hợp lệ"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" không tồn tại"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "“%s” không chỉ ngược đến “%s”"
@@ -6653,158 +7927,164 @@
#: wrapper.c:632
msgid "unable to get current working directory"
-msgstr "Không thể lấy thư mục làm việc hiện hành"
+msgstr "không thể lấy thư mục làm việc hiện hành"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (dùng \"git restore --staged <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (dùng \"git restore --source=%s --staged <tập-tin>…\" để bỏ ra khỏi bệ "
+"phóng)"
+
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
"cần được giải quyết)"
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục "
-"làm việc)"
+" (dùng \"git restore <tập-tin>…\" để loại bỏ các thay đổi trong thư mục làm "
+"việc)"
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa "
"chữa trong mô-đun-con)"
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "được thêm vào bởi chúng ta:"
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "bị xóa đi bởi họ:"
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "được thêm vào bởi họ:"
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "bị xóa bởi chúng ta:"
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "tập tin mới:"
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "đã chép:"
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "đã xóa:"
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "đã sửa:"
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "đã đổi tên:"
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "đổi-kiểu:"
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "không hiểu:"
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "chưa hòa trộn:"
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "lần chuyển giao mới, "
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "nội dung bị sửa đổi, "
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6812,109 +8092,120 @@
"Không sửa hay xóa bỏ đường ở trên.\n"
"Mọi thứ phía dưới sẽ được xóa bỏ."
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
+"Bạn có thể dùng '--no-ahead-behind' tránh phải điều này.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Bạn đang ở giữa của một phiên “am”."
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
-msgstr "thiếu git-rebase-todo"
+msgstr "thiếu git-rebase-todo."
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1284
+#: 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] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)."
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
"continue\")"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -6922,134 +8213,142 @@
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
"đang “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
"rebase --continue\")"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
"rebase nhánh “%s” trên “%s”."
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
"lòng về những thay đổi của mình)"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick hiện tại đang được thực hiện."
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
+
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Hoàn nguyên hiện tại đang thực hiện."
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)"
+
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "HEAD được tách rời từ "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Vẫn chưa chuyển giao"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7061,32 +8360,32 @@
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -7095,200 +8394,200 @@
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
-msgstr "Vẫn không thực hiện lệnh chuyển giao nào"
+msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "khác"
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…"
+msgstr "git add [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
-msgstr "Cập nhật tập tin gặp lỗi"
+msgstr "cập nhật tập tin gặp lỗi"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Không thể mở “%s” để ghi."
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "Không thể lấy thông tin thống kê về “%s”"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%s”"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr ""
"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
"vết"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "cảnh báo khi thêm một kho nhúng"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7319,12 +8618,12 @@
"\n"
"Xem \"git help submodule\" để biết thêm chi tiết."
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "thêm cần một kho git nhúng: %s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n"
@@ -7333,136 +8632,136 @@
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod tham số “%s” phải hoặc là -x hay +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "không thể phân tích cú pháp văn lệnh tác giả"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "“%s” bị xóa bởi móc applypatch-msg"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "dấu thời gian không hợp lệ"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "độ lệch múi giờ không hợp lệ"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
"Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế."
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"."
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể "
"bị mất."
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "Miếng vá trống rỗng."
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "dòng thụt lề không hợp lệ: %.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7470,29 +8769,24 @@
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối"
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -7500,36 +8794,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "Dùng “git am --show-current-patch” để xem miếng vá bị lỗi"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7540,7 +8835,7 @@
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
"vá này."
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7553,17 +8848,17 @@
"Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ"
"\" cho nó."
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
-msgstr "không thể phân tích đối tượng “%s”."
+msgstr "Không thể phân tích đối tượng “%s”."
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -7571,144 +8866,144 @@
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
+msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
+msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
-msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
+msgstr "thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá."
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD chỉ đến nó."
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "hiển thị miếng vá đã được áp dụng rồi."
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "dùng dấu thời gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
-msgstr "lần chuyển giao ký-GPG"
+msgstr "Các lần chuyển giao ký-GPG"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7716,16 +9011,16 @@
"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7734,13 +9029,17 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lênh"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]"
+msgstr "git apply [<các tùy chọn>] [<miếng-vá>…]"
#: builtin/archive.c:17
#, c-format
@@ -7755,224 +9054,455 @@
msgid "git archive: Remote with no URL"
msgstr "git archive: Máy chủ không có địa chỉ URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive: cần ACK/NAK, nhưng lại nhận được gói flush"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive: lỗi giao thức"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive: cần một flush (đẩy dữ liệu lên đĩa)"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <lúc_sai> "
+"<lúc_đúng>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <command> <lúc_sai> "
+"<lúc_đúng>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <lúc_sai> <lúc_đúng> [<term>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<sai> [<đúng>…]] [--] [</các/đường/dẫn>…]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
-msgstr "“%s” không phải một thời hạn hợp lệ."
+msgstr "“%s” không phải một thời hạn hợp lệ"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "không thể dùng lệnh tích hợp “%s” như là một thời kỳ"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "không thể thay đổi nghĩa của thời kỳ “%s”"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "vui lòng dùng hai thời kỳ khác nhau"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "không thể mở tập tin BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Chúng tôi đang không bisect.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "“%s” không phải một lần chuyển giao hợp lệ"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-"
+"chuyển-giao>”."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Đối số bisect_write sai: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "không thể lấy oid của điểm xét duyệt “%s”"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "không thể mở tập tin “%s”"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s"
+
+#: builtin/bisect--helper.c:285
+#, 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 ""
+"Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n"
+"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó."
+
+#: builtin/bisect--helper.c:289
+#, 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 ""
+"Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n"
+"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n"
+"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Bạn có chắc chắn chưa [Y/n]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "chưa định nghĩa thời kỳ nào"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n"
+"và %s cho tình trạng mới.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"tham số không hợp lệ %s cho “git bisect terms”.\n"
+"Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "tùy chọn không được thừa nhận: “%s”"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "sai HEAD - Tôi cần một HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "refspec không hợp lệ: “%s”"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "thực hiện “git bisect next”"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "dọn dẹp tình trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "kiểm tra cho điểm xem xét cần dùng"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "đặt lại trạng di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "kiểm tra và đặt thời điểm trong di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "in ra các thời điểm di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "bắt đầu phiên di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "không có nhật ký cho BISECT_WRITE"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms cần hai tham số"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state không nhận đối số"
-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<các-tùy-chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+"--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
-#: builtin/blame.c:36
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write cần 4 hoặc 5 tham số"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms cần 3 tham số"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms cần 0 hoặc 1 tham số"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<các tùy chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
+
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "cần một màu: %s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "phải kết thúc bằng một màu"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "màu không hợp lệ cho blame.coloring"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "không thể tìm thấy điểm xét duyệt %s để mà bỏ qua"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "bỏ qua <rev> khi blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Bỏ qua các điểm xét duyệt từ <tập tin>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "các dòng màu theo tuổi"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -7985,49 +9515,49 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "tập tin %s chỉ có %lu dòng"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Các dòng blame"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<các-tùy-chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
+msgstr "git branch [<các tùy chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<các-tùy-chọn>] [-r] (-d | -D) <tên-nhánh> …"
+msgstr "git branch [<các tùy chọn>] [-r] (-d | -D) <tên-nhánh> …"
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
+msgstr "git branch [<các tùy chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<các-tùy-chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
+msgstr "git branch [<các tùy chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--points-at]"
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--format]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8036,7 +9566,7 @@
"đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n"
" “%s”, nhưng vẫn chưa được hòa trộn vào HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8045,12 +9575,12 @@
"không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n"
" “%s”, cho dù là nó đã được hòa trộn vào HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8059,112 +9589,121 @@
"Nhánh “%s” không được trộn một cách đầy đủ.\n"
"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "không thể phân tích chuỗi định dạng"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "không thể phân giải HEAD"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Gặp lỗi khi sao chép nhánh"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8175,186 +9714,180 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "không dùng"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "sao chép một nhánh và reflog của nó"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "hiển thị nhánh hiện hành"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "khóa"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "tên trường cần sắp xếp"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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 "đối tượng"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "sắp xếp và lọc là phân biệt HOA thường"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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 "định dạng sẽ dùng cho đầu ra"
-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
-msgstr "không tìm thấy HEAD ở dưới refs/heads!"
+msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "tùy chọn --column và --verbose xung khắc nhau"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "không thể sửa mô tả cho nhiều hơn một nhánh"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chưa chuyển giao trên nhánh “%s”."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "quá nhiều nhánh dành cho thao tác sao chép"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "quá nhiều tham số cho thao tác đổi tên"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "quá nhiều tham số để đặt thượng nguồn mới"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -8362,36 +9895,39 @@
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s” không có thông tin thượng nguồn"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: 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 ""
-"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên "
-"nhánh"
+"Hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không nhận một tên "
+"nhánh.\n"
+"Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8412,7 +9948,7 @@
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8420,7 +9956,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8428,139 +9964,139 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "chỉ một tùy chọn batch được chỉ ra"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "thoát với 0 khi không có lỗi"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "đừng sắp xếp đầu ra --batch-all-objects"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>…] [--] tên-đường-dẫn…"
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>…]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "chỉ dùng .gitattributes từ bảng mục lục"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "hiển thị những đường dẫn đầu vào không khớp với mẫu"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "bỏ qua mục lục khi kiểm tra"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "không thể chỉ định các tên đường dẫn với --stdin"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z chỉ hợp lý với --stdin"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "chưa chỉ ra đường dẫn"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose"
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<các-tùy-chọn>] <danh-bạ>…"
+msgstr "git check-mailmap [<các tùy chọn>] <danh-bạ>…"
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
@@ -8575,166 +10111,223 @@
msgid "no contacts specified"
msgstr "chưa chỉ ra danh bạ"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
+msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "stage nên giữa 1 và 3 hay all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
"không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "không checkout các tập tin mới"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "chuỗi"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "sao chép ra các tập tin từ bệ phóng có tên"
#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<các-tùy-chọn>] <nhánh>"
+msgstr "git checkout [<các tùy chọn>] <nhánh>"
#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…"
+msgstr "git checkout [<các tùy chọn>] [<nhánh>] -- <tập-tin>…"
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<các tùy chọn>] [<nhánh>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Đã tạo lại %d xung đột hòa trộn"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Đã cập nhật đường dẫn %d từ %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "không được dùng “%s” với các đường dẫn cập nhật"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s” với %s"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "không chỉ định '%s' không '%s'"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "phải có “%s” khi không chỉ định “%s”"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' hay '%s' không thể được sử dụng với %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"không thể tiếp tục với các thay đổi đã được đưa lên bệ phóng trong các dòng "
+"sau:\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: %s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thực hiện reflog cho “%s”: %s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8753,7 +10346,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8774,164 +10367,243 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "chỉ cần một tham chiếu"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
+"Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được “%s”"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được “%s”"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi đang hòa trộn\n"
+"Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhanh ở giữa một phiên am\n"
+"Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi cải tổ\n"
+"Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi cherry-picking\n"
+"Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi hoàn nguyên\n"
+"Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr ""
+"bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
+"bước"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s” không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "“%s” không thể nhận <điểm-đầu>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "nhánh"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "tạo và checkout một nhánh mới"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "tạo/đặt_lại và checkout một nhánh"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "tạo reflog cho nhánh mới"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "nhánh-mới"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "nhánh không cha mới"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr ""
-"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr ""
-"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "kiểu"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "kiểu"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "đặt thông tin thượng nguồn cho nhánh mới"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "nhánh-mới"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "nhánh không cha mới"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr ""
+"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr ""
+"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p và --overlay loại từ lẫn nhau"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "không thể phân giải “%s”"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "bạn phải chỉ định các thư mục muốn hồi phục"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo "
"từ đó"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -8939,7 +10611,7 @@
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -8969,38 +10641,106 @@
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
"checkout.defaultRemote=origin trong cấu hình của bạn."
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "nhánh"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "tạo và checkout một nhánh mới"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "tạo/đặt_lại và checkout một nhánh"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "tạo reflog cho nhánh mới"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "đoán thứ hai 'git checkout <không-nhánh-nào-như-vậy>' (mặc định)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "dùng chế độ che phủ (mặc định)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "tạo và chuyển đến một nhánh mới"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "tạo/đặt_lại và chuyển đến một nhánh"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "vứt bỏ các sửa đổi địa phương"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "lấy ra từ tree-ish nào"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "phục hồi bảng mục lục"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "phục hồi cây làm việc (mặc định)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "bỏ qua những thứ chưa hòa trộn: %s"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "dùng chế độ che phủ"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>…"
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] </các/đường/"
+"dẫn>…"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "Đang gỡ bỏ %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "Có thể gỡ bỏ %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "Đang bỏ qua kho chứa %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "Nên bỏ qua kho chứa %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9013,7 +10753,7 @@
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (để trống) không chọn gì cả\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9034,38 +10774,38 @@
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Chọn mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9083,63 +10823,63 @@
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Giờ thì sao"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:"
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "không hiển thị tên của các tập tin đã gỡ bỏ"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -9147,7 +10887,7 @@
"clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
"cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -9155,148 +10895,162 @@
"clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n "
"mà cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]"
+msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "đặc-tả-đường-dẫn"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "số lượng mô-đun-con được nhân bản đồng thời"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "tên"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không "
"theo chúng nữa"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "đặc-tả-máy-phục-vụ"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "tùy chọn để chuyển giao"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9304,145 +11058,145 @@
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "gặp lỗi khi mở “%s”"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "gặp lỗi khi bắt đầu lặp qua “%s”"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lỗi khi tạo được liên kết mềm %s"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi sao chép tập tin và “%s”"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "gặp lỗi khi lặp qua “%s”"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Việc nhân bản thành công, nhưng checkout gặp lỗi.\n"
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
-"và thử lấy ra với lệnh “git checkout -f HEAD”\n"
+"và thử lấy ra với lệnh 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "không thể bỏ liên kết tập tin thay thế tạm thời"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s” đã sẵn tồn tại rồi."
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thư mục làm việc dir “%s”"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Đang nhân bản thành kho chứa bare “%s”…\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -9450,47 +11204,47 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
#: builtin/column.c:10
msgid "git column [<options>]"
-msgstr "git column [<các-tùy-chọn>]"
+msgstr "git column [<các tùy chọn>]"
#: builtin/column.c:27
msgid "lookup config vars"
@@ -9520,15 +11274,83 @@
msgid "--command must be the first argument"
msgstr "--command phải là đối số đầu tiên"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <cha>)…] [-S[<keyid>]] [(-m <ghi chú>)…] [(-F <tập tin>)"
+"…] <cây>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "không phải là tên đối tượng hợp lệ “%s”"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: gặp lỗi khi mở “%s”"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: gặp lỗi khi đọc “%s”"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: gặp lỗi khi đóng “%s”"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "cha-mẹ"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "mã số của đối tượng chuyển giao cha mẹ"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "chú thích"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "chú thích của lần chuyển giao"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "Ký lần chuyển giao dùng GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "phải đưa ra chính xác một cây"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: gặp lỗi khi đọc"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<các-tùy-chọn>] [--] <pathspec>…"
+msgstr "git commit [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<các-tùy-chọn>] [--] <pathspec>…"
+msgstr "git status [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/commit.c:50
+#: 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"
@@ -9541,7 +11363,7 @@
"hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
"\"git reset HEAD^\".\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9556,83 +11378,89 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Nếu không được thì dùng lệnh \"git reset\"\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Nếu không được thì dùng lệnh \"git cherry-pick --skip\"\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
+"và sau đó dùng:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"để lại tiếp tục cherry-picking các lần chuyển giao còn lại.\n"
"Nếu bạn muốn bỏ qua lần chuyển giao này thì dùng:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
-"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "không thể tạo bảng mục lục tạm thời"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "không thể cập nhật bảng mục lục tạm thời"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -9640,38 +11468,38 @@
"không thể chọn một ký tự ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9686,7 +11514,7 @@
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9701,7 +11529,7 @@
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9712,7 +11540,7 @@
"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
"chuyển giao.\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9724,157 +11552,152 @@
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ "
"tác giả nào sẵn có"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Chế độ bỏ qua không hợp lệ “%s”"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "hai tùy chọn -long và -z không tương thích với nhau"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”."
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổ”."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr ""
-"Chỉ được dùng một trong số tùy chọn trong số các tùy chọn -c/-C/-F/--fixup"
+msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được "
"sử dụng."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý."
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Chế độ dọn dẹp không hợp lệ %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "Các đường dẫn với tùy chọn -a không hợp lý."
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "tính đầy đủ giá trị trước/sau"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -9882,11 +11705,11 @@
"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
"no. (Mặc định: traditional)"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -9894,269 +11717,273 @@
"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "không dò tìm các tên thay đổi"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "chú thích"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "chú thích của lần chuyển giao"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ "
"ra"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "mặc định"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "ký lần chuyển giao dùng GPG"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
"(message).\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"kho chứa đã được cập nhật, nhưng không thể ghi vào\n"
"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa\n"
"có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n"
-"và sau đó \"git reset HEAD\" để khắc phục."
+"và sau đó \"git restore --staged :/\" để khắc phục."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow]"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir </thư/mục/đối/tượng>] [--append|--"
+"split] [--reachable|--stdin-packs|--stdin-commits] <các tùy chọn chia tách>"
+
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "tmục"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Thư mục đối tượng để lưu đồ thị"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Không thể mở đồ thị chuyển giao “%s”"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "bắt đầu di chuyển tại mọi tham chiếu"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
"chuyển giao"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
"bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ thị lần chuyển giao"
+"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-"
+"giao"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
+"chia cắt không-cơ-sở"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs"
#: builtin/config.c:11
msgid "git config [<options>]"
-msgstr "git config [<các-tùy-chọn>]"
+msgstr "git config [<các tùy chọn>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "đối số không được thừa nhận --type, %s"
@@ -10261,7 +12088,7 @@
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "giá trị được đưa kiểu này"
@@ -10307,7 +12134,7 @@
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "giá trị"
@@ -10315,48 +12142,48 @@
msgid "with --get, use default value when missing entry"
msgstr "với --get, dùng giá trị mặc định khi thiếu mục tin"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "sai số lượng tham số, phải là %d"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "sai số lượng tham số, phải từ %d đến %d"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "mẫu khóa không hợp lệ: %s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "gặp lỗi khi định dạng giá trị cấu hình mặc định: %s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "không thể phân tích màu “%s”"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "không trong thư mục git"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "việc ghi ra đầu ra tiêu chuẩn là không được hỗ trợ"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "không hỗ trợ ghi cấu hình các blob"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10371,23 +12198,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "chỉ một tập tin cấu hình một lần"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local chỉ có thể được dùng bên trong một kho git"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob chỉ có thể được dùng bên trong một kho git"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "Chưa đặt biến môi trường HOME"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10397,19 +12224,19 @@
"worktreeConfig được bật. Vui lòng đọc phần \"CONFIGURATION FILE\"\n"
"trong \"git help worktree\" để biết thêm chi tiết"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color và kiểu biến là không mạch lạc"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "chỉ một thao tác mỗi lần"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -10417,33 +12244,33 @@
"--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --"
"list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default chỉ được áp dụng cho --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "không thể đọc tập tin cấu hình “%s”"
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "gặp lỗi khi xử lý các tập tin cấu hình"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "sửa chữa đầu ra tiêu chuẩn là không được hỗ trợ"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "việc sửa chữa các blob là không được hỗ trợ"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%s”"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10452,7 +12279,7 @@
"không thể ghi đè nhiều giá trị với một giá trị đơn\n"
" Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "không có đoạn: %s"
@@ -10465,57 +12292,57 @@
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<các-tùy-chọn>] <commit-ish>*"
-
#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<các tùy chọn>] <commit-ish>*"
+
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
-msgstr "git describe [<các-tùy-chọn>] --dirty"
+msgstr "git describe [<các tùy chọn>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
-msgstr "phía trước "
+msgstr "phía trước"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "hạng nhẹ"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "có diễn giải"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "thẻ được chú giải %s không có tên nhúng"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "không có thẻ nào khớp chính xác với “%s”"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "việc tìm kiếm đã kết thúc tại %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10524,7 +12351,7 @@
"Không có thẻ được chú giải nào được mô tả là “%s”.\n"
"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10533,12 +12360,12 @@
"Không có thẻ có thể mô tả “%s”.\n"
"Hãy thử --always, hoặc tạo một số thẻ."
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "đã xuyên %lu qua lần chuyển giao\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10547,118 +12374,118 @@
"tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n"
"đây nhất bỏ đi tìm kiếm tại %s\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "mô tả %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "Không phải tên đối tượng %s hợp lệ"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s không phải là một lần commit cũng không phải blob"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "dùng ref bất kỳ"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "dùng thẻ bất kỳ, cả khi “unannotated”"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "luôn dùng định dạng dài"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "chỉ theo cha mẹ đầu tiên"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "chỉ xuất những gì khớp chính xác"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "không coi rằng các thẻ khớp với <mẫu>"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "dấu"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long là xung khắc với tùy chọn --abbrev=0"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty là xung khắc với các tùy chọn commit-ish"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken là xung khắc với commit-ishes"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "tùy chọn không hợp lệ: %s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s” không hợp lệ."
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%s”."
@@ -10666,30 +12493,30 @@
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-"git difftool [<các-tùy-chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] "
-"<đường-dẫn>…]"
+"git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </"
+"đường/dẫn>…]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "gặp lỗi: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "không đọc được tập tin liên kết mềm %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
-msgstr "Không thể đọc đối tượng %s cho liên kết mềm %s"
+msgstr "không thể đọc đối tượng %s cho liên kết mềm %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10697,53 +12524,53 @@
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
-msgstr "bạn có lẽ muốn dọn dẹp hay "
+msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "đừng nhắc khi khởi chạy công cụ diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "công cụ"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -10751,161 +12578,223 @@
"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
"không"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "chuyển cho “diff”"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool cần cây làm việc hoặc --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff xung khắc với --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <các tùy chọn> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "kiểu"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "mặc định cho git_env_*(...) để quay về"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "im lặng chỉ khi dung giá trị git_env_*() làm mã thoát"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"tùy chọn `--default' cần một giá trị logic với `--type=bool`, không phải `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"tùy chọn `--default' cần một giá trị số nguyên dài không dấu với `--"
+"type=ulong`, không phải `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
-msgstr "nhập vào đánh dấu từ tập tin này"
+msgstr "Nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fetch.c:28
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Các cha mẹ tham chiếu cái mà k trong luồng dữ liệu fast-export bởi mã id đối "
+"tượng"
-#: builtin/fetch.c:29
-msgid "git fetch [<options>] <group>"
-msgstr "git fetch [<các-tùy-chọn>] [<nhóm>"
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "Hiển thị các mã id nguyên gốc của blobs/commits"
#: builtin/fetch.c:30
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]"
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
#: builtin/fetch.c:31
-msgid "git fetch --all [<options>]"
-msgstr "git fetch --all [<các-tùy-chọn>]"
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<các tùy chọn>] [<nhóm>"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:32
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]"
+
+#: builtin/fetch.c:33
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<các tùy chọn>]"
+
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "đường dẫn đến gói tải lên trên máy chủ cuối"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ "
"nữa"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -10913,108 +12802,129 @@
"mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
"tin cấu hình config)"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "đặc-tả-máy-phục-vụ"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "tùy chọn để chuyển giao"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
"báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "chạy 'gc --auto' sau khi lấy về"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
-msgstr "Không tìm thấy đối tượng %s"
+msgstr "không tìm thấy đối tượng %s"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "nên xóa chồng các thẻ có sẵn"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+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 ""
+"Việc lấy về thường chỉ ra các nhánh buộc phải cập nhật,\n"
+"nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n"
+"'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, 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 ""
+"Việc này cần %.2f giây để kiểm tra các cập nhật ép buộc. Bạn có thể dùng\n"
+"'--no-show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates "
+"false'\n"
+"để tránh kiểm tra này.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -11023,59 +12933,60 @@
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
-msgstr "không thể “%s” về"
+msgstr "Không thể lấy“%s” về"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng core."
+"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
"partialClone"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -11083,43 +12994,51 @@
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
-msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
+msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
+"partialclone"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11149,7 +13068,7 @@
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr "git for-each-ref [<các-tùy-chọn>] [<mẫu>]"
+msgstr "git for-each-ref [<các tùy chọn>] [<mẫu>]"
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
@@ -11185,110 +13104,298 @@
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "không hiểu"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "lỗi trong %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "có cảnh báo trong %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "liên kết gãy từ %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "kiểu đối tượng sai trong liên kết"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"liên kết gãy từ %7s %s \n"
+" tới %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "thiếu %s %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "không tiếp cận được %s %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "dangling %s %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "không thể tạo lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "không thể hoàn thành “%s”"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "Đang kiểm tra %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Đang kiểm tra kết nối (%d đối tượng)"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "Đang kiểm tra %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "các liên kết bị gẫy"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "gốc %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "đã đánh thẻ %s %s (%s) trong %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: đối tượng thiếu hay hỏng"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: mục reflog không hợp lệ %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: con trỏ sha1 không hợp lệ %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: không phải là một lần chuyển giao"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "cảnh báo: Không có các tham chiếu mặc định"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: thiếu đối tượng hoặc hỏng: %s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: không thể phân tích cú đối tượng: %s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "tập tin sha1 sai: %s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "Đang kiểm tra thư mục đối tượng"
+
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
-#: builtin/fsck.c:693
-msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]"
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "Đang lấy liên kết %s"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "%s không hợp lệ"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "Đang kiểm tra cây nhớ tạm"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "non-tree trong cache-tree"
+
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
+
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodes”"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes” (mặc định)"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: thiếu đối tượng"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”"
+
#: builtin/gc.c:34
msgid "git gc [<options>]"
-msgstr "git gc [<các-tùy-chọn>]"
+msgstr "git gc [<các tùy chọn>]"
#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "gặp lỗi khi phân tích “%s” giá trị “%s”"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11303,54 +13410,54 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gặp lỗi khi phân tích giá trị gc.logexpiry %s"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "gặp lỗi khi phân tích giá trị prune %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm "
"việc.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -11358,23 +13465,23 @@
"gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
"phải thế)"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” "
"để xóa bỏ chúng đi."
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<các-tùy-chọn>] [-e] <mẫu> [<rev>…] [[--] <đường-dẫn>…]"
+msgstr "git grep [<các tùy chọn>] [-e] <mẫu> [<rev>…] [[--] </đường/dẫn>…]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -11383,263 +13490,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "xử lý tập tin nhị phân như là dạng văn bản thường"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "tìm kiếm trong thư mục con (mặc định)"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "chưa chỉ ra mẫu"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "không thể phân giải điểm xét duyệt: %s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "tùy chọn không được hỗ trợ với --recurse-submodules"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached hay --untracked không được sử dụng với --no-index"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "cả hai --cached và các cây phải được chỉ ra"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11647,36 +13754,32 @@
"git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
"[--] <tập-tin>…"
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "kiểu"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "kiểu đối tượng"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "ghi đối tượng vào dữ liệu đối tượng"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "đọc đối tượng từ đầu vào tiêu chuẩn stdin"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "lưu các tập tin mà nó không có các bộ lọc"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng hỏng để mà gỡ lỗi Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "xử lý tập tin như là nó đang ở thư mục này"
@@ -11716,30 +13819,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "không nhận ra định dạng trợ giúp “%s”"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "Gặp lỗi khi khởi chạy emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "gặp lỗi khi thực thi “%s”"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11748,7 +13851,7 @@
"“%s”: đường dẫn không hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.cmd” để thay thế."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11757,321 +13860,311 @@
"“%s”: cmd (lệnh) hỗ trợ bộ trình chiếu man.\n"
"Hãy cân nhắc đến việc sử dụng “man.<tool>.path” để thay thế."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%s”: không rõ chương trình xem man."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "“%s” được đặt bí danh thành “%s”"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "chuỗi alias.%s sai: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "Chạy lệnh “git help config” để có thêm thông tin"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
-msgstr "Không thể lấy về đối tượng cần %s"
+msgstr "không thể lấy về đối tượng cần %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể điền thêm vào %d byte"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "gói đã vượt quá cỡ tối đa được phép"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%s”"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:555
+#: 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] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "không thể đọc thông tin đối tượng sẵn có %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể đọc đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "lỗi fsck trong đối tượng đóng gói"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "%s không hợp lệ"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "không thể ghi %s tập tin “%s”"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "không thể đóng tập tin được ghi %s “%s”"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "lỗi fsck trong các đối tượng gói"
@@ -12115,42 +14208,42 @@
msgid "not copying templates from '%s': %s"
msgstr "không sao chép các mẫu từ “%s”: %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "không thể xử lý (handle) tập tin kiểu %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s đã có từ trước rồi"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Đã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Đã khởi tạo lại kho Git sẵn có trong %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Đã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Đã khởi tạo lại kho Git trống rỗng sẵn có trong %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12158,25 +14251,25 @@
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyền>]] [thư-mục]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "các quyền"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -12185,12 +14278,12 @@
"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
"dir=<thư-mục>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr "không thể truy cập cây (tree) làm việc “%s”"
+msgstr "Không thể truy cập cây (tree) làm việc “%s”"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12198,460 +14291,452 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "sửa các tập tin tại chỗ"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "bộ dò vết cắt bỏ phần trống rỗng"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "đặt phần đuôi mới ở đâu"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "thao tác khi đã có phần đuôi"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "thao tác khi thiếu phần đuôi"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "chỉ xuất phần đuôi"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "đừng áp dụng các quy tắc cấu hình"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "nối các giá trị khoảng-trắng-liên-tiếp"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "đặt các tùy chọn phân tích cú pháp"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "không coi --- là đặc biệt"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "bộ dò vết"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "bộ dò vết cần thêm"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer cùng với --only-input không hợp lý"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
-#: builtin/log.c:54
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<các-tùy-chọn>] [<vùng-xem-xét>] [[--] <đường-dẫn>…]"
-
#: builtin/log.c:55
-msgid "git show [<options>] <object>..."
-msgstr "git show [<các-tùy-chọn>] <đối-tượng>…"
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]"
-#: builtin/log.c:99
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr "git show [<các tùy chọn>] <đối-tượng>…"
+
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn--decorate không hợp lệ: %s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "chặn mọi kết xuất từ diff"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
-msgstr "Không thể đọc đối tượng %s"
+msgid "could not read object %s"
+msgstr "không thể đọc đối tượng %s"
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
-msgstr "Không nhận ra kiểu: %d"
+msgid "unknown type: %d"
+msgstr "không nhận ra kiểu: %d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Không thể mở tập tin miếng vá: %s"
+msgid "cannot open patch file %s"
+msgstr "không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "Cần chính xác một vùng."
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "cần chính xác một vùng"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "Không phải là một vùng."
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "không phải là một vùng"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "“Cover letter” cần cho định dạng thư"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "“cover letter” cần cho định dạng thư"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "gặp lỗi khi tạo các tập tin cover-letter"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]"
+msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
-msgstr "Hai thư mục kết xuất?"
+#: builtin/log.c:1244
+msgid "two output directories?"
+msgstr "hai thư mục kết xuất?"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
-msgstr "Không hiểu lần chuyển giao %s"
+msgid "unknown commit %s"
+msgstr "không hiểu lần chuyển giao %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "Không tìm thấy nền hòa trộn chính xác."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "không tìm thấy nền hòa trộn chính xác"
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Gặp lỗi khi lấy thượng nguồn, nếu bạn muốn ghi lại lần chuyển giao nền một\n"
+"gặp lỗi khi lấy thượng nguồn, nếu bạn muốn ghi lại lần chuyển giao nền một\n"
"cách tự động, vui lòng dùng \"git branch --set-upstream-to\" để theo dõi\n"
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
-"\"--base=<base-commit-id>\" một cách thủ công."
+"\"--base=<base-commit-id>\" một cách thủ công"
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
-msgstr "Gặp lỗi khi tìm nền hòa trộn chính xác."
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
+msgstr "gặp lỗi khi tìm nền hòa trộn chính xác"
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "gặp lỗi khi suy luận range-diff (vùng khác biệt)"
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "xuất mọi mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá "
"đơn"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n và -k loại từ lẫn nhau"
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Không thể tạo thư mục “%s”"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff cần --cover-letter hoặc vá đơn"
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff dựa trên v%d:"
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor yêu cầu --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff dựa trên v%d:"
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Đang tạo các miếng vá"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
-msgstr "Gặp lỗi khi tạo các tập tin kết xuất"
+#: builtin/log.c:1975
+msgid "failed to create output files"
+msgstr "gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -12659,110 +14744,110 @@
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]"
+msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "nhận dạng các trạng thái tập tin với thẻ"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
"dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không "
"thay đổi)"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "dùng chữ cái viết thường cho các tập tin “fsmonitor clean”"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "hiển thị các tập tin đã xóa trong kết xuất"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "hiển thị các tập tin khác trong kết xuất"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "chỉ hiển thị tên của các thư mục “khác”"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "hiển thị kết thúc dòng của các tập tin"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "bỏ qua những tập tin khớp với một mẫu"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được đọc từ <tập tin>"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "đệ quy xuyên qua mô-đun con"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
@@ -12780,7 +14865,7 @@
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "thực thi"
@@ -12804,17 +14889,17 @@
msgid "take url.<base>.insteadOf into account"
msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+msgstr "git ls-tree [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
#: builtin/ls-tree.c:128
msgid "only show trees"
@@ -12853,266 +14938,286 @@
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<các-tùy-chọn>] [<commit>…]"
+msgstr "git merge [<các tùy chọn>] [<commit>…]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "tùy chọn “%s” yêu cầu một giá trị"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:269
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "thẩm tra móc (hook) commit-msg"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
-msgstr "Không cầm nắm gì ngoài hai head hòa trộn"
+msgstr "Không cầm nắm gì ngoài hai head hòa trộn."
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể đọc từ “%s”"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần "
"thiết,\n"
"đặc biệt là khi nó hòa trộn thượng nguồn đã cập nhật vào trong một nhánh "
"topic.\n"
"\n"
-"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và phần chú thích này nếu "
-"rỗng\n"
-"sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n"
+"thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vời.\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
-msgstr "không phải nhánh hiện hành"
+msgstr "Không phải nhánh hiện hành."
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit không nhận các đối số"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13120,7 +15225,7 @@
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13128,94 +15233,98 @@
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Bạn không thể kết hợp --squash với --no-ff."
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Bạn không thể kết hợp --squash với --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Đã cập nhật rồi."
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Đã cập nhật rồi. Yeeah!"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Đang tua lại cây thành thời xa xưa…\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -13267,7 +15376,7 @@
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
-"git merge-file [<các-tùy-chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
+"git merge-file [<các tùy chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
"tin1> <tập-tin-gốc> <tập-tin2>"
#: builtin/merge-file.c:35
@@ -13302,32 +15411,32 @@
msgid "set labels for file1/orig-file/file2"
msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "không hiểu tùy chọn %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "không thể phân tích đối tượng “%s”"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "không thể xử lý nhiều hơn %d nền. Bỏ qua %s"
+msgstr[0] "không thể xử lý nhiều hơn %d nền. Bỏ qua %s."
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
-msgstr "không cầm nắm gì ngoài hai head hòa trộn"
+msgstr "không xử lý gì ngoài hai head hòa trộn."
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "không thể phân giải tham chiếu %s"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "Đang hòa trộn %s với %s\n"
@@ -13340,7 +15449,7 @@
msgid "input is NUL terminated"
msgstr "đầu vào được chấm dứt bởi NUL"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "cho phép thiếu đối tượng"
@@ -13348,158 +15457,174 @@
msgid "allow creation of more than one tree"
msgstr "cho phép tạo nhiều hơn một cây"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<thư/mục>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<thư/mục>] (write|verify|expire|repack --"
+"batch-size=<cỡ>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
+"vào một bó cái mà lớn hơn kích thước này"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "có quá nhiều đối số"
-#: builtin/multi-pack-index.c:48
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "tùy chọn --batch-size chỉ cho lệnh con 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verb không được thừa nhận: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
-#: builtin/mv.c:17
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>"
+msgstr "git mv [<các tùy chọn>] <nguồn>… <đích>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s trong bảng mục lục"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã tồn tại"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "bỏ qua các lỗi liên quan đến di chuyển, đổi tên"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "có đích “%s” nhưng đây không phải là một thư mục"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "không thể di chuyển một thư mục vào trong chính nó được"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "không di chuyển được thư mục thông qua tập tin"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "đang ghi đè lên “%s”"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
-msgstr "Nhiều nguồn cho cùng một đích"
+msgstr "nhiều nguồn cho cùng một đích"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "thư mục đích không tồn tại"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<các-tùy-chọn>] <commit>…"
+msgstr "git name-rev [<các tùy chọn>] <commit>…"
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
-msgstr "git name-rev [<các-tùy-chọn>] --all"
+msgstr "git name-rev [<các tùy chọn>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<các-tùy-chọn>] --stdin"
+msgstr "git name-rev [<các tùy chọn>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "bỏ qua các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "đọc từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
@@ -13567,11 +15692,11 @@
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
-msgstr "git notes add [<các-tùy-chọn>] [<đối-tượng>]"
+msgstr "git notes add [<các tùy chọn>] [<đối-tượng>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<các-tùy-chọn>] <từ-đối-tượng> <đến-đối-tượng>"
+msgstr "git notes copy [<các tùy chọn>] <từ-đối-tượng> <đến-đối-tượng>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
@@ -13579,7 +15704,7 @@
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
-msgstr "git notes append [<các-tùy-chọn>] [<đối-tượng>]"
+msgstr "git notes append [<các tùy chọn>] [<đối-tượng>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
@@ -13591,15 +15716,15 @@
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<các-tùy-chọn>] <notes-ref>"
+msgstr "git notes merge [<các tùy chọn>] <notes-ref>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
-msgstr "git notes merge --commit [<các-tùy-chọn>]"
+msgstr "git notes merge --commit [<các tùy chọn>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
-msgstr "git notes merge --abort [<các-tùy-chọn>]"
+msgstr "git notes merge --abort [<các tùy chọn>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
@@ -13607,7 +15732,7 @@
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
-msgstr "git notes prune [<các-tùy-chọn>]"
+msgstr "git notes prune [<các tùy chọn>]"
#: builtin/notes.c:92
msgid "git notes get-ref"
@@ -13645,14 +15770,14 @@
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: 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 "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
@@ -13685,38 +15810,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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 "quá nhiều đối số"
-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "không tìm thấy ghi chú cho đối tượng %s."
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
@@ -13729,29 +15854,29 @@
"Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng "
"%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Đang ghi đè lên ghi chú cũ cho đối tượng %s\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "Đang gỡ bỏ ghi chú (note) cho đối tượng %s\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "quá ít đối số"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -13760,12 +15885,12 @@
"Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối "
"tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ"
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13774,52 +15899,52 @@
"Các tùy chọn -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit”.\n"
"Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C”.\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "gặp lỗi khi gỡ bỏ cây làm việc “git notes merge”"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -13827,48 +15952,48 @@
"phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "một ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "gặp lỗi khi lưu liên kết đến tham chiếu ghi chú hiện tại (%s)"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13879,174 +16004,179 @@
"chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa "
"trộn bằng “git notes merge --abort”.\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects --stdout [các-tùy-chọn…] [< <danh-sách-tham-chiếu> | < "
+"git pack-objects --stdout [các tùy chọn…] [< <danh-sách-tham-chiếu> | < "
"<danh-sách-đối-tượng>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects [các-tùy-chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
+"git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
"sách-đối-tượng>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "CRC của đối tượng gói sai với %s"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "đối tượng đã đóng gói sai hỏng cho %s"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "dò thấy delta đệ quy cho đối tượng %s"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "tập tin gói không hợp lệ: %s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "không thể mở tập tin gói để dùng lại: %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "không thể di chuyển vị trí đọc trong tập tin gói dùng lại"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "không thể đọc từ tập tin gói dùng lại"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "không thể lấy kích cỡ của %s"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "không thể phân tích phần đầu đối tượng của “%s”"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "không thể đọc đối tượng %s"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với "
"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - hết bộ nhớ"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Nén delta dùng tới %d tuyến trình"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "mâu thuẫn với số lượng delta"
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -14055,7 +16185,7 @@
"cần ID đối tượng cạnh, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -14064,249 +16194,257 @@
"cần ID đối tượng, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "giá trị cho --missing không hợp lệ"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "không thể mở mục lục của gói"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "đối tượng mất tại %s không thể đã kiểm tra"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev “%s”"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "điểm xem xét sai “%s”"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "không thể thêm các đối tượng mới dùng"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<phiên bản>[,offset]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
-msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn"
+msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "dung thuật toán “sparse reachability”"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "bỏ qua gói này"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "ghi mục lục ánh xạ nếu được"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "xử lý cho thiếu đối tượng"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "tôn trọng island trong suốt quá trình nén “delta”"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "không thể dùng tùy chọn --filter mà không có --stdout"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Đánh số các đối tượng"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
-msgstr "git pack-refs [<các-tùy-chọn>]"
+msgstr "git pack-refs [<các tùy chọn>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "đóng gói mọi thứ"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)"
@@ -14322,69 +16460,69 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <thời-gian>] [--] [<head>…]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "các đối tượng hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập tin gói hứa hẹn"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Giá trị không hợp lệ %s: %s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy của các mô-đun-con"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -14392,14 +16530,14 @@
"Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
"lấy về."
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
"về."
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -14408,7 +16546,7 @@
"tự\n"
"đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14420,43 +16558,43 @@
"theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
"một nhánh trên dòng lệnh."
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14465,34 +16603,34 @@
"Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n"
"từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về."
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao “%s”"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14503,7 +16641,7 @@
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14521,22 +16659,22 @@
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng."
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh."
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+msgstr "git push [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
@@ -14546,7 +16684,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thường"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14555,7 +16693,7 @@
"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help "
"config”."
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14580,7 +16718,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14595,7 +16733,7 @@
"\n"
" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14609,12 +16747,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push."
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14626,14 +16764,14 @@
"nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n"
"để cập nhật nhánh máy chủ nào."
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không "
"là gì cả\"."
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14646,7 +16784,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14660,7 +16798,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14675,11 +16813,11 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ."
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14691,22 +16829,22 @@
"đối tượng\n"
"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "Đang đẩy lên %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "repository (kho) sai “%s”"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14727,119 +16865,119 @@
"\n"
" git push <tên>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "kho"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "xóa các tham chiếu"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<tên-tham-chiếu>:<cần>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "chương trình nhận gói"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "đặt thượng nguồn cho git pull/status"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "xén tỉa những tham chiếu bị gỡ bỏ"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "vòng qua móc tiền-đẩy (pre-push)"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all và --tags xung khắc nhau"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror và --tags xung khắc nhau"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all và --mirror xung khắc nhau"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "các tùy chọn push phải không có ký tự dòng mới"
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-"git range-diff [<các-tùy-chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
+"git range-diff [<các tùy chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git range-diff [<các-tùy-chọn>] <old-tip>…<new-tip>"
+msgstr "git range-diff [<các tùy chọn>] <old-tip>…<new-tip>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git range-diff [<các-tùy-chọn>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<các tùy chọn>] <base> <old-tip> <new-tip>"
#: builtin/range-diff.c:21
msgid "Percentage by which creation is weighted"
@@ -14849,20 +16987,20 @@
msgid "use simple diff colors"
msgstr "dùng màu diff đơn giản"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "không có .. trong vùng: “%s”"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "định dạng đối số đơn phải là một vùng đối xứng"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "cần hai vùng lần chuyển giao"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -14873,121 +17011,304 @@
"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-"
"ish3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "ghi mục lục kết quả vào <tập-tin>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "chỉ với bảng mục lục trống rỗng"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "Hòa trộn"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "thực hiện một hòa trộn thêm vào việc đọc"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr ""
-"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu "
+"hòa trộn kiểu “3-way” nếu không có tập tin mức hòa trộn nào được yêu cầu"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "hòa trộn 3-way trong sự hiện diện của “adds” và “removes”"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "giống với -m, nhưng bỏ qua các mục chưa được hòa trộn"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<thư-mục-con>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "đọc cây vào trong bảng mục lục dưới <thư_mục_con>/"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "cập nhật cây làm việc với kết quả hòa trộn"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "cho phép các tập tin rõ ràng bị lờ đi được ghi đè"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "không kiểm tra cây làm việc sau hòa trộn"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "không cập nhật bảng mục lục hay cây làm việc"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "bỏ qua áp dụng bộ lọc lấy ra (checkout) thưa thớt"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "gỡ lỗi “unpack-trees”"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "không xuất các thông tin phản hồi"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
-"git rebase [-i] [các-tùy-chọn] [--exec <lệnh>] [--onto <newbase>] "
+"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] "
"[<upstream>] [<nhánh>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-"git rebase [-i] [các-tùy-chọn] [--exec <lệnh>] [--onto <newbase>] --root "
+"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] --root "
"[<nhánh>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "danh sách cần làm không dùng được: “%s”"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "không thể ghi “%s”."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "không HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "không thể tạo %s tạm thời"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "không thể đánh dấu là tương tác"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "không thể tạo danh sách cần làm"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<các tùy chọn>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "giữ lại các lần chuyển giao rỗng"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "chấp nhận chuyển giao mà không ghi chú gì"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "cải tổ các lần chuyển giao hòa trộn"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "ký các lần chuyển giao"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "tiếp tục cải tổ"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "bỏ qua lần chuyển giao"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "sửa danh sách cần làm"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "hiển thị miếng vá hiện hành"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "khai triển mã chuyển giao trong danh sách cần làm"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "kiểm tra danh sách cần làm"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "sắp xếp lại các dòng fixup/squash"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "chèn các lệnh thực thi trong danh sách cần làm"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "lên trên"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "điểm-xét-duyệt-hạn-chế"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "điểm xét duyệt hạn chế"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-lên-trên"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "squash lên trên"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "lần chuyển giao thượng nguồn"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "tên-đầu"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "tên đầu"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "chiến lược cải tổ"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "tùy-chọn-chiến-lược"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "các tùy chọn chiến lược"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "chuyển-đến"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "nhánh hay lần chuyển giao lần lấy ra"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "onto-name"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "tên lên trên"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "lệnh"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "lệnh muốn chạy"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s cần một cải tổ kiểu tương tác"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "không thể đặt lấy “onto”: “%s”"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head không hợp lệ: “%s”"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "Không thể đọc “%s”"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "Không thể lưu “%s”"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "không thể dò tìm điểm xét duyệt HEAD"
+
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15002,11 +17323,26 @@
"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
"--abort\"."
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "không thể dò tìm điểm xét duyệt HEAD"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git chạm trán một lỗi trong khi đang chuẩn bị các miếng vá để diễn lại\n"
+"những điểm xét duyệt này:\n"
+"\n"
+" %s\n"
+"\n"
+"Kết quả là git không thể cải tổ lại chúng."
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -15023,7 +17359,7 @@
" git rebase “<nhánh>”\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15037,153 +17373,162 @@
" git branch --set-upstream-to=%s/<nhánh> %s\n"
"\n"
-#: builtin/rebase.c:832
-msgid "rebase onto given branch instead of upstream"
-msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn."
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "lệnh thực thi trống rỗng"
+
+#: builtin/rebase.c:1396
+msgid "rebase onto given branch instead of upstream"
+msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
+
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "cho phép móc (hook) pre-rebase được chạy"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "hãy im lặng. ý là --no-stat"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "thêm dòng Signed-off-by: cho từng lần chuyển giao"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "chuyển cho “git am”"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "chuyển cho “git apply”"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "tiếp tục"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "bãi bỏ và lấy ra nhánh nguyên thủy"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "dùng chiến lược hòa trộn để cải tổ"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "thử khôi phục lại các hòa trộn thay vì bỏ qua chúng"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr ""
-"cho phép rerere cập nhật bảng mục lục với các xung đột đã được giải quyết"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "tự động stash/stash pop trước và sau"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "dùng chiến lược hòa trộn đã cho"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "tùy chọn"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "chuyển thao số đến chiến lược hòa trộn"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "cải tổ tất các các lần chuyển giao cho đến root"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "không thể thực thi %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
+"Xem mục tin của nó trong “ git help config” để biết chi tiết."
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase."
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
+"thế."
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -15191,21 +17536,16 @@
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "không thể loại bỏ các thay đổi cây-làm-việc"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "không thể quay trở lại %s"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "không thể gỡ bỏ “%s”"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15226,343 +17566,173 @@
"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
"có một số thứ quý giá ở đây.\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "tùy chọn “%c” cần một giá trị bằng số"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Không hiểu chế độ: %s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy cần --merge hay --interactive"
-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec cần --exec hay --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-"lỗi: không thể tổ hợp các tùy chọn tương tác (--interactive, --exec, --"
-"rebase-merges, --preserve-merges, --keep-empty, --root + --onto) với các tùy "
-"chọn am (%s)"
+"không thể tổ hợp các tùy chọn am với các tùy chọn tương tác hay hòa trộn"
-#: builtin/rebase.c:1231
-#, c-format
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr ""
-"lỗi: không thể kết hợp các tùy chọn hòa trộn (--merge, --strategy, --"
-"strategy-option) với một tùy chọn am (%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "lỗi: không thể kết hợp “--preserve_merges” với “--rebase-merges”"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "không thể kết hợp “--rebase-merges” với “--strategy-option”"
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "lỗi: không thể kết hợp “--rebase_merges” với “--strategy-option”"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "không thể kết hợp “--rebase-merges” với “--strategy”"
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "lỗi: không thể kết hợp “--rebase-merges” với “--strategy”"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "thượng nguồn không hợp lệ “%s”"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Không thể tạo lần chuyển giao gốc mới"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Gặp đáp ứng stash không cần: “%s”"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Không thể tạo thư mục cho “%s”"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Đã tạo autostash: %s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "không thể reset --hard"
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "không thể chuyển đến %s"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD đã cập nhật."
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Thay đổi thành %s:\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Thay đổi từ %s thành %s:\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Không thể tách rời HEAD"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "không HEAD?"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "không thể tạo %s tạm thời"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "không thể đánh dấu là tương tác"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "không thể mở %s"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "không thể tạo danh sách cần làm"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<các tùy chọn>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "giữ lại các lần chuyển giao rỗng"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "cải tổ các lần chuyển giao hòa trộn"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "ký các lần chuyển giao"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "tiếp tục cải tổ"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "bỏ qua lần chuyển giao"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "sửa danh sách cần làm"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "hiển thị miếng vá hiện hành"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "kiểm tra danh sách cần làm"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "sắp xếp lại các dòng fixup/squash"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "chèn các lệnh thực thi trong danh sách cần làm"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "lên trên"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "điểm-xét-duyệt-hạn-chế"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "điểm xét duyệt hạn chế"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "squash-lên-trên"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "squash lên trên"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "lần chuyển giao thượng nguồn"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "tên-đầu"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "tên đầu"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "chiến lược cải tổ"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "tùy-chọn-chiến-lược"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "các tùy chọn chiến lược"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "chuyển-đến"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "nhánh hay lần chuyển giao lần lấy ra"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "tên lên trên"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "lệnh"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "lệnh muốn chạy"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15592,7 +17762,7 @@
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15613,19 +17783,74 @@
"\n"
"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<các tham chiếu>…"
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<các tham chiếu>…"
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <tham_chiếu>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "“%s” không phải là dấu thời gian hợp lệ"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Đánh dấu các đối tượng tiếp cận được…"
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s chẳng chỉ đến đâu cả!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "chưa chỉ ra reflog để xóa"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "không phải một reflog: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "không reflog cho “%s”"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "định dạng tham chiếu không hợp lệ: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -15686,7 +17911,7 @@
#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
-msgstr "git remote add [<các-tùy-chọn>] <tên> <url>"
+msgstr "git remote add [<các tùy chọn>] <tên> <url>"
#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
@@ -15698,15 +17923,15 @@
#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
-msgstr "git remote show [<các-tùy-chọn>] <tên>"
+msgstr "git remote show [<các tùy chọn>] <tên>"
#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
-msgstr "git remote prune [<các-tùy-chọn>] <tên>"
+msgstr "git remote prune [<các tùy chọn>] <tên>"
#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr "git remote update [<các-tùy-chọn>] [<nhóm> | <máy-chủ>]…"
+msgstr "git remote update [<các tùy chọn>] [<nhóm> | <máy-chủ>]…"
#: builtin/remote.c:98
#, c-format
@@ -16130,7 +18355,7 @@
#: builtin/repack.c:22
msgid "git repack [<options>]"
-msgstr "git repack [<các-tùy-chọn>]"
+msgstr "git repack [<các tùy chọn>]"
#: builtin/repack.c:27
msgid ""
@@ -16140,95 +18365,134 @@
"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+"không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
+"tượng hứa hẹn"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
+"objects."
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "đóng gói mọi thứ trong một gói đơn"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "chuyển --delta-islands cho git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "với -a, đóng gói lại các đối tượng không thể đọc được"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "kích thước cửa sổ được dùng cho nén “delta”"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "giới hạn độ sâu tối đa của “delta”"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "giới hạn số lượng tối đa tuyến trình"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "đừng đóng gói lại gói này"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable và -A xung khắc nhau"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "Không có gì mới để mà đóng gói."
+
+#: builtin/repack.c:478
+#, 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 ""
+"CẢNH BÁO: Một số gói đang dùng vừa được đổi tên bằng cách\n"
+"CẢNH BÁO: đánh tiền tố old- vào tên của chúng, mục đích là\n"
+"CẢNH BÁO: thay chúng bằng phiên bản mới của tập\n"
+"CẢNH BÁO: tin. Nhưng thao tác lại gặp lỗi, và nỗ\n"
+"CẢNH BÁO: lực để đổi ngược lại tên chúng cho đúng với tên\n"
+"CẢNH BÁO: nguyên gốc của nó cũng gặp lỗi.\n"
+"CẢNH BÁO: Vui lòng đổi tên chúng trong %s bằng tay:\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "gặp lỗi khi gỡ bỏ “%s”"
@@ -16257,12 +18521,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<định_dạng>] [-l [<mẫu>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16271,27 +18530,27 @@
"định dạng thay thế không hợp lệ “%s”\n"
"định dạng hợp lệ là “short”, “medium” và “long”"
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "không tìm thấy tham chiếu thay thế “%s”"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "Đã xóa tham chiếu thay thế “%s”"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "“%s” không phải tên tham chiếu hợp lệ"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "tham chiếu thay thế “%s” đã tồn tại rồi"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16302,76 +18561,81 @@
"“%s” chỉ đến đối tượng thay thế của kiểu “%s”\n"
"trong khi “%s” chỉ đến đối tượng tham chiếu của kiểu “%s”."
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "không thể mở “%s” để ghi"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file đã báo cáo gặp lỗi nghiêm trọng"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "không thể mở “%s” để đọc"
-#: builtin/replace.c:268
-msgid "unable to spawn mktree"
-msgstr "không thể spawn mktree"
-
#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "không thể sinh tiến trình con mktree"
+
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "không thể đọc từ mktree"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree đã báo cáo gặp lỗi nghiêm trọng"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree đã không trả về một tên đối tượng"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "không thể fstat %s"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "không thể ghi đối tượng vào cơ sở dữ liệu"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "không thể lấy kiểu đối tượng cho %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "việc sửa tập tin đối tượng gặp lỗi"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "đối tượng mới là giống với cái cũ: “%s”"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "không thể phân tích %s như là một lần chuyển giao"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -16380,104 +18644,104 @@
"lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng "
"tùy chọn --edit thay cho --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "lần chuyển giao gốc “%s” có chữ ký GPG"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "graft cho “%s” không cần thiết"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "lần chuyển giao mới là giống với cái cũ: “%s”"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-"Không thể chuyển đổi các graft sau đây:\n"
+"không thể chuyển đổi các graft sau đây:\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "liệt kê các refs thay thế"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "xóa tham chiếu thay thế"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "sửa đối tượng sẵn có"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "thay đổi cha mẹ của lần chuyển giao"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "chuyển đổi các tập tin graft sẵn có"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "thay thế tham chiếu nếu nó đã sẵn có"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "đừng in đẹp các nội dung cho --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "dùng định dạng này"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "--format không thể được dùng khi không liệt kê gì"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "-f chỉ hợp lý khi ghi một cái thay thế"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw chỉ hợp lý với --edit"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d cần ít nhất một tham số"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "số đối số không đúng"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e cần chính các là một đối số"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-q cần ít nhất một tham số"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file không nhận đối số"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "chỉ một mẫu được chỉ ra với tùy chọn -l"
@@ -16494,126 +18758,127 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "“git rerere forget” mà không có các đường dẫn là đã lạc hậu"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "không thể tạo khác biệt cho “%s”"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:32
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <đường-dẫn>…"
-
#: builtin/reset.c:33
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>…]"
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<tree-ish>] [--] </các/đường/dẫn>…"
-#: builtin/reset.c:39
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [</các/đường/dẫn>…]"
+
+#: builtin/reset.c:40
msgid "mixed"
msgstr "pha trộn"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "mềm"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "cứng"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "hòa trộn"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "giữ lại"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "Bạn không có HEAD nào hợp lệ."
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Gặp lỗi khi tìm cây của HEAD."
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Gặp lỗi khi tìm cây của %s."
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn."
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "đặt lại HEAD, bảng mục lục và cây làm việc"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ."
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ."
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch xung khắc với --{hard,mixed,soft}"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
-"reset -- <đường_dẫn>”."
+"reset -- </các/đường/dẫn>”."
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn."
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset không được phép trên kho thuần"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N chỉ được dùng khi có --mixed"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:"
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16627,53 +18892,53 @@
"Bạn có thể sử dụng để tránh việc này. Đặt reset.quiet thành true trong\n"
"cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”."
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "lọc đối tượng yêu cầu --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "giá trị sparse không hợp lệ “%s”"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]"
+msgstr "git rev-parse --parseopt [<các tùy chọn>] -- [<các tham số>…]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "giữ lại “--” chuyển sang làm tham số"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "kết xuất trong định dạng gậy dài"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16681,15 +18946,15 @@
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-"git rev-parse --parseopt [<các-tùy-chọn>] -- [<các đối số>…]\n"
+"git rev-parse --parseopt [<các tùy chọn>] -- [<các đối số>…]\n"
" hoặc: git rev-parse --sq-quote [<đ.số>…]\n"
-" hoặc: git rev-parse [<các-tùy-chọn>] [<đ.số>…]\n"
+" hoặc: git rev-parse [<các tùy chọn>] [<đ.số>…]\n"
"\n"
"Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng."
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<các-tùy-chọn>] <commit-ish>…"
+msgstr "git revert [<các tùy chọn>] <commit-ish>…"
#: builtin/revert.c:25
msgid "git revert <subcommand>"
@@ -16697,78 +18962,87 @@
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<các-tùy-chọn>] <commit-ish>…"
+msgstr "git cherry-pick [<các tùy chọn>] <commit-ish>…"
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <lệnh-con>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "tùy chọn “%s” cần một giá trị bằng số lớn hơn không"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s không thể được sử dụng với %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "kết thúc cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "phục hồi lại cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "không cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:103
-msgid "don't automatically commit"
-msgstr "không chuyển giao một cách tự động."
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "bỏ qua lần chuyển giao hiện tại và tiếp tục"
-#: builtin/revert.c:104
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "đừng chuyển giao một cách tự động"
+
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "sửa lại chú thích cho lần chuyển giao"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "số-cha-mẹ"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "chọn cha mẹ luồng chính"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "chiến lược hòa trộn"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "nối thêm tên lần chuyển giao"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
-msgstr "git rm [<các-tùy-chọn>] [--] <tập-tin>…"
+msgstr "git rm [<các tùy chọn>] [--] <tập-tin>…"
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -16779,7 +19053,7 @@
"các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n"
"từ cả tập tin và cả HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -16787,12 +19061,12 @@
"\n"
"(dùng -f để buộc gỡ bỏ)"
-#: builtin/rm.c:215
+#: 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] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -16800,42 +19074,42 @@
"\n"
"(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "không liệt kê các tập tin đã gỡ bỏ"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "chỉ gỡ bỏ từ mục lục"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "ghi đè lên kiểm tra cập nhật"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "cho phép gỡ bỏ đệ qui"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: không thể gỡ bỏ %s"
@@ -16868,25 +19142,13 @@
msgid "print status from remote helper"
msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<các-tùy-chọn>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường/dẫn>…]]"
+msgstr "git shortlog [<các tùy chọn>] [<vùng-xét-duyệt>] [[--] [<đường/dẫn>…]]"
#: builtin/shortlog.c:15
msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git log --pretty=short | git shortlog [<các-tùy-chọn>]"
+msgstr "git log --pretty=short | git shortlog [<các tùy chọn>]"
#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
@@ -16912,7 +19174,7 @@
msgid "Linewrap output"
msgstr "Ngắt dòng khi quá dài"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "quá nhiều tham số đưa ra ngoài kho chứa"
@@ -16938,165 +19200,392 @@
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "đang bỏ qua %s; không thể xử lý nhiều hơn %d tham chiếu"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "không tham chiếu nào khớp với %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "hiển thị các nhánh remote-tracking và nội bộ"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-” tương ứng với nhánh"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
"independent hay --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog cần tên một nhánh"
-#: builtin/show-branch.c:742
+#: 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] "chỉ có thể hiển thị cùng lúc %d hạng mục."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "không có tham chiếu nào như thế %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "không thể xử lý nhiều hơn %d điểm xét duyệt."
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "“%s” không phải tham chiếu hợp lệ."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…] "
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mẫu>…]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<mẫu>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với đầu)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"việc kiểm tra tham chiếu chính xác, đòi hỏi chính xác đường dẫn tham chiếu"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "hiển thị tham chiếu HEAD, ngay cả khi nó đã được lọc ra"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "bãi bỏ tham chiếu các thẻ thành ra các ID đối tượng"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "chỉ hiển thị mã băm SHA1 sử dụng <n> chữ số"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"không hiển thị kết quả ra đầu ra chuẩn (stdout) (chỉ hữu dụng với --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội "
"bộ"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<các tùy chọn>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<các tùy chọn>] <stash>"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <tên-nhánh> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n"
+" [--] [<đặc/tả/đường/dẫn>…]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<ghi chú>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <ghi chú>] [-q|--quiet] <commit>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "“%s” không phải là lần chuyển giao kiểu-stash (cất đi)"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Không tìm thấy các mục tạm cất (stash) nào."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "“%s” không phải một tham chiếu hợp lệ"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "không thể áp dụng một stash ở giữa của quá trình hòa trộn"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "không thể tạo diff %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "không thể ghi lại cây chỉ mục"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Đang hòa trộn %s với %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Bảng mục lục đã không được bỏ stash."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "gặp lỗi đọc bảng mục lục"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Đã xóa %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Không thể xóa bỏ mục stash"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "”%s” không phải tham chiếu đến stash"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Chưa chỉ ra tên của nhánh"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Không thể cập nhật %s với %s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "phần chú thích cho stash"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Chưa có thay đổi nào được chọn"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Không thể ghi lại các tập tin chưa theo dõi"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "Có lẽ bạn đã quên “git add ” phải không?"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Không có thay đổi nội bộ nào được ghi lại"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Không thể khởi tạo stash"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Không thể ghi lại trạng thái hiện hành"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "giữ nguyên bảng mục lục"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "cất đi ở chế độ miếng vá"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "chế độ im lặng"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "bao gồm các tập tin không được theo dõi trong stash"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "bao gồm các tập tin bị bỏ qua"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "không thể thực thi %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -17105,48 +19594,48 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote takes không nhận tham số"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "điểm neo thay thế cho các đường dẫn tương đối"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "Đang vào “%s”\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -17155,7 +19644,7 @@
"run_command trả về trạng thái khác không cho %s\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -17166,19 +19655,19 @@
"con lồng nhau của %s\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Chặn kết xuất của từng lệnh mô-đun-con"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Đệ quy vào trong các mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <lệnh>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -17187,56 +19676,56 @@
"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
"sở hữu chính nó."
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [</đường/dẫn>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-"Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn "
+"không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn "
"“%s”"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Chặn két xuất tình trạng mô-đun-con"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -17244,48 +19733,48 @@
"Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
"đun-con"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
-msgstr "url mô-đun-con đồng bộ hóa cho “%s”\n"
+msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Chặn kết xuất cho đồng bộ url mô-đun-con"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17294,7 +19783,7 @@
"Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn "
"thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -17303,80 +19792,80 @@
"Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại "
"bỏ chúng đi"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Đã xóa thư mục “%s”\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr "Gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Bỏ đăng ký tất cả các trong mô-đun-con"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "mô-đun-con “%s” không thể thêm thay thế: %s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url nơi mà nhân bản mô-đun-con từ đó"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17384,95 +19873,95 @@
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
+msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "không thể lấy thư mục mô-đun-con cho “%s”"
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -17481,49 +19970,57 @@
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [</đường/dẫn>…]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config tên [giá trị]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "bỏ đặt cấu hình trong tập tin .gitmodules"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <tên> [<giá trị>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <tên>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<các-tùy-chọn>] <tên> [<t.chiếu>]"
+msgstr "git symbolic-ref [<các tùy chọn>] <tên> [<t.chiếu>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
@@ -17551,17 +20048,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg>|-F <tập-tin>] <tên-thẻ> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>]\n"
+"\t\t<tên-thẻ> [<head>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <tên-thẻ>…"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17571,21 +20068,21 @@
"<lần_chuyển_giao>] [--points-at <đối-tượng>]\n"
"\t\t[--format=<định_dạng>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…"
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17598,7 +20095,7 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17613,147 +20110,160 @@
"Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/tag.c:218
+#: 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 ""
+"Bạn đã tạo một thẻ lồng nhau. Đối tượng được chỉ đến thẻ mới của bạn là\n"
+"đã là một thẻ. Nếu ý bạn là gắn thẻ đối tượng mà nó trỏ đến, sử dụng:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Nội dung ghi chú còn lại %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "ép buộc sửa thẻ lần commit"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "chỉ có một tùy chọn -F hoặc -m là được phép."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "quá nhiều đối số"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
-msgstr "Thẻ “%s” đã tồn tại rồi"
+msgstr "thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
@@ -17762,202 +20272,202 @@
msgid "Unpacking objects"
msgstr "Đang giải nén các đối tượng"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "gặp lỗi khi tạo tập tin %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "gặp lỗi khi xóa tập tin %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "gặp lỗi khi xóa thư mục %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
-msgstr "Đang kiểm thử mtime trong “%s”"
+msgstr "Đang kiểm thử mtime trong “%s” "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư "
"mục con"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
-msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
+msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "để các tập tin thay thế các thư mục và “vice-versa”"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr ""
"làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
-msgstr "Đánh dấu các tập tin là \"không thay đổi\""
+msgstr "đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
"chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
"gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
"làm việc"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "ghi ra mục lục ngay cả khi không được đánh cờ là có thay đổi"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "bật/tắt theo dõi hệ thống tập tin"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "xóa bít hợp lệ fsmonitor"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -17965,7 +20475,7 @@
"core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật chia tách mục lục"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -17973,7 +20483,7 @@
"core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn tắt chia tách mục lục"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -17981,11 +20491,11 @@
"core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực "
"sự muốn tắt bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -17993,43 +20503,43 @@
"core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự "
"muốn bật bộ đệm chưa theo dõi"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Nhớ đệm không theo vết được bật cho “%s”"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
"core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor được bật"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
"core.fsmonitor đã được đặt; bỏ đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
"thống tập tin"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor bị tắt"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<các-tùy-chọn>] -d <refname> [<biến-cũ>]"
+msgstr "git update-ref [<các tùy chọn>] -d <refname> [<biến-cũ>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<các-tùy-chọn>] <refname> <biến-mới> [<biến-cũ>]"
+msgstr "git update-ref [<các tùy chọn>] <refname> <biến-mới> [<biến-cũ>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<các-tùy-chọn>] --stdin [-z]"
+msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
#: builtin/update-ref.c:364
msgid "delete the reference"
@@ -18057,7 +20567,11 @@
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>"
+msgstr "git upload-pack [<các tùy chọn>] </đường/dẫn>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "thoát sau khi một trao đổi yêu cầu hay trả lời đơn"
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
@@ -18071,15 +20585,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…"
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "hiển thị nội dung của lần chuyển giao"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "in kết xuất trạng thái gpg dạng thô"
@@ -18095,98 +20609,98 @@
msgid "show statistics only"
msgstr "chỉ hiển thị thống kê"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…"
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr "git worktree add [<các-tùy-chọn>] <đường-dẫn> [<commit-ish>]"
-
#: builtin/worktree.c:18
-msgid "git worktree list [<options>]"
-msgstr "git worktree list [<các-tùy-chọn>]"
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]"
#: builtin/worktree.c:19
-msgid "git worktree lock [<options>] <path>"
-msgstr "git worktree lock [<các-tùy-chọn>] </đường/dẫn>"
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<các tùy chọn>]"
#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>"
+
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> </đường/dẫn/mới>"
-#: builtin/worktree.c:21
-msgid "git worktree prune [<options>]"
-msgstr "git worktree prune [<các-tùy-chọn>]"
-
#: builtin/worktree.c:22
-msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree remove [<các-tùy-chọn>] <worktree>"
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<các tùy chọn>]"
#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<các tùy chọn>] <worktree>"
+
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "Gỡ bỏ cây làm việc/%s: đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "báo cáo các cây làm việc đã prune"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "không thể thêm-lại cây “%s”"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -18195,7 +20709,7 @@
"“%s” bị mất nhưng cây làm việc bị khóa;\n"
"dùng “add -f -f” để ghi đè, hoặc “unlock” và “prune” hay “remove” để xóa"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -18209,115 +20723,115 @@
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "“%s” là cây làm việc chính"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "không thể phác họa ra tên đích đến “%s”"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "đích “%s” đã tồn tại rồi"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18326,7 +20840,7 @@
"không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18334,36 +20848,36 @@
"không thể di chuyển một cây-làm-việc bị khóa;\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "gặp lỗi khi chạy “git status” vào “%s”"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "“%s” đang bẩn, hãy dùng --force để xóa nó"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18372,7 +20886,7 @@
"không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18380,28 +20894,28 @@
"không thể xóa bỏ một cây-làm-việc bị khóa;\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<tiền-tố>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<tiền tố>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "chỉ hữu ích khi cần gỡ lỗi"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18414,7 +20928,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
@@ -18427,6 +20941,14 @@
msgid "too many commits marked reachable"
msgstr "có quá nhiều lần chuyển giao được đánh dấu là tiếp cận được"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<các tùy chọn>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18449,104 +20971,156 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n"
"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
-"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
+"để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
+"Xem 'git help git' để biết tổng quan của hệ thống."
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "chưa chỉ ra thư mục cho --git-dir\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "chưa đưa ra cây làm việc cho --work-tree\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "chưa đưa ra tiền tố cho --super-prefix\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c cần một chuỗi cấu hình\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "chưa đưa ra thư mục cho -C\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "không hiểu tùy chọn: %s\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "trong khi triển khai bí danh “%s”: “%s”"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"bí danh “%s” thay đổi biến môi trường.\n"
+"Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "làm trống bí danh cho %s"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "đệ quy các bí danh: %s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
"dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s” không có điểm kết:%s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "không thể xử lý %s như là một phần bổ sung"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"cách dùng: %s\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "gặp lỗi khi khai triển bí danh “%s”; “%s” không phải là lệnh git\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "giá trị âm cho http.postbuffer; đặt thành mặc định là %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Điều khiển giao quyền không được hỗ trợ với cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE không được hỗ trợ với cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
"Không hỗ trợ ứng dụng SSL chạy phía sau “%s”. Hỗ trợ ứng dụng SSL chạy phía "
"sau:"
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"Không thể đặt ứng dụng chạy SSL phía sau “%s”: cURL được biên dịch không có "
"sự hỗ trợ ứng dụng chạy phía sau SSL"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s”: đã đặt rồi"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18557,39 +21131,169 @@
" hỏi cho: %s\n"
" chuyển hướng: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "sai trích dẫn trong giá trị push-option :“%s”"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói "
+"flush"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "trả về của máy phục vụ không hợp lệ; nhận được %s"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "không tìm thấy kho “%s”"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Xác thực gặp lỗi cho “%s”"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "không thể truy cập “%s”: %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "không nên có EOF khi không gentle trên EOF"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC gặp lỗi; %s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "không thể xử lý đẩy cái lớn này"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "lấy về gặp lỗi."
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "không thể lấy về bằng sha1 thông qua smart http"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "vận chuyển http không hỗ trợ %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push gặp lỗi"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: không hiểu lệnh “%s” từ git"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "các_tham_số"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "lọc đối tượng"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "ngày hết hạn"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "khóa"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "tên trường cần sắp xếp"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD được tách rời tại "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD được tách rời từ "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Thêm nội dung tập tin vào bảng mục lục"
@@ -18743,8 +21447,8 @@
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-"Xem các thay đổi giữa những lần chuyển giao, giữa một lần chuyển giao và cây "
-"làm việc, v.v.."
+"Hiển thị các thay đổi giữa những lần chuyển giao, giữa một lần chuyển giao "
+"và cây làm việc, v.v.."
#: command-list.h:87
msgid "Compares files in the working tree and the index"
@@ -18856,8 +21560,8 @@
msgstr "Duyệt ngay kho làm việc của bạn trong gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
-msgstr "thêm hay phân tích thông tin cấu trúc trong ghi chú lần chuyển giao"
+msgid "Add or parse structured information in commit messages"
+msgstr "Thêm hay phân tích thông tin cấu trúc trong ghi chú lần chuyển giao"
#: command-list.h:114
msgid "The Git repository browser"
@@ -18939,7 +21643,7 @@
#: command-list.h:133
msgid "Add or inspect object notes"
-msgstr "thêm hoặc điều tra đối tượng ghi chú"
+msgstr "Thêm hoặc điều tra đối tượng ghi chú"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
@@ -19031,220 +21735,224 @@
msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Hoàn nguyên các tập tin cây làm việc"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Hoàn lại một số lần chuyển giao sẵn có"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Cậy ra và xử lý các tham số"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Gửi một tập hợp của các miếng vá ở dạng thư điện tử"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Đẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Kết xuất “git log” dạng tóm tắt"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Hiển thị các muc lục kho nén đã đóng gói"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ vỏ"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Mã cài đặt văn lệnh hệ vỏ Git chung"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Hiển thị trạng thái cây làm việc"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Xóa bỏ các khoảng trắng không cần thiết"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Khởi tạo, cập nhật hay điều tra các mô-đun-con"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Thao tác hai hướng giữ hai kho Subversion và Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Các nhánh chuyển"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Đọc, sửa và xóa tham chiếu mềm"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Tạo một tập tin tạm với nội dung của blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Gỡ các đối tượng khỏi một kho lưu đã đóng gói"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Đăng ký nội dung tập tin từ cây làm việc đến bảng mục lục"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Cập nhật tên đối tượng được lưu trong một tham chiếu một cách an toàn"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Cập nhật tập tin thông tin phụ trợ để giúp đỡ các dịch vụ dumb"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Gửi trở lại kho lưu đến git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Gửi trở lại các đối tượng đã đóng gói cho git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Hiển thị một biến Git luận lý"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Kiểm tra ký lần chuyển giao dùng GPG"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Kiểm tra lại các tập tin kho (lưu trữ, nén) Git đã được đóng gói"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Kiểm tra chữ ký GPG của các thẻ"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Quản lý nhiều cây làm việc"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Giao diện dòng lệnh Git và quy ước"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Hướng dẫn Git cơ bản cho nhà phát triển"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git dành cho những người dùng CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Chỉnh kết xuất diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Các móc được sử dụng bởi Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Định nghĩa thuộc tính mô-đun-con"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
-msgstr "không gian tên Git"
+msgstr "Không gian tên Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Bố cục kho Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Hướng dẫn cách dùng Git: phần hai"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Hướng dẫn cách dùng Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
-msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git."
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
+msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
@@ -19257,137 +21965,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "không công nhận tùy chọn: “$arg”"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "”$arg” không có vẻ như là một điểm xét duyệt hợp lệ"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "HEAD sai - Tôi cần một HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Việc lấy “$start_head” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>"
-"\"."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD sai - tham chiếu mềm kỳ lạ"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Đối số bisect_write sai: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Đầu vào rev sai: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Đầu vào rev sai: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Đầu vào rev sai: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "“git bisect $TERM_BAD” có thể lấy chỉ một đối số."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao $TERM_BAD."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Bạn có chắc chắn chưa [Y/n]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Bạn phải chỉ cho tôi ít nhất một điểm $bad_syn và một $good_syn.\n"
-"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
-"cái đó.)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n"
-"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt $good_syn và một "
-"$bad_syn.\n"
-"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
-"chúng.)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "Chúng tôi không bisect."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "”$invalid” không phải là lần chuyển giao hợp lệ"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"Không thể check-out HEAD nguyên thủy của “$branch”.\n"
-"Hãy thử “git bisect reset <lần-chuyển-giao>”."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Chưa chỉ ra tập tin ghi nhật ký"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "không thể đọc $file để thao diễn lại"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? bạn đang nói gì thế?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "đang chạy lệnh $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19396,11 +22016,11 @@
"chạy bisect gặp lỗi:\n"
"mã trả về $res từ lệnh “$command” là < 0 hoặc >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "bisect không thể tiếp tục thêm được nữa"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19409,27 +22029,13 @@
"chạy bisect gặp lỗi:\n"
"”bisect_state $state” đã thoát ra với mã lỗi $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "bisect chạy thành công"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Lệnh không hợp lệ: bạn hiện đang ở bisect $TERM_BAD/$TERM_GOOD."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "chưa định nghĩa thời kỳ nào"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"tham số không hợp lệ $arg cho “git bisect terms”.\n"
-"Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Chúng tôi không bisect."
#: git-merge-octopus.sh:46
msgid ""
@@ -19471,267 +22077,118 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Không thể quay trở lại $head_name"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Hình như là ở đây sẵn có một thư mục $state_dir_base, và\n"
-"Tôi tự hỏi có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n"
-"như vậy, xin hãy thử\n"
-"\t$cmd_live_rebase\n"
-"Nếu không phải thế, hãy thử\n"
-"\t$cmd_clear_stale_rebase\n"
-"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
-"có một số thứ quý giá ở đây."
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "lỗi: không thể kết hợp “--signoff” với “--preserve-merges”"
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "thượng nguồn không hợp lệ “$upstream_name”"
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: ở đây không có nền móng hòa trộn nào"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "nghiêm trọng: không có nhánh như thế: “$branch_name”"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Đã tạo autostash: $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Thay đổi thành $onto:"
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Thay đổi từ $mb thành $onto:"
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr ""
-"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Chưa có thay đổi nào được chọn"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Không thể cập nhật $ref_stash với $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc."
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Không có thay đổi nội bộ nào được ghi lại"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Không thể khởi tạo stash"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Không thể ghi lại trạng thái hiện hành"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chọn: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Không tìm thấy các mục tạm cất (stash) nào."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "”$args” không phải tham chiếu đến stash"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Bảng mục lục đã không được bỏ stash."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Đã xóa ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỏ mục stash"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Chưa chỉ ra tên của nhánh"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
"việc"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
"”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-"
"con"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -19743,23 +22200,23 @@
"$sm_path\n"
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:"
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -19775,40 +22232,40 @@
"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy "
"chọn “--name”."
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”."
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-đun-con “$sm_path”"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -19817,12 +22274,16 @@
"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
"đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực "
+"tiếp $sha1:"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -19831,74 +22292,74 @@
"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -19910,12 +22371,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Đã áp dụng autostash."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Không thể lưu $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Đang rebase ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -19958,7 +22428,7 @@
"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
"đáy.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -19977,82 +22447,82 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Chuyển-tiếp-nhanh đến $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Không thể di chuyển HEAD đến $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Từ chối squash lần hòa trộn: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Không thể lấy ra $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:"
-#: git-rebase--preserve-merges.sh:428
+#: 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] "Đây là tổ hợp của $count lần chuyển giao."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Không thể $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Đây là tổ hợp của 2 lần chuyển giao."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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 "Không thể áp dụng $sha1… $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20068,31 +22538,31 @@
"này\n"
"trước khi bạn có thể làm việc lại với lần chuyển giao."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Bị dừng tại $sha1_abbrev… $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Thực thi: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Thực thi gặp lỗi: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20103,7 +22573,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20118,25 +22588,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Lệnh chưa biết: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Cài tổ và cập nhật $head_name một cách thành công."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20167,11 +22637,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-#: git-rebase--preserve-merges.sh:784
+#: 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."
@@ -20180,39 +22650,39 @@
"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
"nữa."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Không thể thực thi trình biên soạn"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Không thể checkout $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Không HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Không thể tạo thư mục tạm thời $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Không thể đánh dấu là tương tác"
-#: git-rebase--preserve-merges.sh:888
+#: 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] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
@@ -20221,188 +22691,190 @@
msgid "usage: $dashless $USAGE"
msgstr "cách dùng: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
"Không thể chuyển thư mục (chdir) sang $cdup, thư mục ở mức cao nhất của cây "
"làm việc"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
"lỗi nghiêm trọng: $program_name không thể được dùng ngoaoif thư mục làm việc."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
"Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Không thể $action: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
"Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
"Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
"giao."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
"Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "đã đưa lên bệ phóng"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "nhị phân"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "không có gì"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "không thay đổi"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "đã thêm %d đường dẫn\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "đã cập nhật %d đường dẫn\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "đã hoàn nguyên %d đường dẫn\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d đường dẫn đã touch (chạm)\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Cập nhật"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Hoàn nguyên"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Thêm các cái chưa được theo dõi"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Không có tập tin nào chưa được theo dõi.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để chuyển lên bệ phóng."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để tạm cất."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để bỏ chuyển lên bệ phóng."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để áp dụng."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để loại bỏ."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "gặp lỗi khi tập tin sửa hunk để ghi: %s"
+msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Chế độ sửa hunk bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
+msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20416,20 +22888,20 @@
"Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
"Nếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n"
-"để sửa lần nữa. Nếu mọi dòng của hunk bị xóa bỏ, thế thì những\n"
-"sửa dổi sẽ bị loại bỏ, và hunk vẫn giữ nguyên.\n"
+"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n"
+"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
-msgstr "gặp lỗi khi mở tập tin hunk để đọc: %s"
+msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
@@ -20437,14 +22909,14 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
"bỏ!) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20452,14 +22924,14 @@
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-"y - đưa lên bệ phóng hunk này\n"
-"n - đừng đưa lên bệ phóng hunk này\n"
-"q - thoát; đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - đưa lên bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong tập "
+"y - đưa lên bệ phóng khúc này\n"
+"n - đừng đưa lên bệ phóng khúc này\n"
+"q - thoát; đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - đưa lên bệ phóng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20467,13 +22939,13 @@
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-"y - tạm cất hunk này\n"
-"n - đừng tạm cất hunk này\n"
-"q - thoát; đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - tạm cất hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại trong tập tin"
+"y - tạm cất khúc này\n"
+"n - đừng tạm cất khúc này\n"
+"q - thoát; đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20481,15 +22953,15 @@
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-"y - đưa ra khỏi bệ phóng hunk này\n"
-"n - đừng đưa ra khỏi bệ phóng hunk này\n"
-"q - thoát; đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn "
+"y - đưa ra khỏi bệ phóng khúc này\n"
+"n - đừng đưa ra khỏi bệ phóng khúc này\n"
+"q - thoát; đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn "
"lại\n"
-"a - đưa ra khỏi bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong "
+"a - đưa ra khỏi bệ phóng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20497,13 +22969,13 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - áp dụng hunk này vào mục lục\n"
-"n - đừng áp dụng hunk này vào mục lục\n"
-"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - áp dụng khúc này vào mục lục\n"
+"n - đừng áp dụng khúc này vào mục lục\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20511,13 +22983,13 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - loại bỏ hunk này khỏi cây làm việc\n"
-"n - đừng loại bỏ hunk khỏi cây làm việc\n"
-"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - loại bỏ khúc này khỏi cây làm việc\n"
+"n - đừng loại bỏ khúc khỏi cây làm việc\n"
+"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20525,13 +22997,13 @@
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - loại bỏ hunk này khỏi mục lục và cây làm việc\n"
-"n - đừng loại bỏ hunk khỏi mục lục và cây làm việc\n"
-"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - loại bỏ khúc này khỏi mục lục và cây làm việc\n"
+"n - đừng loại bỏ khúc khỏi mục lục và cây làm việc\n"
+"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20539,13 +23011,27 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - áp dụng hunk này vào mục lục và cây làm việc\n"
-"n - đừng áp dụng hunk vào mục lục và cây làm việc\n"
-"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - áp dụng khúc này vào mục lục và cây làm việc\n"
+"n - đừng áp dụng khúc vào mục lục và cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - áp dụng khúc này vào cây làm việc\n"
+"n - đừng áp dụng khúc vào cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20557,219 +23043,234 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"g - chọn một hunk muốn tới\n"
-"/ - tìm một hunk khớp với biểu thức chính quy đưa ra\n"
-"j - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế\n"
-"J - để lại hunk này là chưa quyết định, xem hunk kế\n"
-"k - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế trước\n"
-"K - để lại hunk này là chưa quyết định, xem hunk kế trước\n"
-"s - chia hunk hiện tại thành các hunk nhỏ hơn\n"
-"e - sửa bằng tay hunk hiện hành\n"
+"g - chọn một khúc muốn tới\n"
+"/ - tìm một khúc khớp với biểu thức chính quy đưa ra\n"
+"j - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế\n"
+"J - để lại khúc này là chưa quyết định, xem khúc kế\n"
+"k - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế trước\n"
+"K - để lại khúc này là chưa quyết định, xem khúc kế trước\n"
+"s - chia khúc hiện tại thành các khúc nhỏ hơn\n"
+"e - sửa bằng tay khúc hiện hành\n"
"? - in trợ giúp\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
-msgstr "Các hunk đã chọn không được áp dụng vào bảng mục lục!\n"
+msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Đã không áp dụng gì cả.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Đưa lên bệ phóng hunk này [y,n,q,a,d%s,?]? "
+msgstr "Đưa lên bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Tạm cất hunk này [y,n,q,a,d%s,?]? "
+msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Bỏ ra khỏi bệ phóng hunk này [y,n,q,a,d%s,?]? "
+msgstr "Bỏ ra khỏi bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Áo dụng hunk này vào mục lục [y,n,q,a,d%s,?]? "
+msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Loại bỏ hunk này khỏi cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Loại bỏ hunk này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Áp dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
-msgstr "Không còn hunk nào để mà nhảy đến\n"
+msgstr "Không còn khúc nào để mà nhảy đến\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
-msgstr "nhảy đến hunk nào (<ret> để xem thêm)? "
+msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
-msgstr "nhảy đến hunk nào?"
+msgstr "nhảy đến khúc nào? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Số không hợp lệ: “%s”\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] "Rất tiếc, chỉ có sẵn %d hunk..\n"
+msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
-msgstr "Không còn hunk nào để mà tìm kiếm\n"
+msgstr "Không còn khúc nào để mà tìm kiếm\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
-msgstr "tìm kiếm cho regex? "
+msgstr "tìm kiếm cho biểu thức chính quy? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
-#: git-add--interactive.perl:1598
-msgid "No hunk matches the given pattern\n"
-msgstr "Không thấy hunk nào khớp mẫu đã cho\n"
-
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
-msgid "No previous hunk\n"
-msgstr "Không có hunk kế trước\n"
-
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
-msgid "No next hunk\n"
-msgstr "Không có hunk kế tiếp\n"
-
#: git-add--interactive.perl:1644
-msgid "Sorry, cannot split this hunk\n"
-msgstr "Rất tiếc, không thể chia nhỏ hunk này\n"
+msgid "No hunk matches the given pattern\n"
+msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+msgid "No previous hunk\n"
+msgstr "Không có khúc kế trước\n"
+
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+msgid "No next hunk\n"
+msgstr "Không có khúc kế tiếp\n"
+
+#: git-add--interactive.perl:1690
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Rất tiếc, không thể chia nhỏ khúc này\n"
+
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
-msgstr[0] "Chi nhỏ thành %d hunks.\n"
-
-#: git-add--interactive.perl:1660
-msgid "Sorry, cannot edit this hunk\n"
-msgstr "Rất tiếc, không thể sửa hunk này\n"
+msgstr[0] "Chi nhỏ thành %d khúc.\n"
#: git-add--interactive.perl:1706
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Rất tiếc, không thể sửa khúc này\n"
+
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Xem xét lại diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -20784,23 +23285,24 @@
"đặt lên bệ phóng\n"
"revert - hoàn nguyên tập hợp các thay đổi đã đặt lên bệ phóng trở lại "
"phiên bản HEAD\n"
-"patch - cậy các hunk và cập nhật có lựa chọn\n"
+"patch - cậy các khúc và cập nhật có lựa chọn\n"
"diff\t - xem khác biệt giữa HEAD và mục lục\n"
"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
"thay đổi đã đặt lên bệ phóng\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "thiếu --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "không hiểu chế độ --patch: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "đối số không hợp lệ %s, cần --"
@@ -20813,30 +23315,30 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases xung khắc với các tùy chọn khác\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -20844,37 +23346,37 @@
"“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng "
"lệnh hoặc tùy chọn cấu hình)\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Không hiểu trường --suppress-cc: “%s”\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Không hiểu cài đặt --confirm: “%s”\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -20889,12 +23391,12 @@
" * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n"
" * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Gặp lỗi khi mở thư mục “%s”: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -20903,7 +23405,7 @@
"nghiêm trọng: %s: %s\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -20913,17 +23415,17 @@
"Chưa chỉ định các tập tin miếng vá!\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Không có dòng chủ đề trong %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Gặp lỗi khi mở “%s” để ghi: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -20937,27 +23439,27 @@
"\n"
"Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Gặp lỗi khi mở “%s”: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Gặp lỗi khi mở %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Bạn có chắc muốn dùng <%s> [y/N]? "
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -20965,11 +23467,11 @@
"Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -20982,20 +23484,20 @@
"có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự "
"muốn gửi.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Tới người mà thư được gửi (nếu có)?"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? "
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n"
@@ -21003,16 +23505,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
-msgstr "đường dẫn CA “%s” không tồn tại"
+msgstr "Đường dẫn CA “%s” không tồn tại"
-#: git-send-email.perl:1412
+#: 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"
@@ -21039,143 +23541,385 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Gửi thư này trả lời yêu cầu"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS gặp lỗi! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-"
"debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Gặp lỗi khi gửi %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Thử gửi %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Gửi %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Kết quả: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Kết quả: Tốt\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "không thể mở tập tin “%s”"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi “%s”"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "không thể lấy gửi thư dạng 7 bít"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "bảng mã truyền không hợp lệ"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: 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 "không thể mở %s: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "Lấy về bình thường cho biết các các nhánh nào buộc phải cập nhật, nhưng "
+#~ "việc kiểm tra đã bị vô hiệu hóa."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "hoặc chạy 'git config fetch.showForcedUpdates false' để tránh kiểm tra "
+#~ "này.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "log.mailmap không được đặt; giá trị ngầm của nó sẽ thay đổi trong một\n"
+#~ "phát hành sắp tới. Để chấm dứt thông báo này và duy trì hành xử\n"
+#~ "hiện tại, đặt giá trị cấu hình log.mailmap thành false.\n"
+#~ "\n"
+#~ "Để làm chấm dứt thông báo này và áp cách hành xử mới, hãy đặt\n"
+#~ "giá trị cấu hình log.mailmap true.\n"
+#~ "\n"
+#~ "Xem 'git help config ' và tìm kiếm ' log.mailmap ' để biết thêm thông tin."
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Máy chủ hỗ trợ multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Máy chủ hỗ trợ no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Máy chủ hỗ trợ multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Máy chủ hỗ trợ side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Máy chủ hỗ trợ side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Máy chủ hỗ trợ ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD được tách rời tại %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD được tách rời từ %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Đang lấy ra các tập tin"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "gặp lỗi khi mở “%s”"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Nếu bạn muốn bỏ qua lần chuyển giao này thì dùng:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
+#~ "những lần chuyển giao còn lại.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verb không được thừa nhận: %s"
+
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "phiên bản băm “%X” không có phiên bản khớp %X"
+
+#~ msgid "option '%s' requires a value"
+#~ msgstr "tùy chọn “%s” yêu cầu một giá trị"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "không thể chuyển dạng danh sách cần làm"
+
+#~ msgid "default"
+#~ msgstr "mặc định"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "Không thể tạo thư mục “%s”"
+
+#~ msgid "allow rerere to update index with resolved conflict"
+#~ msgstr ""
+#~ "cho phép rerere cập nhật bảng mục lục với các xung đột đã được giải quyết"
+
+#~ msgid "could not open %s"
+#~ msgstr "không thể mở %s"
+
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "Không thể quay trở lại $head_name"
+
+#~ msgid ""
+#~ "It seems that there is already a $state_dir_base directory, and\n"
+#~ "I wonder if you are in the middle of another rebase. If that is the\n"
+#~ "case, please try\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "If that is not the case, please\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "and run me again. I am stopping in case you still have something\n"
+#~ "valuable there."
+#~ msgstr ""
+#~ "Hình như là ở đây sẵn có một thư mục $state_dir_base, và\n"
+#~ "Tôi tự hỏi có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n"
+#~ "như vậy, xin hãy thử\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "Nếu không phải thế, hãy thử\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
+#~ "có một số thứ quý giá ở đây."
+
+#~ msgid ""
+#~ "fatal: cannot combine am options with either interactive or merge options"
+#~ msgstr ""
+#~ "lỗi nghiêm trọng: không thể tổ hợp các tùy chọn am với các tùy chọn tương "
+#~ "tác hay hòa trộn"
+
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr ""
+#~ "lỗi nghiêm trọng: không thể kết hợp “--signoff” với “--preserve-merges”"
+
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr ""
+#~ "lỗi nghiêm trọng: không thể kết hợp “--preserve-merges” với “--rebase-"
+#~ "merges”"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr ""
+#~ "lỗi nghiêm trọng: không thể kết hợp “--rebase-merges” với “--strategy-"
+#~ "option”"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr ""
+#~ "lỗi nghiêm trọng: không thể kết hợp “--rebase-merges” với “--strategy”"
+
+#~ msgid "invalid upstream '$upstream_name'"
+#~ msgstr "thượng nguồn không hợp lệ “$upstream_name”"
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: ở đây có nhiều hơn một nền móng hòa trộn"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: ở đây không có nền móng hòa trộn nào"
+
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
+
+#~ msgid "fatal: no such branch/commit '$branch_name'"
+#~ msgstr "nghiêm trọng: không có nhánh như thế: “$branch_name”"
+
+#~ msgid "Created autostash: $stash_abbrev"
+#~ msgstr "Đã tạo autostash: $stash_abbrev"
+
+#~ msgid "Current branch $branch_name is up to date."
+#~ msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
+
+#~ msgid "Current branch $branch_name is up to date, rebase forced."
+#~ msgstr ""
+#~ "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
+
+#~ msgid "Changes to $onto:"
+#~ msgstr "Thay đổi thành $onto:"
+
+#~ msgid "Changes from $mb to $onto:"
+#~ msgstr "Thay đổi từ $mb thành $onto:"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
+
+#~ msgid "First, rewinding head to replay your work on top of it..."
+#~ msgstr ""
+#~ "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
+
+#~ msgid "ignoring unknown color-moved-ws mode '%s'"
+#~ msgstr "bỏ qua chế độ color-moved-ws chưa biết “%s”"
+
+#~ msgid "only 'tree:0' is supported"
+#~ msgstr "chỉ “tree:0” là được hỗ trợ"
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Đang đổi tên %s thành %s thay vì %s thành %s"
+
+#~ msgid "Adding merged %s"
+#~ msgstr "Thêm hòa trộn %s"
+
+#~ msgid "Internal error"
+#~ msgstr "Lỗi nội bộ"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr ""
+#~ "luồng chính đã được chỉ ra nhưng lần chuyển giao %s không phải là một lần "
+#~ "hòa trộn."
+
+#~ msgid "unable to write sha1 filename %s"
+#~ msgstr "không thể ghi vào tên tập tin sha1 %s"
+
+#~ msgid "cannot read sha1_file for %s"
+#~ msgstr "không thể đọc sha1_file cho %s"
+
+#~ msgid ""
+#~ "error: cannot combine interactive options (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
+#~ "options (%s)"
+#~ msgstr ""
+#~ "lỗi: không thể tổ hợp các tùy chọn tương tác (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) với các "
+#~ "tùy chọn am (%s)"
+
+#~ msgid ""
+#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
+#~ "option) with am options (%s)"
+#~ msgstr ""
+#~ "lỗi: không thể kết hợp các tùy chọn hòa trộn (--merge, --strategy, --"
+#~ "strategy-option) với một tùy chọn am (%s)"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "không công nhận tùy chọn: “$arg”"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "”$invalid” không phải là lần chuyển giao hợp lệ"
+
#~ msgid "could not parse '%s' (looking for '%s')"
#~ msgstr "không thể phân tích “%s” (đang tìm kiếm cho “%s”)"
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "sai trích dẫn trên %s giá trị trong “%s”"
-
-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
-
#~ msgid "deprecated synonym for --create-reflog"
#~ msgstr "đồng nghĩa đã lạc hậu cho --create-reflog"
@@ -21197,12 +23941,6 @@
#~ msgid "cannot remove a locked working tree"
#~ msgstr "không thể gỡ bỏ một cây-làm-việc bị khóa"
-#~ msgid "Applied autostash."
-#~ msgstr "Đã áp dụng autostash."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Không thể lưu $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
@@ -21297,9 +24035,6 @@
#~ msgid "could not truncate '%s'"
#~ msgstr "không thể cắt cụt “%s”"
-#~ msgid "could not finish '%s'"
-#~ msgstr "không thể hoàn thành “%s”"
-
#~ msgid "could not close %s"
#~ msgstr "không thể đóng %s"
@@ -21312,9 +24047,6 @@
#~ msgid "Don't know how to clone %s"
#~ msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#~ msgid "show ignored files"
-#~ msgstr "hiển thị các tập tin ẩn"
-
#~ msgid "Don't know how to fetch from %s"
#~ msgstr "Không biết làm cách nào để lấy về từ %s"
@@ -21354,9 +24086,6 @@
#~ msgid "basename"
#~ msgstr "tên cơ sở"
-#~ msgid "prepend parent project's basename to output"
-#~ msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất"
-
#~ msgid ""
#~ "When you have resolved this problem, run \"git rebase --continue\".\n"
#~ "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -21396,9 +24125,6 @@
#~ msgid_plural "%s, %"
#~ msgstr[0] "%s, %"
-#~ msgid "Could not open file '%s'"
-#~ msgstr "Không thể mở tập tin “%s”"
-
#~ msgid "in %0.1f seconds automatically..."
#~ msgstr "trong %0.1f giây một cách tự động…"
@@ -21466,9 +24192,6 @@
#~ msgid "ref '%s' does not have %ld components to :strip"
#~ msgstr "tham chiếu “%s” không có %ld thành phần để mà :strip"
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "Không hiểu định dạng %.*s %s"
-
#~ msgid "[%s: gone]"
#~ msgstr "[%s: đã ra đi]"
@@ -21557,9 +24280,6 @@
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
-#~ msgid "cannot open %s: %s"
-#~ msgstr "không thể mở %s: %s"
-
#~ msgid "You need to set your committer info first"
#~ msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã"
@@ -21784,9 +24504,6 @@
#~ msgid "'%s': %s"
#~ msgstr "“%s”: %s"
-#~ msgid "unable to access '%s': %s"
-#~ msgstr "không thể truy cập “%s”: %s"
-
#~ msgid " git branch -d %s\n"
#~ msgstr " git branch -d %s\n"
@@ -21804,9 +24521,6 @@
#~ msgid "failed to remove: %s"
#~ msgstr "gặp lỗi khi gỡ bỏ: %s"
-#~ msgid "The --exec option must be used with the --interactive option"
-#~ msgstr "Tùy chọn --exec phải được sử dụng cùng với tùy chọn --interactive"
-
#~ msgid ""
#~ "Submodule path '$displaypath' not initialized\n"
#~ "Maybe you want to use 'update --init'?"
@@ -22034,9 +24748,6 @@
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s: không thể khóa ref (tham chiếu)"
-#~ msgid "%s: cannot update the ref"
-#~ msgstr "%s: không thể cập nhật ref (tham chiếu)"
-
#~ msgid "Failed to lock HEAD during fast_forward_to"
#~ msgstr "Gặp lỗi khi khóa HEAD trong quá trình fast_forward_to"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 912083e..c6bdb3e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
-# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
+# - Fangyi Zhou <me AT fangyi.io>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
@@ -45,6 +45,7 @@
# commit-ish (also committish) | 提交号
# conflict | 冲突
# core Git | 核心 Git 工具
+# cover letter | 附函
# DAG | 有向无环图
# dangling object | 悬空对象
# detached HEAD | 分离头指针
@@ -138,8 +139,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-03 18:08+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-13 21:16+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -148,37 +149,37 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:99
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:152
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:154
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:156
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:158
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:160
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:162
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:170
+#: advice.c:180
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."
@@ -186,135 +187,155 @@
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:178
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:185
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:186
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:192
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"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 performing another checkout.\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 -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"注意：正在检出 '%s'。\n"
+"注意：正在切换到 '%s'。\n"
"\n"
-"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"
-"外\n"
-"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
+"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以在切换\n"
+"回一个分支时，丢弃在此状态下所做的提交而不对分支造成影响。\n"
"\n"
-"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
-"参数 -b 来实现（现在或稍后）。例如：\n"
+"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在 switch 命令\n"
+"中添加参数 -c 来实现（现在或稍后）。例如：\n"
"\n"
-" git checkout -b <新分支名>\n"
+" git switch -c <新分支名>\n"
+"\n"
+"或者撤销此操作：\n"
+"\n"
+" git switch -\n"
+"\n"
+"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
"\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "命令行以 \\ 结尾"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "未关闭的引号"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同时使用。"
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1307
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1479
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1548
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1568
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -325,82 +346,82 @@
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1581
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1769
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1771
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1805
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1842
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1844
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1847
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1994
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2031
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2193
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2279
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2283
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2942
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3063
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
-#: apply.c:3075
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3081
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
@@ -409,445 +430,445 @@
"当查询：\n"
"%.*s"
-#: apply.c:3103
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3111
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3158
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3168
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3176
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3194
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3207
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3213
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3234
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3416
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3575
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3610
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3881 apply.c:3883
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3962
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3967
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:3987
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
-msgstr "检查补丁 %s..."
+msgstr "正在检查补丁 %s..."
-#: apply.c:4098
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4105
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4313
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4545
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4719
+#: apply.c:4704
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4874
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4901
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4907 apply.c:4922
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4915
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "路径"
-#: apply.c:4959
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4962
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "数字"
-#: apply.c:4965
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4968
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4970
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4974
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4976
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4978
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4980
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4982
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:4984
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4986
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4989
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4991
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4993
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:4998
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "动作"
-#: apply.c:5000
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5003 apply.c:5006
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5009
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5011
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5013
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5015
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5018
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5021
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5023 builtin/am.c:2206
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "根目录"
-#: apply.c:5024
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
@@ -869,99 +890,118 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "无此引用：%.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "不是一个有效的对象名：%s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "不是一个树对象：%s"
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr "当前工作目录未被跟踪"
+
+#: archive.c:457
msgid "fmt"
msgstr "格式"
-#: archive.c:453
+#: archive.c:457
msgid "archive format"
msgstr "归档格式"
-#: archive.c:454 builtin/log.c:1536
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "前缀"
-#: archive.c:455
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
-#: parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "文件"
-#: archive.c:457 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:459
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:460
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:461
+#: archive.c:465
msgid "store only"
msgstr "只存储"
-#: archive.c:462
+#: archive.c:466
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:470
+#: archive.c:474
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:473
+#: archive.c:477
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "仓库"
-#: archive.c:476 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "命令"
-#: archive.c:478 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:485
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:487
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:489
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:511
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:518
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
@@ -981,16 +1021,16 @@
msgid "cannot read %s"
msgstr "不能读取 %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
@@ -1005,7 +1045,7 @@
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路径太长（%d 字符，SHA1：%s）：%s"
-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
@@ -1015,12 +1055,17 @@
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "对于本系统时间戳太大：%<PRIuMAX>"
-#: attr.c:212
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "不允许 %s：%s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1033,17 +1078,17 @@
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:676
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:730
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:754
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1052,7 +1097,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:759
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1061,7 +1106,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:764
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1070,7 +1115,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:772
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1081,7 +1126,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:785
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1092,22 +1137,22 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:818
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:858
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
@@ -1147,42 +1192,42 @@
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:1787
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:1801
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:1822
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:1849
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:1860
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:1871
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
@@ -1194,85 +1239,85 @@
"在修复错误后，您可以尝试修改远程跟踪分支，通过执行命令\n"
"\"git branch --set-upstream-to=%s%s%s\" 。"
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
-#: branch.c:92
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
-#: branch.c:97
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
-#: branch.c:103
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
-#: branch.c:108
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "无法写入上游分支配置"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪：引用 %s 有歧义"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:232
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: branch.c:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1290,27 +1335,27 @@
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:279
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"
-#: branch.c:299
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"
-#: branch.c:304
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:358
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:381
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1325,70 +1370,74 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:192
+#: 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] "这个包中含有 %d 个引用："
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："
-#: bundle.c:267
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "无法复制 bundle 描述符"
-#: bundle.c:274
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:285
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:327
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:376
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:464
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:474
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:498
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack 终止"
@@ -1397,9 +1446,8 @@
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -1409,7 +1457,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交！"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1429,27 +1477,27 @@
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1115
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1118
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1121
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1124
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1378
+#: commit.c:1390
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"
@@ -1459,95 +1507,252 @@
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
-#: commit-graph.c:108
-#, c-format
-msgid "graph file %s is too small"
-msgstr "图形文件 %s 太小"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr "提交图形文件太小"
-#: commit-graph.c:115
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr "图形签名 %X 和签名 %X 不匹配"
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交图形签名 %X 和签名 %X 不匹配"
-#: commit-graph.c:122
+#: commit-graph.c:199
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr "图形版本 %X 和版本 %X 不匹配"
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交图形版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:129
+#: commit-graph.c:206
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr "散列版本 %X 和版本 %X 不匹配"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:153
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr "提交图形块查找表条目丢失，文件可能不完整"
+
+#: commit-graph.c:240
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr "不正确的块偏移 %08x%08x"
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "提交图形不正确的块偏移 %08x%08x"
-#: commit-graph.c:189
+#: commit-graph.c:283
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr "块 id %08x 出现了多次"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "提交图形块 id %08x 出现了多次"
-#: commit-graph.c:308
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交图形没有基础图形块"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "提交图形链不匹配"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "无法找到所有提交图形文件"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "无效的提交位置。提交图形可能已损坏"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "正在注解提交图中的提交"
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:691
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在扩展提交图中的可达提交"
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交图中的提交标记"
+
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "正在查找提交图的提交"
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "正在 %d 个包中查找提交图的提交"
+msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:812
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:814
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:868
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "提交图格式不能写入 %d 个提交"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "正在从 %d 个引用中查找提交图的提交"
+msgstr[1] "正在从 %d 个引用中查找提交图的提交"
-#: commit-graph.c:895
-msgid "too many commits to write graph"
-msgstr "提交太多不能画图"
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr "正在计算提交图中不同的提交"
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
+msgstr "正在查找提交图中额外的边"
+
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "无法写入正确数量的基础图形 ID"
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1002
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "正在用 %d 步写出提交图"
+msgstr[1] "正在用 %d 步写出提交图"
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "无法打开提交图形链文件"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "无法重命名基础提交图形文件"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "无法重命名临时提交图形文件"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "正在扫描合并提交"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "意外的重复提交 ID %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "正在合并提交图形"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "提交图格式不能写入 %d 个提交"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "提交太多不能画图"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:1046
-msgid "Verifying commits in commit graph"
-msgstr "校验提交图中的提交"
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "无法从提交图形中解析提交 %s"
+
+#: commit-graph.c:1989
+msgid "Verifying commits in commit graph"
+msgstr "正在校验提交图中的提交"
+
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "无法从提交图形的对象库中解析提交 %s"
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交图形父提交列表太长了"
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交图形父提交是 %s != %s"
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交图形父提交列表过早终止"
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1562,294 +1767,294 @@
"\t%2$s\n"
"这可能是因为循环包含。"
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称：%s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:378 sequencer.c:2296
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名（有换行符）：%s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数：%s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "超出范围"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录：'%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围：%d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1602
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1605
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1622
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1652
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1705
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2037
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2207
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2250
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: config.c:2276
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2322
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2324
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2405
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2437
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2466
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2717 config.c:3041
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2728
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2763 builtin/config.c:327
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:2788
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2801 config.c:3054
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2812
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2821 config.c:3059
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2906 config.c:3156
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:2940
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2942 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3032
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3199
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
@@ -1901,50 +2106,45 @@
msgid "repository on the other end cannot be shallow"
msgstr "另一端的仓库不能是浅克隆仓库"
-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "远程错误：%s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr "无效数据包"
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "协议错误：意外的 '%s'"
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "无效的 ls-refs 响应：%s"
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr "在引用列表之后应该有一个 flush 包"
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支持 '%s' 协议"
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "无法为 socket 设置 SO_KEEPALIVE"
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "查找 %s ..."
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "无法查找 %s（端口 %s）（%s）"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
@@ -1953,7 +2153,7 @@
"完成。\n"
"连接到 %s（端口 %s）... "
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -1963,52 +2163,52 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr "完成。"
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "无法查找 %s（%s）"
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "未知端口 %s"
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的端口号 '%s'"
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
@@ -2017,33 +2217,33 @@
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
-msgstr "检查连接中"
+msgstr "正在检查连通性"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "非法的 crlf 动作 %d"
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "%s 中的 CRLF 将被 LF 替换"
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -2052,12 +2252,12 @@
"%s 中的 CRLF 将被 LF 替换。<\n"
"在工作区中该文件仍保持原有的换行符。"
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "文件 %s 中的 LF 将被 CRLF 替换"
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -2066,24 +2266,24 @@
"%s 中的 LF 将被 CRLF 替换。\n"
"在工作区中该文件仍保持原有的换行符"
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2092,37 +2292,37 @@
"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
"节序）作为工作区编码。"
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "不能 fork 以执行外部过滤器 '%s'"
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "不能将输入传递给外部过滤器 '%s'"
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "外部过滤器 '%s' 失败码 %d"
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "从外部过滤器 '%s' 读取失败"
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "外部过滤器 '%s' 失败"
@@ -2156,53 +2356,53 @@
msgid "%s: smudge filter %s failed"
msgstr "%s：smudge 过滤器 %s 失败"
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "在将来"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒钟前"
msgstr[1] "%<PRIuMAX> 秒钟前"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分钟前"
msgstr[1] "%<PRIuMAX> 分钟前"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小时前"
msgstr[1] "%<PRIuMAX> 小时前"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
msgstr[1] "%<PRIuMAX> 天前"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2210,40 +2410,40 @@
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> 年前"
msgstr[1] "%<PRIuMAX> 年前"
-#: delta-islands.c:268
+#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "正在传播数据岛标记"
-#: delta-islands.c:286
+#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "坏的树对象 %s"
-#: delta-islands.c:330
+#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "未能加载 '%s' 的数据岛正则表达式：%s"
-#: delta-islands.c:386
+#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
-#: delta-islands.c:462
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛，结束。\n"
@@ -2257,24 +2457,29 @@
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "选项 '%s' 需要一个值"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<选项>] <路径> <路径>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者：注意保持前导空格
-#: diff.c:158
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -2282,23 +2487,27 @@
"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
"'plain'"
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "忽略未知的 color-moved-ws 模式 '%s'"
-
-#: diff.c:323
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
+"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
+
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -2307,24 +2516,35 @@
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4140
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4482
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4485
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4563
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4729
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "无效的 --stat 值：%s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s 期望一个数字值"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2333,59 +2553,530 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4743
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
+
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s 之后未知的值"
+
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "不能解析 '%s'"
+
+#: diff.c:4899 diff.c:4905
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s 期望 <n>/<m> 格式"
+
+#: diff.c:4917
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s 期望一个字符，得到 '%s'"
+
+#: diff.c:4938
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "坏的 --color-moved 参数：%s"
+
+#: diff.c:4957
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws 中的无效模式 '%s' "
+
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
+
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s 的参数无效"
+
+#: diff.c:5191
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5823
+#: diff.c:5247
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "坏的 --word-diff 参数：%s"
+
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "差异输出格式化选项"
+
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "生成补丁"
+
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
+msgstr "不显示差异输出"
+
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "生成含 <n> 行上下文的差异"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "生成原始格式的差异"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "和 '-p --raw' 同义"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' 同义"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "机器友好的 --stat"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "只输出 --stat 的最后一行"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<参数1,参数2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "输出每个子目录相对变更的分布"
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative 同义"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的同义词"
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精简摘要，例如创建、重命名和模式变更"
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "只显示变更文件的文件名"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "只显示变更文件的文件名和状态"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "生成差异统计（diffstat）"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<宽度>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "使用给定的长度生成差异统计"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "使用给定的文件名长度生成差异统计"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "使用给定的图形长度生成差异统计"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<次数>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "生成有限行数的差异统计"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "生成差异统计的简洁摘要"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "输出一个可以应用的二进制差异"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行显示完整的前后对象名称"
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "显示带颜色的差异"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr "<类型>"
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
+"符"
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<前缀>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr "显示给定的源前缀取代 \"a/\""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "显示给定的目标前缀取代 \"b/\""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "输出的每一行附加前缀"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "不显示任何源和目标前缀"
+
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "显示指定行数的差异块间的上下文"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<字符>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一个字符取代 '+' 来表示新的一行"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一个字符取代 '-' 来表示旧的一行"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一个字符取代 ' ' 来表示一行上下文"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "差异重命名选项"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "将完全重写的变更打破为成对的删除和创建"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "检测重命名"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "省略删除操作的差异输出"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "检测拷贝"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的文件做为发现拷贝的源"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "禁用重命名探测"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "使用空的数据对象做为重命名的源"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "继续列出文件重命名以外的历史记录"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "差异算法选项"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "生成尽可能小的差异"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "行比较时忽略空白字符"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字符的变更"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字符变更"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的回车符（CR）"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的变更"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "启发式转换差异边界以便阅读"
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 算法生成差异"
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 算法生成差异"
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<算法>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "选择一个差异算法"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<文本>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 算法生成差异"
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<正则>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <正则表达式> 确定何为一个词"
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr "移动的代码行用不同方式着色"
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字符"
+
+#: diff.c:5469
+msgid "Other diff options"
+msgstr "其它差异选项"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "把所有文件当做文本处理"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr "交换两个输入，反转差异"
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差异时退出码为 1，否则为 0"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "禁用本程序的所有输出"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr "允许执行一个外置的差异助手"
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<何时>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生成差异时，忽略子模组的更改"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<格式>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "指定子模组的差异如何显示"
+
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
+msgstr "隐藏索引中 'git add -N' 条目"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "将索引中 'git add -N' 条目当做真实的"
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<字符串>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "查找改变了指定字符串出现次数的差异"
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "查找改变指定正则匹配出现次数的差异"
+
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr "显示使用 -S 或 -G 的变更集的所有变更"
+
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
+
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
+msgstr "控制输出中的文件显示顺序"
+
+#: diff.c:5515
+msgid "<object-id>"
+msgstr "<对象 ID>"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "查找改变指定对象出现次数的差异"
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "通过差异类型选择文件"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<文件>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "输出到一个指定的文件"
+
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:5826
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:5829
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:576
+#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-#: dir.c:965
+#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:1880
+#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2122
+#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2246
+#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3047
+#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3092 dir.c:3097
+#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3126
+#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -2399,7 +3090,7 @@
msgid "Filtering content"
msgstr "过滤内容"
-#: entry.c:465
+#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
@@ -2414,7 +3105,7 @@
msgid "could not set GIT_DIR to '%s'"
msgstr "不能设置 GIT_DIR 为 '%s'"
-#: exec-cmd.c:361
+#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
@@ -2427,248 +3118,236 @@
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:183
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:253
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "无法写到远程"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:404
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:421
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:452
+#: fetch-pack.c:465
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "完成"
-#: fetch-pack.c:476
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:522
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:764
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:803
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:811
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:879
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:897
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "服务器不支持 shalllow 客户端"
-
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "服务器支持 multi_ack_detailed"
-
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "服务器支持 no-done"
-
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "服务器支持 multi_ack"
-
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "服务器支持 side-band-64k"
-
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "服务器支持 side-band"
-
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "服务器支持 allow-tip-sha1-in-want"
-
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "服务器支持 allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "服务器支持 ofs-delta"
-
-#: fetch-pack.c:971 fetch-pack.c:1158
-msgid "Server supports filter"
-msgstr "服务器支持 filter"
-
-#: fetch-pack.c:979
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:985
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "服务器支持 %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持 shalllow 客户端"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:989
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:991
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1008
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1153
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
-#: fetch-pack.c:1199
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "服务器支持 filter"
+
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "无法将请求写到远程"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1205
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1259
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1261
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1298
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1314
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1324
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1328
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1642
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:1686
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1689
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
@@ -2678,18 +3357,18 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
@@ -2746,41 +3425,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "低级命令/内部助手"
-#: help.c:296
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
-#: help.c:303
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
-#: help.c:312
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令："
-#: help.c:361 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
-#: help.c:408
+#: help.c:403
msgid "The common Git guides are:"
msgstr "最常用的 Git 向导有："
-#: help.c:517
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "执行 'git help <command>' 来查看特定子命令"
-#: help.c:522
+#: help.c:517
msgid "External commands"
msgstr "外部命令"
-#: help.c:530
+#: help.c:532
msgid "Command aliases"
msgstr "命令别名"
-#: help.c:594
+#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -2789,31 +3468,31 @@
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:653
+#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀，您的系统中未发现 Git 命令。"
-#: help.c:675
+#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-#: help.c:680
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 并继续。"
-#: help.c:685
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-#: help.c:693
+#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: help.c:697
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
@@ -2827,16 +3506,16 @@
"\n"
"最相似的命令是"
-#: help.c:712
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:780
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:784
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
@@ -2850,7 +3529,7 @@
"\n"
"您指的是这其中的某一个么？"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -2875,48 +3554,72 @@
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
-#: ident.c:369
+#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "未提供邮件地址且自动探测被禁用"
-#: ident.c:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "无法自动探测邮件地址（得到 '%s'）"
-#: ident.c:384
+#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自动探测被禁用"
-#: ident.c:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "无法自动探测姓名（得到 '%s'）"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允许空的姓名（对于 <%s>）"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:419 builtin/commit.c:606
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: list-objects-filter-options.c:35
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "无法为提交 %s 加载根树"
+
+#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多种过滤规格"
#: list-objects-filter-options.c:58
-msgid "only 'tree:0' is supported"
-msgstr "只支持 'tree:0'"
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path 过滤器支持已被删除"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "无效的过滤器表达式 '%s'"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "无法修改部分克隆的 promisor 远程仓库"
@@ -2947,12 +3650,13 @@
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:323
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
@@ -2961,99 +3665,99 @@
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
-#: merge-recursive.c:353
+#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
-#: merge-recursive.c:435
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "创建树出错"
-#: merge-recursive.c:906
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
-#: merge-recursive.c:917
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:940
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:984
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:1008
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败：%s"
-#: merge-recursive.c:1019
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败：%s"
-#: merge-recursive.c:1024
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1212
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s （没有检出）"
-#: merge-recursive.c:1219
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s（提交不存在）"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交："
-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s（非快进）"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案：\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3069,31 +3773,31 @@
"\n"
"以接受此建议。\n"
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s （发现多个合并）"
-#: merge-recursive.c:1358
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:1363
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1395
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1416
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: merge-recursive.c:1483
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3102,7 +3806,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1488
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3111,7 +3815,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1495
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3120,7 +3824,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1500
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3129,31 +3833,40 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1602
+#: merge-recursive.c:1601
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
+
+#: merge-recursive.c:1659
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
+
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1607
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: merge-recursive.c:1633
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3162,28 +3875,18 @@
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1638
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
"%5$s"
-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3193,7 +3896,7 @@
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:1984
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3202,7 +3905,7 @@
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
"在：%s。"
-#: merge-recursive.c:1994
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3211,7 +3914,7 @@
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
"径放置于此：%s"
-#: merge-recursive.c:2086
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3220,43 +3923,28 @@
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:2331
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "添加合并后的 %s"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "而是以 %s 为名添加"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:2937
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3006
+#: merge-recursive.c:3005
msgid "modified"
msgstr "修改"
@@ -3264,48 +3952,93 @@
msgid "content"
msgstr "内容"
-#: merge-recursive.c:3024
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:3071
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3097
+#, c-format
+msgid "Adding as %s instead"
+msgstr "而是以 %s 为名添加"
+
+#: merge-recursive.c:3179
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
+
+#: merge-recursive.c:3182
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
+"到 %s。"
+
+#: merge-recursive.c:3186
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
+"动到 %5$s。"
+
+#: merge-recursive.c:3189
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
+"建议将其移动到 %5$s。"
+
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3242
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3248
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3255
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
-#: merge-recursive.c:3264
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3300
+#: merge-recursive.c:3356
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "冲突（add/add）：合并冲突于 %s"
+
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3314,151 +4047,176 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
" %s"
-#: merge-recursive.c:3311
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:3320
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3419
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3432
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3471
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:91
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "散列版本 %u 不匹配"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "无效的块偏移（太大）"
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "终止多包索引块 id 出现时间早于预期"
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:144
-msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "多包索引缺少必需的 OID 扇出块"
-
-#: midx.c:146
-msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "多包索引缺少必需的 OID 查询块"
-
#: midx.c:148
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "多包索引缺少必需的对象 ID 扇出块"
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "多包索引缺少必需的对象 ID 查询块"
+
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "从多包索引准备 packfile 出错"
-#: midx.c:407
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:413
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:507
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到要丢弃的包文件 %s"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "正在查找引用的包文件"
+
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr "oid 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:992
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
+msgstr "正在校验 MIDX 中的对象 ID 顺序"
+
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr "oid 查询无序：oid[%d] = %s >= %s = oid[%d]"
+msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:996
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "通过包文件为对象排序"
+
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1004
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1010
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "不能开始 pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "不能结束 pack-objects"
+
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
@@ -3474,7 +4232,7 @@
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 线程：%s"
-#: notes-merge.c:275
+#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -3485,21 +4243,21 @@
"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
-#: notes-merge.c:282
+#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并（存在 %s）。"
-#: notes-utils.c:45
+#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"
-#: notes-utils.c:104
+#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值：'%s'"
-#: notes-utils.c:114
+#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
@@ -3508,7 +4266,7 @@
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:144
+#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
@@ -3518,45 +4276,100 @@
msgid "invalid object type \"%s\""
msgstr "无效的对象类型 \"%s\""
-#: object.c:173
+#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "对象 %s 是一个 %s，不是一个 %s"
-#: object.c:233
+#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "对象 %s 有未知的类型 id %d"
-#: object.c:246
+#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
-#: object.c:266 object.c:277
+#: object.c:267 object.c:278
#, c-format
-msgid "sha1 mismatch %s"
-msgstr "sha1 与 %s 不匹配"
+msgid "hash mismatch %s"
+msgstr "哈希值与 %s 不匹配"
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:1864
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1868
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: parse-options.c:672
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s 需要一个值"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s 与 %s 不兼容"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s：和其它的不兼容"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
+msgstr "%s 不取值"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s 不可用"
+
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
+
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
+
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "你的意思是 `--%s`（有两个短线？）"
+
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr "未知选项 `%s'"
+
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "未知开关 `%c'"
+
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "字符串中未知的非 ascii 字符选项：`%s'"
+
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:691
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -3564,185 +4377,257 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:697
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:700
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:739
+#: parse-options.c:954
msgid "-NUM"
msgstr "-数字"
-#: parse-options-cb.c:37
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s 的别名"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "选项 `%s' 期望一个数字值"
+
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式错误的到期时间：'%s'"
-#: parse-options-cb.c:109
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
-#: pathspec.c:129
+#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
-#: pathspec.c:147
+#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "只允许一个 'attr:' 规格。"
-#: pathspec.c:150
+#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "属性规格不能为空"
-#: pathspec.c:193
+#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "无效的属性名 %s"
-#: pathspec.c:258
+#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
-#: pathspec.c:265
+#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
-#: pathspec.c:305
+#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
-#: pathspec.c:326
+#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
-#: pathspec.c:331
+#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
-#: pathspec.c:369
+#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
-#: pathspec.c:428
+#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:441
+#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s：'%s' 在仓库之外"
-#: pathspec.c:515
+#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助记符：'%c'）"
-#: pathspec.c:525
+#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:592
+#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pkt-line.c:104
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "无法写 flush 包"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "无法写 delim 包"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "flush 包写错误"
-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "协议错误：不可能的长行"
-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "格式化包写入错误"
-#: pkt-line.c:192
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr "写数据包失败：数据超过了包的最大长度"
-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "数据包写入失败"
-#: pkt-line.c:291
+#: pkt-line.c:295
msgid "read error"
msgstr "读取错误"
-#: pkt-line.c:299
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "远端意外挂断了"
-#: pkt-line.c:327
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "协议错误：错误的行长度字符串：%.4s"
-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "协议错误：错误的行长度 %d"
-#: preload-index.c:118
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "远程错误：%s"
+
+#: preload-index.c:119
msgid "Refreshing index"
msgstr "正在刷新索引"
-#: preload-index.c:137
+#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "无法创建线程 lstat：%s"
-#: pretty.c:962
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "无法解析 git 头 '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "生成 diff 失败"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
-#: read-cache.c:1490
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr "不能在对象数据库中创建空的数据对象"
+
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s：只能添加常规文件、符号链接或 git 目录"
+
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' 没有检出一个提交"
+
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "无法索引文件 '%s'"
+
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "无法在索引中添加 '%s'"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "无法对 %s 执行 stat"
+
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' 看起来既是文件又是目录"
+
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1604
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -3751,7 +4636,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1614
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -3760,60 +4645,150 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1792
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "坏的签名 0x%08x"
+
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr "坏的索引版本 %d"
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr "坏的索引文件 sha1 签名"
+
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "索引使用不被支持的 %.4s 扩展"
+
+#
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "忽略 %.4s 扩展"
+
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "未知的索引条目格式 0x%08x"
+
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr "索引中有未排序的暂存条目"
+
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "合并文件 '%s' 有多个暂存条目"
+
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' 的未排序暂存条目"
+
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: read-cache.c:2101
+#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2114
+#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2201
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s：打开索引文件失败"
+
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s：不能对打开的索引执行 stat 操作"
+
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s：索引文件比预期的小"
+
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s：无法对索引文件执行 map 操作"
+
+#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2228
+#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "无法刷新共享索引 '%s'"
+
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
+
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3068
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3080
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: rebase-interactive.c:10
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "不能修复 '%s' 的权限位"
+
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s：不能落到暂存区 #0"
+
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
@@ -3853,7 +4828,14 @@
"\n"
"可以对这些行重新排序，将从上至下执行。\n"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "变基 %s 到 %s（%d 个提交）"
+msgstr[1] "变基 %s 到 %s（%d 个提交）"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -3861,7 +4843,7 @@
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -3869,7 +4851,7 @@
"\n"
"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -3883,7 +4865,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -3893,125 +4875,154 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "不能读取 '%s'。"
+msgid "could not write '%s'"
+msgstr "不能写入 '%s'"
-#: refs.c:192
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "不能拷贝 '%s' 至 '%s'。"
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些提交可能被意外丢弃。\n"
+"丢弃的提交（从新到旧）：\n"
+
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。\n"
+"\n"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
-#: refs.c:583
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:585 ref-filter.c:1951
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "无法为写入打开 '%s'：%s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "无法读取引用 '%s'"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "引用 '%s' 已经存在"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "写入 '%s' 时意外的对象 ID"
-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
-#: wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "删除 '%s' 时意外的对象 ID"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1137
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:1911
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2039 refs.c:2069
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2045 refs.c:2080
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
@@ -4021,348 +5032,477 @@
msgid "invalid refspec '%s'"
msgstr "无效的引用表达式：'%s'"
-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "丢失"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "领先 %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "落后 %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:235
+#: ref-filter.c:269
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) 不带参数"
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "未能识别的 %%(objectsize) 参数：%s"
-#: ref-filter.c:247
+#: ref-filter.c:277
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) 不带参数"
+
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:256
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:278
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:307
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:309
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:324
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
-#: ref-filter.c:328
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:358
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:370
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:377
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:386
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:394
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:412
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:508
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:535
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:539
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:663
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:726
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:728
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:730
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:758
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:760
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:762
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:777
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:834
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1424
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
+msgid "no branch, rebasing %s"
+msgstr "非分支，正变基 %s"
-#: ref-filter.c:1427
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "（非分支，正变基分离头指针 %s）"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "非分支，正变基分离头指针 %s"
-#: ref-filter.c:1430
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
+msgid "no branch, bisect started on %s"
+msgstr "非分支，二分查找开始于 %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1438
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针分离于 %s）"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "非分支"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1445
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针分离自 %s）"
-
-#: ref-filter.c:1449
-msgid "(no branch)"
-msgstr "（非分支）"
-
-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1491
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1857
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:1946
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2232
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2338
+#: ref-filter.c:2482
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "选项 `%s' 和 --merged 不兼容"
+
+#: ref-filter.c:2485
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "选项 `%s' 和 --no-merged 不兼容"
+
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: remote.c:607
+#: ref-filter.c:2500
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "选项 `%s' 必须指向一个提交"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "配置的远程短名称不能以 '/' 开始：%s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "提供了一个以上的 receivepack，使用第一个"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "提供了一个以上的 uploadpack，使用第一个"
+
+#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:611
+#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:615
+#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:623
-msgid "Internal error"
-msgstr "内部错误"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:1569 remote.c:1670
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "模式的值 '%s' 没有 '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "源引用表达式 %s 没有匹配"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "源引用表达式 %s 匹配超过一个"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"
+"试着猜测您的想法：\n"
+"\n"
+"- 在远端查询和 '%s' 匹配的引用。\n"
+"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"
+" 引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
+"\n"
+"都不行，所以我们已放弃。您必须给出完整的引用。"
+
+#: remote.c:1040
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
+"'%s:refs/heads/%s' 推送么？"
+
+#: remote.c:1045
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c:1055
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
+"'%s:refs/tags/%s' 推送么？"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s 无法被解析为分支"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "无法删除 '%s'：远程引用不存在"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "目标引用表达式 %s 匹配超过一个"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "目标引用 %s 接收超过一个源"
+
+#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1578
+#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1581
+#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1587
+#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1602
+#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1614
+#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1624
+#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1637
+#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1659
+#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "无法找到远程引用 %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* 在本地忽略可笑的引用 '%s'"
+
+#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:1939
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:1942
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:1946
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:1949
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:1953
+#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:1959
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:1962
+#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -4371,11 +5511,11 @@
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:1970
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:1973
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -4391,10 +5531,15 @@
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:1983
+#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "无法解析期望的对象名 '%s'"
+
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
@@ -4418,11 +5563,6 @@
msgid "unable to write rerere record"
msgstr "无法写入 rerere 记录"
-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
-#, c-format
-msgid "could not write '%s'"
-msgstr "不能写入 '%s'"
-
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
@@ -4473,8 +5613,8 @@
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
@@ -4508,29 +5648,33 @@
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
-#: revision.c:2324
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2327
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2523
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
-#: run-command.c:740
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: run-command.c:1229
+#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
-#: run-command.c:1293
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4539,70 +5683,75 @@
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-#: send-pack.c:142
+#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
-#: send-pack.c:144
+#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态：%s"
-#: send-pack.c:146
+#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败：%s"
-#: send-pack.c:308
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
-#: send-pack.c:421
+#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:423
+#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:435
+#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:440
+#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:183
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:287
+#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:313
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "无法删除 '%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "还原"
-#: sequencer.c:315
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:317
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:319
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:376
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -4610,7 +5759,7 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:379
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -4619,110 +5768,115 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:399
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: sequencer.c:453
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:457
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:486
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "无效的清理模式 %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:575
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:591
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:604
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:684
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:695
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:742
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:747
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:752
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:756
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:761
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:763
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:765
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:825
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "'%2$s' 中无效的日期格式 '%1$s'"
-#: sequencer.c:842
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -4751,15 +5905,15 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:935
+#: sequencer.c:995
msgid "writing root commit"
msgstr "写根提交"
-#: sequencer.c:1142
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1149
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4783,7 +5937,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1162
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -4806,300 +5960,349 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1202
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1204
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1250
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1252
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1256
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1277
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1279
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1443
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1448
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1615
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1621
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1636
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1643
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1649
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1732
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1739
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1758
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1766
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1770
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
-
-#: sequencer.c:1776
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1860
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1915
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1916
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1974
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:1981
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2062
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2071
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2130
+#: sequencer.c:2174
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr "无法解析 '%.*s'"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2138
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2209
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "不能读取 '%s'。"
+
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "正在取消一个进行中的拣选"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "正在取消一个进行中的还原"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2211
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2216
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2227
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2229
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2299
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2380
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2396
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2487
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "一个还原操作已在进行"
-#: sequencer.c:2488
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2491
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "拣选操作已在进行"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2505
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2562
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2587
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:2588
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2594
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2605
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:2709 sequencer.c:3679
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "没有正在进行的还原"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "没有正在进行的拣选"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "无法跳过这个提交"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "没有要跳过的"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"您已经提交了么？\n"
+"试试 \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:2762
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:2770
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5118,28 +6321,28 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:2780
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:2787
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:2829
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5154,11 +6357,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2835
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:2841
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5175,76 +6378,76 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:2902
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:2954
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:2959
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "不能写入索引"
-#: sequencer.c:3042
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3068
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3090
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3099
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3111
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3126
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3274
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3290
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3370
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -5255,31 +6458,31 @@
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3427
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "不能检出 %s"
-#: sequencer.c:3441
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
-msgstr "%s：不是一个有效的 OID"
+msgstr "%s：不是一个有效的对象 ID"
-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3461
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3463
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3471
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -5299,48 +6502,48 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3543
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3622
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:3667
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:3686
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:3772
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:3781
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:3783
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:3785
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:3788
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -5349,79 +6552,42 @@
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:3877
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:3884
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:3982
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:3986
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4021
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:4466
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:4469
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "不可用的待办列表：'%s'"
-
-#: sequencer.c:4620
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
-
-#: sequencer.c:4690
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"警告：一些提交可能被意外丢弃。\n"
-"丢弃的提交（从新到旧）：\n"
-
-#: sequencer.c:4697
-#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
-"可选值有：ignore、warn、error。\n"
-"\n"
-
-#: sequencer.c:4710
-#, c-format
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
@@ -5430,31 +6596,15 @@
"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
"或者您可以用 'git rebase --abort' 终止变基。\n"
-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:4852
-#, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "变基 %s 到 %s（%d 个提交）"
-msgstr[1] "变基 %s 到 %s（%d 个提交）"
-
-#: sequencer.c:4864
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "不能拷贝 '%s' 至 '%s'。"
-
-#: sequencer.c:4868 sequencer.c:4897
-msgid "could not transform the todo list"
-msgstr "无法改变待办列表"
-
-#: sequencer.c:4900
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:4983
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
@@ -5463,7 +6613,7 @@
msgid "'%s' is outside repository"
msgstr "'%s' 在仓库之外"
-#: setup.c:172
+#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -5472,7 +6622,7 @@
"%s：工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -5483,12 +6633,12 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -5499,91 +6649,91 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:527
+#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大，无法作为 .git 文件：'%s'"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式：%s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径：%s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "不是一个 git 仓库：%s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一个 git 仓库：'%s'"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:837
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-
-#: setup.c:848
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "获取 '%*s%s%s' 状态（stat）失败"
-#: setup.c:1078
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1090 setup.c:1096
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "不是一个 git 仓库（或者任何父目录）：%s"
+
#: setup.c:1109
#, c-format
msgid ""
@@ -5593,7 +6743,7 @@
"不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1192
+#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -5602,371 +6752,438 @@
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1235
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "不能打开或者复制 /dev/null"
-#: setup.c:1250
+#: setup.c:1279
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1255
+#: setup.c:1284
msgid "setsid failed"
msgstr "setsid 失败"
-#: sha1-file.c:381
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-#: sha1-file.c:432
+#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径：%s"
-#: sha1-file.c:503
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s：忽略备用对象库，嵌套太深"
-#: sha1-file.c:510
+#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
-#: sha1-file.c:565
+#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
-#: sha1-file.c:583
+#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
-#: sha1-file.c:590
+#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
-#: sha1-file.c:625
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1-file.c:651
+#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1-file.c:657
+#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1-file.c:663
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1-file.c:671
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: sha1-file.c:781
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时无效的行：%s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: sha1-file.c:806
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap 失败"
-#: sha1-file.c:973
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: sha1-file.c:1137
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "无效的对象类型"
-#: sha1-file.c:1219
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: sha1-file.c:1222
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: sha1-file.c:1228
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: sha1-file.c:1231
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: sha1-file.c:1422
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: sha1-file.c:1426
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1430
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1434
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1536
+#: sha1-file.c:1703
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr "无法写入 sha1 文件名 %s"
+msgid "unable to write file %s"
+msgstr "无法写文件 %s"
-#: sha1-file.c:1543
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: sha1-file.c:1550
+#: sha1-file.c:1717
msgid "file write error"
msgstr "文件写错误"
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "关闭 sha1 文件时出错"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
+msgstr "关闭松散对象文件时出错"
-#: sha1-file.c:1635
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: sha1-file.c:1637
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "无法写入 sha1 文件"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
+msgstr "不能写松散对象文件"
-#: sha1-file.c:1667
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: sha1-file.c:1671
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: sha1-file.c:1675
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: sha1-file.c:1760
+#: sha1-file.c:1926
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr "不能从 %s 读取 sha1 文件"
+msgid "cannot read object for %s"
+msgstr "不能读取对象 %s"
-#: sha1-file.c:1805
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "损坏的提交"
-#: sha1-file.c:1813
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "损坏的标签"
-#: sha1-file.c:1912
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: sha1-file.c:1915
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入数据库失败"
-#: sha1-file.c:2003
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: sha1-file.c:2027
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: sha1-file.c:2029
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "%s 的 sha1 不匹配（预期 %s）"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的哈希值不匹配（预期 %s）"
-#: sha1-file.c:2250
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2255
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: sha1-file.c:2261
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: sha1-file.c:2272
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
-#: sha1-name.c:476
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1-name.c:487
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "候选者有："
-#: sha1-name.c:770
+#: sha1-name.c:800
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 checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
-"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
+"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
-"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
-"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
-"命令关闭本消息通知。"
+"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
+"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
+"false\" 命令关闭本消息通知。"
-#: submodule.c:116 submodule.c:145
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u 字节"
+msgstr[1] "%u 字节"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u 字节/秒"
+msgstr[1] "%u 字节/秒"
+
+#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:156
+#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:167
+#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:329
+#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
-#: submodule.c:360
+#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:857
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: submodule.c:1404
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "无法访问子模组 '%s'"
+
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: submodule.c:1542
+#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1555
+#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1648
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
+
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1700
+#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:1747
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:1766
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -5977,16 +7194,16 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:1850
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1894
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:1933
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
@@ -5996,21 +7213,21 @@
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模组名称：%s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允许为负值"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
@@ -6045,7 +7262,7 @@
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
@@ -6084,36 +7301,44 @@
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:616
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr "服务端选项需要版本 2 协议或更高"
+
+#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:689
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:816
+#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:882
+#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:936
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1031
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1035
+#: transport.c:1044
#, c-format
msgid ""
"\n"
@@ -6140,136 +7365,131 @@
"以推送至远程。\n"
"\n"
-#: transport.c:1043
+#: transport.c:1052
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1182
+#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
-#: transport.c:1419
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析备用引用时无效的行：%s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "完整写入远程助手失败"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "无法为 '%s' 找到远程助手"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr "无法复制助手输出文件句柄"
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "远程助手需要实现 refspec 能力"
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s 意外地说：'%s'"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s 也锁定了 %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "不能执行 fast-import"
-#: transport-helper.c:502
+#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "连接时未知的响应：%s"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "协议不支持设置远程服务路径"
-#: transport-helper.c:600
+#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
-#: transport-helper.c:713
+#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error，助手说 '%s'"
-#: transport-helper.c:766
+#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
-#: transport-helper.c:827
+#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
-#: transport-helper.c:830
+#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
-#: transport-helper.c:833
+#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
-#: transport-helper.c:840
+#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:932
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push，需要引用表达式"
-#: transport-helper.c:937
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:984
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:989
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1014
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -6278,47 +7498,47 @@
"没有共同的引用并且也没有指定，什么也不会做。\n"
"可能您应该指定一个分支如 'master'。\n"
-#: transport-helper.c:1077
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1231
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1258
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1307
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1311
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1371
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1375
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
@@ -6334,11 +7554,11 @@
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:115
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:112
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6347,7 +7567,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:114
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -6356,7 +7576,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:117
+#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6365,7 +7585,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:119
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -6374,7 +7594,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6383,7 +7603,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:124
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -6392,7 +7612,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:129
+#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -6401,7 +7621,7 @@
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:133
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6410,7 +7630,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:135
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -6419,7 +7639,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6428,7 +7648,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:140
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -6437,7 +7657,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6446,7 +7666,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:145
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -6455,7 +7675,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:151
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6465,7 +7685,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -6475,7 +7695,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6484,7 +7704,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:158
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -6493,7 +7713,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6502,7 +7722,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:163
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -6511,12 +7731,12 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:174
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
@@ -6525,7 +7745,7 @@
"无法更新稀疏检出：如下条目不是最新：\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -6535,7 +7755,7 @@
"工作区中下列文件将被稀疏检出更新所覆盖：\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -6545,7 +7765,7 @@
"工作区中下列文件将被稀疏检出更新所删除：\n"
"%s"
-#: unpack-trees.c:180
+#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -6554,16 +7774,16 @@
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:254
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
-msgstr "终止中\n"
+msgstr "正在终止\n"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "正在检出文件"
+#: unpack-trees.c:318
+msgid "Updating files"
+msgstr "正在更新文件"
-#: unpack-trees.c:368
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -6601,32 +7821,32 @@
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件，错误码 %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
@@ -6645,162 +7865,167 @@
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wt-status.c:154
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:181 wt-status.c:208
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " （使用 \"git restore --staged <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr " （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:187
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:191
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:224
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:226
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:227
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git restore <文件>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:229
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:241
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: wt-status.c:256
+#: wt-status.c:268
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:258
+#: wt-status.c:270
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:260
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:262
+#: wt-status.c:274
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:264
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:266
+#: wt-status.c:278
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:268
+#: wt-status.c:280
msgid "both modified:"
msgstr "双方修改："
-#: wt-status.c:278
+#: wt-status.c:290
msgid "new file:"
msgstr "新文件："
-#: wt-status.c:280
+#: wt-status.c:292
msgid "copied:"
msgstr "拷贝："
-#: wt-status.c:282
+#: wt-status.c:294
msgid "deleted:"
msgstr "删除："
-#: wt-status.c:284
+#: wt-status.c:296
msgid "modified:"
msgstr "修改："
-#: wt-status.c:286
+#: wt-status.c:298
msgid "renamed:"
msgstr "重命名："
-#: wt-status.c:288
+#: wt-status.c:300
msgid "typechange:"
msgstr "类型变更："
-#: wt-status.c:290
+#: wt-status.c:302
msgid "unknown:"
msgstr "未知："
-#: wt-status.c:292
+#: wt-status.c:304
msgid "unmerged:"
msgstr "未合并："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
+#: wt-status.c:384
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
+#: wt-status.c:386
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:376
+#: wt-status.c:388
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:880
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的贮藏区当前有 %d 条记录"
msgstr[1] "您的贮藏区当前有 %d 条记录"
-#: wt-status.c:912
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:914
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:996
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -6808,77 +8033,88 @@
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
-#: wt-status.c:1097
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
+"为避免，您可以使用 '--no-ahead-behind'。\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1100
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1102
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1106
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1109
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1118
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1121
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1125
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1127
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1129
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1260
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1262
+#: wt-status.c:1311
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1265
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
msgstr[1] "最后的命令已完成（%d 条命令被执行）："
-#: wt-status.c:1276
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1281
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1284
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -6886,169 +8122,179 @@
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1292
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1304
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1309
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1322
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1324
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1326
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1333
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1337
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1342
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1345
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1349
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1354
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1357
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1359
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1368
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
+msgstr "拣选操作正在进行中。"
+
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1373
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1376
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1378
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1386
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "还原操作正在行中。"
+
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1391
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " （解决冲突并运行 \"git revert --continue\"）"
+msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1394
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " （执行 \"git revert --continue\" 以继续）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
+msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1396
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1406
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1410
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1413
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1611
+#: wt-status.c:1690
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1618
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1620
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1625
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.c:1627
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
-#: wt-status.c:1630
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1647
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1648
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1662
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1664
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1668
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7058,221 +8304,221 @@
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1674
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1676
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1682
+#: wt-status.c:1761
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1687
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1690
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1693
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1696
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1699
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1702 wt-status.c:1707
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1705
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1709
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1822
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:1826
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1857
+#: wt-status.c:1936
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2374
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2380
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2382
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: builtin/add.c:24
+#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:83
+#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:98
+#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:173
+#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:244
+#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法为写入打开 '%s'。"
-#: builtin/add.c:248
+#: builtin/add.c:249
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:254
+#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:256
+#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:261
+#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:269
+#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:292
+#: builtin/add.c:293
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:294
+#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:295
+#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:296
+#: builtin/add.c:297
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:297
+#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
-#: builtin/add.c:298
+#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:299
+#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:302
+#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:304
+#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:305
+#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:306
+#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:310
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:325
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -7301,12 +8547,12 @@
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:353
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:371
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
@@ -7315,132 +8561,132 @@
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:417
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:424
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:428
+#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:443
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:444
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/am.c:363
+#: builtin/am.c:348
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:447
+#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:488
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:525
+#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:551
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:739
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:804
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:852
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:864
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:957
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
-#: builtin/am.c:967
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1111
+#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1112
+#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1113
+#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1196
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
-#: builtin/am.c:1224
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1290
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1312
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1508
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1510
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1529
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -7448,28 +8694,24 @@
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1535
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1561
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1593
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1659
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-
-#: builtin/am.c:1664
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -7478,34 +8720,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1674
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1724
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1781
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1787
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1791
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
-#: builtin/am.c:1835
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -7515,7 +8758,7 @@
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1842
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -7526,159 +8769,159 @@
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2001
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2036
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2129
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2165
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2166
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2174
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
-#: builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2179
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2182
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2184
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2186
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2188
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2190
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2193
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2196
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
-#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
-#: builtin/am.c:2245
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "显示正在应用的补丁。"
-#: builtin/am.c:2249
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2251
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2257
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
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."
@@ -7686,16 +8929,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2282
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2297
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2321
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -7704,10 +8947,14 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2327
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "交互式模式需要命令行上提供补丁"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
@@ -7725,221 +8972,447 @@
msgid "git archive: Remote with no URL"
msgstr "git archive：未提供远程 URL"
-#: builtin/archive.c:58
+#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
-#: builtin/archive.c:61
+#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archive：NACK %s"
-#: builtin/archive.c:64
+#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive：协议错误"
-#: builtin/archive.c:68
+#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive：应有一个 flush 包"
-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
-#: builtin/bisect--helper.c:14
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<提交>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
+">"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
+"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
+
+#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
-#: builtin/bisect--helper.c:60
+#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
-#: builtin/bisect--helper.c:71
+#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "请使用两个不同的术语"
-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "不能打开文件 BISECT_TERMS"
-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "我们没有在二分查找。\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' 不是一个有效的提交"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "坏的 bisect_write 参数：%s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "无法获取版本 '%s' 的对象 ID"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "无法打开文件 '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"您需要给我至少一个 %s 和一个 %s 版本。\n"
+"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
+
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"您需要执行 \"git bisect start\" 来开始。\n"
+"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
+"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "在只有一个 %s 提交的情况下二分查找"
+
+# 译者：注意保持句尾空格
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "您确认么[Y/n]？ "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "未定义术语"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"命令 'git bisect terms' 的参数 %s 无效。\n"
+"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "未识别的选项：'%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' 看起来不是一个有效的版本"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "坏的 HEAD - 我需要一个 HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "不会在做了 cg-seek 的树上做二分查找"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "坏的 HEAD - 奇怪的符号引用"
+
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "无效的引用：'%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "将术语写入 .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "检查预期的版本"
-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
+msgstr "清除二分查找状态"
+
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "将二分查找的状态写入 BISECT_LOG"
+
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
+msgstr "在一个二分查找状态中检查和设置术语"
+
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
+msgstr "检查坏的或好的术语是否存在"
+
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
+msgstr "打印二分查找术语"
+
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
+msgstr "启动二分查找过程"
+
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
-#: builtin/bisect--helper.c:143
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE 无日志"
+
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms 需要两个参数"
-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state 不需要参数"
+msgstr "--bisect-clean-state 不带参数"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset 无需参数或者需要一个提交"
+
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write 需要 4 或 5 个参数"
+
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--check-and-set-terms 需要 3 个参数"
+
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check 需要 2 或 3 个参数"
+
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms 需要 0 或 1 个参数"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:406
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "不能找到要忽略的版本 %s"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:795
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:803
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "版本"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "在执行 blame 操作时忽略 <版本>"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "忽略来自 <文件> 中的版本"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "得分"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
-#: builtin/blame.c:873
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
@@ -7951,18 +9424,18 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:924
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1011
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1057
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "追踪代码行"
@@ -7995,7 +9468,7 @@
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -8005,7 +9478,7 @@
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -8014,12 +9487,12 @@
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -8028,112 +9501,121 @@
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
+msgstr "不能解析 HEAD 提交"
+
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) 指向 refs/heads/ 之外"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:481
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:543
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8144,219 +9626,217 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+msgid "show current branch name"
+msgstr "显示当前分支名"
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:415
-msgid "key"
-msgstr "key"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "排序的字段名"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
-#: builtin/tag.c:418
+#: 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:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: 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:637 builtin/for-each-ref.c:38 builtin/tag.c:423
-#: builtin/verify-tag.c:39
+#: 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:660 builtin/clone.c:739
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:792
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:796
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:802
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:812
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
+"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:815
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -8376,7 +9856,7 @@
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -8384,7 +9864,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -8392,132 +9872,132 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:637 git-submodule.sh:857
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "报告设置在文件上的所有属性"
-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: 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:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "不显示进度报告"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "显示未匹配的输入路径"
-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "检查时忽略索引"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时指定路径及 --stdin 参数"
-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z 需要和 --stdin 参数共用才有意义"
-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "未指定路径"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "参数 --quiet 只在提供一个路径名时有效"
-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching 选项只在使用 --verbose 时有效"
@@ -8538,54 +10018,54 @@
msgid "no contacts specified"
msgstr "未指定联系地址"
-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "不检出新文件"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "字符串"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
@@ -8597,106 +10077,164 @@
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<选项>] [<分支>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:162
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:224
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:240
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "重新创建了 %d 个合并冲突"
+msgstr[1] "重新创建了 %d 个合并冲突"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "从 %2$s 更新了 %1$d 个路径"
+msgstr[1] "从 %2$s 更新了 %1$d 个路径"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "从索引区更新了 %d 个路径"
+msgstr[1] "从索引区更新了 %d 个路径"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:280
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:349 builtin/checkout.c:356
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "'%s' 或 '%s' 都没有指定"
+
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:608
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"不能继续，下列文件有暂存的修改：\n"
+"%s"
+
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr "下列文件暂存的修改可能会丢失：%s"
+
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:786
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:856
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:862
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -8717,7 +10255,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:881
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -8744,167 +10282,244 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:913
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:917
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "预期只有一个引用"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1230
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
+"请使用 --（和可选的 --no-guess）来消除歧义"
+
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "期望一个分支，得到标签 '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "期望一个分支，得到远程分支 '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "期望一个分支，得到 '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "期望一个分支，得到提交 '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在合并时切换分支\n"
+"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在一个 am 会话期间切换分支\n"
+"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在变基时切换分支\n"
+"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在拣选时切换分支\n"
+"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在还原时切换分支\n"
+"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "您在执行二分查找时切换分支"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' 不带 <起始点>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
-msgid "branch"
-msgstr "分支"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1236
-msgid "create and checkout a new branch"
-msgstr "创建并检出一个新的分支"
-
-#: builtin/checkout.c:1238
-msgid "create/reset and checkout a branch"
-msgstr "创建/重置并检出一个分支"
-
-#: builtin/checkout.c:1239
-msgid "create reflog for new branch"
-msgstr "为新的分支创建引用日志"
-
-#: builtin/checkout.c:1240 builtin/worktree.c:492
-msgid "detach HEAD at named commit"
-msgstr "HEAD 从指定的提交分离"
-
-#: builtin/checkout.c:1241
-msgid "set upstream info for new branch"
-msgstr "为新的分支设置上游信息"
-
-#: builtin/checkout.c:1243
-msgid "new-branch"
-msgstr "新分支"
-
-#: builtin/checkout.c:1243
-msgid "new unparented branch"
-msgstr "新的没有父提交的分支"
-
-#: builtin/checkout.c:1245
-msgid "checkout our version for unmerged files"
-msgstr "对尚未合并的文件检出我们的版本"
-
-#: builtin/checkout.c:1248
-msgid "checkout their version for unmerged files"
-msgstr "对尚未合并的文件检出他们的版本"
-
-#: builtin/checkout.c:1250
-msgid "force checkout (throw away local modifications)"
-msgstr "强制检出（丢弃本地修改）"
-
-#: builtin/checkout.c:1252
-msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支执行三方合并"
-
-#: builtin/checkout.c:1254 builtin/merge.c:275
-msgid "update ignored files (default)"
-msgstr "更新忽略的文件（默认）"
-
-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
-msgid "style"
-msgstr "风格"
-
-#: builtin/checkout.c:1257
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
-
-#: builtin/checkout.c:1260
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "对路径不做稀疏检出的限制"
-
-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "二次猜测'git checkout <无此分支>'"
-
-#: builtin/checkout.c:1264
-msgid "do not check if another worktree is holding the given ref"
-msgstr "不检查指定的引用是否被其他工作区所占用"
-
-#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "和新的分支执行三方合并"
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "风格"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "冲突输出风格（merge 或 diff3）"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr "HEAD 从指定的提交分离"
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr "为新的分支设置上游信息"
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "强制检出（丢弃本地修改）"
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr "新分支"
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
+msgstr "新的没有父提交的分支"
+
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "更新忽略的文件（默认）"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "不检查指定的引用是否被其他工作区所占用"
+
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "对尚未合并的文件检出我们的版本"
+
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "对尚未合并的文件检出他们的版本"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "对路径不做稀疏检出的限制"
+
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p 和 --overlay 互斥"
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "缺少分支名，尝试 -b"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "无法解析 %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "您必须指定一个要恢复的路径"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
@@ -8932,38 +10547,105 @@
"如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n"
"仓库名，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/clean.c:27
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "分支"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "创建并检出一个新的分支"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "创建/重置并检出一个分支"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "为新的分支创建引用日志"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "二次猜测 'git checkout <无此分支>'（默认）"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "使用叠加模式（默认）"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "创建并切换一个新分支"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "创建/重置并切换一个分支"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "二次猜测 'git switch <无此分支>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "丢弃本地修改"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "要检出哪一个树"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "恢复索引"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "恢复工作区（默认）"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "忽略未合并条目"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "使用叠加模式"
+
+#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "正删除 %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "将删除 %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "忽略仓库 %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "将忽略仓库 %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "删除 %s 失败"
-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "不能对 %s 调用 lstat\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -8976,7 +10658,7 @@
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -8997,38 +10679,38 @@
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:518 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:718
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9046,217 +10728,231 @@
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:828
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:844
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:906
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:908
+#: builtin/clean.c:910
msgid "force"
msgstr "强制"
-#: builtin/clean.c:909
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:911
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:913
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:914
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:916
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:934
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:938
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clean.c:941
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clone.c:43
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:93
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:95
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:97
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:99
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:108
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "名称"
-#: builtin/clone.c:118
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:120
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:122
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:124
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "时间"
-#: builtin/clone.c:126
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:130
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:132
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:134
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:137
+#: builtin/clone.c:139
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:138
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "server-specific"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "传输选项"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:279
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -9264,180 +10960,180 @@
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:332
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
-msgstr "打开 '%s' 失败"
-
-#: builtin/clone.c:412
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:426
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "对 %s 调用 stat 失败\n"
+msgid "failed to start iterator over '%s'"
+msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:443
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
-#: builtin/clone.c:448
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:452
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:478
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "无法在 '%s' 上迭代"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:492
+#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"克隆成功，但是检出失败。\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
-"'git checkout -f HEAD' 重试\n"
+"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:569
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:680
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:730
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:761
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:806
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:869
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:871
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:915
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:928
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:931
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:944
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:960
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:970
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:990
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1010
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1012
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1036
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1097
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1099
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1103
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1111
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1192
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -9473,15 +11169,83 @@
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
-#: builtin/commit.c:40
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
+">)...] <树>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "忽略重复的父提交 %s"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#, c-format
+msgid "not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree：无法打开 '%s'"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree：无法读取 '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree：无法关闭 '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "父提交"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "父提交对象 ID"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "说明"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+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:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "GPG 提交签名"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "必须精确地提供一个树"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree：读取失败"
+
+#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
-#: builtin/commit.c:50
+#: 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"
@@ -9490,7 +11254,7 @@
"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
-#: builtin/commit.c:55
+#: 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"
@@ -9504,118 +11268,123 @@
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:62
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "否则，请使用命令 'git reset'\n"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "否则，请使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:65
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"如果您想跳过这个提交，使用命令：\n"
+"然后使用：\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
-"操作。\n"
+"来继续拣选剩余提交。如果您想跳过此提交，使用：\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
-#: builtin/commit.c:311
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 树对象失败"
-#: builtin/commit.c:352
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:358
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:371
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:373
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:450
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:452
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:460
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:479
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:577
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:579
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:598
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:650
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:701
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:705
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:739
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:793
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:811
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
@@ -9629,7 +11398,7 @@
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:816
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
@@ -9643,7 +11412,7 @@
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:829
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9652,7 +11421,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:837
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -9663,407 +11432,399 @@
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:854
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:862
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:869
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:887
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:953
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1011
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1025
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1077
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1110
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1119
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1122
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1124
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1147
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1166
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1208
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "无效的清理模式 %s"
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1185
-msgid "Paths with -a does not make sense."
-msgstr "路径和 -a 选项同时使用没有意义。"
-
-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1315
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1319
+#: builtin/commit.c:1347
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
-#: builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1332
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1335
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1337
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1338
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1465
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1466
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1468
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1470
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
-msgid "message"
-msgstr "说明"
-
-#: builtin/commit.c:1472
-msgid "commit message"
-msgstr "提交说明"
-
-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1475
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "强制编辑提交"
-# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1481
-msgid "default"
-msgstr "default"
-
-#: builtin/commit.c:1481 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "设置如何删除提交说明里的空格和#注释"
-
-#: builtin/commit.c:1482
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "GPG 提交签名"
-
-#: builtin/commit.c:1487
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1688
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 reset HEAD\" to recover."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
-"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
+"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n"
+"磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <对象目录>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <对象目录>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <对象目录>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
-msgstr ""
-"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
+msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
-#: builtin/log.c:1540
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
-#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "如果提交图形被拆分，只验证头一个文件"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "无法打开提交图形 '%s'"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "允许写一个增量提交图形文件"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "在非基本拆分提交图形中的最大提交数"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "一个拆分提交图形的两个级别之间的最大比率"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
@@ -10071,7 +11832,7 @@
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数，%s"
@@ -10176,7 +11937,7 @@
msgid "Type"
msgstr "类型"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "取值为该类型"
@@ -10220,7 +11981,7 @@
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "取值"
@@ -10228,48 +11989,48 @@
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 参数，当缺少设置时使用默认值"
-#: builtin/config.c:171
+#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "错误的参数个数，应该为 %d 个"
-#: builtin/config.c:173
+#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
-#: builtin/config.c:307
+#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "无效键名模式：%s"
-#: builtin/config.c:343
+#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化默认配置值失败：%s"
-#: builtin/config.c:400
+#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "无法解析颜色 '%s'"
-#: builtin/config.c:442
+#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "无法解析默认颜色值"
-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "不在 git 仓库中"
-#: builtin/config.c:498
+#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "不支持写到标准输入"
-#: builtin/config.c:501
+#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "不支持写到配置数据对象"
-#: builtin/config.c:586
+#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -10284,23 +12045,23 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:610
+#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "一次只能有一个配置文件"
-#: builtin/config.c:615
+#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一个仓库内使用"
-#: builtin/config.c:618
+#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob 只能在一个仓库内使用"
-#: builtin/config.c:637
+#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME 未设置"
-#: builtin/config.c:657
+#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -10309,51 +12070,51 @@
"不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
-#: builtin/config.c:687
+#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和变量类型不兼容"
-#: builtin/config.c:692
+#: builtin/config.c:693
msgid "only one action at a time"
msgstr "一次只能有一个动作"
-#: builtin/config.c:705
+#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 仅适用于 --list 或 --get-regexp"
-#: builtin/config.c:711
+#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
-#: builtin/config.c:717
+#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default 仅适用于 --get"
-#: builtin/config.c:730
+#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "无法读取配置文件 '%s'"
-#: builtin/config.c:733
+#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "处理配置文件出错"
-#: builtin/config.c:743
+#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "不支持编辑标准输入"
-#: builtin/config.c:745
+#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "不支持编辑数据对象"
-#: builtin/config.c:759
+#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:772
+#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -10362,7 +12123,7 @@
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "无此小节：%s"
@@ -10375,57 +12136,57 @@
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
-#: builtin/describe.c:26
+#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/describe.c:27
+#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "头"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "轻量级的"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "附注的"
-#: builtin/describe.c:272
+#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:276
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:278
+#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:322
+#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:324
+#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
-#: builtin/describe.c:378
+#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:404
+#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -10434,7 +12195,7 @@
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:408
+#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -10443,12 +12204,12 @@
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:438
+#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -10457,118 +12218,118 @@
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:509
+#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:520
+#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是数据对象"
-#: builtin/describe.c:534
+#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:535
+#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:536
+#: builtin/describe.c:537
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:537
+#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:538
+#: builtin/describe.c:539
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:539
+#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:542
+#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:544
+#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:546
+#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:548
+#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:552
+#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:555
+#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:573
+#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:602
+#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:652
+#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
-#: builtin/diff.c:83
+#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:363
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "不是一个 git 仓库"
-#: builtin/diff.c:407
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:416
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:421
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
@@ -10577,27 +12338,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -10605,318 +12366,393 @@
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:633
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:635
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:647
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:696
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:699
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "传递给 `diff`"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool 要求工作区或者 --no-index"
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff 和 --no-index 不兼容"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui、--tool 和 --extcmd 互斥"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:746
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "类型"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "git_env_*(...) 的默认值"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "安静模式，只使用 git_env_*() 的值作为退出码"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "选择使用备用编码处理提交说明"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr "引用父对象 ID 不在 fast-export 流中"
+
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
+msgstr "显示数据对象/提交的原始对象 ID"
+
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "server-specific"
-
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "传输选项"
-
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:470
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "获取后执行 'gc --auto'"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "在所有更新分支上检查强制更新"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:706
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:720
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:730
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:735
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:757
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:802
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:807
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:853
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n"
+"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
+"'git config fetch.showForcedUpdates true'。"
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
+"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:874
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:963 builtin/fetch.c:1085
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:974
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -10926,98 +12762,105 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1532
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
-msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
+msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1541
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
+
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
@@ -11079,89 +12922,272 @@
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
-#: builtin/fsck.c:598
-msgid "Checking object directories"
-msgstr "检查对象目录中"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "未知"
-#: builtin/fsck.c:693
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "%s %s 错误：%s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "%s %s 警告：%s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "来自 %7s %s 的损坏的链接"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "链接中错误的对象类型"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"损坏的链接来自于 %7s %s\n"
+" 到 %7s %s"
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr "缺失 %s %s"
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr "不可达 %s %s"
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr "悬空 %s %s"
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr "不能创建 lost-found"
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "不能完成 '%s'"
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr "正在检查 %s"
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "正在检查连通性（%d 个对象）"
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr "正在检查 %s %s"
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr "损坏的链接"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr "根 %s"
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "标记 %s %s (%s) 于 %s"
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s：对象损坏或丢失"
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s：无效的引用日志条目 %s"
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "正在检查引用日志 %s->%s"
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s：无效的 sha1 指针 %s"
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s：不是一个提交"
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr "注意：无默认引用"
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s：对象损坏或丢失：%s"
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s：不能解析对象：%s"
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "坏的 sha1 文件：%s"
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr "正在检查对象目录"
+
+#: builtin/fsck.c:685
+msgid "Checking object directories"
+msgstr "正在检查对象目录"
+
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr "正在检查 %s 链接"
+
+#: builtin/fsck.c:705 builtin/index-pack.c:842
+#, c-format
+msgid "invalid %s"
+msgstr "无效的 %s"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s 指向奇怪的东西（%s）"
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s：分离头指针的指向不存在"
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr "正在检查缓存树"
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s：cache-tree 中无效的 sha1 指针"
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr "cache-tree 中非树对象"
+
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:699
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:700
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "显示悬空的对象"
-#: builtin/fsck.c:701
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:704
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:705
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:706
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:707
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:711
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
-msgstr "检查对象中"
+msgstr "正在检查对象"
+
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr "%s：对象缺失"
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "无效的参数：期望 sha1，得到 '%s'"
#: builtin/gc.c:34
msgid "git gc [<options>]"
@@ -11172,17 +13198,22 @@
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "无法解析 '%s' 值 '%s'"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -11196,73 +13227,73 @@
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失败"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失败"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:670
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
-#: builtin/grep.c:28
+#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/grep.c:224
+#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:278
+#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -11271,263 +13302,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:701
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:800
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:802
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:804
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:806
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:808
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:811
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:813
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:815
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:817
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:819
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:822
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:824
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:826
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:830
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:833
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:839
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:842
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:844
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:845
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:847
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:849
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:851
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:854
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:856
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:859
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:861
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:862
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:864
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:866
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:869
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:872
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:874
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:876
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:877
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:880
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:882
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:885
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:887
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:889
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:901
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:903
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:905
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:909
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:913
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:977
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1051
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1080
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1103
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "选项不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1109
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1123
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -11535,36 +13566,32 @@
"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
"[--] <文件>..."
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "类型"
-
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "object type"
msgstr "对象类型"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "将对象写入对象数据库"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "从标准输入读取对象"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "原样存储文件不使用过滤器"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
@@ -11604,30 +13631,30 @@
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "执行 '%s' 失败"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -11636,7 +13663,7 @@
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -11645,327 +13672,317 @@
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:444
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串：%s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:297
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:555
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
-#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "无效的 %s"
-
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "应用 delta 失败"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1259
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1615
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
-#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
@@ -12009,42 +14026,42 @@
msgid "not copying templates from '%s': %s"
msgstr "没有从 '%s' 复制模版：%s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:406
+#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:410
+#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:411
+#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "已初始化空的 Git 仓库于 %s%s\n"
-#: builtin/init-db.c:460
+#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -12052,37 +14069,37 @@
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "权限"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
@@ -12090,561 +14107,553 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
">])...] [<文件>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "在原位编辑文件"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "删除空的尾部署名"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "在哪里放置新的尾部署名"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "当尾部署名已经存在时所采取的动作"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "当尾部署名缺失时所采取的动作"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "只输出尾部署名"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "不要应用配置规则"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "连接空白折行的值"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "设置解析选项"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "不要对 --- 特殊处理"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "要添加的尾部署名"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer 和 --only-input 同时使用没有意义"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:54
+#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:55
+#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:99
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:162
-msgid "suppress diff output"
-msgstr "不显示差异输出"
-
-#: builtin/log.c:163
+#: builtin/log.c:173
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:164
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:166
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/log.c:168
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/log.c:169
+#: builtin/log.c:179
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:172
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
-#: builtin/log.c:270
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:522
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Could not read object %s"
+msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:655
+#: builtin/log.c:668
#, c-format
-msgid "Unknown type: %d"
+msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:776
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:877
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:893
+#: builtin/log.c:924
#, c-format
-msgid "Cannot open patch file %s"
+msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:910
-msgid "Need exactly one range."
-msgstr "只需要一个范围。"
+#: builtin/log.c:941
+msgid "need exactly one range"
+msgstr "只需要一个范围"
-#: builtin/log.c:920
-msgid "Not a range."
-msgstr "不是一个范围。"
+#: builtin/log.c:951
+msgid "not a range"
+msgstr "不是一个范围"
-#: builtin/log.c:1043
-msgid "Cover letter needs email format"
-msgstr "信封需要邮件地址格式"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
+msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1119
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
+msgstr "无法创建附函文件"
+
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1146
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1204
-msgid "Two output directories?"
+#: builtin/log.c:1244
+msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
-msgid "Unknown commit %s"
+msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用。"
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1326
-msgid "Could not find exact merge base."
-msgstr "不能找到准确的合并基线。"
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
+msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1330
+#: builtin/log.c:1374
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
-"参数 --base=<基线提交> 手动指定一个基线提交。"
+"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1350
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1361
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1365
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1418
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1470
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "无法推断 range-diff 范围"
-#: builtin/log.c:1515
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1518
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1522
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1524
+#: builtin/log.c:1568
msgid "generate a cover letter"
-msgstr "生成一封附信"
+msgstr "生成一封附函"
-#: builtin/log.c:1526
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1527
+#: builtin/log.c:1571
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1528
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1530
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1532
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1534
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1537
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1540
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1543
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1546
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1548
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1550
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1552
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1554
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1555
+#: builtin/log.c:1599
msgid "header"
msgstr "header"
-#: builtin/log.c:1556
+#: builtin/log.c:1600
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1557
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1559
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1561
+#: builtin/log.c:1605
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1562
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1564
+#: builtin/log.c:1608
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1565
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1567
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1570
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1574
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1576
+#: builtin/log.c:1620
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1577
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1578
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1579
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1581
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1582
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1584
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1585
-msgid "rev"
-msgstr "版本"
-
-#: builtin/log.c:1586
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/log.c:1589
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/log.c:1591
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1666
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1681
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1683
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1691
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1693
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1695
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1727
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1729
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "不能创建目录 '%s'"
-
-#: builtin/log.c:1816
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1820
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:1821
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:1827
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1831
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1839
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:1840
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:1851
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1887
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:1931
-msgid "Failed to create output files"
+#: builtin/log.c:1975
+msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1989
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2043
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "显示调试数据"
@@ -12662,7 +14671,7 @@
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exec"
@@ -12686,11 +14695,11 @@
msgid "take url.<base>.insteadOf into account"
msgstr "参考 url.<base>.insteadOf 设置"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到匹配的引用则以退出码2退出"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外，显示指向的引用名"
@@ -12735,256 +14744,277 @@
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:52
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:53
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:54
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:111
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:177
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "选项 `%s' 需要一个值"
+
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:178
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:183
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:237 builtin/pull.c:146
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:243 builtin/pull.c:158
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:245 builtin/pull.c:161
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:248
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:260
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:267
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:269
+#
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort，但是保留索引和工作区"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:277
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "校验 commit-msg 钩子"
-#: builtin/merge.c:302
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:307
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:312
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:381
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:392
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:442
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:493
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:580
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:701
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:715
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:730
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:782
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:791
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:797
-#, c-format
+#: 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"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
"合并到主题分支。\n"
"\n"
-"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
+msgstr "空的提交说明会终止提交。\n"
+
+#: builtin/merge.c:812
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:852
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:905
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:944
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:946
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:948
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:953
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1010
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1113
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1147
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1266
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit 不带参数"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1270
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -12992,7 +15022,7 @@
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1293
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -13000,92 +15030,96 @@
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1296
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1305
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 与 --no-ff 同时使用。"
+msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1313
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "您不能将 --squash 和 --commit 组合使用。"
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1330
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1337
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1430
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1482
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1489
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1514
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1613
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1624
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1636
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -13170,33 +15204,33 @@
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "未知选项 %s"
-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "无法解析引用 '%s'"
-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
@@ -13209,7 +15243,7 @@
msgid "input is NUL terminated"
msgstr "输入以 NUL 字符终止"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "允许丢失的对象"
@@ -13217,156 +15251,170 @@
msgid "allow creation of more than one tree"
msgstr "允许创建一个以上的树"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --"
+"batch-size=<大小>)"
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成对包文件和包索引的对象目录"
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "太多参数"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "未能识别的动作：%s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "--batch-size 选项仅用于 'repack' 子命令"
-#: builtin/mv.c:17
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未识别的子命令：%s"
+
+#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<选项>] <源>... <目标>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "目录 %s 在索引中并且不是子模组？"
-#: builtin/mv.c:84
+#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s 在索引中"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "强制移动/重命令，即使目标存在"
-#: builtin/mv.c:126
+#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:168
+#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
-#: builtin/mv.c:179
+#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:184
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:186
+#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:189
+#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:198
+#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:226
+#: builtin/mv.c:227
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:234
+#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:240
+#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:242
+#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "目标目录不存在"
-#: builtin/mv.c:249
+#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "只打印名称（无 SHA-1）"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
@@ -13510,14 +15558,14 @@
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -13550,38 +15598,38 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: 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:675
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "替换已存在的注解"
@@ -13592,41 +15640,41 @@
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:495
+#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:497
+#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:515
+#: builtin/notes.c:517
msgid "too few parameters"
msgstr "参数太少"
-#: builtin/notes.c:536
+#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:548
+#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:600
+#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -13635,97 +15683,97 @@
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:695
+#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/notes.c:697
+#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "删除引用 NOTES_MERGE_REF 失败"
-#: builtin/notes.c:699
+#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "删除 'git notes merge' 工作区失败"
-#: builtin/notes.c:719
+#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
-#: builtin/notes.c:721
+#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:723
+#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:736
+#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "解析 NOTES_MERGE_REF 失败"
-#: builtin/notes.c:739
+#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:765
+#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:781
+#: builtin/notes.c:784
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:783
+#: builtin/notes.c:786
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:785
+#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:787
+#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:789
+#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:791
+#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:793
+#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:804
+#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:809
+#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:833
+#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:870
+#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:873
+#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:875
+#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -13735,169 +15783,173 @@
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:897
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "无法解析 '%s' 为一个有效引用。"
+
+#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:909
+#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:912
+#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:951
+#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:993
+#: builtin/notes.c:998
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:994
+#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1029
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/pack-objects.c:51
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "无效的包文件：%s"
-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "无法为重用打开包文件：%s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "无法在重用的包文件中查找"
-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "无法读取索引文件"
-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:848
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1585
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#
-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -13906,7 +15958,7 @@
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -13915,247 +15967,255 @@
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:3245
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3259
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3269
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
+msgstr "使用稀疏可达性算法"
+
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "如果可能，写 bitmap 索引"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "枚举对象"
-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<选项>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "打包一切"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "清除松散的引用（默认）"
@@ -14171,86 +16231,86 @@
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍历 promisor 包以外的对象"
-#: builtin/prune.c:129
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: builtin/pull.c:82
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:133
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:137
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:140
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:176
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:192
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:202
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:210
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:305
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:421
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:423
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:424
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:427
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -14260,42 +16320,42 @@
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:461
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -14304,32 +16364,32 @@
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:565
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:843
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:891
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:899
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:902
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:903
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:928
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -14339,7 +16399,7 @@
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:934
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -14356,15 +16416,15 @@
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:949
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:953
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:960
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
@@ -14380,7 +16440,7 @@
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -14388,7 +16448,7 @@
"\n"
"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
-#: builtin/push.c:168
+#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -14412,7 +16472,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -14426,7 +16486,7 @@
"\n"
" git push %s HEAD:<远程分支名字>\n"
-#: builtin/push.c:197
+#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -14439,12 +16499,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:205
+#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#: builtin/push.c:208
+#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -14454,12 +16514,12 @@
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
-#: builtin/push.c:267
+#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
-#: builtin/push.c:274
+#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -14470,7 +16530,7 @@
"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:280
+#: builtin/push.c:282
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"
@@ -14481,7 +16541,7 @@
"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:286
+#: builtin/push.c:288
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"
@@ -14494,11 +16554,11 @@
"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:293
+#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒绝，因为该标签在远程已经存在。"
-#: builtin/push.c:296
+#: builtin/push.c:298
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"
@@ -14507,22 +16567,22 @@
"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/push.c:357
+#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:361
+#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
-#: builtin/push.c:395
+#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "坏的仓库 '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -14543,104 +16603,104 @@
"\n"
" git push <名称>\n"
-#: builtin/push.c:551
+#: builtin/push.c:554
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:555
+#: builtin/push.c:558
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:556
+#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:565
+#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:570
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:573
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:575
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:576
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:599
+#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:601
+#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
-#: builtin/push.c:604
+#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:606
+#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:610
+#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:612
+#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:615
+#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:634
+#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
@@ -14664,20 +16724,20 @@
msgid "use simple diff colors"
msgstr "使用简单差异颜色"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "没有在范围中使用 ..：'%s'"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "单个参数格式必须是对称范围（即包含...）"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "需要两个提交范围"
-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -14687,118 +16747,301 @@
"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "只是清空索引"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129
msgid "Merging"
msgstr "合并"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要，执行三方合并"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时，也执行三方合并"
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m，但丢弃未合并的条目"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<子目录>/"
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
-#: builtin/rebase.c:29
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "抑制反馈信息"
+
+#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
-#: builtin/rebase.c:31
+#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
-#: builtin/rebase.c:33
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:119
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "不可用的待办列表：'%s'"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "不能写入 '%s'。"
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "没有 HEAD？"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "无法创建临时的 %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "无法标记为交互式"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "无法生成待办列表"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<选项>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "保持空提交"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "允许提交说明为空"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "对合并提交变基"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr "保持兄弟提交的原始分支点"
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr "移动以 squash!/fixup! 开头的提交"
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "签名提交"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr "显示上游变化的差异统计"
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "继续变基"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "跳过提交"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "变基待办列表"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "显示当前补丁"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "缩短待办列表中的提交号"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "扩展待办列表中的提交号"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "检查待办列表"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "重新排列 fixup/squash 行"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "在待办列表中插入 exec 执行命令"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr "onto"
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr "restrict-revision"
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr "限制版本"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr "squash-onto"
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr "squash onto"
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr "上游提交"
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr "head-name"
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr "head 名称"
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr "变基策略"
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr "strategy-opts"
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr "策略选项"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr "切换到"
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr "要检出的分支或提交"
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr "onto-name"
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr "onto name"
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr "cmd"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "要执行的命令"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自动重新安排任何失败的 `exec`"
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s 需要交互式变基"
-#: builtin/rebase.c:171
+#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:186
+#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:214
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:259
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/rebase.c:277
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "不能存储 %s"
-#: builtin/rebase.c:337
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
+msgstr "不能确定 HEAD 版本"
+
+#: builtin/rebase.c:950 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"
@@ -14811,11 +17054,25 @@
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "不能确定 HEAD 版本"
+#: builtin/rebase.c:1031
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"在为重放这些版本而准备补丁时，git 遇到了一个错误：\n"
+"\n"
+" %s\n"
+"\n"
+"因此 git 无法对其变基。"
-#: builtin/rebase.c:753
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
@@ -14832,7 +17089,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:769
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -14845,149 +17102,157 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:832
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
+msgstr "exec 命令不能包含换行符"
+
+#: builtin/rebase.c:1368
+msgid "empty exec command"
+msgstr "空的 exec 命令"
+
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:834
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:836
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:839
-msgid "display a diffstat of what changed upstream"
-msgstr "显示上游变化的 diffstat"
-
-#: builtin/rebase.c:842
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
-msgstr "不显示上游变化的 diffstat"
+msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:845
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "为每一个提交添加一个 Signed-off-by: 签名"
-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "传递给 'git am'"
-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:864
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:867
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者：注意保持前导空格
-#: builtin/rebase.c:869
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:872
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:873
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:876
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:879
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:883
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:887
-msgid "try to recreate merges instead of ignoring them"
-msgstr "尝试重建合并提交而非忽略它们"
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:891
-msgid "allow rerere to update index with resolved conflict"
-msgstr "允许 rerere 用已解决的冲突更新索引"
-
-#: builtin/rebase.c:894
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "变基时保留空提交"
-#: builtin/rebase.c:896
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:902
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/rebase.c:904
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:908
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:911
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:914
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:916
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:919
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:922
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:938
-#, c-format
-msgid "could not exec %s"
-msgstr "不能执行 %s"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"对 rebase.useBuiltin 的支持已被删除！\n"
+"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14995,21 +17260,16 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1077 builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "无法删除 '%s'"
-
-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -15028,339 +17288,172 @@
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1226
-#, c-format
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
+
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
+msgstr "不能将 am 选项与交互或合并选项同时使用"
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
+
+#: builtin/rebase.c:1832
msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-"错误：无法同时使用交互式选项（--interactive, --exec, --rebase-merges, --preserve-"
-"merges, --keep-empty, --root + --onto）和 am 选项（%s）"
+"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1231
-#, c-format
-msgid ""
-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
-msgstr "错误：不能组合合并选项（--merge、--strategy、--strategy-option）和 am 选项（%s）"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"
-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "错误：不能组合 '--preserve-merges' 和 '--rebase-merges'"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"
-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "错误：不能组合 '--rebase-merges' 和 '--strategy-option'"
-
-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "错误：不能组合 '--rebase-merges' 和 '--strategy'"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
-msgstr "严重错误：无此分支/提交 '%s'"
+msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应：'%s'"
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash：%s\n"
-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "无法 reset --hard"
-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: builtin/rebase.c:1470
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:1543
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:1552
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/rebase--interactive.c:24
-msgid "no HEAD?"
-msgstr "没有 HEAD？"
-
-#: builtin/rebase--interactive.c:51
-#, c-format
-msgid "could not create temporary %s"
-msgstr "无法创建临时的 %s"
-
-#: builtin/rebase--interactive.c:57
-msgid "could not mark as interactive"
-msgstr "无法标记为交互式"
-
-#: builtin/rebase--interactive.c:101
-#, c-format
-msgid "could not open %s"
-msgstr "无法打开 %s"
-
-#: builtin/rebase--interactive.c:114
-msgid "could not generate todo list"
-msgstr "无法生成待办列表"
-
-#: builtin/rebase--interactive.c:129
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<选项>]"
-
-#: builtin/rebase--interactive.c:148
-msgid "keep empty commits"
-msgstr "保持空提交"
-
-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "允许提交说明为空"
-
-#: builtin/rebase--interactive.c:151
-msgid "rebase merge commits"
-msgstr "对合并提交变基"
-
-#: builtin/rebase--interactive.c:153
-msgid "keep original branch points of cousins"
-msgstr "保持兄弟提交的原始分支点"
-
-#: builtin/rebase--interactive.c:155
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移动以 squash!/fixup! 开头的提交"
-
-#: builtin/rebase--interactive.c:156
-msgid "sign commits"
-msgstr "签名提交"
-
-#: builtin/rebase--interactive.c:158
-msgid "continue rebase"
-msgstr "继续变基"
-
-#: builtin/rebase--interactive.c:160
-msgid "skip commit"
-msgstr "跳过提交"
-
-#: builtin/rebase--interactive.c:161
-msgid "edit the todo list"
-msgstr "变基待办列表"
-
-#: builtin/rebase--interactive.c:163
-msgid "show the current patch"
-msgstr "显示当前补丁"
-
-#: builtin/rebase--interactive.c:166
-msgid "shorten commit ids in the todo list"
-msgstr "缩短待办列表中的提交号"
-
-#: builtin/rebase--interactive.c:168
-msgid "expand commit ids in the todo list"
-msgstr "扩展待办列表中的提交号"
-
-#: builtin/rebase--interactive.c:170
-msgid "check the todo list"
-msgstr "检查待办列表"
-
-#: builtin/rebase--interactive.c:172
-msgid "rearrange fixup/squash lines"
-msgstr "重新排列 fixup/squash 行"
-
-#: builtin/rebase--interactive.c:174
-msgid "insert exec commands in todo list"
-msgstr "在待办列表中插入 exec 执行命令"
-
-#: builtin/rebase--interactive.c:175
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase--interactive.c:177
-msgid "restrict revision"
-msgstr "限制版本"
-
-#: builtin/rebase--interactive.c:178
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase--interactive.c:179
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase--interactive.c:181
-msgid "the upstream commit"
-msgstr "上游提交"
-
-#: builtin/rebase--interactive.c:182
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase--interactive.c:182
-msgid "head name"
-msgstr "head 名称"
-
-#: builtin/rebase--interactive.c:187
-msgid "rebase strategy"
-msgstr "变基策略"
-
-#: builtin/rebase--interactive.c:188
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase--interactive.c:189
-msgid "strategy options"
-msgstr "策略选项"
-
-#: builtin/rebase--interactive.c:190
-msgid "switch-to"
-msgstr "切换到"
-
-#: builtin/rebase--interactive.c:191
-msgid "the branch or commit to checkout"
-msgstr "要检出的分支或提交"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase--interactive.c:192
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase--interactive.c:193
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase--interactive.c:193
-msgid "the command to run"
-msgstr "要执行的命令"
-
-#: builtin/rebase--interactive.c:220
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#: builtin/rebase--interactive.c:226
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
@@ -15386,7 +17479,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
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"
@@ -15405,19 +17498,74 @@
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
+"用>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
+"用>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <引用>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "正在标记可达对象..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s 指向不存在！"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "未指定要删除的引用日志"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是一个引用日志：%s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "没有 '%s' 的引用日志"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "无效的引用格式：%s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -15935,95 +18083,127 @@
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:294
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
+
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
+
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
+
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:527
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
+msgstr "没有新的要打包。"
+
+#: builtin/repack.c:478
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"警告：为了将包文件替换为新版本，一些使用中的包已经\n"
+"警告：通过添加 old- 前缀的方式重命名。但是操作失败，\n"
+"警告：并且尝试重命名改回原有文件名的操作也失败。\n"
+"警告：请手动将 %s 下的这些文件重命名：\n"
+
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "删除 '%s' 失败"
@@ -16052,12 +18232,7 @@
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr "无法将 '%s' 解析为一个有效引用"
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
@@ -16066,27 +18241,27 @@
"无效的替换格式 '%s'\n"
"有效的格式有 'short'、'medium' 和 'long'"
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "未发现替换引用 '%s'"
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "已删除替换引用 '%s'"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' 不是一个有效的引用名"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "替换引用 '%s' 已经存在"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
@@ -16097,107 +18272,112 @@
"'%s' 指向 '%s' 类型的替换对象\n"
"而 '%s' 指向 '%s' 类型的替换对象。"
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "无法为写入打开 %s"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file 报告失败"
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "无法为读取打开 %s"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "无法启动 mktree"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "无法从 mktree 读取"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree 报告失败"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree 没有返回一个对象名"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "无法对 %s 执行 fstat"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "无法得到 %s 的对象类型"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "编辑对象文件失败"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "新对象和旧对象相同：'%s'"
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "无法将 %s 解析为一个提交"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
-#: builtin/replace.c:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样：'%s'"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
@@ -16206,71 +18386,71 @@
"不能转换下列移植：\n"
"%s"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "使用此格式"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
-#: builtin/replace.c:569
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "错误的参数个数"
-#: builtin/replace.c:587
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
-#: builtin/replace.c:599
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
-#: builtin/replace.c:605
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
@@ -16286,126 +18466,127 @@
msgid "'git rerere forget' without paths is deprecated"
msgstr "没有路径的 'git rerere forget' 已经过时"
-#: builtin/rerere.c:111
+#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "无法为 '%s' 生成差异"
-#: builtin/reset.c:31
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
-#: builtin/reset.c:32
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
-#: builtin/reset.c:33
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "mixed"
msgstr "混杂"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "soft"
msgstr "软性"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "hard"
msgstr "硬性"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "merge"
msgstr "合并"
-#: builtin/reset.c:39
+#: builtin/reset.c:40
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:80
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:88
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:192
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:292
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:294
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:295
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:301
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:307
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:325
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:333
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:342
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:351
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:353
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:363
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:367
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:387
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:390
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
@@ -16417,53 +18598,53 @@
"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
-#: builtin/reset.c:400
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:404
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "无效的稀疏值 '%s'"
-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
-#: builtin/rev-parse.c:407
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -16493,72 +18674,81 @@
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "选项 `%s' 期望一个大于零的数字"
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s：%s 不能和 %s 同时使用"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:103
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "跳过当前提交并继续"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:104
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "父编号"
-#: builtin/revert.c:108
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "选择主干父提交编号"
-#: builtin/revert.c:110
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:112
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:121
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:123
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:125
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:219
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:232
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "拣选失败"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<选项>] [--] <文件>..."
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -16568,7 +18758,7 @@
msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
@@ -16576,13 +18766,13 @@
"\n"
"（使用 -f 强制删除）"
-#: builtin/rm.c:215
+#: 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:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -16590,42 +18780,42 @@
"\n"
"（使用 --cached 保留本地文件，或用 -f 强制删除）"
-#: builtin/rm.c:225
+#: 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:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "不列出删除的文件"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "只从索引区删除"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "允许递归删除"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
@@ -16657,18 +18847,6 @@
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<选项>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "在一次单独的请求/响应之后退出"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "对能力广告之后立即退出"
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
@@ -16701,7 +18879,7 @@
msgid "Linewrap output"
msgstr "折行输出"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
@@ -16728,118 +18906,118 @@
msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能显示 %d 个条目。"
msgstr[1] "一次只能显示 %d 个条目。"
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能处理 %d 个以上的版本。"
msgstr[1] "不能处理 %d 个以上的版本。"
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -16847,42 +19025,268 @@
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<模式>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "只显示标签（可以和头共用）"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "只显示头（可以和标签共用）"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测，需要精确的引用路径"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用，即使被过滤掉"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "转换标签到对象 ID"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<选项>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<选项>] [<stash>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <分支名> [<stash>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
+" [--] [<路径规格>...]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<消息>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' 不像是一个贮藏提交"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "指定了太多的版本：%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "未发现贮藏条目。"
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s 不是一个有效的引用名"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear 不支持参数"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "无法在合并过程应用贮藏"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "无法生成差异 %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "索引中有冲突。尝试不用 --index。"
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "不能保存索引树"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "无法从贮藏条目中恢复未跟踪文件"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "正在合并 %s 和 %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "索引未从贮藏中恢复。"
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "尝试重建索引"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "丢弃了 %s（%s）"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s：无法丢弃贮藏条目"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' 不是一个贮藏引用"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "贮藏条目被保留以备您再次需要。"
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "未指定分支名"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "无法用 %2$s 更新 %1$s"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr "贮藏说明"
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" 需要一个 <提交> 参数"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "没有选择变更"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "您尚未建立初始提交"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "无法保存当前索引状态"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "无法保存未跟踪文件"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "无法保存当前工作区状态"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "不能记录工作区状态"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr "您是否忘了执行 'git add'？"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "没有要保存的本地修改"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "无法初始化贮藏"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "无法保存当前状态"
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "保存工作目录和索引状态 %s"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "无法删除工作区变更"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr "保持索引"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr "以补丁模式贮藏"
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr "静默模式"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr "贮藏中包含未跟踪文件"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr "包含忽略的文件"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "不能执行 %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
@@ -16891,48 +19295,48 @@
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "跳过和移除所有的注释行"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote 不带参数"
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "进入 '%s'\n"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
@@ -16941,7 +19345,7 @@
"对 %s 执行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -16951,120 +19355,119 @@
"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "阻止进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>"
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
+msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
-#
-#: builtin/submodule--helper.c:677
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:706
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "阻止子模组初始化的输出"
-#: builtin/submodule--helper.c:711
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<路径>]"
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "阻止子模组状态输出"
-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "阻止子模组 url 同步的输出"
-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -17073,87 +19476,87 @@
"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
"-rf' 命令）"
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -17161,134 +19564,142 @@
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1433
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1469
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2096
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<路径>...]"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2157
-msgid "git submodule--helper config name [value]"
-msgstr "git submodule--helper config name [value]"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <名称> [<值>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <名称>"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -17323,16 +19734,17 @@
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
+"\t\t<标签名> [<头>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签名>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
@@ -17342,21 +19754,21 @@
"at <对象>]\n"
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
-#: builtin/tag.c:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -17369,7 +19781,7 @@
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -17383,146 +19795,159 @@
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:218
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
+"对其指向的目标创建标签，使用：\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -17531,210 +19956,210 @@
msgid "Unpacking objects"
msgstr "展开对象中"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "创建目录 %s 失败"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "创建文件 %s 失败"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "删除文件 %s 失败"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "删除目录 %s 失败"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:961
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:976
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "即使没有被标记为已更改，也要写出索引"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "启用或禁用文件系统监控"
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "标记文件为 fsmonitor 有效"
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -17742,11 +20167,11 @@
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -17754,25 +20179,25 @@
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
-#: builtin/update-index.c:1201
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor 被启用"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor 被禁用"
@@ -17816,6 +20241,10 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "在一次单独的请求/响应之后退出"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
@@ -17828,15 +20257,15 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <提交>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "打印提交内容"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "打印原始 gpg 状态输出"
@@ -17852,98 +20281,98 @@
msgid "show statistics only"
msgstr "只显示统计"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:85
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "无法再次添加工作区 '%s'"
-#: builtin/worktree.c:256
+#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
@@ -17952,7 +20381,7 @@
"'%s' 是一个丢失但锁定的工作区，使用\n"
"'add -f -f' 覆盖，或 'unlock' 和 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:258
+#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
@@ -17966,115 +20395,115 @@
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:430
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:445
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:486
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:508
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:569
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:669
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:688
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:690
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:718
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:743
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:751
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:779
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:785
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "目标 '%s' 已存在"
-#: builtin/worktree.c:793
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -18083,7 +20512,7 @@
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:795
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -18091,36 +20520,36 @@
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:798
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:803
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:851
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' 是脏的，使用 --force 删除"
-#: builtin/worktree.c:860
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:883
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:906
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -18129,7 +20558,7 @@
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:908
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -18137,28 +20566,28 @@
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:911
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<前缀>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "将 <前缀> 子目录内容写到一个树对象"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "只对调试有用"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -18171,7 +20600,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
@@ -18184,6 +20613,14 @@
msgid "too many commits marked reachable"
msgstr "太多提交标记为可达"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<选项>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "对能力广告之后立即退出"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -18204,99 +20641,151 @@
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
-"帮助。"
+"帮助。\n"
+"有关系统的概述，查看 'git help git'。"
-#: git.c:173
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "没有为 --git-dir 提供目录\n"
-#: git.c:187
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
-#: git.c:201
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "没有为 --work-tree 提供目录\n"
-#: git.c:215
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "没有为 --super-prefix 提供前缀\n"
-#: git.c:237
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "应为 -c 提供一个配置字符串\n"
-#: git.c:275
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "没有为 -C 提供目录\n"
-#: git.c:300
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "未知选项：%s\n"
-#: git.c:719
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "在扩展别名 '%s' 时：'%s'"
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"别名 '%s' 修改环境变量。您可以使用在别名中\n"
+"使用 '!git'"
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s 的空别名"
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr "递归的别名：%s"
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr "在标准输出写入失败"
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr "到标准输出的未知写入错误"
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr "标准输出关闭失败"
+
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:802
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "不能作为内置命令处理 %s"
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"用法：%s\n"
+"\n"
+
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:814
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败：%s\n"
-#: http.c:374
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值，默认为 %d"
-#: http.c:395
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支持委托控制，因为 cURL < 7.22.0"
-#: http.c:404
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:837
+#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
-#: http.c:910
+#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "不支持协议限制，因为 cURL < 7.19.4"
-#: http.c:1046
+#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-#: http.c:1053
+#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
-#: http.c:1057
+#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-#: http.c:1921
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -18307,39 +20796,167 @@
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "在 push-option 取值中无效的引号：'%s'"
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs 无效：这是一个 git 仓库么？"
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr "无效的服务端响应。预期服务，得到 flush 包"
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "无效的服务端响应，得到 '%s'"
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr "仓库 '%s' 未找到"
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' 鉴权失败"
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "无法访问 '%s'：%s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: list-objects-filter-options.h:60
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC 失败。%s"
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr "不能处理这么大的推送"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "不能压缩请求，zlib 压缩错误 %d"
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "不能压缩请求，zlib 结束错误 %d"
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "哑 http 传输不支持 shalllow 能力"
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr "获取失败。"
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr "无法通过智能 HTTP 获取 sha1"
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "协议错误：期望 sha/ref，却得到 '%s'"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http 传输协议不支持 %s"
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr "git-http-push 失败"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl：错误读取来自 git 的命令流"
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl：尝试没有本地仓库下获取"
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl：未知的来自 git 的命令 '%s'"
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "参数"
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "对象过滤"
-#: parse-options.h:154
+#: parse-options.h:170
msgid "expiry-date"
msgstr "到期时间"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:261
+#: parse-options.h:305
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:263
+#: parse-options.h:307
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:269
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "设置如何删除提交说明里的空格和#注释"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "排序的字段名"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果可能，重用冲突解决更新索引"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "添加文件内容至索引"
@@ -18426,7 +21043,7 @@
#: command-list.h:71
msgid "Clone a repository into a new directory"
-msgstr "克隆一个仓库到一个新目录"
+msgstr "克隆仓库到一个新目录"
#: command-list.h:72
msgid "Display data in columns"
@@ -18546,7 +21163,7 @@
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
-msgstr "从 git-archive 创建的归档文件中提取提交ID"
+msgstr "从 git-archive 创建的归档文件中提取提交 ID"
#: command-list.h:102
msgid "Print lines matching a pattern"
@@ -18558,7 +21175,7 @@
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "从一个文件计算对象ID，并可以创建 blob 数据对象"
+msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
#: command-list.h:105
msgid "Display help information about Git"
@@ -18593,7 +21210,7 @@
msgstr "在 gitweb 中即时浏览您的工作仓库"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr "添加或解析提交说明中的结构化信息"
#: command-list.h:114
@@ -18699,7 +21316,7 @@
#: command-list.h:139
msgid "Compute unique ID for a patch"
-msgstr "计算一个补丁的唯一ID"
+msgstr "计算一个补丁的唯一 ID"
#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
@@ -18766,221 +21383,225 @@
msgstr "重置当前 HEAD 到指定状态"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "恢复工作区文件"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "回退一些现存提交"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "按时间顺序列出提交对象"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "选出并处理参数"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "通过电子邮件发送一组补丁"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 协议推送对象到另一个仓库"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允许 Git SSH 访问的受限登录shell"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "'git log' 输出摘要"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "显示各种类型的对象"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "显示分支和提交"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "显示打包归档索引"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "显示本地仓库中的引用"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "为 shell 脚本准备的 Git 国际化设置代码"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 脚本设置代码"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "贮藏脏工作区中的修改"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "将文件内容添加到索引"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "显示工作区状态"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "删除不必要的空白字符"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或检查子模组"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subersion 仓库和 Git 之间的双向操作"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "切换分支"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "读取、修改和删除符号引用"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 数据对象的内容创建一个临时文件"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "从打包文件中解压缩对象"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "将工作区的文件内容注册到索引"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新存储于引用中的对象名称"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新辅助信息文件以帮助哑协议服务"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "将存档发送回 git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "将对象压缩包发送回 git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "显示一个Git逻辑变量"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "检查 GPG 提交签名"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "校验打包的Git存仓文件"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "检查标签的 GPG 签名"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 界面（Git 仓库的 web 前端）"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "适合 CVS 用户的 Git 帮助"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "调整差异输出"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Git 词汇表"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git 名字空间"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Git 仓库布局"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "一个 Git 教程：第二部分"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "一个 Git 教程"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
-msgstr "如果可能，重用冲突解决更新索引"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "您需要执行 \"git bisect start\" 来开始"
@@ -18993,133 +21614,49 @@
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n]？ "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "未能识别的选项：'$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' 看起来不像是一个有效的版本"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "坏的 HEAD - 我需要一个 HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "不会在做了 cg-seek 的树上做二分查找"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "坏的 HEAD - 奇怪的符号引用"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "坏的 bisect_write 参数：$state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "坏的输入版本：$arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "坏的输入版本：$bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "坏的输入版本：$rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。"
-
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "您确认么[Y/n]？ "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"您需要给我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"您需要执行 \"git bisect start\" 来开始。\n"
-"然后需要提供我至少一个好版本和一个坏版本。\n"
-"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' 不是一个有效的提交"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"不能检出原始 HEAD '$branch'。\n"
-"尝试 'git bisect reset <提交>'。"
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "二分查找运行失败：没有提供命令。"
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19128,11 +21665,11 @@
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -19141,27 +21678,13 @@
"二分查找运行失败：\n"
"'bisect_state $state' 退出码为 $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "未定义术语"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"参数 $arg 对命令 'git bisect terms' 无效。\n"
-"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
#: git-merge-octopus.sh:46
msgid ""
@@ -19201,259 +21724,113 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-legacy-rebase.sh:434
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "无法移回 $head_name"
-
-#: git-legacy-rebase.sh:460
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
-"过程中。 如果是这样，请执行\n"
-"\t$cmd_live_rebase\n"
-"如果不是这样，请执行\n"
-"\t$cmd_clear_stale_rebase\n"
-"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-
-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "错误：不能组合 '--signoff' 和 '--preserve-merges'"
-
-#: git-legacy-rebase.sh:570
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "无效的上游 '$upstream_name'"
-
-#: git-legacy-rebase.sh:594
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: 有一个以上的合并基准"
-
-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: 没有合并基准"
-
-#: git-legacy-rebase.sh:606
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "没有指向一个有效的提交：$onto_name"
-
-#: git-legacy-rebase.sh:632
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "严重错误：无此分支/提交 '$branch_name'"
-
-#: git-legacy-rebase.sh:670
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "创建了 autostash: $stash_abbrev"
-
-#: git-legacy-rebase.sh:699
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "当前分支 $branch_name 是最新的。"
-
-#: git-legacy-rebase.sh:709
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "当前分支 $branch_name 是最新的，强制变基。"
-
-#: git-legacy-rebase.sh:723
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "到 $onto 的变更："
-
-#: git-legacy-rebase.sh:725
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "从 $mb 到 $onto 的变更："
-
-#: git-legacy-rebase.sh:736
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "首先，回退分支以便在上面重放您的工作..."
-
-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "快进 $branch_name 至 $onto_name。"
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear 不支持参数"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "您尚未建立初始提交"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "无法保存当前索引状态"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "无法保存未跟踪文件"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "无法保存当前工作区状态"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "没有选择变更"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "不能记录工作区状态"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "错误：'stash push' 的未知选项：$option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "没有要保存的本地修改"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "无法初始化贮藏"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "无法保存当前状态"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "无法删除工作区变更"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "未发现贮藏条目。"
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是贮藏式提交"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个贮藏引用"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "索引未从贮藏中恢复。"
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "贮藏条目被保留以备您再次需要。"
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：无法丢弃贮藏条目"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "未指定分支名"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-submodule.sh:236
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' 没有检出的提交"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -19464,22 +21841,22 @@
"$sm_path\n"
"如果您确实想添加它，使用 -f 参数。"
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:261
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:269
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-submodule.sh:271
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -19494,49 +21871,51 @@
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:277
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:303
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:563
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:573
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:578
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:596
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "无法在子模组路径 '$displaypath' 中获取"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -19544,74 +21923,74 @@
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:609
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:754
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:829
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:832
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
@@ -19621,12 +22000,21 @@
msgid "See git-${cmd}(1) for details."
msgstr "详见 git-${cmd}(1)。"
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "已应用 autostash。"
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "不能存储 $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "变基中（$new_count/$total）"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
@@ -19664,7 +22052,7 @@
"\n"
"可以对这些行重新排序，将从上至下执行。\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -19683,83 +22071,83 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1：不是一个可以被拣选的提交"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "无效的提交名：$sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "不能写入当前提交的替代 sha1"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "快进到 $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "不能快进到 $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "不能移动 HEAD 到 $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}："
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "这是一个 $count 个提交的组合。"
msgstr[1] "这是一个 $count 个提交的组合。"
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -19772,32 +22160,32 @@
"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "执行：$rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败：$rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者：注意保持前导空格
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -19808,7 +22196,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -19822,25 +22210,25 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -19869,51 +22257,51 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
@@ -19922,173 +22310,175 @@
msgid "usage: $dashless $USAGE"
msgstr "用法：$dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切换目录到 $cdup，工作区的顶级目录"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "严重错误：$program_name 不能在没有工作区的情况下使用"
+msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支：您有未暂存的变更。"
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "无法通过变基方式拉取：您有未暂存的变更。"
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action：您有未暂存的变更。"
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "不能变基：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action：您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "缓存"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "未缓存"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "二进制"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "无"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "没有修改"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "触碰了 %d 个路径\n"
msgstr[1] "触碰了 %d 个路径\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "为写入打开块编辑文件失败：%s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
@@ -20102,7 +22492,7 @@
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -20111,7 +22501,7 @@
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
@@ -20122,12 +22512,12 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -20141,7 +22531,7 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -20155,7 +22545,7 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -20169,7 +22559,7 @@
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -20183,7 +22573,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -20197,7 +22587,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -20211,7 +22601,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -20225,7 +22615,21 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在工作区中应用该块\n"
+"n - 不要在工作区中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -20247,211 +22651,226 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "补丁更新"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起，只有 %d 个可用块。\n"
msgstr[1] "对不起，只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -20468,18 +22887,19 @@
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
@@ -20492,66 +22912,66 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:534
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -20566,21 +22986,21 @@
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-"严重：%s：%s\n"
+"致命错误：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
@@ -20590,17 +23010,17 @@
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "为写入打开 %s 失败: %s"
-#: git-send-email.perl:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -20609,41 +23029,41 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"以 \"GIT:\" 开头的行将被删除。\n"
-"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
+"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:790
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:825
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:880
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
-#: git-send-email.perl:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -20655,20 +23075,20 @@
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "严重：别名 '%s' 扩展为它自己\n"
+msgstr "致命错误：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
-#: git-send-email.perl:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -20676,16 +23096,16 @@
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1412
+#: 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"
@@ -20710,128 +23130,128 @@
#. 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:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1632
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1842
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-send-email.perl:1941
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
diff --git a/ppc/sha1.c b/ppc/sha1.c
index ec6a192..1b705ce 100644
--- a/ppc/sha1.c
+++ b/ppc/sha1.c
@@ -10,8 +10,8 @@
#include <string.h>
#include "sha1.h"
-extern void ppc_sha1_core(uint32_t *hash, const unsigned char *p,
- unsigned int nblocks);
+void ppc_sha1_core(uint32_t *hash, const unsigned char *p,
+ unsigned int nblocks);
int ppc_SHA1_Init(ppc_SHA_CTX *c)
{
diff --git a/preload-index.c b/preload-index.c
index e73600e..ed6eaa4 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -78,7 +78,7 @@
if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
continue;
ce_mark_uptodate(ce);
- mark_fsmonitor_valid(ce);
+ mark_fsmonitor_valid(index, ce);
} while (--nr > 0);
if (p->progress) {
struct progress_data *pd = p->progress;
diff --git a/pretty.c b/pretty.c
index 0ab45d1..b32f036 100644
--- a/pretty.c
+++ b/pretty.c
@@ -98,12 +98,16 @@
{ "fuller", CMIT_FMT_FULLER, 0, 8 },
{ "full", CMIT_FMT_FULL, 0, 8 },
{ "oneline", CMIT_FMT_ONELINE, 1, 0 }
+ /*
+ * Please update $__git_log_pretty_formats in
+ * git-completion.bash when you add new formats.
+ */
};
commit_formats_len = ARRAY_SIZE(builtin_formats);
builtin_formats_len = commit_formats_len;
ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
- memcpy(commit_formats, builtin_formats,
- sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
+ COPY_ARRAY(commit_formats, builtin_formats,
+ ARRAY_SIZE(builtin_formats));
git_config(git_pretty_formats_config, NULL);
}
@@ -339,8 +343,7 @@
return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
}
-static int needs_rfc2047_encoding(const char *line, int len,
- enum rfc2047_type type)
+static int needs_rfc2047_encoding(const char *line, int len)
{
int i;
@@ -466,7 +469,7 @@
}
strbuf_addstr(sb, "From: ");
- if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) {
+ if (needs_rfc2047_encoding(namebuf, namelen)) {
add_rfc2047(sb, namebuf, namelen,
encoding, RFC2047_ADDRESS);
max_length = 76; /* per rfc2047 */
@@ -985,8 +988,7 @@
return rest - placeholder;
}
-static size_t parse_padding_placeholder(struct strbuf *sb,
- const char *placeholder,
+static size_t parse_padding_placeholder(const char *placeholder,
struct format_commit_context *c)
{
const char *ch = placeholder;
@@ -1057,13 +1059,26 @@
return 0;
}
-static int match_placeholder_arg(const char *to_parse, const char *candidate,
- const char **end)
+static int match_placeholder_arg_value(const char *to_parse, const char *candidate,
+ const char **end, const char **valuestart,
+ size_t *valuelen)
{
const char *p;
if (!(skip_prefix(to_parse, candidate, &p)))
return 0;
+ if (valuestart) {
+ if (*p == '=') {
+ *valuestart = p + 1;
+ *valuelen = strcspn(*valuestart, ",)");
+ p = *valuestart + *valuelen;
+ } else {
+ if (*p != ',' && *p != ')')
+ return 0;
+ *valuestart = NULL;
+ *valuelen = 0;
+ }
+ }
if (*p == ',') {
*end = p + 1;
return 1;
@@ -1075,6 +1090,47 @@
return 0;
}
+static int match_placeholder_bool_arg(const char *to_parse, const char *candidate,
+ const char **end, int *val)
+{
+ const char *argval;
+ char *strval;
+ size_t arglen;
+ int v;
+
+ if (!match_placeholder_arg_value(to_parse, candidate, end, &argval, &arglen))
+ return 0;
+
+ if (!argval) {
+ *val = 1;
+ return 1;
+ }
+
+ strval = xstrndup(argval, arglen);
+ v = git_parse_maybe_bool(strval);
+ free(strval);
+
+ if (v == -1)
+ return 0;
+
+ *val = v;
+
+ return 1;
+}
+
+static int format_trailer_match_cb(const struct strbuf *key, void *ud)
+{
+ const struct string_list *list = ud;
+ const struct string_list_item *item;
+
+ for_each_string_list_item (item, list) {
+ if (key->len == (uintptr_t)item->util &&
+ !strncasecmp(item->string, key->buf, key->len))
+ return 1;
+ }
+ return 0;
+}
+
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const char *placeholder,
void *context)
@@ -1084,10 +1140,14 @@
const char *msg = c->message;
struct commit_list *p;
const char *arg;
- int ch;
+ size_t res;
char **slot;
/* these are independent of the commit */
+ res = strbuf_expand_literal_cb(sb, placeholder, NULL);
+ if (res)
+ return res;
+
switch (placeholder[0]) {
case 'C':
if (starts_with(placeholder + 1, "(auto)")) {
@@ -1106,16 +1166,6 @@
*/
return ret;
}
- case 'n': /* newline */
- strbuf_addch(sb, '\n');
- return 1;
- case 'x':
- /* %x00 == NUL, %x0a == LF, etc. */
- ch = hex2chr(placeholder + 1);
- if (ch < 0)
- return 0;
- strbuf_addch(sb, ch);
- return 3;
case 'w':
if (placeholder[1] == '(') {
unsigned long width = 0, indent1 = 0, indent2 = 0;
@@ -1143,7 +1193,7 @@
case '<':
case '>':
- return parse_padding_placeholder(sb, placeholder, c);
+ return parse_padding_placeholder(placeholder, c);
}
/* these depend on the commit */
@@ -1189,11 +1239,9 @@
strbuf_addstr(sb, get_revision_mark(NULL, commit));
return 1;
case 'd':
- load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations(sb, commit, c->auto_color);
return 1;
case 'D':
- load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations_extended(sb, commit, c->auto_color, "", ", ", "");
return 1;
case 'S': /* tag/branch like --source */
@@ -1322,24 +1370,53 @@
if (skip_prefix(placeholder, "(trailers", &arg)) {
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+ struct string_list filter_list = STRING_LIST_INIT_NODUP;
+ struct strbuf sepbuf = STRBUF_INIT;
+ size_t ret = 0;
opts.no_divider = 1;
if (*arg == ':') {
arg++;
for (;;) {
- if (match_placeholder_arg(arg, "only", &arg))
+ const char *argval;
+ size_t arglen;
+
+ if (match_placeholder_arg_value(arg, "key", &arg, &argval, &arglen)) {
+ uintptr_t len = arglen;
+
+ if (!argval)
+ goto trailer_out;
+
+ if (len && argval[len - 1] == ':')
+ len--;
+ string_list_append(&filter_list, argval)->util = (char *)len;
+
+ opts.filter = format_trailer_match_cb;
+ opts.filter_data = &filter_list;
opts.only_trailers = 1;
- else if (match_placeholder_arg(arg, "unfold", &arg))
- opts.unfold = 1;
- else
+ } else if (match_placeholder_arg_value(arg, "separator", &arg, &argval, &arglen)) {
+ char *fmt;
+
+ strbuf_reset(&sepbuf);
+ fmt = xstrndup(argval, arglen);
+ strbuf_expand(&sepbuf, fmt, strbuf_expand_literal_cb, NULL);
+ free(fmt);
+ opts.separator = &sepbuf;
+ } else if (!match_placeholder_bool_arg(arg, "only", &arg, &opts.only_trailers) &&
+ !match_placeholder_bool_arg(arg, "unfold", &arg, &opts.unfold) &&
+ !match_placeholder_bool_arg(arg, "valueonly", &arg, &opts.value_only))
break;
}
}
if (*arg == ')') {
format_trailers_from_commit(sb, msg + c->subject_off, &opts);
- return arg - placeholder + 1;
+ ret = arg - placeholder + 1;
}
+ trailer_out:
+ string_list_clear(&filter_list, 0);
+ strbuf_release(&sepbuf);
+ return ret;
}
return 0; /* unknown placeholder */
@@ -1647,7 +1724,7 @@
if (pp->print_email_subject) {
if (pp->rev)
fmt_output_email_subject(sb, pp->rev);
- if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
+ if (needs_rfc2047_encoding(title.buf, title.len))
add_rfc2047(sb, title.buf, title.len,
encoding, RFC2047_SUBJECT);
else
diff --git a/prio-queue.h b/prio-queue.h
index 682e518..4f9a37e 100644
--- a/prio-queue.h
+++ b/prio-queue.h
@@ -37,24 +37,24 @@
/*
* Add the "thing" to the queue.
*/
-extern void prio_queue_put(struct prio_queue *, void *thing);
+void prio_queue_put(struct prio_queue *, void *thing);
/*
* Extract the "thing" that compares the smallest out of the queue,
* or NULL. If compare function is NULL, the queue acts as a LIFO
* stack.
*/
-extern void *prio_queue_get(struct prio_queue *);
+void *prio_queue_get(struct prio_queue *);
/*
* Gain access to the "thing" that would be returned by
* prio_queue_get, but do not remove it from the queue.
*/
-extern void *prio_queue_peek(struct prio_queue *);
+void *prio_queue_peek(struct prio_queue *);
-extern void clear_prio_queue(struct prio_queue *);
+void clear_prio_queue(struct prio_queue *);
/* Reverse the LIFO elements */
-extern void prio_queue_reverse(struct prio_queue *);
+void prio_queue_reverse(struct prio_queue *);
#endif /* PRIO_QUEUE_H */
diff --git a/progress.c b/progress.c
index 5a99c9f..277db8a 100644
--- a/progress.c
+++ b/progress.c
@@ -8,11 +8,12 @@
* published by the Free Software Foundation.
*/
-#include "git-compat-util.h"
+#include "cache.h"
#include "gettext.h"
#include "progress.h"
#include "strbuf.h"
#include "trace.h"
+#include "utf8.h"
#define TP_IDX_MAX 8
@@ -34,8 +35,12 @@
uint64_t total;
unsigned last_percent;
unsigned delay;
+ unsigned sparse;
struct throughput *throughput;
uint64_t start_ns;
+ struct strbuf counters_sb;
+ int title_len;
+ int split;
};
static volatile sig_atomic_t progress_update;
@@ -78,41 +83,58 @@
return tpgrp < 0 || tpgrp == getpgid(0);
}
-static int display(struct progress *progress, uint64_t n, const char *done)
+static void display(struct progress *progress, uint64_t n, const char *done)
{
- const char *eol, *tp;
+ const char *tp;
+ struct strbuf *counters_sb = &progress->counters_sb;
+ int show_update = 0;
if (progress->delay && (!progress_update || --progress->delay))
- return 0;
+ return;
progress->last_value = n;
tp = (progress->throughput) ? progress->throughput->display.buf : "";
- eol = done ? done : " \r";
if (progress->total) {
unsigned percent = n * 100 / progress->total;
if (percent != progress->last_percent || progress_update) {
progress->last_percent = percent;
- if (is_foreground_fd(fileno(stderr)) || done) {
- fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s",
- progress->title, percent,
- (uintmax_t)n, (uintmax_t)progress->total,
- tp, eol);
- fflush(stderr);
- }
- progress_update = 0;
- return 1;
+
+ strbuf_reset(counters_sb);
+ strbuf_addf(counters_sb,
+ "%3u%% (%"PRIuMAX"/%"PRIuMAX")%s", percent,
+ (uintmax_t)n, (uintmax_t)progress->total,
+ tp);
+ show_update = 1;
}
} else if (progress_update) {
+ strbuf_reset(counters_sb);
+ strbuf_addf(counters_sb, "%"PRIuMAX"%s", (uintmax_t)n, tp);
+ show_update = 1;
+ }
+
+ if (show_update) {
if (is_foreground_fd(fileno(stderr)) || done) {
- fprintf(stderr, "%s: %"PRIuMAX"%s%s",
- progress->title, (uintmax_t)n, tp, eol);
+ const char *eol = done ? done : "\r";
+
+ term_clear_line();
+ if (progress->split) {
+ fprintf(stderr, " %s%s", counters_sb->buf,
+ eol);
+ } else if (!done &&
+ /* The "+ 2" accounts for the ": ". */
+ term_columns() < progress->title_len +
+ counters_sb->len + 2) {
+ fprintf(stderr, "%s:\n %s%s",
+ progress->title, counters_sb->buf, eol);
+ progress->split = 1;
+ } else {
+ fprintf(stderr, "%s: %s%s", progress->title,
+ counters_sb->buf, eol);
+ }
fflush(stderr);
}
progress_update = 0;
- return 1;
}
-
- return 0;
}
static void throughput_string(struct strbuf *buf, uint64_t total,
@@ -122,8 +144,7 @@
strbuf_addstr(buf, ", ");
strbuf_humanise_bytes(buf, total);
strbuf_addstr(buf, " | ");
- strbuf_humanise_bytes(buf, rate * 1024);
- strbuf_addstr(buf, "/s");
+ strbuf_humanise_rate(buf, rate * 1024);
}
void display_throughput(struct progress *progress, uint64_t total)
@@ -139,12 +160,10 @@
now_ns = getnanotime();
if (!tp) {
- progress->throughput = tp = calloc(1, sizeof(*tp));
- if (tp) {
- tp->prev_total = tp->curr_total = total;
- tp->prev_ns = now_ns;
- strbuf_init(&tp->display, 0);
- }
+ progress->throughput = tp = xcalloc(1, sizeof(*tp));
+ tp->prev_total = tp->curr_total = total;
+ tp->prev_ns = now_ns;
+ strbuf_init(&tp->display, 0);
return;
}
tp->curr_total = total;
@@ -188,44 +207,73 @@
display(progress, progress->last_value, NULL);
}
-int display_progress(struct progress *progress, uint64_t n)
+void display_progress(struct progress *progress, uint64_t n)
{
- return progress ? display(progress, n, NULL) : 0;
+ if (progress)
+ display(progress, n, NULL);
}
static struct progress *start_progress_delay(const char *title, uint64_t total,
- unsigned delay)
+ unsigned delay, unsigned sparse)
{
- struct progress *progress = malloc(sizeof(*progress));
- if (!progress) {
- /* unlikely, but here's a good fallback */
- fprintf(stderr, "%s...\n", title);
- fflush(stderr);
- return NULL;
- }
+ struct progress *progress = xmalloc(sizeof(*progress));
progress->title = title;
progress->total = total;
progress->last_value = -1;
progress->last_percent = -1;
progress->delay = delay;
+ progress->sparse = sparse;
progress->throughput = NULL;
progress->start_ns = getnanotime();
+ strbuf_init(&progress->counters_sb, 0);
+ progress->title_len = utf8_strwidth(title);
+ progress->split = 0;
set_progress_signal();
return progress;
}
struct progress *start_delayed_progress(const char *title, uint64_t total)
{
- return start_progress_delay(title, total, 2);
+ return start_progress_delay(title, total, 2, 0);
}
struct progress *start_progress(const char *title, uint64_t total)
{
- return start_progress_delay(title, total, 0);
+ return start_progress_delay(title, total, 0, 0);
+}
+
+/*
+ * Here "sparse" means that the caller might use some sampling criteria to
+ * decide when to call display_progress() rather than calling it for every
+ * integer value in[0 .. total). In particular, the caller might not call
+ * display_progress() for the last value in the range.
+ *
+ * When "sparse" is set, stop_progress() will automatically force the done
+ * message to show 100%.
+ */
+struct progress *start_sparse_progress(const char *title, uint64_t total)
+{
+ return start_progress_delay(title, total, 0, 1);
+}
+
+struct progress *start_delayed_sparse_progress(const char *title,
+ uint64_t total)
+{
+ return start_progress_delay(title, total, 2, 1);
+}
+
+static void finish_if_sparse(struct progress *progress)
+{
+ if (progress &&
+ progress->sparse &&
+ progress->last_value != progress->total)
+ display_progress(progress, progress->total);
}
void stop_progress(struct progress **p_progress)
{
+ finish_if_sparse(*p_progress);
+
stop_progress_msg(p_progress, _("done"));
}
@@ -253,6 +301,7 @@
free(buf);
}
clear_progress_signal();
+ strbuf_release(&progress->counters_sb);
if (progress->throughput)
strbuf_release(&progress->throughput->display);
free(progress->throughput);
diff --git a/progress.h b/progress.h
index 70a4d4a..8473389 100644
--- a/progress.h
+++ b/progress.h
@@ -4,9 +4,12 @@
struct progress;
void display_throughput(struct progress *progress, uint64_t total);
-int display_progress(struct progress *progress, uint64_t n);
+void display_progress(struct progress *progress, uint64_t n);
struct progress *start_progress(const char *title, uint64_t total);
+struct progress *start_sparse_progress(const char *title, uint64_t total);
struct progress *start_delayed_progress(const char *title, uint64_t total);
+struct progress *start_delayed_sparse_progress(const char *title,
+ uint64_t total);
void stop_progress(struct progress **progress);
void stop_progress_msg(struct progress **progress, const char *msg);
diff --git a/promisor-remote.c b/promisor-remote.c
new file mode 100644
index 0000000..9bc296c
--- /dev/null
+++ b/promisor-remote.c
@@ -0,0 +1,265 @@
+#include "cache.h"
+#include "object-store.h"
+#include "promisor-remote.h"
+#include "config.h"
+#include "transport.h"
+
+static char *repository_format_partial_clone;
+static const char *core_partial_clone_filter_default;
+
+void set_repository_format_partial_clone(char *partial_clone)
+{
+ repository_format_partial_clone = xstrdup_or_null(partial_clone);
+}
+
+static int fetch_refs(const char *remote_name, struct ref *ref)
+{
+ struct remote *remote;
+ struct transport *transport;
+ int original_fetch_if_missing = fetch_if_missing;
+ int res;
+
+ fetch_if_missing = 0;
+ remote = remote_get(remote_name);
+ if (!remote->url[0])
+ die(_("Remote with no URL"));
+ transport = transport_get(remote, remote->url[0]);
+
+ transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
+ transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
+ res = transport_fetch_refs(transport, ref);
+ fetch_if_missing = original_fetch_if_missing;
+
+ return res;
+}
+
+static int fetch_objects(const char *remote_name,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ struct ref *ref = NULL;
+ int i;
+
+ for (i = 0; i < oid_nr; i++) {
+ struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
+ oidcpy(&new_ref->old_oid, &oids[i]);
+ new_ref->exact_oid = 1;
+ new_ref->next = ref;
+ ref = new_ref;
+ }
+ return fetch_refs(remote_name, ref);
+}
+
+static struct promisor_remote *promisors;
+static struct promisor_remote **promisors_tail = &promisors;
+
+static struct promisor_remote *promisor_remote_new(const char *remote_name)
+{
+ struct promisor_remote *r;
+
+ if (*remote_name == '/') {
+ warning(_("promisor remote name cannot begin with '/': %s"),
+ remote_name);
+ return NULL;
+ }
+
+ FLEX_ALLOC_STR(r, name, remote_name);
+
+ *promisors_tail = r;
+ promisors_tail = &r->next;
+
+ return r;
+}
+
+static struct promisor_remote *promisor_remote_lookup(const char *remote_name,
+ struct promisor_remote **previous)
+{
+ struct promisor_remote *r, *p;
+
+ for (p = NULL, r = promisors; r; p = r, r = r->next)
+ if (!strcmp(r->name, remote_name)) {
+ if (previous)
+ *previous = p;
+ return r;
+ }
+
+ return NULL;
+}
+
+static void promisor_remote_move_to_tail(struct promisor_remote *r,
+ struct promisor_remote *previous)
+{
+ if (previous)
+ previous->next = r->next;
+ else
+ promisors = r->next ? r->next : r;
+ r->next = NULL;
+ *promisors_tail = r;
+ promisors_tail = &r->next;
+}
+
+static int promisor_remote_config(const char *var, const char *value, void *data)
+{
+ const char *name;
+ int namelen;
+ const char *subkey;
+
+ if (!strcmp(var, "core.partialclonefilter"))
+ return git_config_string(&core_partial_clone_filter_default,
+ var, value);
+
+ if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
+ return 0;
+
+ if (!strcmp(subkey, "promisor")) {
+ char *remote_name;
+
+ if (!git_config_bool(var, value))
+ return 0;
+
+ remote_name = xmemdupz(name, namelen);
+
+ if (!promisor_remote_lookup(remote_name, NULL))
+ promisor_remote_new(remote_name);
+
+ free(remote_name);
+ return 0;
+ }
+ if (!strcmp(subkey, "partialclonefilter")) {
+ struct promisor_remote *r;
+ char *remote_name = xmemdupz(name, namelen);
+
+ r = promisor_remote_lookup(remote_name, NULL);
+ if (!r)
+ r = promisor_remote_new(remote_name);
+
+ free(remote_name);
+
+ if (!r)
+ return 0;
+
+ return git_config_string(&r->partial_clone_filter, var, value);
+ }
+
+ return 0;
+}
+
+static int initialized;
+
+static void promisor_remote_init(void)
+{
+ if (initialized)
+ return;
+ initialized = 1;
+
+ git_config(promisor_remote_config, NULL);
+
+ if (repository_format_partial_clone) {
+ struct promisor_remote *o, *previous;
+
+ o = promisor_remote_lookup(repository_format_partial_clone,
+ &previous);
+ if (o)
+ promisor_remote_move_to_tail(o, previous);
+ else
+ promisor_remote_new(repository_format_partial_clone);
+ }
+}
+
+static void promisor_remote_clear(void)
+{
+ while (promisors) {
+ struct promisor_remote *r = promisors;
+ promisors = promisors->next;
+ free(r);
+ }
+
+ promisors_tail = &promisors;
+}
+
+void promisor_remote_reinit(void)
+{
+ initialized = 0;
+ promisor_remote_clear();
+ promisor_remote_init();
+}
+
+struct promisor_remote *promisor_remote_find(const char *remote_name)
+{
+ promisor_remote_init();
+
+ if (!remote_name)
+ return promisors;
+
+ return promisor_remote_lookup(remote_name, NULL);
+}
+
+int has_promisor_remote(void)
+{
+ return !!promisor_remote_find(NULL);
+}
+
+static int remove_fetched_oids(struct repository *repo,
+ struct object_id **oids,
+ int oid_nr, int to_free)
+{
+ int i, remaining_nr = 0;
+ int *remaining = xcalloc(oid_nr, sizeof(*remaining));
+ struct object_id *old_oids = *oids;
+ struct object_id *new_oids;
+
+ for (i = 0; i < oid_nr; i++)
+ if (oid_object_info_extended(repo, &old_oids[i], NULL,
+ OBJECT_INFO_SKIP_FETCH_OBJECT)) {
+ remaining[i] = 1;
+ remaining_nr++;
+ }
+
+ if (remaining_nr) {
+ int j = 0;
+ new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+ for (i = 0; i < oid_nr; i++)
+ if (remaining[i])
+ oidcpy(&new_oids[j++], &old_oids[i]);
+ *oids = new_oids;
+ if (to_free)
+ free(old_oids);
+ }
+
+ free(remaining);
+
+ return remaining_nr;
+}
+
+int promisor_remote_get_direct(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ struct promisor_remote *r;
+ struct object_id *remaining_oids = (struct object_id *)oids;
+ int remaining_nr = oid_nr;
+ int to_free = 0;
+ int res = -1;
+
+ promisor_remote_init();
+
+ for (r = promisors; r; r = r->next) {
+ if (fetch_objects(r->name, remaining_oids, remaining_nr) < 0) {
+ if (remaining_nr == 1)
+ continue;
+ remaining_nr = remove_fetched_oids(repo, &remaining_oids,
+ remaining_nr, to_free);
+ if (remaining_nr) {
+ to_free = 1;
+ continue;
+ }
+ }
+ res = 0;
+ break;
+ }
+
+ if (to_free)
+ free(remaining_oids);
+
+ return res;
+}
diff --git a/promisor-remote.h b/promisor-remote.h
new file mode 100644
index 0000000..8200dfc
--- /dev/null
+++ b/promisor-remote.h
@@ -0,0 +1,31 @@
+#ifndef PROMISOR_REMOTE_H
+#define PROMISOR_REMOTE_H
+
+struct object_id;
+
+/*
+ * Promisor remote linked list
+ *
+ * Information in its fields come from remote.XXX config entries or
+ * from extensions.partialclone or core.partialclonefilter.
+ */
+struct promisor_remote {
+ struct promisor_remote *next;
+ const char *partial_clone_filter;
+ const char name[FLEX_ARRAY];
+};
+
+extern void promisor_remote_reinit(void);
+extern struct promisor_remote *promisor_remote_find(const char *remote_name);
+extern int has_promisor_remote(void);
+extern int promisor_remote_get_direct(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr);
+
+/*
+ * This should be used only once from setup.c to set the value we got
+ * from the extensions.partialclone config option.
+ */
+extern void set_repository_format_partial_clone(char *partial_clone);
+
+#endif /* PROMISOR_REMOTE_H */
diff --git a/protocol.c b/protocol.c
index 5e63678..9741f05 100644
--- a/protocol.c
+++ b/protocol.c
@@ -17,6 +17,10 @@
enum protocol_version get_protocol_version_config(void)
{
const char *value;
+ enum protocol_version retval = protocol_v0;
+ const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
+ const char *git_test_v = getenv(git_test_k);
+
if (!git_config_get_string_const("protocol.version", &value)) {
enum protocol_version version = parse_protocol_version(value);
@@ -24,10 +28,19 @@
die("unknown value for config 'protocol.version': %s",
value);
- return version;
+ retval = version;
}
- return protocol_v0;
+ if (git_test_v && *git_test_v) {
+ enum protocol_version env = parse_protocol_version(git_test_v);
+
+ if (env == protocol_unknown_version)
+ die("unknown value for %s: %s", git_test_k, git_test_v);
+ if (retval < env)
+ retval = env;
+ }
+
+ return retval;
}
enum protocol_version determine_protocol_version_server(void)
diff --git a/protocol.h b/protocol.h
index 2ad35e4..cef1a4a 100644
--- a/protocol.h
+++ b/protocol.h
@@ -14,7 +14,7 @@
* 'protocol.version' config. If unconfigured, a value of 'protocol_v0' is
* returned.
*/
-extern enum protocol_version get_protocol_version_config(void);
+enum protocol_version get_protocol_version_config(void);
/*
* Used by a server to determine which protocol version should be used based on
@@ -23,12 +23,12 @@
* request a particular protocol version, a default of 'protocol_v0' will be
* used.
*/
-extern enum protocol_version determine_protocol_version_server(void);
+enum protocol_version determine_protocol_version_server(void);
/*
* Used by a client to determine which protocol version the server is speaking
* based on the server's initial response.
*/
-extern enum protocol_version determine_protocol_version_client(const char *server_response);
+enum protocol_version determine_protocol_version_client(const char *server_response);
#endif /* PROTOCOL_H */
diff --git a/quote.c b/quote.c
index 7f2aa6f..c8ba6b3 100644
--- a/quote.c
+++ b/quote.c
@@ -84,12 +84,28 @@
}
}
+/*
+ * Legacy function to append each argv value, quoted as necessasry,
+ * with whitespace before each value. This results in a leading
+ * space in the result.
+ */
void sq_quote_argv_pretty(struct strbuf *dst, const char **argv)
{
+ if (argv[0])
+ strbuf_addch(dst, ' ');
+ sq_append_quote_argv_pretty(dst, argv);
+}
+
+/*
+ * Append each argv value, quoted as necessary, with whitespace between them.
+ */
+void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv)
+{
int i;
for (i = 0; argv[i]; i++) {
- strbuf_addch(dst, ' ');
+ if (i > 0)
+ strbuf_addch(dst, ' ');
sq_quote_buf_pretty(dst, argv[i]);
}
}
diff --git a/quote.h b/quote.h
index ea992dc..ca8ee31 100644
--- a/quote.h
+++ b/quote.h
@@ -29,9 +29,9 @@
* sq_quotef() quotes the entire formatted string as a single result.
*/
-extern void sq_quote_buf(struct strbuf *, const char *src);
-extern void sq_quote_argv(struct strbuf *, const char **argv);
-extern void sq_quotef(struct strbuf *, const char *fmt, ...);
+void sq_quote_buf(struct strbuf *, const char *src);
+void sq_quote_argv(struct strbuf *, const char **argv);
+void sq_quotef(struct strbuf *, const char *fmt, ...);
/*
* These match their non-pretty variants, except that they avoid
@@ -40,19 +40,20 @@
*/
void sq_quote_buf_pretty(struct strbuf *, const char *src);
void sq_quote_argv_pretty(struct strbuf *, const char **argv);
+void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv);
/* This unwraps what sq_quote() produces in place, but returns
* NULL if the input does not look like what sq_quote would have
* produced.
*/
-extern char *sq_dequote(char *);
+char *sq_dequote(char *);
/*
* Same as the above, but can be used to unwrap many arguments in the
* same string separated by space. Like sq_quote, it works in place,
* modifying arg and appending pointers into it to argv.
*/
-extern int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc);
+int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc);
/*
* Same as above, but store the unquoted strings in an argv_array. We will
@@ -60,24 +61,24 @@
* will duplicate and take ownership of the strings.
*/
struct argv_array;
-extern int sq_dequote_to_argv_array(char *arg, struct argv_array *);
+int sq_dequote_to_argv_array(char *arg, struct argv_array *);
-extern int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
-extern size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq);
-extern void quote_two_c_style(struct strbuf *, const char *, const char *, int);
+int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
+size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq);
+void quote_two_c_style(struct strbuf *, const char *, const char *, int);
-extern void write_name_quoted(const char *name, FILE *, int terminator);
-extern void write_name_quoted_relative(const char *name, const char *prefix,
- FILE *fp, int terminator);
+void write_name_quoted(const char *name, FILE *, int terminator);
+void write_name_quoted_relative(const char *name, const char *prefix,
+ FILE *fp, int terminator);
/* quote path as relative to the given prefix */
-extern char *quote_path_relative(const char *in, const char *prefix,
+char *quote_path_relative(const char *in, const char *prefix,
struct strbuf *out);
/* quoting as a string literal for other languages */
-extern void perl_quote_buf(struct strbuf *sb, const char *src);
-extern void python_quote_buf(struct strbuf *sb, const char *src);
-extern void tcl_quote_buf(struct strbuf *sb, const char *src);
-extern void basic_regex_quote_buf(struct strbuf *sb, const char *src);
+void perl_quote_buf(struct strbuf *sb, const char *src);
+void python_quote_buf(struct strbuf *sb, const char *src);
+void tcl_quote_buf(struct strbuf *sb, const char *src);
+void basic_regex_quote_buf(struct strbuf *sb, const char *src);
#endif
diff --git a/range-diff.c b/range-diff.c
index 48b0e1b..ba1e9a4 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -10,6 +10,7 @@
#include "commit.h"
#include "pretty.h"
#include "userdiff.h"
+#include "apply.h"
struct patch_util {
/* For the search for an exact match */
@@ -24,6 +25,17 @@
struct object_id oid;
};
+static size_t find_end_of_line(char *buffer, unsigned long size)
+{
+ char *eol = memchr(buffer, '\n', size);
+
+ if (!eol)
+ return size;
+
+ *eol = '\0';
+ return eol + 1 - buffer;
+}
+
/*
* Reads the patches into a string list, with the `util` field being populated
* as struct object_id (will need to be free()d).
@@ -31,10 +43,12 @@
static int read_patches(const char *range, struct string_list *list)
{
struct child_process cp = CHILD_PROCESS_INIT;
- FILE *in;
- struct strbuf buf = STRBUF_INIT, line = STRBUF_INIT;
+ struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
struct patch_util *util = NULL;
int in_header = 1;
+ char *line, *current_filename = NULL;
+ int offset, len;
+ size_t size;
argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
"--reverse", "--date-order", "--decorate=no",
@@ -54,17 +68,20 @@
if (start_command(&cp))
return error_errno(_("could not start `log`"));
- in = fdopen(cp.out, "r");
- if (!in) {
+ if (strbuf_read(&contents, cp.out, 0) < 0) {
error_errno(_("could not read `log` output"));
finish_command(&cp);
return -1;
}
- while (strbuf_getline(&line, in) != EOF) {
+ line = contents.buf;
+ size = contents.len;
+ for (offset = 0; size > 0; offset += len, size -= len, line += len) {
const char *p;
- if (skip_prefix(line.buf, "commit ", &p)) {
+ len = find_end_of_line(line, size);
+ line[len - 1] = '\0';
+ if (skip_prefix(line, "commit ", &p)) {
if (util) {
string_list_append(list, buf.buf)->util = util;
strbuf_reset(&buf);
@@ -75,8 +92,7 @@
free(util);
string_list_clear(list, 1);
strbuf_release(&buf);
- strbuf_release(&line);
- fclose(in);
+ strbuf_release(&contents);
finish_command(&cp);
return -1;
}
@@ -85,61 +101,95 @@
continue;
}
- if (starts_with(line.buf, "diff --git")) {
+ if (starts_with(line, "diff --git")) {
+ struct patch patch = { 0 };
+ struct strbuf root = STRBUF_INIT;
+ int linenr = 0;
+
in_header = 0;
strbuf_addch(&buf, '\n');
if (!util->diff_offset)
util->diff_offset = buf.len;
- strbuf_addch(&buf, ' ');
- strbuf_addbuf(&buf, &line);
+ line[len - 1] = '\n';
+ len = parse_git_diff_header(&root, &linenr, 1, line,
+ len, size, &patch);
+ if (len < 0)
+ die(_("could not parse git header '%.*s'"), (int)len, line);
+ strbuf_addstr(&buf, " ## ");
+ if (patch.is_new > 0)
+ strbuf_addf(&buf, "%s (new)", patch.new_name);
+ else if (patch.is_delete > 0)
+ strbuf_addf(&buf, "%s (deleted)", patch.old_name);
+ else if (patch.is_rename)
+ strbuf_addf(&buf, "%s => %s", patch.old_name, patch.new_name);
+ else
+ strbuf_addstr(&buf, patch.new_name);
+
+ free(current_filename);
+ if (patch.is_delete > 0)
+ current_filename = xstrdup(patch.old_name);
+ else
+ current_filename = xstrdup(patch.new_name);
+
+ if (patch.new_mode && patch.old_mode &&
+ patch.old_mode != patch.new_mode)
+ strbuf_addf(&buf, " (mode change %06o => %06o)",
+ patch.old_mode, patch.new_mode);
+
+ strbuf_addstr(&buf, " ##");
} else if (in_header) {
- if (starts_with(line.buf, "Author: ")) {
- strbuf_addbuf(&buf, &line);
+ if (starts_with(line, "Author: ")) {
+ strbuf_addstr(&buf, " ## Metadata ##\n");
+ strbuf_addstr(&buf, line);
strbuf_addstr(&buf, "\n\n");
- } else if (starts_with(line.buf, " ")) {
- strbuf_rtrim(&line);
- strbuf_addbuf(&buf, &line);
+ strbuf_addstr(&buf, " ## Commit message ##\n");
+ } else if (starts_with(line, " ")) {
+ p = line + len - 2;
+ while (isspace(*p) && p >= line)
+ p--;
+ strbuf_add(&buf, line, p - line + 1);
strbuf_addch(&buf, '\n');
}
continue;
- } else if (starts_with(line.buf, "@@ "))
+ } else if (skip_prefix(line, "@@ ", &p)) {
+ p = strstr(p, "@@");
strbuf_addstr(&buf, "@@");
- else if (!line.buf[0] || starts_with(line.buf, "index "))
+ if (current_filename && p[2])
+ strbuf_addf(&buf, " %s:", current_filename);
+ if (p)
+ strbuf_addstr(&buf, p + 2);
+ } else if (!line[0])
/*
* A completely blank (not ' \n', which is context)
* line is not valid in a diff. We skip it
* silently, because this neatly handles the blank
* separator line between commits in git-log
* output.
- *
- * We also want to ignore the diff's `index` lines
- * because they contain exact blob hashes in which
- * we are not interested.
*/
continue;
- else if (line.buf[0] == '>') {
+ else if (line[0] == '>') {
strbuf_addch(&buf, '+');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
- } else if (line.buf[0] == '<') {
+ strbuf_addstr(&buf, line + 1);
+ } else if (line[0] == '<') {
strbuf_addch(&buf, '-');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
- } else if (line.buf[0] == '#') {
+ strbuf_addstr(&buf, line + 1);
+ } else if (line[0] == '#') {
strbuf_addch(&buf, ' ');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
+ strbuf_addstr(&buf, line + 1);
} else {
strbuf_addch(&buf, ' ');
- strbuf_addbuf(&buf, &line);
+ strbuf_addstr(&buf, line);
}
strbuf_addch(&buf, '\n');
util->diffsize++;
}
- fclose(in);
- strbuf_release(&line);
+ strbuf_release(&contents);
if (util)
string_list_append(list, buf.buf)->util = util;
strbuf_release(&buf);
+ free(current_filename);
if (finish_command(&cp))
return -1;
@@ -148,7 +198,7 @@
}
static int patch_util_cmp(const void *dummy, const struct patch_util *a,
- const struct patch_util *b, const char *keydata)
+ const struct patch_util *b, const char *keydata)
{
return strcmp(a->diff, keydata ? keydata : b->diff);
}
@@ -354,8 +404,9 @@
fwrite(buf->buf, buf->len, 1, diffopt->file);
}
-static struct userdiff_driver no_func_name = {
- .funcname = { "$^", 0 }
+static struct userdiff_driver section_headers = {
+ .funcname = { "^ ## (.*) ##$\n"
+ "^.?@@ (.*)$", REG_EXTENDED }
};
static struct diff_filespec *get_filespec(const char *name, const char *p)
@@ -367,13 +418,13 @@
spec->size = strlen(p);
spec->should_munmap = 0;
spec->is_stdin = 1;
- spec->driver = &no_func_name;
+ spec->driver = §ion_headers;
return spec;
}
static void patch_diff(const char *a, const char *b,
- struct diff_options *diffopt)
+ struct diff_options *diffopt)
{
diff_queue(&diff_queued_diff,
get_filespec("a", a), get_filespec("b", b));
@@ -469,6 +520,7 @@
opts.output_format = DIFF_FORMAT_PATCH;
opts.flags.suppress_diff_headers = 1;
opts.flags.dual_color_diffed_diffs = dual_color;
+ opts.flags.suppress_hunk_header_line_count = 1;
opts.output_prefix = output_prefix_cb;
strbuf_addstr(&indent, " ");
opts.output_prefix_data = &indent;
diff --git a/reachable.c b/reachable.c
index 6e9b810..8f50235 100644
--- a/reachable.c
+++ b/reachable.c
@@ -12,6 +12,7 @@
#include "packfile.h"
#include "worktree.h"
#include "object-store.h"
+#include "pack-bitmap.h"
struct connectivity_progress {
struct progress *progress;
@@ -108,7 +109,7 @@
const char *path, void *data)
{
struct stat st;
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
@@ -133,7 +134,7 @@
struct packed_git *p, uint32_t pos,
void *data)
{
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
@@ -158,10 +159,44 @@
FOR_EACH_OBJECT_LOCAL_ONLY);
}
+static void *lookup_object_by_type(struct repository *r,
+ const struct object_id *oid,
+ enum object_type type)
+{
+ switch (type) {
+ case OBJ_COMMIT:
+ return lookup_commit(r, oid);
+ case OBJ_TREE:
+ return lookup_tree(r, oid);
+ case OBJ_TAG:
+ return lookup_tag(r, oid);
+ case OBJ_BLOB:
+ return lookup_blob(r, oid);
+ default:
+ die("BUG: unknown object type %d", type);
+ }
+}
+
+static int mark_object_seen(const struct object_id *oid,
+ enum object_type type,
+ int exclude,
+ uint32_t name_hash,
+ struct packed_git *found_pack,
+ off_t found_offset)
+{
+ struct object *obj = lookup_object_by_type(the_repository, oid, type);
+ if (!obj)
+ die("unable to create object '%s'", oid_to_hex(oid));
+
+ obj->flags |= SEEN;
+ return 0;
+}
+
void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
timestamp_t mark_recent, struct progress *progress)
{
struct connectivity_progress cp;
+ struct bitmap_index *bitmap_git;
/*
* Set up revision parsing, and mark us as being interested
@@ -188,6 +223,13 @@
cp.progress = progress;
cp.count = 0;
+ bitmap_git = prepare_bitmap_walk(revs);
+ if (bitmap_git) {
+ traverse_bitmap_commit_list(bitmap_git, mark_object_seen);
+ free_bitmap_index(bitmap_git);
+ return;
+ }
+
/*
* Set up the revision walk - this will move all commits
* from the pending list to the commit walking list.
diff --git a/reachable.h b/reachable.h
index 18b0f9f..5df932a 100644
--- a/reachable.h
+++ b/reachable.h
@@ -4,9 +4,9 @@
struct progress;
struct rev_info;
-extern int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
- timestamp_t timestamp);
-extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
- timestamp_t mark_recent, struct progress *);
+int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
+ timestamp_t timestamp);
+void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
+ timestamp_t mark_recent, struct progress *);
#endif
diff --git a/read-cache.c b/read-cache.c
index 0e0c93e..2c14094 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -17,6 +17,7 @@
#include "commit.h"
#include "blob.h"
#include "resolve-undo.h"
+#include "run-command.h"
#include "strbuf.h"
#include "varint.h"
#include "split-index.h"
@@ -194,7 +195,7 @@
* cache, ie the parts that aren't tracked by GIT, and only used
* to validate the cache.
*/
-void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
+void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
{
fill_stat_data(&ce->ce_stat_data, st);
@@ -203,7 +204,7 @@
if (S_ISREG(st->st_mode)) {
ce_mark_uptodate(ce);
- mark_fsmonitor_valid(ce);
+ mark_fsmonitor_valid(istate, ce);
}
}
@@ -548,7 +549,7 @@
first = 0;
last = istate->cache_nr;
while (last > first) {
- int next = (last + first) >> 1;
+ int next = first + ((last - first) >> 1);
struct cache_entry *ce = istate->cache[next];
int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
if (!cmp)
@@ -588,13 +589,19 @@
* CE_REMOVE is set in ce_flags. This is much more effective than
* calling remove_index_entry_at() for each entry to be removed.
*/
-void remove_marked_cache_entries(struct index_state *istate)
+void remove_marked_cache_entries(struct index_state *istate, int invalidate)
{
struct cache_entry **ce_array = istate->cache;
unsigned int i, j;
for (i = j = 0; i < istate->cache_nr; i++) {
if (ce_array[i]->ce_flags & CE_REMOVE) {
+ if (invalidate) {
+ cache_tree_invalidate_path(istate,
+ ce_array[i]->name);
+ untracked_cache_remove_from_index(istate,
+ ce_array[i]->name);
+ }
remove_name_hash(istate, ce_array[i]);
save_or_free_index_entry(istate, ce_array[i]);
}
@@ -702,6 +709,7 @@
int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
(intent_only ? ADD_CACHE_NEW_ONLY : 0));
int hash_flags = HASH_WRITE_OBJECT;
+ struct object_id oid;
if (flags & ADD_CACHE_RENORMALIZE)
hash_flags |= HASH_RENORMALIZE;
@@ -711,6 +719,8 @@
namelen = strlen(path);
if (S_ISDIR(st_mode)) {
+ if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
+ return error(_("'%s' does not have a commit checked out"), path);
while (namelen && path[namelen-1] == '/')
namelen--;
}
@@ -718,7 +728,7 @@
memcpy(ce->name, path, namelen);
ce->ce_namelen = namelen;
if (!intent_only)
- fill_stat_cache_info(ce, st);
+ fill_stat_cache_info(istate, ce, st);
else
ce->ce_flags |= CE_INTENT_TO_ADD;
@@ -1422,7 +1432,7 @@
*/
if (!S_ISGITLINK(ce->ce_mode)) {
ce_mark_uptodate(ce);
- mark_fsmonitor_valid(ce);
+ mark_fsmonitor_valid(istate, ce);
}
return ce;
}
@@ -1437,7 +1447,7 @@
updated = make_empty_cache_entry(istate, ce_namelen(ce));
copy_cache_entry(updated, ce);
memcpy(updated->name, ce->name, ce->ce_namelen + 1);
- fill_stat_cache_info(updated, &st);
+ fill_stat_cache_info(istate, updated, &st);
/*
* If ignore_valid is not set, we should leave CE_VALID bit
* alone. Otherwise, paths marked with --no-assume-unchanged
@@ -1462,6 +1472,27 @@
printf(fmt, name);
}
+int repo_refresh_and_write_index(struct repository *repo,
+ unsigned int refresh_flags,
+ unsigned int write_flags,
+ int gentle,
+ const struct pathspec *pathspec,
+ char *seen, const char *header_msg)
+{
+ struct lock_file lock_file = LOCK_INIT;
+ int fd, ret = 0;
+
+ fd = repo_hold_locked_index(repo, &lock_file, 0);
+ if (!gentle && fd < 0)
+ return -1;
+ if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg))
+ ret = 1;
+ if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags))
+ ret = -1;
+ return ret;
+}
+
+
int refresh_index(struct index_state *istate, unsigned int flags,
const struct pathspec *pathspec,
char *seen, const char *header_msg)
@@ -1589,16 +1620,17 @@
#define INDEX_FORMAT_DEFAULT 3
-static unsigned int get_index_format_default(void)
+static unsigned int get_index_format_default(struct repository *r)
{
char *envversion = getenv("GIT_INDEX_VERSION");
char *endp;
- int value;
unsigned int version = INDEX_FORMAT_DEFAULT;
if (!envversion) {
- if (!git_config_get_int("index.version", &value))
- version = value;
+ prepare_repo_settings(r);
+
+ if (r->settings.index_version >= 0)
+ version = r->settings.index_version;
if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
warning(_("index.version set, but the value is invalid.\n"
"Using version %i"), INDEX_FORMAT_DEFAULT);
@@ -1634,39 +1666,24 @@
uint32_t uid;
uint32_t gid;
uint32_t size;
- unsigned char sha1[20];
- uint16_t flags;
- char name[FLEX_ARRAY]; /* more */
-};
-
-/*
- * This struct is used when CE_EXTENDED bit is 1
- * The struct must match ondisk_cache_entry exactly from
- * ctime till flags
- */
-struct ondisk_cache_entry_extended {
- struct cache_time ctime;
- struct cache_time mtime;
- uint32_t dev;
- uint32_t ino;
- uint32_t mode;
- uint32_t uid;
- uint32_t gid;
- uint32_t size;
- unsigned char sha1[20];
- uint16_t flags;
- uint16_t flags2;
- char name[FLEX_ARRAY]; /* more */
+ /*
+ * unsigned char hash[hashsz];
+ * uint16_t flags;
+ * if (flags & CE_EXTENDED)
+ * uint16_t flags2;
+ */
+ unsigned char data[GIT_MAX_RAWSZ + 2 * sizeof(uint16_t)];
+ char name[FLEX_ARRAY];
};
/* These are only used for v3 or lower */
#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
-#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
+#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7)
#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
-#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
-#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
- ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
- ondisk_cache_entry_size(ce_namelen(ce)))
+#define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \
+ ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len)
+#define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len))
+#define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce))))
/* Allow fsck to force verification of the index checksum. */
int verify_index_checksum;
@@ -1740,6 +1757,8 @@
struct cache_entry *ce;
size_t len;
const char *name;
+ const unsigned hashsz = the_hash_algo->rawsz;
+ const uint16_t *flagsp = (const uint16_t *)(ondisk->data + hashsz);
unsigned int flags;
size_t copy_len = 0;
/*
@@ -1752,22 +1771,20 @@
int expand_name_field = version == 4;
/* On-disk flags are just 16 bits */
- flags = get_be16(&ondisk->flags);
+ flags = get_be16(flagsp);
len = flags & CE_NAMEMASK;
if (flags & CE_EXTENDED) {
- struct ondisk_cache_entry_extended *ondisk2;
int extended_flags;
- ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
- extended_flags = get_be16(&ondisk2->flags2) << 16;
+ extended_flags = get_be16(flagsp + 1) << 16;
/* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
if (extended_flags & ~CE_EXTENDED_FLAGS)
die(_("unknown index entry format 0x%08x"), extended_flags);
flags |= extended_flags;
- name = ondisk2->name;
+ name = (const char *)(flagsp + 2);
}
else
- name = ondisk->name;
+ name = (const char *)(flagsp + 1);
if (expand_name_field) {
const unsigned char *cp = (const unsigned char *)name;
@@ -1806,7 +1823,9 @@
ce->ce_flags = flags & ~CE_NAMEMASK;
ce->ce_namelen = len;
ce->index = 0;
- hashcpy(ce->oid.hash, ondisk->sha1);
+ hashcpy(ce->oid.hash, ondisk->data);
+ memcpy(ce->name, name, len);
+ ce->name[len] = '\0';
if (expand_name_field) {
if (copy_len)
@@ -1847,18 +1866,17 @@
static void tweak_untracked_cache(struct index_state *istate)
{
- switch (git_config_get_untracked_cache()) {
- case -1: /* keep: do nothing */
- break;
- case 0: /* false */
+ struct repository *r = the_repository;
+
+ prepare_repo_settings(r);
+
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) {
remove_untracked_cache(istate);
- break;
- case 1: /* true */
- add_untracked_cache(istate);
- break;
- default: /* unknown value: do nothing */
- break;
+ return;
}
+
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+ add_untracked_cache(istate);
}
static void tweak_split_index(struct index_state *istate)
@@ -2040,7 +2058,7 @@
}
static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size,
- unsigned long src_offset, int nr_threads, struct index_entry_offset_table *ieot)
+ int nr_threads, struct index_entry_offset_table *ieot)
{
int i, offset, ieot_blocks, ieot_start, err;
struct load_cache_entries_thread_data *data;
@@ -2143,7 +2161,7 @@
if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz)
die(_("%s: index file smaller than expected"), path);
- mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (mmap == MAP_FAILED)
die_errno(_("%s: unable to map index file"), path);
close(fd);
@@ -2201,7 +2219,7 @@
ieot = read_ieot_extension(mmap, mmap_size, extension_offset);
if (ieot) {
- src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, src_offset, nr_threads, ieot);
+ src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot);
free(ieot);
} else {
src_offset += load_all_cache_entries(istate, mmap, mmap_size, src_offset);
@@ -2220,6 +2238,16 @@
load_index_extensions(&p);
}
munmap((void *)mmap, mmap_size);
+
+ /*
+ * TODO trace2: replace "the_repository" with the actual repo instance
+ * that is associated with the given "istate".
+ */
+ trace2_data_intmax("index", the_repository, "read/version",
+ istate->version);
+ trace2_data_intmax("index", the_repository, "read/cache_nr",
+ istate->cache_nr);
+
return istate->cache_nr;
unmap:
@@ -2251,9 +2279,17 @@
if (istate->initialized)
return istate->cache_nr;
+ /*
+ * TODO trace2: replace "the_repository" with the actual repo instance
+ * that is associated with the given "istate".
+ */
+ trace2_region_enter_printf("index", "do_read_index", the_repository,
+ "%s", path);
trace_performance_enter();
ret = do_read_index(istate, path, 0);
trace_performance_leave("read cache %s", path);
+ trace2_region_leave_printf("index", "do_read_index", the_repository,
+ "%s", path);
split_index = istate->split_index;
if (!split_index || is_null_oid(&split_index->base_oid)) {
@@ -2269,7 +2305,11 @@
base_oid_hex = oid_to_hex(&split_index->base_oid);
base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
+ trace2_region_enter_printf("index", "shared/do_read_index",
+ the_repository, "%s", base_path);
ret = do_read_index(split_index->base, base_path, 1);
+ trace2_region_leave_printf("index", "shared/do_read_index",
+ the_repository, "%s", base_path);
if (!oideq(&split_index->base_oid, &split_index->base->oid))
die(_("broken index, expect %s in %s, got %s"),
base_oid_hex, base_path,
@@ -2307,6 +2347,7 @@
free_name_hash(istate);
cache_tree_free(&(istate->cache_tree));
istate->initialized = 0;
+ istate->fsmonitor_has_run_once = 0;
FREE_AND_NULL(istate->cache);
istate->cache_alloc = 0;
discard_split_index(istate);
@@ -2528,6 +2569,8 @@
struct cache_entry *ce)
{
short flags;
+ const unsigned hashsz = the_hash_algo->rawsz;
+ uint16_t *flagsp = (uint16_t *)(ondisk->data + hashsz);
ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
@@ -2539,15 +2582,13 @@
ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
ondisk->size = htonl(ce->ce_stat_data.sd_size);
- hashcpy(ondisk->sha1, ce->oid.hash);
+ hashcpy(ondisk->data, ce->oid.hash);
flags = ce->ce_flags & ~CE_NAMEMASK;
flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
- ondisk->flags = htons(flags);
+ flagsp[0] = htons(flags);
if (ce->ce_flags & CE_EXTENDED) {
- struct ondisk_cache_entry_extended *ondisk2;
- ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
- ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
+ flagsp[1] = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
}
}
@@ -2566,10 +2607,7 @@
stripped_name = 1;
}
- if (ce->ce_flags & CE_EXTENDED)
- size = offsetof(struct ondisk_cache_entry_extended, name);
- else
- size = offsetof(struct ondisk_cache_entry, name);
+ size = offsetof(struct ondisk_cache_entry,data) + ondisk_data_size(ce->ce_flags, 0);
if (!previous_name) {
int len = ce_namelen(ce);
@@ -2727,7 +2765,7 @@
struct cache_entry **cache = istate->cache;
int entries = istate->cache_nr;
struct stat st;
- struct ondisk_cache_entry_extended ondisk;
+ struct ondisk_cache_entry ondisk;
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
int drop_cache_tree = istate->drop_cache_tree;
off_t offset;
@@ -2748,7 +2786,7 @@
}
if (!istate->version) {
- istate->version = get_index_format_default();
+ istate->version = get_index_format_default(the_repository);
if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
init_split_index(istate);
}
@@ -2894,7 +2932,8 @@
return -1;
}
- if (!strip_extensions && istate->split_index) {
+ if (!strip_extensions && istate->split_index &&
+ !is_null_oid(&istate->split_index->base_oid)) {
struct strbuf sb = STRBUF_INIT;
err = write_link_extension(&sb, istate) < 0 ||
@@ -2976,6 +3015,16 @@
istate->timestamp.sec = (unsigned int)st.st_mtime;
istate->timestamp.nsec = ST_MTIME_NSEC(st);
trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed);
+
+ /*
+ * TODO trace2: replace "the_repository" with the actual repo instance
+ * that is associated with the given "istate".
+ */
+ trace2_data_intmax("index", the_repository, "write/version",
+ istate->version);
+ trace2_data_intmax("index", the_repository, "write/cache_nr",
+ istate->cache_nr);
+
return 0;
}
@@ -2995,12 +3044,32 @@
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
unsigned flags)
{
- int ret = do_write_index(istate, lock->tempfile, 0);
+ int ret;
+
+ /*
+ * TODO trace2: replace "the_repository" with the actual repo instance
+ * that is associated with the given "istate".
+ */
+ trace2_region_enter_printf("index", "do_write_index", the_repository,
+ "%s", lock->tempfile->filename.buf);
+ ret = do_write_index(istate, lock->tempfile, 0);
+ trace2_region_leave_printf("index", "do_write_index", the_repository,
+ "%s", lock->tempfile->filename.buf);
+
if (ret)
return ret;
if (flags & COMMIT_LOCK)
- return commit_locked_index(lock);
- return close_lock_file_gently(lock);
+ ret = commit_locked_index(lock);
+ else
+ ret = close_lock_file_gently(lock);
+
+ run_hook_le(NULL, "post-index-change",
+ istate->updated_workdir ? "1" : "0",
+ istate->updated_skipworktree ? "1" : "0", NULL);
+ istate->updated_workdir = 0;
+ istate->updated_skipworktree = 0;
+
+ return ret;
}
static int write_split_index(struct index_state *istate,
@@ -3080,7 +3149,13 @@
int ret;
move_cache_to_base_index(istate);
+
+ trace2_region_enter_printf("index", "shared/do_write_index",
+ the_repository, "%s", (*temp)->filename.buf);
ret = do_write_index(si->base, *temp, 1);
+ trace2_region_leave_printf("index", "shared/do_write_index",
+ the_repository, "%s", (*temp)->filename.buf);
+
if (ret)
return ret;
ret = adjust_shared_perm(get_tempfile_path(*temp));
@@ -3189,7 +3264,7 @@
ret = write_split_index(istate, lock, flags);
/* Freshen the shared index only if the split-index was written */
- if (!ret && !new_shared_index) {
+ if (!ret && !new_shared_index && !is_null_oid(&si->base_oid)) {
const char *shared_index = git_path("sharedindex.%s",
oid_to_hex(&si->base_oid));
freshen_shared_index(shared_index, 1);
diff --git a/rebase-interactive.c b/rebase-interactive.c
index 68aff1d..aa18ae8 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -1,10 +1,35 @@
#include "cache.h"
#include "commit.h"
-#include "rebase-interactive.h"
#include "sequencer.h"
+#include "rebase-interactive.h"
#include "strbuf.h"
+#include "commit-slab.h"
+#include "config.h"
-void append_todo_help(unsigned edit_todo, unsigned keep_empty,
+enum missing_commit_check_level {
+ MISSING_COMMIT_CHECK_IGNORE = 0,
+ MISSING_COMMIT_CHECK_WARN,
+ MISSING_COMMIT_CHECK_ERROR
+};
+
+static enum missing_commit_check_level get_missing_commit_check_level(void)
+{
+ const char *value;
+
+ if (git_config_get_value("rebase.missingcommitscheck", &value) ||
+ !strcasecmp("ignore", value))
+ return MISSING_COMMIT_CHECK_IGNORE;
+ if (!strcasecmp("warn", value))
+ return MISSING_COMMIT_CHECK_WARN;
+ if (!strcasecmp("error", value))
+ return MISSING_COMMIT_CHECK_ERROR;
+ warning(_("unrecognized setting %s for option "
+ "rebase.missingCommitsCheck. Ignoring."), value);
+ return MISSING_COMMIT_CHECK_IGNORE;
+}
+
+void append_todo_help(unsigned keep_empty, int command_count,
+ const char *shortrevisions, const char *shortonto,
struct strbuf *buf)
{
const char *msg = _("\nCommands:\n"
@@ -24,6 +49,15 @@
". 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");
+ unsigned edit_todo = !(shortrevisions && shortonto);
+
+ if (!edit_todo) {
+ strbuf_addch(buf, '\n');
+ strbuf_commented_addf(buf, Q_("Rebase %s onto %s (%d command)",
+ "Rebase %s onto %s (%d commands)",
+ command_count),
+ shortrevisions, shortonto, command_count);
+ }
strbuf_add_commented_lines(buf, msg, strlen(msg));
@@ -53,39 +87,103 @@
}
}
-int edit_todo_list(struct repository *r, unsigned flags)
+int edit_todo_list(struct repository *r, struct todo_list *todo_list,
+ struct todo_list *new_todo, const char *shortrevisions,
+ const char *shortonto, unsigned flags)
{
- struct strbuf buf = STRBUF_INIT;
const char *todo_file = rebase_path_todo();
+ unsigned initial = shortrevisions && shortonto;
- if (strbuf_read_file(&buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
+ /* If the user is editing the todo list, we first try to parse
+ * it. If there is an error, we do not return, because the user
+ * might want to fix it in the first place. */
+ if (!initial)
+ todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
- strbuf_stripspace(&buf, 1);
- if (write_message(buf.buf, buf.len, todo_file, 0)) {
- strbuf_release(&buf);
- return -1;
- }
+ if (todo_list_write_to_file(r, todo_list, todo_file, shortrevisions, shortonto,
+ -1, flags | TODO_LIST_SHORTEN_IDS | TODO_LIST_APPEND_TODO_HELP))
+ return error_errno(_("could not write '%s'"), todo_file);
- strbuf_release(&buf);
+ if (initial && copy_file(rebase_path_todo_backup(), todo_file, 0666))
+ return error(_("could not copy '%s' to '%s'."), todo_file,
+ rebase_path_todo_backup());
- transform_todos(r, flags | TODO_LIST_SHORTEN_IDS);
+ if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
+ return -2;
- if (strbuf_read_file(&buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
+ strbuf_stripspace(&new_todo->buf, 1);
+ if (initial && new_todo->buf.len == 0)
+ return -3;
- append_todo_help(1, 0, &buf);
- if (write_message(buf.buf, buf.len, todo_file, 0)) {
- strbuf_release(&buf);
- return -1;
- }
-
- strbuf_release(&buf);
-
- if (launch_sequence_editor(todo_file, NULL, NULL))
- return -1;
-
- transform_todos(r, flags & ~(TODO_LIST_SHORTEN_IDS));
+ /* For the initial edit, the todo list gets parsed in
+ * complete_action(). */
+ if (!initial)
+ return todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo);
return 0;
}
+
+define_commit_slab(commit_seen, unsigned char);
+/*
+ * Check if the user dropped some commits by mistake
+ * Behaviour determined by rebase.missingCommitsCheck.
+ * Check if there is an unrecognized command or a
+ * bad SHA-1 in a command.
+ */
+int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
+{
+ enum missing_commit_check_level check_level = get_missing_commit_check_level();
+ struct strbuf missing = STRBUF_INIT;
+ int res = 0, i;
+ struct commit_seen commit_seen;
+
+ init_commit_seen(&commit_seen);
+
+ if (check_level == MISSING_COMMIT_CHECK_IGNORE)
+ goto leave_check;
+
+ /* Mark the commits in git-rebase-todo as seen */
+ for (i = 0; i < new_todo->nr; i++) {
+ struct commit *commit = new_todo->items[i].commit;
+ if (commit)
+ *commit_seen_at(&commit_seen, commit) = 1;
+ }
+
+ /* Find commits in git-rebase-todo.backup yet unseen */
+ for (i = old_todo->nr - 1; i >= 0; i--) {
+ struct todo_item *item = old_todo->items + i;
+ struct commit *commit = item->commit;
+ if (commit && !*commit_seen_at(&commit_seen, commit)) {
+ strbuf_addf(&missing, " - %s %.*s\n",
+ find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV),
+ item->arg_len,
+ todo_item_get_arg(old_todo, item));
+ *commit_seen_at(&commit_seen, commit) = 1;
+ }
+ }
+
+ /* Warn about missing commits */
+ if (!missing.len)
+ goto leave_check;
+
+ if (check_level == MISSING_COMMIT_CHECK_ERROR)
+ res = 1;
+
+ fprintf(stderr,
+ _("Warning: some commits may have been dropped accidentally.\n"
+ "Dropped commits (newer to older):\n"));
+
+ /* Make the list user-friendly and display */
+ fputs(missing.buf, stderr);
+ strbuf_release(&missing);
+
+ fprintf(stderr, _("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"));
+
+leave_check:
+ clear_commit_seen(&commit_seen);
+ return res;
+}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index 17b6c9f..44dbb06 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -3,9 +3,14 @@
struct strbuf;
struct repository;
+struct todo_list;
-void append_todo_help(unsigned edit_todo, unsigned keep_empty,
+void append_todo_help(unsigned keep_empty, int command_count,
+ const char *shortrevisions, const char *shortonto,
struct strbuf *buf);
-int edit_todo_list(struct repository *r, unsigned flags);
+int edit_todo_list(struct repository *r, struct todo_list *todo_list,
+ struct todo_list *new_todo, const char *shortrevisions,
+ const char *shortonto, unsigned flags);
+int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
#endif
diff --git a/ref-filter.c b/ref-filter.c
index 422a9c9..220e9bd 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -20,6 +20,9 @@
#include "commit-slab.h"
#include "commit-graph.h"
#include "commit-reach.h"
+#include "worktree.h"
+#include "hashmap.h"
+#include "argv-array.h"
static struct ref_msg {
const char *gone;
@@ -75,6 +78,27 @@
struct object_info info;
} oi, oi_deref;
+struct ref_to_worktree_entry {
+ struct hashmap_entry ent; /* must be the first member! */
+ struct worktree *wt; /* key is wt->head_ref */
+};
+
+static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata,
+ const void *existing_hashmap_entry_to_test,
+ const void *key,
+ const void *keydata_aka_refname)
+{
+ const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test;
+ const struct ref_to_worktree_entry *k = key;
+ return strcmp(e->wt->head_ref,
+ keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref);
+}
+
+static struct ref_to_worktree_map {
+ struct hashmap map;
+ struct worktree **worktrees;
+} ref_to_worktree_map;
+
/*
* An atom is a valid field atom listed below, possibly prefixed with
* a "*" to denote deref_tag().
@@ -480,11 +504,16 @@
{ "flag", SOURCE_NONE },
{ "HEAD", SOURCE_NONE, FIELD_STR, head_atom_parser },
{ "color", SOURCE_NONE, FIELD_STR, color_atom_parser },
+ { "worktreepath", SOURCE_NONE },
{ "align", SOURCE_NONE, FIELD_STR, align_atom_parser },
{ "end", SOURCE_NONE },
{ "if", SOURCE_NONE, FIELD_STR, if_atom_parser },
{ "then", SOURCE_NONE },
{ "else", SOURCE_NONE },
+ /*
+ * Please update $__git_ref_fieldlist in git-completion.bash
+ * when you add new atoms
+ */
};
#define REF_FORMATTING_STATE_INIT { 0, NULL }
@@ -913,7 +942,7 @@
}
/* See grab_values */
-static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
+static void grab_tag_values(struct atom_value *val, int deref, struct object *obj)
{
int i;
struct tag *tag = (struct tag *) obj;
@@ -935,7 +964,7 @@
}
/* See grab_values */
-static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
+static void grab_commit_values(struct atom_value *val, int deref, struct object *obj)
{
int i;
struct commit *commit = (struct commit *) obj;
@@ -968,7 +997,7 @@
}
}
-static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz)
+static const char *find_wholine(const char *who, int wholen, const char *buf)
{
const char *eol;
while (*buf) {
@@ -999,7 +1028,7 @@
if (!strncmp(cp, " <", 2))
return xmemdupz(buf, cp - buf);
}
- return "";
+ return xstrdup("");
}
static const char *copy_email(const char *buf)
@@ -1007,10 +1036,10 @@
const char *email = strchr(buf, '<');
const char *eoemail;
if (!email)
- return "";
+ return xstrdup("");
eoemail = strchr(email, '>');
if (!eoemail)
- return "";
+ return xstrdup("");
return xmemdupz(email, eoemail + 1 - email);
}
@@ -1064,7 +1093,7 @@
}
/* See grab_values */
-static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
+static void grab_person(const char *who, struct atom_value *val, int deref, void *buf)
{
int i;
int wholen = strlen(who);
@@ -1085,7 +1114,7 @@
!starts_with(name + wholen, "date"))
continue;
if (!wholine)
- wholine = find_wholine(who, wholen, buf, sz);
+ wholine = find_wholine(who, wholen, buf);
if (!wholine)
return; /* no point looking for it */
if (name[wholen] == 0)
@@ -1105,7 +1134,7 @@
if (strcmp(who, "tagger") && strcmp(who, "committer"))
return; /* "author" for commit object is not wanted */
if (!wholine)
- wholine = find_wholine(who, wholen, buf, sz);
+ wholine = find_wholine(who, wholen, buf);
if (!wholine)
return;
for (i = 0; i < used_atom_cnt; i++) {
@@ -1123,7 +1152,7 @@
}
}
-static void find_subpos(const char *buf, unsigned long sz,
+static void find_subpos(const char *buf,
const char **sub, unsigned long *sublen,
const char **body, unsigned long *bodylen,
unsigned long *nonsiglen,
@@ -1192,7 +1221,7 @@
}
/* See grab_values */
-static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
+static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
{
int i;
const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;
@@ -1212,7 +1241,7 @@
!starts_with(name, "contents"))
continue;
if (!subpos)
- find_subpos(buf, sz,
+ find_subpos(buf,
&subpos, &sublen,
&bodypos, &bodylen, &nonsiglen,
&sigpos, &siglen);
@@ -1265,19 +1294,19 @@
* pointed at by the ref itself; otherwise it is the object the
* ref (which is a tag) refers to.
*/
-static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
+static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf)
{
switch (obj->type) {
case OBJ_TAG:
- grab_tag_values(val, deref, obj, buf, sz);
- grab_sub_body_contents(val, deref, obj, buf, sz);
- grab_person("tagger", val, deref, obj, buf, sz);
+ grab_tag_values(val, deref, obj);
+ grab_sub_body_contents(val, deref, buf);
+ grab_person("tagger", val, deref, buf);
break;
case OBJ_COMMIT:
- grab_commit_values(val, deref, obj, buf, sz);
- grab_sub_body_contents(val, deref, obj, buf, sz);
- grab_person("author", val, deref, obj, buf, sz);
- grab_person("committer", val, deref, obj, buf, sz);
+ grab_commit_values(val, deref, obj);
+ grab_sub_body_contents(val, deref, buf);
+ grab_person("author", val, deref, buf);
+ grab_person("committer", val, deref, buf);
break;
case OBJ_TREE:
/* grab_tree_values(val, deref, obj, buf, sz); */
@@ -1388,7 +1417,8 @@
*s = show_ref(&atom->u.remote_ref.refname, refname);
else if (atom->u.remote_ref.option == RR_TRACK) {
if (stat_tracking_info(branch, &num_ours, &num_theirs,
- NULL, AHEAD_BEHIND_FULL) < 0) {
+ NULL, atom->u.remote_ref.push,
+ AHEAD_BEHIND_FULL) < 0) {
*s = xstrdup(msgs.gone);
} else if (!num_ours && !num_theirs)
*s = xstrdup("");
@@ -1406,7 +1436,8 @@
}
} else if (atom->u.remote_ref.option == RR_TRACKSHORT) {
if (stat_tracking_info(branch, &num_ours, &num_theirs,
- NULL, AHEAD_BEHIND_FULL) < 0) {
+ NULL, atom->u.remote_ref.push,
+ AHEAD_BEHIND_FULL) < 0) {
*s = xstrdup("");
return;
}
@@ -1441,35 +1472,35 @@
struct wt_status_state state;
memset(&state, 0, sizeof(state));
wt_status_get_state(the_repository, &state, 1);
+
+ /*
+ * The ( character must be hard-coded and not part of a localizable
+ * string, since the description is used as a sort key and compared
+ * with ref names.
+ */
+ strbuf_addch(&desc, '(');
if (state.rebase_in_progress ||
state.rebase_interactive_in_progress) {
if (state.branch)
- strbuf_addf(&desc, _("(no branch, rebasing %s)"),
+ strbuf_addf(&desc, _("no branch, rebasing %s"),
state.branch);
else
- strbuf_addf(&desc, _("(no branch, rebasing detached HEAD %s)"),
+ strbuf_addf(&desc, _("no branch, rebasing detached HEAD %s"),
state.detached_from);
} else if (state.bisect_in_progress)
- strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
+ strbuf_addf(&desc, _("no branch, bisect started on %s"),
state.branch);
else if (state.detached_from) {
if (state.detached_at)
- /*
- * TRANSLATORS: make sure this matches "HEAD
- * detached at " in wt-status.c
- */
- strbuf_addf(&desc, _("(HEAD detached at %s)"),
- state.detached_from);
+ strbuf_addstr(&desc, HEAD_DETACHED_AT);
else
- /*
- * TRANSLATORS: make sure this matches "HEAD
- * detached from " in wt-status.c
- */
- strbuf_addf(&desc, _("(HEAD detached from %s)"),
- state.detached_from);
+ strbuf_addstr(&desc, HEAD_DETACHED_FROM);
+ strbuf_addstr(&desc, state.detached_from);
}
else
- strbuf_addstr(&desc, _("(no branch)"));
+ strbuf_addstr(&desc, _("no branch"));
+ strbuf_addch(&desc, ')');
+
free(state.branch);
free(state.onto);
free(state.detached_from);
@@ -1516,7 +1547,7 @@
return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
oid_to_hex(&oi->oid), ref->refname);
}
- grab_values(ref->value, deref, *obj, oi->content, oi->size);
+ grab_values(ref->value, deref, *obj, oi->content);
}
grab_common_values(ref->value, deref, oi);
@@ -1525,6 +1556,48 @@
return 0;
}
+static void populate_worktree_map(struct hashmap *map, struct worktree **worktrees)
+{
+ int i;
+
+ for (i = 0; worktrees[i]; i++) {
+ if (worktrees[i]->head_ref) {
+ struct ref_to_worktree_entry *entry;
+ entry = xmalloc(sizeof(*entry));
+ entry->wt = worktrees[i];
+ hashmap_entry_init(entry, strhash(worktrees[i]->head_ref));
+
+ hashmap_add(map, entry);
+ }
+ }
+}
+
+static void lazy_init_worktree_map(void)
+{
+ if (ref_to_worktree_map.worktrees)
+ return;
+
+ ref_to_worktree_map.worktrees = get_worktrees(0);
+ hashmap_init(&(ref_to_worktree_map.map), ref_to_worktree_map_cmpfnc, NULL, 0);
+ populate_worktree_map(&(ref_to_worktree_map.map), ref_to_worktree_map.worktrees);
+}
+
+static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref)
+{
+ struct hashmap_entry entry;
+ struct ref_to_worktree_entry *lookup_result;
+
+ lazy_init_worktree_map();
+
+ hashmap_entry_init(&entry, strhash(ref->refname));
+ lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname);
+
+ if (lookup_result)
+ return xstrdup(lookup_result->wt->path);
+ else
+ return xstrdup("");
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
@@ -1562,6 +1635,13 @@
if (starts_with(name, "refname"))
refname = get_refname(atom, ref);
+ else if (!strcmp(name, "worktreepath")) {
+ if (ref->kind == FILTER_REFS_BRANCHES)
+ v->s = get_worktree_path(atom, ref);
+ else
+ v->s = xstrdup("");
+ continue;
+ }
else if (starts_with(name, "symref"))
refname = get_symref(atom, ref);
else if (starts_with(name, "upstream")) {
@@ -1686,7 +1766,7 @@
* If it is a tag object, see if we use a value that derefs
* the object, and if we do grab the object it refers to.
*/
- oi_deref.oid = ((struct tag *)obj)->tagged->oid;
+ oi_deref.oid = *get_tagged_oid((struct tag *)obj);
/*
* NEEDSWORK: This derefs tag only once, which
@@ -1784,21 +1864,62 @@
return match_pattern(filter, refname);
}
-/*
- * Find the longest prefix of pattern we can pass to
- * `for_each_fullref_in()`, namely the part of pattern preceding the
- * first glob character. (Note that `for_each_fullref_in()` is
- * perfectly happy working with a prefix that doesn't end at a
- * pathname component boundary.)
- */
-static void find_longest_prefix(struct strbuf *out, const char *pattern)
+static int qsort_strcmp(const void *va, const void *vb)
{
- const char *p;
+ const char *a = *(const char **)va;
+ const char *b = *(const char **)vb;
- for (p = pattern; *p && !is_glob_special(*p); p++)
- ;
+ return strcmp(a, b);
+}
- strbuf_add(out, pattern, p - pattern);
+static void find_longest_prefixes_1(struct string_list *out,
+ struct strbuf *prefix,
+ const char **patterns, size_t nr)
+{
+ size_t i;
+
+ for (i = 0; i < nr; i++) {
+ char c = patterns[i][prefix->len];
+ if (!c || is_glob_special(c)) {
+ string_list_append(out, prefix->buf);
+ return;
+ }
+ }
+
+ i = 0;
+ while (i < nr) {
+ size_t end;
+
+ /*
+ * Set "end" to the index of the element _after_ the last one
+ * in our group.
+ */
+ for (end = i + 1; end < nr; end++) {
+ if (patterns[i][prefix->len] != patterns[end][prefix->len])
+ break;
+ }
+
+ strbuf_addch(prefix, patterns[i][prefix->len]);
+ find_longest_prefixes_1(out, prefix, patterns + i, end - i);
+ strbuf_setlen(prefix, prefix->len - 1);
+
+ i = end;
+ }
+}
+
+static void find_longest_prefixes(struct string_list *out,
+ const char **patterns)
+{
+ struct argv_array sorted = ARGV_ARRAY_INIT;
+ struct strbuf prefix = STRBUF_INIT;
+
+ argv_array_pushv(&sorted, patterns);
+ QSORT(sorted.argv, sorted.argc, qsort_strcmp);
+
+ find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc);
+
+ argv_array_clear(&sorted);
+ strbuf_release(&prefix);
}
/*
@@ -1811,7 +1932,8 @@
void *cb_data,
int broken)
{
- struct strbuf prefix = STRBUF_INIT;
+ struct string_list prefixes = STRING_LIST_INIT_DUP;
+ struct string_list_item *prefix;
int ret;
if (!filter->match_as_path) {
@@ -1837,21 +1959,15 @@
return for_each_fullref_in("", cb, cb_data, broken);
}
- if (filter->name_patterns[1]) {
- /*
- * multiple patterns; in theory this could still work as long
- * as the patterns are disjoint. We'd just make multiple calls
- * to for_each_ref(). But if they're not disjoint, we'd end up
- * reporting the same ref multiple times. So let's punt on that
- * for now.
- */
- return for_each_fullref_in("", cb, cb_data, broken);
+ find_longest_prefixes(&prefixes, filter->name_patterns);
+
+ for_each_string_list_item(prefix, &prefixes) {
+ ret = for_each_fullref_in(prefix->string, cb, cb_data, broken);
+ if (ret)
+ break;
}
- find_longest_prefix(&prefix, filter->name_patterns[0]);
-
- ret = for_each_fullref_in(prefix.buf, cb, cb_data, broken);
- strbuf_release(&prefix);
+ string_list_clear(&prefixes, 0);
return ret;
}
@@ -1881,7 +1997,7 @@
if (!obj)
die(_("malformed object at '%s'"), refname);
if (obj->type == OBJ_TAG)
- tagged_oid = &((struct tag *)obj)->tagged->oid;
+ tagged_oid = get_tagged_oid((struct tag *)obj);
if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
return tagged_oid;
return NULL;
@@ -2026,7 +2142,9 @@
{
free((char *)item->symref);
if (item->value) {
- free((char *)item->value->s);
+ int i;
+ for (i = 0; i < used_atom_cnt; i++)
+ free((char *)item->value[i].s);
free(item->value);
}
free(item);
@@ -2037,14 +2155,21 @@
{
int i;
- for (i = 0; i < used_atom_cnt; i++)
- free((char *)used_atom[i].name);
- FREE_AND_NULL(used_atom);
- used_atom_cnt = 0;
for (i = 0; i < array->nr; i++)
free_array_item(array->items[i]);
FREE_AND_NULL(array->items);
array->nr = array->alloc = 0;
+
+ for (i = 0; i < used_atom_cnt; i++)
+ free((char *)used_atom[i].name);
+ FREE_AND_NULL(used_atom);
+ used_atom_cnt = 0;
+
+ if (ref_to_worktree_map.worktrees) {
+ hashmap_free(&(ref_to_worktree_map.map), 1);
+ free_worktrees(ref_to_worktree_map.worktrees);
+ ref_to_worktree_map.worktrees = NULL;
+ }
}
static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
@@ -2333,8 +2458,13 @@
int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)
{
- if (!arg) /* should --no-sort void the list ? */
- return -1;
+ /*
+ * NEEDSWORK: We should probably clear the list in this case, but we've
+ * already munged the global used_atoms list, which would need to be
+ * undone.
+ */
+ BUG_ON_OPT_NEG(unset);
+
parse_ref_sorting(opt->value, arg);
return 0;
}
diff --git a/ref-filter.h b/ref-filter.h
index 85c8ebc..f1dcff4 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -96,6 +96,11 @@
#define OPT_MERGED(f, h) _OPT_MERGED_NO_MERGED("merged", f, h)
#define OPT_NO_MERGED(f, h) _OPT_MERGED_NO_MERGED("no-merged", f, h)
+#define OPT_REF_SORT(var) \
+ OPT_CALLBACK_F(0, "sort", (var), \
+ N_("key"), N_("field name to sort on"), \
+ PARSE_OPT_NONEG, parse_opt_ref_sorting)
+
/*
* API for filtering a set of refs. Based on the type of refs the user
* has requested, we iterate through those refs and apply filters
diff --git a/reflog-walk.h b/reflog-walk.h
index cb3e737..f26408f 100644
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -6,21 +6,21 @@
struct commit;
struct reflog_walk_info;
-extern void init_reflog_walk(struct reflog_walk_info **info);
-extern int add_reflog_for_walk(struct reflog_walk_info *info,
- struct commit *commit, const char *name);
-extern void show_reflog_message(struct reflog_walk_info *info, int,
- const struct date_mode *, int force_date);
-extern void get_reflog_message(struct strbuf *sb,
- struct reflog_walk_info *reflog_info);
-extern const char *get_reflog_ident(struct reflog_walk_info *reflog_info);
-extern timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info);
-extern void get_reflog_selector(struct strbuf *sb,
- struct reflog_walk_info *reflog_info,
- const struct date_mode *dmode, int force_date,
- int shorten);
+void init_reflog_walk(struct reflog_walk_info **info);
+int add_reflog_for_walk(struct reflog_walk_info *info,
+ struct commit *commit, const char *name);
+void show_reflog_message(struct reflog_walk_info *info, int,
+ const struct date_mode *, int force_date);
+void get_reflog_message(struct strbuf *sb,
+ struct reflog_walk_info *reflog_info);
+const char *get_reflog_ident(struct reflog_walk_info *reflog_info);
+timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info);
+void get_reflog_selector(struct strbuf *sb,
+ struct reflog_walk_info *reflog_info,
+ const struct date_mode *dmode, int force_date,
+ int shorten);
-extern int reflog_walk_empty(struct reflog_walk_info *walk);
+int reflog_walk_empty(struct reflog_walk_info *walk);
struct commit *next_reflog_entry(struct reflog_walk_info *reflog_info);
diff --git a/refs.c b/refs.c
index 142888a..cd297ee 100644
--- a/refs.c
+++ b/refs.c
@@ -63,7 +63,7 @@
* not legal. It is legal if it is something reasonable to have under
* ".git/refs/"; We do not like it if:
*
- * - any path component of it begins with ".", or
+ * - it begins with ".", or
* - it has double dots "..", or
* - it has ASCII control characters, or
* - it has ":", "?", "[", "\", "^", "~", SP, or TAB anywhere, or
@@ -71,31 +71,63 @@
* - it ends with a "/", or
* - it ends with ".lock", or
* - it contains a "@{" portion
+ *
+ * When sanitized is not NULL, instead of rejecting the input refname
+ * as an error, try to come up with a usable replacement for the input
+ * refname in it.
*/
-static int check_refname_component(const char *refname, int *flags)
+static int check_refname_component(const char *refname, int *flags,
+ struct strbuf *sanitized)
{
const char *cp;
char last = '\0';
+ size_t component_start = 0; /* garbage - not a reasonable initial value */
+
+ if (sanitized)
+ component_start = sanitized->len;
for (cp = refname; ; cp++) {
int ch = *cp & 255;
unsigned char disp = refname_disposition[ch];
+
+ if (sanitized && disp != 1)
+ strbuf_addch(sanitized, ch);
+
switch (disp) {
case 1:
goto out;
case 2:
- if (last == '.')
- return -1; /* Refname contains "..". */
+ if (last == '.') { /* Refname contains "..". */
+ if (sanitized)
+ /* collapse ".." to single "." */
+ strbuf_setlen(sanitized, sanitized->len - 1);
+ else
+ return -1;
+ }
break;
case 3:
- if (last == '@')
- return -1; /* Refname contains "@{". */
+ if (last == '@') { /* Refname contains "@{". */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ }
break;
case 4:
- return -1;
+ /* forbidden char */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ break;
case 5:
- if (!(*flags & REFNAME_REFSPEC_PATTERN))
- return -1; /* refspec can't be a pattern */
+ if (!(*flags & REFNAME_REFSPEC_PATTERN)) {
+ /* refspec can't be a pattern */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ }
/*
* Unset the pattern flag so that we only accept
@@ -109,26 +141,48 @@
out:
if (cp == refname)
return 0; /* Component has zero length. */
- if (refname[0] == '.')
- return -1; /* Component starts with '.'. */
+
+ if (refname[0] == '.') { /* Component starts with '.'. */
+ if (sanitized)
+ sanitized->buf[component_start] = '-';
+ else
+ return -1;
+ }
if (cp - refname >= LOCK_SUFFIX_LEN &&
- !memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN))
- return -1; /* Refname ends with ".lock". */
+ !memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN)) {
+ if (!sanitized)
+ return -1;
+ /* Refname ends with ".lock". */
+ while (strbuf_strip_suffix(sanitized, LOCK_SUFFIX)) {
+ /* try again in case we have .lock.lock */
+ }
+ }
return cp - refname;
}
-int check_refname_format(const char *refname, int flags)
+static int check_or_sanitize_refname(const char *refname, int flags,
+ struct strbuf *sanitized)
{
int component_len, component_count = 0;
- if (!strcmp(refname, "@"))
+ if (!strcmp(refname, "@")) {
/* Refname is a single character '@'. */
- return -1;
+ if (sanitized)
+ strbuf_addch(sanitized, '-');
+ else
+ return -1;
+ }
while (1) {
+ if (sanitized && sanitized->len)
+ strbuf_complete(sanitized, '/');
+
/* We are at the start of a path component. */
- component_len = check_refname_component(refname, &flags);
- if (component_len <= 0)
+ component_len = check_refname_component(refname, &flags,
+ sanitized);
+ if (sanitized && component_len == 0)
+ ; /* OK, omit empty component */
+ else if (component_len <= 0)
return -1;
component_count++;
@@ -138,13 +192,29 @@
refname += component_len + 1;
}
- if (refname[component_len - 1] == '.')
- return -1; /* Refname ends with '.'. */
+ if (refname[component_len - 1] == '.') {
+ /* Refname ends with '.'. */
+ if (sanitized)
+ ; /* omit ending dot */
+ else
+ return -1;
+ }
if (!(flags & REFNAME_ALLOW_ONELEVEL) && component_count < 2)
return -1; /* Refname has only one component. */
return 0;
}
+int check_refname_format(const char *refname, int flags)
+{
+ return check_or_sanitize_refname(refname, flags, NULL);
+}
+
+void sanitize_refname_component(const char *refname, struct strbuf *out)
+{
+ if (check_or_sanitize_refname(refname, REFNAME_ALLOW_ONELEVEL, out))
+ BUG("sanitizing refname '%s' check returned error", refname);
+}
+
int refname_is_safe(const char *refname)
{
const char *rest;
@@ -241,9 +311,14 @@
return read_ref_full(refname, RESOLVE_REF_READING, oid, NULL);
}
+static int refs_ref_exists(struct ref_store *refs, const char *refname)
+{
+ return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING, NULL, NULL);
+}
+
int ref_exists(const char *refname)
{
- return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, NULL, NULL);
+ return refs_ref_exists(get_main_ref_store(the_repository), refname);
}
static int match_ref_pattern(const char *refname,
@@ -304,7 +379,7 @@
enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
{
- struct object *o = lookup_unknown_object(name->hash);
+ struct object *o = lookup_unknown_object(name);
if (o->type == OBJ_NONE) {
int type = oid_object_info(the_repository, name, NULL);
@@ -534,10 +609,11 @@
* later free()ing) if the string passed in is a magic short-hand form
* to name a branch.
*/
-static char *substitute_branch_name(const char **string, int *len)
+static char *substitute_branch_name(struct repository *r,
+ const char **string, int *len)
{
struct strbuf buf = STRBUF_INIT;
- int ret = interpret_branch_name(*string, *len, &buf, 0);
+ int ret = repo_interpret_branch_name(r, *string, *len, &buf, 0);
if (ret == *len) {
size_t size;
@@ -549,15 +625,22 @@
return NULL;
}
-int dwim_ref(const char *str, int len, struct object_id *oid, char **ref)
+int repo_dwim_ref(struct repository *r, const char *str, int len,
+ struct object_id *oid, char **ref)
{
- char *last_branch = substitute_branch_name(&str, &len);
- int refs_found = expand_ref(str, len, oid, ref);
+ char *last_branch = substitute_branch_name(r, &str, &len);
+ int refs_found = expand_ref(r, str, len, oid, ref);
free(last_branch);
return refs_found;
}
-int expand_ref(const char *str, int len, struct object_id *oid, char **ref)
+int dwim_ref(const char *str, int len, struct object_id *oid, char **ref)
+{
+ return repo_dwim_ref(the_repository, str, len, oid, ref);
+}
+
+int expand_ref(struct repository *repo, const char *str, int len,
+ struct object_id *oid, char **ref)
{
const char **p, *r;
int refs_found = 0;
@@ -572,8 +655,9 @@
this_result = refs_found ? &oid_from_ref : oid;
strbuf_reset(&fullref);
strbuf_addf(&fullref, *p, len, str);
- r = resolve_ref_unsafe(fullref.buf, RESOLVE_REF_READING,
- this_result, &flag);
+ r = refs_resolve_ref_unsafe(get_main_ref_store(repo),
+ fullref.buf, RESOLVE_REF_READING,
+ this_result, &flag);
if (r) {
if (!refs_found++)
*ref = xstrdup(r);
@@ -589,9 +673,11 @@
return refs_found;
}
-int dwim_log(const char *str, int len, struct object_id *oid, char **log)
+int repo_dwim_log(struct repository *r, const char *str, int len,
+ struct object_id *oid, char **log)
{
- char *last_branch = substitute_branch_name(&str, &len);
+ struct ref_store *refs = get_main_ref_store(r);
+ char *last_branch = substitute_branch_name(r, &str, &len);
const char **p;
int logs_found = 0;
struct strbuf path = STRBUF_INIT;
@@ -603,13 +689,15 @@
strbuf_reset(&path);
strbuf_addf(&path, *p, len, str);
- ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING,
- &hash, NULL);
+ ref = refs_resolve_ref_unsafe(refs, path.buf,
+ RESOLVE_REF_READING,
+ &hash, NULL);
if (!ref)
continue;
- if (reflog_exists(path.buf))
+ if (refs_reflog_exists(refs, path.buf))
it = path.buf;
- else if (strcmp(ref, path.buf) && reflog_exists(ref))
+ else if (strcmp(ref, path.buf) &&
+ refs_reflog_exists(refs, ref))
it = ref;
else
continue;
@@ -625,6 +713,11 @@
return logs_found;
}
+int dwim_log(const char *str, int len, struct object_id *oid, char **log)
+{
+ return repo_dwim_log(the_repository, str, len, oid, log);
+}
+
static int is_per_worktree_ref(const char *refname)
{
return !strcmp(refname, "HEAD") ||
@@ -944,7 +1037,8 @@
return 1;
}
-int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, int cnt,
+int read_ref_at(struct ref_store *refs, const char *refname,
+ unsigned int flags, timestamp_t at_time, int cnt,
struct object_id *oid, char **msg,
timestamp_t *cutoff_time, int *cutoff_tz, int *cutoff_cnt)
{
@@ -960,7 +1054,7 @@
cb.cutoff_cnt = cutoff_cnt;
cb.oid = oid;
- for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
+ refs_for_each_reflog_ent_reverse(refs, refname, read_ref_at_ent, &cb);
if (!cb.reccnt) {
if (flags & GET_OID_QUIETLY)
@@ -971,7 +1065,7 @@
if (cb.found_it)
return 0;
- for_each_reflog_ent(refname, read_ref_at_ent_oldest, &cb);
+ refs_for_each_reflog_ent(refs, refname, read_ref_at_ent_oldest, &cb);
return 1;
}
@@ -1164,7 +1258,8 @@
old_oid, flags, onerr);
}
-char *shorten_unambiguous_ref(const char *refname, int strict)
+char *refs_shorten_unambiguous_ref(struct ref_store *refs,
+ const char *refname, int strict)
{
int i;
static char **scanf_fmts;
@@ -1242,7 +1337,7 @@
strbuf_reset(&resolved_buf);
strbuf_addf(&resolved_buf, rule,
short_name_len, short_name);
- if (ref_exists(resolved_buf.buf))
+ if (refs_ref_exists(refs, resolved_buf.buf))
break;
}
@@ -1261,6 +1356,12 @@
return xstrdup(refname);
}
+char *shorten_unambiguous_ref(const char *refname, int strict)
+{
+ return refs_shorten_unambiguous_ref(get_main_ref_store(the_repository),
+ refname, strict);
+}
+
static struct string_list *hide_refs;
int parse_hide_refs_config(const char *var, const char *value, const char *section)
diff --git a/refs.h b/refs.h
index 308fa1f..730d05a 100644
--- a/refs.h
+++ b/refs.h
@@ -111,7 +111,7 @@
int is_branch(const char *refname);
-extern int refs_init_db(struct strbuf *err);
+int refs_init_db(struct strbuf *err);
/*
* If refname is a non-symbolic reference that refers to a tag object,
@@ -148,7 +148,9 @@
struct argv_array;
void expand_ref_prefix(struct argv_array *prefixes, const char *prefix);
-int expand_ref(const char *str, int len, struct object_id *oid, char **ref);
+int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
+int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
+int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
int dwim_ref(const char *str, int len, struct object_id *oid, char **ref);
int dwim_log(const char *str, int len, struct object_id *oid, char **ref);
@@ -386,7 +388,8 @@
int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
/** Reads log for the value of ref during at_time. **/
-int read_ref_at(const char *refname, unsigned int flags,
+int read_ref_at(struct ref_store *refs,
+ const char *refname, unsigned int flags,
timestamp_t at_time, int cnt,
struct object_id *oid, char **msg,
timestamp_t *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
@@ -460,8 +463,16 @@
*/
int check_refname_format(const char *refname, int flags);
+/*
+ * Apply the rules from check_refname_format, but mutate the result until it
+ * is acceptable, and place the result in "out".
+ */
+void sanitize_refname_component(const char *refname, struct strbuf *out);
+
const char *prettify_refname(const char *refname);
+char *refs_shorten_unambiguous_ref(struct ref_store *refs,
+ const char *refname, int strict);
char *shorten_unambiguous_ref(const char *refname, int strict);
/** rename ref, return 0 on success **/
diff --git a/refs/files-backend.c b/refs/files-backend.c
index dd8abe9..d60767a 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -215,6 +215,33 @@
}
/*
+ * Manually add refs/bisect, refs/rewritten and refs/worktree, which, being
+ * per-worktree, might not appear in the directory listing for
+ * refs/ in the main repo.
+ */
+static void add_per_worktree_entries_to_dir(struct ref_dir *dir, const char *dirname)
+{
+ const char *prefixes[] = { "refs/bisect/", "refs/worktree/", "refs/rewritten/" };
+ int ip;
+
+ if (strcmp(dirname, "refs/"))
+ return;
+
+ for (ip = 0; ip < ARRAY_SIZE(prefixes); ip++) {
+ const char *prefix = prefixes[ip];
+ int prefix_len = strlen(prefix);
+ struct ref_entry *child_entry;
+ int pos;
+
+ pos = search_ref_dir(dir, prefix, prefix_len);
+ if (pos >= 0)
+ continue;
+ child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
+ add_entry_to_dir(dir, child_entry);
+ }
+}
+
+/*
* Read the loose references from the namespace dirname into dir
* (without recursing). dirname must end with '/'. dir must be the
* directory entry corresponding to dirname.
@@ -297,28 +324,7 @@
strbuf_release(&path);
closedir(d);
- /*
- * Manually add refs/bisect and refs/worktree, which, being
- * per-worktree, might not appear in the directory listing for
- * refs/ in the main repo.
- */
- if (!strcmp(dirname, "refs/")) {
- int pos = search_ref_dir(dir, "refs/bisect/", 12);
-
- if (pos < 0) {
- struct ref_entry *child_entry = create_dir_entry(
- dir->cache, "refs/bisect/", 12, 1);
- add_entry_to_dir(dir, child_entry);
- }
-
- pos = search_ref_dir(dir, "refs/worktree/", 11);
-
- if (pos < 0) {
- struct ref_entry *child_entry = create_dir_entry(
- dir->cache, "refs/worktree/", 11, 1);
- add_entry_to_dir(dir, child_entry);
- }
- }
+ add_per_worktree_entries_to_dir(dir, dirname);
}
static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
@@ -2137,13 +2143,24 @@
static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
const char *gitdir)
{
- struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
- struct ref_iterator *ref_iterator = &iter->base;
+ struct dir_iterator *diter;
+ struct files_reflog_iterator *iter;
+ struct ref_iterator *ref_iterator;
struct strbuf sb = STRBUF_INIT;
- base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
strbuf_addf(&sb, "%s/logs", gitdir);
- iter->dir_iterator = dir_iterator_begin(sb.buf);
+
+ diter = dir_iterator_begin(sb.buf, 0);
+ if (!diter) {
+ strbuf_release(&sb);
+ return empty_ref_iterator_begin();
+ }
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+
+ base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
+ iter->dir_iterator = diter;
iter->ref_store = ref_store;
strbuf_release(&sb);
@@ -2254,8 +2271,7 @@
* Note that the new update will itself be subject to splitting when
* the iteration gets to it.
*/
-static int split_symref_update(struct files_ref_store *refs,
- struct ref_update *update,
+static int split_symref_update(struct ref_update *update,
const char *referent,
struct ref_transaction *transaction,
struct string_list *affected_refnames,
@@ -2449,7 +2465,7 @@
* of processing the split-off update, so we
* don't have to do it here.
*/
- ret = split_symref_update(refs, update,
+ ret = split_symref_update(update,
referent.buf, transaction,
affected_refnames, err);
if (ret)
@@ -2696,18 +2712,32 @@
if (is_packed_transaction_needed(refs->packed_ref_store,
packed_transaction)) {
ret = ref_transaction_prepare(packed_transaction, err);
+ /*
+ * A failure during the prepare step will abort
+ * itself, but not free. Do that now, and disconnect
+ * from the files_transaction so it does not try to
+ * abort us when we hit the cleanup code below.
+ */
+ if (ret) {
+ ref_transaction_free(packed_transaction);
+ backend_data->packed_transaction = NULL;
+ }
} else {
/*
* We can skip rewriting the `packed-refs`
* file. But we do need to leave it locked, so
* that somebody else doesn't pack a reference
* that we are trying to delete.
+ *
+ * We need to disconnect our transaction from
+ * backend_data, since the abort (whether successful or
+ * not) will free it.
*/
+ backend_data->packed_transaction = NULL;
if (ref_transaction_abort(packed_transaction, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
}
- backend_data->packed_transaction = NULL;
}
}
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index c01c7f5..4458a0f 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1012,14 +1012,23 @@
}
/*
- * Now that we hold the `packed-refs` lock, make sure that our
- * snapshot matches the current version of the file. Normally
- * `get_snapshot()` does that for us, but that function
- * assumes that when the file is locked, any existing snapshot
- * is still valid. We've just locked the file, but it might
- * have changed the moment *before* we locked it.
+ * There is a stat-validity problem might cause `update-ref -d`
+ * lost the newly commit of a ref, because a new `packed-refs`
+ * file might has the same on-disk file attributes such as
+ * timestamp, file size and inode value, but has a changed
+ * ref value.
+ *
+ * This could happen with a very small chance when
+ * `update-ref -d` is called and at the same time another
+ * `pack-refs --all` process is running.
+ *
+ * Now that we hold the `packed-refs` lock, it is important
+ * to make sure we could read the latest version of
+ * `packed-refs` file no matter we have just mmap it or not.
+ * So what need to do is clear the snapshot if we hold it
+ * already.
*/
- validate_snapshot(refs);
+ clear_snapshot(refs);
/*
* Now make sure that the packed-refs file as it exists in the
diff --git a/refspec.c b/refspec.c
index f529092..9a9bf21 100644
--- a/refspec.c
+++ b/refspec.c
@@ -72,7 +72,7 @@
/* LHS */
if (!*item->src)
; /* empty is ok; it means "HEAD" */
- else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(item->src, &unused))
+ else if (llen == the_hash_algo->hexsz && !get_oid_hex(item->src, &unused))
item->exact_sha1 = 1; /* ok */
else if (!check_refname_format(item->src, flags))
; /* valid looking ref is ok */
diff --git a/remote-curl.c b/remote-curl.c
index 2e04d53..051f266 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -16,6 +16,7 @@
#include "send-pack.h"
#include "protocol.h"
#include "quote.h"
+#include "transport.h"
static struct remote *remote;
/* always ends with a trailing slash */
@@ -153,7 +154,7 @@
else {
struct strbuf unquoted = STRBUF_INIT;
if (unquote_c_style(&unquoted, value, NULL) < 0)
- die("invalid quoting in push-option value");
+ die(_("invalid quoting in push-option value: '%s'"), value);
string_list_append_nodup(&options.push_options,
strbuf_detach(&unquoted, NULL));
}
@@ -249,9 +250,9 @@
if (data[i] == '\t')
mid = &data[i];
if (data[i] == '\n') {
- if (mid - start != 40)
- die("%sinfo/refs not valid: is this a git repository?",
- url.buf);
+ if (mid - start != the_hash_algo->hexsz)
+ die(_("%sinfo/refs not valid: is this a git repository?"),
+ transport_anonymize_url(url.buf));
data[i] = 0;
ref_name = mid + 1;
ref = alloc_ref(ref_name);
@@ -331,9 +332,63 @@
return 0;
}
+static void check_smart_http(struct discovery *d, const char *service,
+ struct strbuf *type)
+{
+ const char *p;
+ struct packet_reader reader;
+
+ /*
+ * If we don't see x-$service-advertisement, then it's not smart-http.
+ * But once we do, we commit to it and assume any other protocol
+ * violations are hard errors.
+ */
+ if (!skip_prefix(type->buf, "application/x-", &p) ||
+ !skip_prefix(p, service, &p) ||
+ strcmp(p, "-advertisement"))
+ return;
+
+ packet_reader_init(&reader, -1, d->buf, d->len,
+ PACKET_READ_CHOMP_NEWLINE |
+ PACKET_READ_DIE_ON_ERR_PACKET);
+ if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
+ die(_("invalid server response; expected service, got flush packet"));
+
+ if (skip_prefix(reader.line, "# service=", &p) && !strcmp(p, service)) {
+ /*
+ * The header can include additional metadata lines, up
+ * until a packet flush marker. Ignore these now, but
+ * in the future we might start to scan them.
+ */
+ for (;;) {
+ packet_reader_read(&reader);
+ if (reader.pktlen <= 0) {
+ break;
+ }
+ }
+
+ /*
+ * v0 smart http; callers expect us to soak up the
+ * service and header packets
+ */
+ d->buf = reader.src_buffer;
+ d->len = reader.src_len;
+ d->proto_git = 1;
+
+ } else if (!strcmp(reader.line, "version 2")) {
+ /*
+ * v2 smart http; do not consume version packet, which will
+ * be handled elsewhere.
+ */
+ d->proto_git = 1;
+
+ } else {
+ die(_("invalid server response; got '%s'"), reader.line);
+ }
+}
+
static struct discovery *discover_refs(const char *service, int for_push)
{
- struct strbuf exp = STRBUF_INIT;
struct strbuf type = STRBUF_INIT;
struct strbuf charset = STRBUF_INIT;
struct strbuf buffer = STRBUF_INIT;
@@ -388,64 +443,31 @@
break;
case HTTP_MISSING_TARGET:
show_http_message(&type, &charset, &buffer);
- die("repository '%s' not found", url.buf);
+ die(_("repository '%s' not found"),
+ transport_anonymize_url(url.buf));
case HTTP_NOAUTH:
show_http_message(&type, &charset, &buffer);
- die("Authentication failed for '%s'", url.buf);
+ die(_("Authentication failed for '%s'"),
+ transport_anonymize_url(url.buf));
default:
show_http_message(&type, &charset, &buffer);
- die("unable to access '%s': %s", url.buf, curl_errorstr);
+ die(_("unable to access '%s': %s"),
+ transport_anonymize_url(url.buf), curl_errorstr);
}
- if (options.verbosity && !starts_with(refs_url.buf, url.buf))
- warning(_("redirecting to %s"), url.buf);
+ if (options.verbosity && !starts_with(refs_url.buf, url.buf)) {
+ char *u = transport_anonymize_url(url.buf);
+ warning(_("redirecting to %s"), u);
+ free(u);
+ }
last= xcalloc(1, sizeof(*last_discovery));
last->service = xstrdup(service);
last->buf_alloc = strbuf_detach(&buffer, &last->len);
last->buf = last->buf_alloc;
- strbuf_addf(&exp, "application/x-%s-advertisement", service);
- if (maybe_smart &&
- (5 <= last->len && last->buf[4] == '#') &&
- !strbuf_cmp(&exp, &type)) {
- struct packet_reader reader;
- packet_reader_init(&reader, -1, last->buf, last->len,
- PACKET_READ_CHOMP_NEWLINE |
- PACKET_READ_DIE_ON_ERR_PACKET);
-
- /*
- * smart HTTP response; validate that the service
- * pkt-line matches our request.
- */
- if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
- die("invalid server response; expected service, got flush packet");
-
- strbuf_reset(&exp);
- strbuf_addf(&exp, "# service=%s", service);
- if (strcmp(reader.line, exp.buf))
- die("invalid server response; got '%s'", reader.line);
- strbuf_release(&exp);
-
- /* The header can include additional metadata lines, up
- * until a packet flush marker. Ignore these now, but
- * in the future we might start to scan them.
- */
- for (;;) {
- packet_reader_read(&reader);
- if (reader.pktlen <= 0) {
- break;
- }
- }
-
- last->buf = reader.src_buffer;
- last->len = reader.src_len;
-
- last->proto_git = 1;
- } else if (maybe_smart &&
- last->len > 5 && starts_with(last->buf + 4, "version 2")) {
- last->proto_git = 1;
- }
+ if (maybe_smart)
+ check_smart_http(last, service, &type);
if (last->proto_git)
last->refs = parse_git_refs(last, for_push);
@@ -453,7 +475,6 @@
last->refs = parse_info_refs(last);
strbuf_release(&refs_url);
- strbuf_release(&exp);
strbuf_release(&type);
strbuf_release(&charset);
strbuf_release(&effective_url);
@@ -491,8 +512,6 @@
struct rpc_state {
const char *service_name;
- const char **argv;
- struct strbuf *stdin_preamble;
char *service_url;
char *hdr_content_type;
char *hdr_accept;
@@ -504,25 +523,121 @@
int in;
int out;
int any_written;
- struct strbuf result;
unsigned gzip_request : 1;
unsigned initial_buffer : 1;
+
+ /*
+ * Whenever a pkt-line is read into buf, append the 4 characters
+ * denoting its length before appending the payload.
+ */
+ unsigned write_line_lengths : 1;
+
+ /*
+ * Used by rpc_out; initialize to 0. This is true if a flush has been
+ * read, but the corresponding line length (if write_line_lengths is
+ * true) and EOF have not been sent to libcurl. Since each flush marks
+ * the end of a request, each flush must be completely sent before any
+ * further reading occurs.
+ */
+ unsigned flush_read_but_not_sent : 1;
};
+/*
+ * Appends the result of reading from rpc->out to the string represented by
+ * rpc->buf and rpc->len if there is enough space. Returns 1 if there was
+ * enough space, 0 otherwise.
+ *
+ * If rpc->write_line_lengths is true, appends the line length as a 4-byte
+ * hexadecimal string before appending the result described above.
+ *
+ * Writes the total number of bytes appended into appended.
+ */
+static int rpc_read_from_out(struct rpc_state *rpc, int options,
+ size_t *appended,
+ enum packet_read_status *status) {
+ size_t left;
+ char *buf;
+ int pktlen_raw;
+
+ if (rpc->write_line_lengths) {
+ left = rpc->alloc - rpc->len - 4;
+ buf = rpc->buf + rpc->len + 4;
+ } else {
+ left = rpc->alloc - rpc->len;
+ buf = rpc->buf + rpc->len;
+ }
+
+ if (left < LARGE_PACKET_MAX)
+ return 0;
+
+ *status = packet_read_with_status(rpc->out, NULL, NULL, buf,
+ left, &pktlen_raw, options);
+ if (*status != PACKET_READ_EOF) {
+ *appended = pktlen_raw + (rpc->write_line_lengths ? 4 : 0);
+ rpc->len += *appended;
+ }
+
+ if (rpc->write_line_lengths) {
+ switch (*status) {
+ case PACKET_READ_EOF:
+ if (!(options & PACKET_READ_GENTLE_ON_EOF))
+ die(_("shouldn't have EOF when not gentle on EOF"));
+ break;
+ case PACKET_READ_NORMAL:
+ set_packet_header(buf - 4, *appended);
+ break;
+ case PACKET_READ_DELIM:
+ memcpy(buf - 4, "0001", 4);
+ break;
+ case PACKET_READ_FLUSH:
+ memcpy(buf - 4, "0000", 4);
+ break;
+ }
+ }
+
+ return 1;
+}
+
static size_t rpc_out(void *ptr, size_t eltsize,
size_t nmemb, void *buffer_)
{
size_t max = eltsize * nmemb;
struct rpc_state *rpc = buffer_;
size_t avail = rpc->len - rpc->pos;
+ enum packet_read_status status;
if (!avail) {
rpc->initial_buffer = 0;
- avail = packet_read(rpc->out, NULL, NULL, rpc->buf, rpc->alloc, 0);
- if (!avail)
- return 0;
+ rpc->len = 0;
rpc->pos = 0;
- rpc->len = avail;
+ if (!rpc->flush_read_but_not_sent) {
+ if (!rpc_read_from_out(rpc, 0, &avail, &status))
+ BUG("The entire rpc->buf should be larger than LARGE_PACKET_MAX");
+ if (status == PACKET_READ_FLUSH)
+ rpc->flush_read_but_not_sent = 1;
+ }
+ /*
+ * If flush_read_but_not_sent is true, we have already read one
+ * full request but have not fully sent it + EOF, which is why
+ * we need to refrain from reading.
+ */
+ }
+ if (rpc->flush_read_but_not_sent) {
+ if (!avail) {
+ /*
+ * The line length either does not need to be sent at
+ * all or has already been completely sent. Now we can
+ * return 0, indicating EOF, meaning that the flush has
+ * been fully sent.
+ */
+ rpc->flush_read_but_not_sent = 0;
+ return 0;
+ }
+ /*
+ * If avail is non-zerp, the line length for the flush still
+ * hasn't been fully sent. Proceed with sending the line
+ * length.
+ */
}
if (max < avail)
@@ -546,7 +661,7 @@
rpc->pos = 0;
return CURLIOE_OK;
}
- error("unable to rewind rpc post data - try increasing http.postBuffer");
+ error(_("unable to rewind rpc post data - try increasing http.postBuffer"));
return CURLIOE_FAILRESTART;
default:
@@ -606,7 +721,7 @@
strbuf_addstr(&msg, curl_errorstr);
}
}
- error("RPC failed; %s", msg.buf);
+ error(_("RPC failed; %s"), msg.buf);
strbuf_release(&msg);
}
@@ -646,11 +761,15 @@
{
uintmax_t size = len;
if (size > maximum_signed_value_of_type(curl_off_t))
- die("cannot handle pushes this big");
+ die(_("cannot handle pushes this big"));
return (curl_off_t)size;
}
-static int post_rpc(struct rpc_state *rpc)
+/*
+ * If flush_received is true, do not attempt to read any more; just use what's
+ * in rpc->buf.
+ */
+static int post_rpc(struct rpc_state *rpc, int flush_received)
{
struct active_request_slot *slot;
struct curl_slist *headers = http_copy_default_headers();
@@ -665,21 +784,19 @@
* allocated buffer space we can use HTTP/1.0 and avoid the
* chunked encoding mess.
*/
- while (1) {
- size_t left = rpc->alloc - rpc->len;
- char *buf = rpc->buf + rpc->len;
- int n;
+ if (!flush_received) {
+ while (1) {
+ size_t n;
+ enum packet_read_status status;
- if (left < LARGE_PACKET_MAX) {
- large_request = 1;
- use_gzip = 0;
- break;
+ if (!rpc_read_from_out(rpc, 0, &n, &status)) {
+ large_request = 1;
+ use_gzip = 0;
+ break;
+ }
+ if (status == PACKET_READ_FLUSH)
+ break;
}
-
- n = packet_read(rpc->out, NULL, NULL, buf, left, 0);
- if (!n)
- break;
- rpc->len += n;
}
if (large_request) {
@@ -759,11 +876,11 @@
ret = git_deflate(&stream, Z_FINISH);
if (ret != Z_STREAM_END)
- die("cannot deflate request; zlib deflate error %d", ret);
+ die(_("cannot deflate request; zlib deflate error %d"), ret);
ret = git_deflate_end_gently(&stream);
if (ret != Z_OK)
- die("cannot deflate request; zlib end error %d", ret);
+ die(_("cannot deflate request; zlib end error %d"), ret);
gzip_size = stream.total_out;
@@ -815,22 +932,22 @@
return err;
}
-static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
+static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
+ const char **client_argv, const struct strbuf *preamble,
+ struct strbuf *rpc_result)
{
const char *svc = rpc->service_name;
struct strbuf buf = STRBUF_INIT;
- struct strbuf *preamble = rpc->stdin_preamble;
struct child_process client = CHILD_PROCESS_INIT;
int err = 0;
client.in = -1;
client.out = -1;
client.git_cmd = 1;
- client.argv = rpc->argv;
+ client.argv = client_argv;
if (start_command(&client))
exit(1);
- if (preamble)
- write_or_die(client.in, preamble->buf, preamble->len);
+ write_or_die(client.in, preamble->buf, preamble->len);
if (heads)
write_or_die(client.in, heads->buf, heads->len);
@@ -838,7 +955,6 @@
rpc->buf = xmalloc(rpc->alloc);
rpc->in = client.in;
rpc->out = client.out;
- strbuf_init(&rpc->result, 0);
strbuf_addf(&buf, "%s%s", url.buf, svc);
rpc->service_url = strbuf_detach(&buf, NULL);
@@ -860,13 +976,13 @@
break;
rpc->pos = 0;
rpc->len = n;
- err |= post_rpc(rpc);
+ err |= post_rpc(rpc, 0);
}
close(client.in);
client.in = -1;
if (!err) {
- strbuf_read(&rpc->result, client.out, 0);
+ strbuf_read(rpc_result, client.out, 0);
} else {
char buf[4096];
for (;;)
@@ -895,7 +1011,7 @@
ALLOC_ARRAY(targets, nr_heads);
if (options.depth || options.deepen_since)
- die("dumb http transport does not support shallow capabilities");
+ die(_("dumb http transport does not support shallow capabilities"));
for (i = 0; i < nr_heads; i++)
targets[i] = xstrdup(oid_to_hex(&to_fetch[i]->old_oid));
@@ -909,7 +1025,7 @@
free(targets[i]);
free(targets);
- return ret ? error("fetch failed.") : 0;
+ return ret ? error(_("fetch failed.")) : 0;
}
static int fetch_git(struct discovery *heads,
@@ -919,6 +1035,7 @@
struct strbuf preamble = STRBUF_INIT;
int i, err;
struct argv_array args = ARGV_ARRAY_INIT;
+ struct strbuf rpc_result = STRBUF_INIT;
argv_array_pushl(&args, "fetch-pack", "--stateless-rpc",
"--stdin", "--lock-pack", NULL);
@@ -956,7 +1073,7 @@
for (i = 0; i < nr_heads; i++) {
struct ref *ref = to_fetch[i];
if (!*ref->name)
- die("cannot fetch by sha1 over smart http");
+ die(_("cannot fetch by sha1 over smart http"));
packet_buf_write(&preamble, "%s %s\n",
oid_to_hex(&ref->old_oid), ref->name);
}
@@ -964,14 +1081,12 @@
memset(&rpc, 0, sizeof(rpc));
rpc.service_name = "git-upload-pack",
- rpc.argv = args.argv;
- rpc.stdin_preamble = &preamble;
rpc.gzip_request = 1;
- err = rpc_service(&rpc, heads);
- if (rpc.result.len)
- write_or_die(1, rpc.result.buf, rpc.result.len);
- strbuf_release(&rpc.result);
+ err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+ if (rpc_result.len)
+ write_or_die(1, rpc_result.buf, rpc_result.len);
+ strbuf_release(&rpc_result);
strbuf_release(&preamble);
argv_array_clear(&args);
return err;
@@ -999,15 +1114,16 @@
const char *name;
struct ref *ref;
struct object_id old_oid;
+ const char *q;
- if (get_oid_hex(p, &old_oid))
- die("protocol error: expected sha/ref, got %s'", p);
- if (p[GIT_SHA1_HEXSZ] == ' ')
- name = p + GIT_SHA1_HEXSZ + 1;
- else if (!p[GIT_SHA1_HEXSZ])
+ if (parse_oid_hex(p, &old_oid, &q))
+ die(_("protocol error: expected sha/ref, got '%s'"), p);
+ if (*q == ' ')
+ name = q + 1;
+ else if (!*q)
name = "";
else
- die("protocol error: expected sha/ref, got %s'", p);
+ die(_("protocol error: expected sha/ref, got '%s'"), p);
ref = alloc_ref(name);
oidcpy(&ref->old_oid, &old_oid);
@@ -1019,7 +1135,7 @@
to_fetch[nr_heads++] = ref;
}
else
- die("http transport does not support %s", buf->buf);
+ die(_("http transport does not support %s"), buf->buf);
strbuf_reset(buf);
if (strbuf_getline_lf(buf, stdin) == EOF)
@@ -1055,7 +1171,7 @@
argv_array_push(&child.args, specs[i]);
if (run_command(&child))
- die("git-http-push failed");
+ die(_("git-http-push failed"));
return 0;
}
@@ -1066,6 +1182,7 @@
struct argv_array args;
struct string_list_item *cas_option;
struct strbuf preamble = STRBUF_INIT;
+ struct strbuf rpc_result = STRBUF_INIT;
argv_array_init(&args);
argv_array_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status",
@@ -1098,13 +1215,11 @@
memset(&rpc, 0, sizeof(rpc));
rpc.service_name = "git-receive-pack",
- rpc.argv = args.argv;
- rpc.stdin_preamble = &preamble;
- err = rpc_service(&rpc, heads);
- if (rpc.result.len)
- write_or_die(1, rpc.result.buf, rpc.result.len);
- strbuf_release(&rpc.result);
+ err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+ if (rpc_result.len)
+ write_or_die(1, rpc_result.buf, rpc_result.len);
+ strbuf_release(&rpc_result);
strbuf_release(&preamble);
argv_array_clear(&args);
return err;
@@ -1134,7 +1249,7 @@
specs[nr_spec++] = xstrdup(buf->buf + 5);
}
else
- die("http transport does not support %s", buf->buf);
+ die(_("http transport does not support %s"), buf->buf);
strbuf_reset(buf);
if (strbuf_getline_lf(buf, stdin) == EOF)
@@ -1156,165 +1271,11 @@
free(specs);
}
-/*
- * Used to represent the state of a connection to an HTTP server when
- * communicating using git's wire-protocol version 2.
- */
-struct proxy_state {
- char *service_name;
- char *service_url;
- struct curl_slist *headers;
- struct strbuf request_buffer;
- int in;
- int out;
- struct packet_reader reader;
- size_t pos;
- int seen_flush;
-};
-
-static void proxy_state_init(struct proxy_state *p, const char *service_name,
- enum protocol_version version)
-{
- struct strbuf buf = STRBUF_INIT;
-
- memset(p, 0, sizeof(*p));
- p->service_name = xstrdup(service_name);
-
- p->in = 0;
- p->out = 1;
- strbuf_init(&p->request_buffer, 0);
-
- strbuf_addf(&buf, "%s%s", url.buf, p->service_name);
- p->service_url = strbuf_detach(&buf, NULL);
-
- p->headers = http_copy_default_headers();
-
- strbuf_addf(&buf, "Content-Type: application/x-%s-request", p->service_name);
- p->headers = curl_slist_append(p->headers, buf.buf);
- strbuf_reset(&buf);
-
- strbuf_addf(&buf, "Accept: application/x-%s-result", p->service_name);
- p->headers = curl_slist_append(p->headers, buf.buf);
- strbuf_reset(&buf);
-
- p->headers = curl_slist_append(p->headers, "Transfer-Encoding: chunked");
-
- /* Add the Git-Protocol header */
- if (get_protocol_http_header(version, &buf))
- p->headers = curl_slist_append(p->headers, buf.buf);
-
- packet_reader_init(&p->reader, p->in, NULL, 0,
- PACKET_READ_GENTLE_ON_EOF |
- PACKET_READ_DIE_ON_ERR_PACKET);
-
- strbuf_release(&buf);
-}
-
-static void proxy_state_clear(struct proxy_state *p)
-{
- free(p->service_name);
- free(p->service_url);
- curl_slist_free_all(p->headers);
- strbuf_release(&p->request_buffer);
-}
-
-/*
- * CURLOPT_READFUNCTION callback function.
- * Attempts to copy over a single packet-line at a time into the
- * curl provided buffer.
- */
-static size_t proxy_in(char *buffer, size_t eltsize,
- size_t nmemb, void *userdata)
-{
- size_t max;
- struct proxy_state *p = userdata;
- size_t avail = p->request_buffer.len - p->pos;
-
-
- if (eltsize != 1)
- BUG("curl read callback called with size = %"PRIuMAX" != 1",
- (uintmax_t)eltsize);
- max = nmemb;
-
- if (!avail) {
- if (p->seen_flush) {
- p->seen_flush = 0;
- return 0;
- }
-
- strbuf_reset(&p->request_buffer);
- switch (packet_reader_read(&p->reader)) {
- case PACKET_READ_EOF:
- die("unexpected EOF when reading from parent process");
- case PACKET_READ_NORMAL:
- packet_buf_write_len(&p->request_buffer, p->reader.line,
- p->reader.pktlen);
- break;
- case PACKET_READ_DELIM:
- packet_buf_delim(&p->request_buffer);
- break;
- case PACKET_READ_FLUSH:
- packet_buf_flush(&p->request_buffer);
- p->seen_flush = 1;
- break;
- }
- p->pos = 0;
- avail = p->request_buffer.len;
- }
-
- if (max < avail)
- avail = max;
- memcpy(buffer, p->request_buffer.buf + p->pos, avail);
- p->pos += avail;
- return avail;
-}
-
-static size_t proxy_out(char *buffer, size_t eltsize,
- size_t nmemb, void *userdata)
-{
- size_t size;
- struct proxy_state *p = userdata;
-
- if (eltsize != 1)
- BUG("curl read callback called with size = %"PRIuMAX" != 1",
- (uintmax_t)eltsize);
- size = nmemb;
-
- write_or_die(p->out, buffer, size);
- return size;
-}
-
-/* Issues a request to the HTTP server configured in `p` */
-static int proxy_request(struct proxy_state *p)
-{
- struct active_request_slot *slot;
-
- slot = get_active_slot();
-
- curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
- curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
- curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
- curl_easy_setopt(slot->curl, CURLOPT_URL, p->service_url);
- curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, p->headers);
-
- /* Setup function to read request from client */
- curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, proxy_in);
- curl_easy_setopt(slot->curl, CURLOPT_READDATA, p);
-
- /* Setup function to write server response to client */
- curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, proxy_out);
- curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, p);
-
- if (run_slot(slot, NULL) != HTTP_OK)
- return -1;
-
- return 0;
-}
-
static int stateless_connect(const char *service_name)
{
struct discovery *discover;
- struct proxy_state p;
+ struct rpc_state rpc;
+ struct strbuf buf = STRBUF_INIT;
/*
* Run the info/refs request and see if the server supports protocol
@@ -1334,23 +1295,58 @@
fflush(stdout);
}
- proxy_state_init(&p, service_name, discover->version);
+ rpc.service_name = service_name;
+ rpc.service_url = xstrfmt("%s%s", url.buf, rpc.service_name);
+ rpc.hdr_content_type = xstrfmt("Content-Type: application/x-%s-request", rpc.service_name);
+ rpc.hdr_accept = xstrfmt("Accept: application/x-%s-result", rpc.service_name);
+ if (get_protocol_http_header(discover->version, &buf)) {
+ rpc.protocol_header = strbuf_detach(&buf, NULL);
+ } else {
+ rpc.protocol_header = NULL;
+ strbuf_release(&buf);
+ }
+ rpc.buf = xmalloc(http_post_buffer);
+ rpc.alloc = http_post_buffer;
+ rpc.len = 0;
+ rpc.pos = 0;
+ rpc.in = 1;
+ rpc.out = 0;
+ rpc.any_written = 0;
+ rpc.gzip_request = 1;
+ rpc.initial_buffer = 0;
+ rpc.write_line_lengths = 1;
+ rpc.flush_read_but_not_sent = 0;
/*
* Dump the capability listing that we got from the server earlier
* during the info/refs request.
*/
- write_or_die(p.out, discover->buf, discover->len);
+ write_or_die(rpc.in, discover->buf, discover->len);
- /* Peek the next packet line. Until we see EOF keep sending POSTs */
- while (packet_reader_peek(&p.reader) != PACKET_READ_EOF) {
- if (proxy_request(&p)) {
+ /* Until we see EOF keep sending POSTs */
+ while (1) {
+ size_t avail;
+ enum packet_read_status status;
+
+ if (!rpc_read_from_out(&rpc, PACKET_READ_GENTLE_ON_EOF, &avail,
+ &status))
+ BUG("The entire rpc->buf should be larger than LARGE_PACKET_MAX");
+ if (status == PACKET_READ_EOF)
+ break;
+ if (post_rpc(&rpc, status == PACKET_READ_FLUSH))
/* We would have an err here */
break;
- }
+ /* Reset the buffer for next request */
+ rpc.len = 0;
}
- proxy_state_clear(&p);
+ free(rpc.service_url);
+ free(rpc.hdr_content_type);
+ free(rpc.hdr_accept);
+ free(rpc.protocol_header);
+ free(rpc.buf);
+ strbuf_release(&buf);
+
return 0;
}
@@ -1361,7 +1357,7 @@
setup_git_directory_gently(&nongit);
if (argc < 2) {
- error("remote-curl: usage: git remote-curl <remote> [<url>]");
+ error(_("remote-curl: usage: git remote-curl <remote> [<url>]"));
return 1;
}
@@ -1371,6 +1367,13 @@
string_list_init(&options.deepen_not, 1);
string_list_init(&options.push_options, 1);
+ /*
+ * Just report "remote-curl" here (folding all the various aliases
+ * ("git-remote-http", "git-remote-https", and etc.) here since they
+ * are all just copies of the same actual executable.
+ */
+ trace2_cmd_name("remote-curl");
+
remote = remote_get(argv[1]);
if (argc > 2) {
@@ -1386,14 +1389,14 @@
if (strbuf_getline_lf(&buf, stdin) == EOF) {
if (ferror(stdin))
- error("remote-curl: error reading command stream from git");
+ error(_("remote-curl: error reading command stream from git"));
return 1;
}
if (buf.len == 0)
break;
if (starts_with(buf.buf, "fetch ")) {
if (nongit)
- die("remote-curl: fetch attempted without a local repo");
+ die(_("remote-curl: fetch attempted without a local repo"));
parse_fetch(&buf);
} else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) {
@@ -1433,7 +1436,7 @@
if (!stateless_connect(arg))
break;
} else {
- error("remote-curl: unknown command '%s' from git", buf.buf);
+ error(_("remote-curl: unknown command '%s' from git"), buf.buf);
return 1;
}
strbuf_reset(&buf);
diff --git a/remote.c b/remote.c
index 9cc3b07..e50f760 100644
--- a/remote.c
+++ b/remote.c
@@ -820,11 +820,11 @@
return ret;
}
-static void free_ref(struct ref *ref)
+void free_one_ref(struct ref *ref)
{
if (!ref)
return;
- free_ref(ref->peer_ref);
+ free_one_ref(ref->peer_ref);
free(ref->remote_status);
free(ref->symref);
free(ref);
@@ -835,7 +835,7 @@
struct ref *next;
while (ref) {
next = ref->next;
- free_ref(ref);
+ free_one_ref(ref);
ref = next;
}
}
@@ -1880,37 +1880,27 @@
}
/*
- * Lookup the upstream branch for the given branch and if present, optionally
- * compute the commit ahead/behind values for the pair.
+ * Compute the commit ahead/behind values for the pair branch_name, base.
*
* If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
* counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
* the (potentially expensive) a/b computation (*num_ours and *num_theirs are
* set to zero).
*
- * The name of the upstream branch (or NULL if no upstream is defined) is
- * returned via *upstream_name, if it is not itself NULL.
- *
- * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
- * upstream defined, or ref does not exist). Returns 0 if the commits are
- * identical. Returns 1 if commits are different.
+ * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
+ * does not exist). Returns 0 if the commits are identical. Returns 1 if
+ * commits are different.
*/
-int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
- const char **upstream_name, enum ahead_behind_flags abf)
+
+static int stat_branch_pair(const char *branch_name, const char *base,
+ int *num_ours, int *num_theirs,
+ enum ahead_behind_flags abf)
{
struct object_id oid;
struct commit *ours, *theirs;
struct rev_info revs;
- const char *base;
struct argv_array argv = ARGV_ARRAY_INIT;
- /* Cannot stat unless we are marked to build on top of somebody else. */
- base = branch_get_upstream(branch, NULL);
- if (upstream_name)
- *upstream_name = base;
- if (!base)
- return -1;
-
/* Cannot stat if what we used to build on no longer exists */
if (read_ref(base, &oid))
return -1;
@@ -1918,7 +1908,7 @@
if (!theirs)
return -1;
- if (read_ref(branch->refname, &oid))
+ if (read_ref(branch_name, &oid))
return -1;
ours = lookup_commit_reference(the_repository, &oid);
if (!ours)
@@ -1932,7 +1922,7 @@
if (abf == AHEAD_BEHIND_QUICK)
return 1;
if (abf != AHEAD_BEHIND_FULL)
- BUG("stat_tracking_info: invalid abf '%d'", abf);
+ BUG("stat_branch_pair: invalid abf '%d'", abf);
/* Run "rev-list --left-right ours...theirs" internally... */
argv_array_push(&argv, ""); /* ignored */
@@ -1967,6 +1957,42 @@
}
/*
+ * Lookup the tracking branch for the given branch and if present, optionally
+ * compute the commit ahead/behind values for the pair.
+ *
+ * If for_push is true, the tracking branch refers to the push branch,
+ * otherwise it refers to the upstream branch.
+ *
+ * The name of the tracking branch (or NULL if it is not defined) is
+ * returned via *tracking_name, if it is not itself NULL.
+ *
+ * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
+ * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
+ * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
+ * set to zero).
+ *
+ * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
+ * upstream defined, or ref does not exist). Returns 0 if the commits are
+ * identical. Returns 1 if commits are different.
+ */
+int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
+ const char **tracking_name, int for_push,
+ enum ahead_behind_flags abf)
+{
+ const char *base;
+
+ /* Cannot stat unless we are marked to build on top of somebody else. */
+ base = for_push ? branch_get_push(branch, NULL) :
+ branch_get_upstream(branch, NULL);
+ if (tracking_name)
+ *tracking_name = base;
+ if (!base)
+ return -1;
+
+ return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
+}
+
+/*
* Return true when there is anything to report, otherwise false.
*/
int format_tracking_info(struct branch *branch, struct strbuf *sb,
@@ -1977,7 +2003,7 @@
char *base;
int upstream_is_gone = 0;
- sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
+ sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
if (sti < 0) {
if (!full_base)
return 0;
diff --git a/remote.h b/remote.h
index da53ad5..83e8856 100644
--- a/remote.h
+++ b/remote.h
@@ -119,36 +119,38 @@
#define REF_HEADS (1u << 1)
#define REF_TAGS (1u << 2)
-extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
+struct ref *find_ref_by_name(const struct ref *list, const char *name);
struct ref *alloc_ref(const char *name);
struct ref *copy_ref(const struct ref *ref);
struct ref *copy_ref_list(const struct ref *ref);
void sort_ref_list(struct ref **, int (*cmp)(const void *, const void *));
-extern int count_refspec_match(const char *, struct ref *refs, struct ref **matched_ref);
+int count_refspec_match(const char *, struct ref *refs, struct ref **matched_ref);
int ref_compare_name(const void *, const void *);
int check_ref_type(const struct ref *ref, int flags);
/*
- * Frees the entire list and peers of elements.
+ * Free a single ref and its peer, or an entire list of refs and their peers,
+ * respectively.
*/
+void free_one_ref(struct ref *ref);
void free_refs(struct ref *ref);
struct oid_array;
struct packet_reader;
struct argv_array;
struct string_list;
-extern struct ref **get_remote_heads(struct packet_reader *reader,
- struct ref **list, unsigned int flags,
- struct oid_array *extra_have,
- struct oid_array *shallow_points);
+struct ref **get_remote_heads(struct packet_reader *reader,
+ struct ref **list, unsigned int flags,
+ struct oid_array *extra_have,
+ struct oid_array *shallow_points);
/* Used for protocol v2 in order to retrieve refs from a remote */
-extern struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
- struct ref **list, int for_push,
- const struct argv_array *ref_prefixes,
- const struct string_list *server_options);
+struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
+ struct ref **list, int for_push,
+ const struct argv_array *ref_prefixes,
+ const struct string_list *server_options);
int resolve_remote_symref(struct ref *ref, struct ref *list);
@@ -253,7 +255,8 @@
/* Reporting of tracking info */
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
- const char **upstream_name, enum ahead_behind_flags abf);
+ const char **upstream_name, int for_push,
+ enum ahead_behind_flags abf);
int format_tracking_info(struct branch *branch, struct strbuf *sb,
enum ahead_behind_flags abf);
@@ -287,9 +290,9 @@
int alloc;
};
-extern int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
+int parseopt_push_cas_option(const struct option *, const char *arg, int unset);
-extern int is_empty_cas(const struct push_cas_option *);
+int is_empty_cas(const struct push_cas_option *);
void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
#endif
diff --git a/replace-object.h b/replace-object.h
index 16528df..04ed7a8 100644
--- a/replace-object.h
+++ b/replace-object.h
@@ -16,8 +16,8 @@
* This internal function is only declared here for the benefit of
* lookup_replace_object(). Please do not call it directly.
*/
-extern const struct object_id *do_lookup_replace_object(struct repository *r,
- const struct object_id *oid);
+const struct object_id *do_lookup_replace_object(struct repository *r,
+ const struct object_id *oid);
/*
* If object sha1 should be replaced, return the replacement object's
diff --git a/repo-settings.c b/repo-settings.c
new file mode 100644
index 0000000..05546db
--- /dev/null
+++ b/repo-settings.c
@@ -0,0 +1,68 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+
+#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
+
+void prepare_repo_settings(struct repository *r)
+{
+ int value;
+ char *strval;
+
+ if (r->settings.initialized)
+ return;
+
+ /* Defaults */
+ memset(&r->settings, -1, sizeof(r->settings));
+
+ if (!repo_config_get_bool(r, "core.commitgraph", &value))
+ r->settings.core_commit_graph = value;
+ if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
+ r->settings.gc_write_commit_graph = value;
+ UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
+ UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
+
+ if (!repo_config_get_bool(r, "index.version", &value))
+ r->settings.index_version = value;
+ if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
+ if (value == 0)
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
+ else
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+ } else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+ if (!strcasecmp(strval, "keep"))
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+
+ free(strval);
+ }
+
+ if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+ if (!strcasecmp(strval, "skipping"))
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+ else
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+ }
+
+ if (!repo_config_get_bool(r, "pack.usesparse", &value))
+ r->settings.pack_use_sparse = value;
+ if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
+ UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
+ UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
+ }
+ if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
+ r->settings.fetch_write_commit_graph = value;
+ if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
+ UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
+ }
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
+
+ /* Hack for test programs like test-dump-untracked-cache */
+ if (ignore_untracked_cache_config)
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+ else
+ UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
+
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
+}
diff --git a/repository.c b/repository.c
index 65e6f8b..682c239 100644
--- a/repository.c
+++ b/repository.c
@@ -126,6 +126,8 @@
void repo_set_worktree(struct repository *repo, const char *path)
{
repo->worktree = real_pathdup(path, 1);
+
+ trace2_def_repo(repo);
}
static int read_and_verify_repository_format(struct repository_format *format,
@@ -155,7 +157,7 @@
const char *gitdir,
const char *worktree)
{
- struct repository_format format;
+ struct repository_format format = REPOSITORY_FORMAT_INIT;
memset(repo, 0, sizeof(*repo));
repo->objects = raw_object_store_new();
@@ -172,6 +174,7 @@
if (worktree)
repo_set_worktree(repo, worktree);
+ clear_repository_format(&format);
return 0;
error:
diff --git a/repository.h b/repository.h
index 8981649..fe42197 100644
--- a/repository.h
+++ b/repository.h
@@ -11,6 +11,34 @@
struct raw_object_store;
struct submodule_cache;
+enum untracked_cache_setting {
+ UNTRACKED_CACHE_UNSET = -1,
+ UNTRACKED_CACHE_REMOVE = 0,
+ UNTRACKED_CACHE_KEEP = 1,
+ UNTRACKED_CACHE_WRITE = 2
+};
+
+enum fetch_negotiation_setting {
+ FETCH_NEGOTIATION_UNSET = -1,
+ FETCH_NEGOTIATION_NONE = 0,
+ FETCH_NEGOTIATION_DEFAULT = 1,
+ FETCH_NEGOTIATION_SKIPPING = 2,
+};
+
+struct repo_settings {
+ int initialized;
+
+ int core_commit_graph;
+ int gc_write_commit_graph;
+ int fetch_write_commit_graph;
+
+ int index_version;
+ enum untracked_cache_setting core_untracked_cache;
+
+ int pack_use_sparse;
+ enum fetch_negotiation_setting fetch_negotiation_algorithm;
+};
+
struct repository {
/* Environment */
/*
@@ -72,6 +100,8 @@
*/
char *submodule_prefix;
+ struct repo_settings settings;
+
/* Subsystems */
/*
* Repository's config which contains key-value pairs from the usual
@@ -92,6 +122,12 @@
/* Repository's current hash algorithm, as serialized on disk. */
const struct git_hash_algo *hash_algo;
+ /* A unique-id for tracing purposes. */
+ int trace2_repo_id;
+
+ /* True if commit-graph has been disabled within this process. */
+ int commit_graph_disabled;
+
/* Configurations */
/* Indicate if a repository has a different 'commondir' from 'gitdir' */
@@ -154,5 +190,6 @@
*/
void repo_update_index_if_able(struct repository *, struct lock_file *);
+void prepare_repo_settings(struct repository *r);
#endif /* REPOSITORY_H */
diff --git a/resolve-undo.h b/resolve-undo.h
index fbe348e..2b3f0f9 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -8,12 +8,12 @@
struct object_id oid[3];
};
-extern void record_resolve_undo(struct index_state *, struct cache_entry *);
-extern void resolve_undo_write(struct strbuf *, struct string_list *);
-extern struct string_list *resolve_undo_read(const char *, unsigned long);
-extern void resolve_undo_clear_index(struct index_state *);
-extern int unmerge_index_entry_at(struct index_state *, int);
-extern void unmerge_index(struct index_state *, const struct pathspec *);
-extern void unmerge_marked_index(struct index_state *);
+void record_resolve_undo(struct index_state *, struct cache_entry *);
+void resolve_undo_write(struct strbuf *, struct string_list *);
+struct string_list *resolve_undo_read(const char *, unsigned long);
+void resolve_undo_clear_index(struct index_state *);
+int unmerge_index_entry_at(struct index_state *, int);
+void unmerge_index(struct index_state *, const struct pathspec *);
+void unmerge_marked_index(struct index_state *);
#endif
diff --git a/revision.c b/revision.c
index 162d511..442a705 100644
--- a/revision.c
+++ b/revision.c
@@ -404,9 +404,7 @@
struct tag *tag = (struct tag *) object;
if (revs->tag_objects && !(flags & UNINTERESTING))
add_pending_object(revs, object, tag->tag);
- if (!tag->tagged)
- die("bad tag");
- object = parse_object(revs->repo, &tag->tagged->oid);
+ object = parse_object(revs->repo, get_tagged_oid(tag));
if (!object) {
if (revs->ignore_missing_links || (flags & UNINTERESTING))
return NULL;
@@ -436,7 +434,9 @@
die("unable to parse commit %s", name);
if (flags & UNINTERESTING) {
mark_parents_uninteresting(commit);
- revs->limited = 1;
+
+ if (!revs->topo_order || !generation_numbers_enabled(the_repository))
+ revs->limited = 1;
}
if (revs->sources) {
char **slot = revision_sources_at(revs->sources, commit);
@@ -911,26 +911,11 @@
commit->object.flags |= TREESAME;
}
-static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
- struct commit_list *cached_base, struct commit_list **cache)
-{
- struct commit_list *new_entry;
-
- if (cached_base && p->date < cached_base->item->date)
- new_entry = commit_list_insert_by_date(p, &cached_base->next);
- else
- new_entry = commit_list_insert_by_date(p, head);
-
- if (cache && (!*cache || p->date < (*cache)->item->date))
- *cache = new_entry;
-}
-
static int process_parents(struct rev_info *revs, struct commit *commit,
- struct commit_list **list, struct commit_list **cache_ptr)
+ struct commit_list **list, struct prio_queue *queue)
{
struct commit_list *parent = commit->parents;
unsigned left_flag;
- struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
if (commit->object.flags & ADDED)
return 0;
@@ -966,7 +951,9 @@
continue;
p->object.flags |= SEEN;
if (list)
- commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
+ commit_list_insert_by_date(p, list);
+ if (queue)
+ prio_queue_put(queue, p);
}
return 0;
}
@@ -1006,7 +993,9 @@
if (!(p->object.flags & SEEN)) {
p->object.flags |= SEEN;
if (list)
- commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
+ commit_list_insert_by_date(p, list);
+ if (queue)
+ prio_queue_put(queue, p);
}
if (revs->first_parent_only)
break;
@@ -1563,6 +1552,32 @@
free_worktrees(worktrees);
}
+struct add_alternate_refs_data {
+ struct rev_info *revs;
+ unsigned int flags;
+};
+
+static void add_one_alternate_ref(const struct object_id *oid,
+ void *vdata)
+{
+ const char *name = ".alternate";
+ struct add_alternate_refs_data *data = vdata;
+ struct object *obj;
+
+ obj = get_reference(data->revs, name, oid, data->flags);
+ add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
+ add_pending_object(data->revs, obj, name);
+}
+
+static void add_alternate_refs_to_pending(struct rev_info *revs,
+ unsigned int flags)
+{
+ struct add_alternate_refs_data data;
+ data.revs = revs;
+ data.flags = flags;
+ for_each_alternate_ref(add_one_alternate_ref, &data);
+}
+
static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
int exclude_parent)
{
@@ -1894,7 +1909,7 @@
return 0;
}
-static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
+static void read_pathspec_from_stdin(struct strbuf *sb,
struct argv_array *prune)
{
while (strbuf_getline(sb, stdin) != EOF)
@@ -1928,7 +1943,7 @@
die("bad revision '%s'", sb.buf);
}
if (seen_dashdash)
- read_pathspec_from_stdin(revs, &sb, prune);
+ read_pathspec_from_stdin(&sb, prune);
strbuf_release(&sb);
warn_on_object_refname_ambiguity = save_warning;
@@ -1965,6 +1980,7 @@
!strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
!strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
!strcmp(arg, "--indexed-objects") ||
+ !strcmp(arg, "--alternate-refs") ||
starts_with(arg, "--exclude=") ||
starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
@@ -2045,7 +2061,6 @@
revs->simplify_by_decoration = 1;
revs->limited = 1;
revs->prune = 1;
- load_ref_decorations(NULL, DECORATE_SHORT_REFS);
} else if (!strcmp(arg, "--date-order")) {
revs->sort_order = REV_SORT_BY_COMMIT_DATE;
revs->topo_order = 1;
@@ -2151,6 +2166,9 @@
revs->diff = 1;
revs->dense_combined_merges = 0;
revs->combine_merges = 1;
+ } else if (!strcmp(arg, "--combined-all-paths")) {
+ revs->diff = 1;
+ revs->combined_all_paths = 1;
} else if (!strcmp(arg, "--cc")) {
revs->diff = 1;
revs->dense_combined_merges = 1;
@@ -2448,6 +2466,8 @@
add_reflogs_to_pending(revs, *flags);
} else if (!strcmp(arg, "--indexed-objects")) {
add_index_objects_to_pending(revs, *flags);
+ } else if (!strcmp(arg, "--alternate-refs")) {
+ add_alternate_refs_to_pending(revs, *flags);
} else if (!strcmp(arg, "--not")) {
*flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) {
@@ -2500,6 +2520,7 @@
int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
struct argv_array prune_data = ARGV_ARRAY_INIT;
const char *submodule = NULL;
+ int seen_end_of_options = 0;
if (opt)
submodule = opt->submodule;
@@ -2529,7 +2550,7 @@
revarg_opt |= REVARG_CANNOT_BE_FILENAME;
for (left = i = 1; i < argc; i++) {
const char *arg = argv[i];
- if (*arg == '-') {
+ if (!seen_end_of_options && *arg == '-') {
int opts;
opts = handle_revision_pseudo_opt(submodule,
@@ -2551,6 +2572,11 @@
continue;
}
+ if (!strcmp(arg, "--end-of-options")) {
+ seen_end_of_options = 1;
+ continue;
+ }
+
opts = handle_revision_opt(revs, argc - i, argv + i,
&left, argv, opt);
if (opts > 0) {
@@ -2647,6 +2673,9 @@
}
if (revs->combine_merges)
revs->ignore_merges = 0;
+ if (revs->combined_all_paths && !revs->combine_merges)
+ die("--combined-all-paths makes no sense without -c or --cc");
+
revs->diffopt.abbrev = revs->abbrev;
if (revs->line_level_traverse) {
@@ -2683,6 +2712,10 @@
if (revs->first_parent_only && revs->bisect)
die(_("--first-parent is incompatible with --bisect"));
+ if (revs->line_level_traverse &&
+ (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
+ die(_("-L does not yet support diff formats besides -p and -s"));
+
if (revs->expand_tabs_in_log < 0)
revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
@@ -2742,7 +2775,7 @@
return st;
}
-static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
+static int mark_redundant_parents(struct commit *commit)
{
struct commit_list *h = reduce_heads(commit->parents);
int i = 0, marked = 0;
@@ -2778,7 +2811,7 @@
return marked;
}
-static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
+static int mark_treesame_root_parents(struct commit *commit)
{
struct commit_list *p;
int marked = 0;
@@ -2970,8 +3003,8 @@
* Detect and simplify both cases.
*/
if (1 < cnt) {
- int marked = mark_redundant_parents(revs, commit);
- marked += mark_treesame_root_parents(revs, commit);
+ int marked = mark_redundant_parents(commit);
+ marked += mark_treesame_root_parents(commit);
if (marked)
marked -= leave_one_treesame_to_parent(revs, commit);
if (marked)
@@ -3264,6 +3297,9 @@
struct commit *parent = p->item;
int *pi;
+ if (parent->object.flags & UNINTERESTING)
+ continue;
+
if (parse_commit_gently(parent, 1) < 0)
continue;
@@ -3335,14 +3371,14 @@
return 0;
}
-static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
+static enum rewrite_result rewrite_one_1(struct rev_info *revs,
+ struct commit **pp,
+ struct prio_queue *queue)
{
- struct commit_list *cache = NULL;
-
for (;;) {
struct commit *p = *pp;
if (!revs->limited)
- if (process_parents(revs, p, &revs->commits, &cache) < 0)
+ if (process_parents(revs, p, NULL, queue) < 0)
return rewrite_one_error;
if (p->object.flags & UNINTERESTING)
return rewrite_one_ok;
@@ -3356,6 +3392,31 @@
}
}
+static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list)
+{
+ while (q->nr) {
+ struct commit *item = prio_queue_peek(q);
+ struct commit_list *p = *list;
+
+ if (p && p->item->date >= item->date)
+ list = &p->next;
+ else {
+ p = commit_list_insert(item, list);
+ list = &p->next; /* skip newly added item */
+ prio_queue_get(q); /* pop item */
+ }
+ }
+}
+
+static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
+{
+ struct prio_queue queue = { compare_commits_by_commit_date };
+ enum rewrite_result ret = rewrite_one_1(revs, pp, &queue);
+ merge_queue_into_list(&queue, &revs->commits);
+ clear_prio_queue(&queue);
+ return ret;
+}
+
int rewrite_parents(struct rev_info *revs, struct commit *commit,
rewrite_parent_fn_t rewrite_parent)
{
diff --git a/revision.h b/revision.h
index d32d62a..4134dc6 100644
--- a/revision.h
+++ b/revision.h
@@ -172,6 +172,7 @@
verbose_header:1,
ignore_merges:1,
combine_merges:1,
+ combined_all_paths:1,
dense_combined_merges:1,
always_show_header:1;
diff --git a/run-command.c b/run-command.c
index 3db26b7..3449db3 100644
--- a/run-command.c
+++ b/run-command.c
@@ -219,9 +219,29 @@
int sane_execvp(const char *file, char * const argv[])
{
+#ifndef GIT_WINDOWS_NATIVE
+ /*
+ * execvp() doesn't return, so we all we can do is tell trace2
+ * what we are about to do and let it leave a hint in the log
+ * (unless of course the execvp() fails).
+ *
+ * we skip this for Windows because the compat layer already
+ * has to emulate the execvp() call anyway.
+ */
+ int exec_id = trace2_exec(file, (const char **)argv);
+#endif
+
if (!execvp(file, argv))
return 0; /* cannot happen ;-) */
+#ifndef GIT_WINDOWS_NATIVE
+ {
+ int ec = errno;
+ trace2_exec_result(exec_id, ec);
+ errno = ec;
+ }
+#endif
+
/*
* When a command can't be found because one of the directories
* listed in $PATH is unsearchable, execvp reports EACCES, but
@@ -712,6 +732,7 @@
cmd->err = fderr[0];
}
+ trace2_child_start(cmd);
trace_run_command(cmd);
fflush(NULL);
@@ -926,6 +947,8 @@
#endif
if (cmd->pid < 0) {
+ trace2_child_exit(cmd, -1);
+
if (need_in)
close_pair(fdin);
else if (cmd->in)
@@ -964,13 +987,16 @@
int finish_command(struct child_process *cmd)
{
int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
+ trace2_child_exit(cmd, ret);
child_process_clear(cmd);
return ret;
}
int finish_command_in_signal(struct child_process *cmd)
{
- return wait_or_whine(cmd->pid, cmd->argv[0], 1);
+ int ret = wait_or_whine(cmd->pid, cmd->argv[0], 1);
+ trace2_child_exit(cmd, ret);
+ return ret;
}
@@ -992,8 +1018,19 @@
return run_command_v_opt_cd_env(argv, opt, NULL, NULL);
}
+int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class)
+{
+ return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, tr2_class);
+}
+
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env)
{
+ return run_command_v_opt_cd_env_tr2(argv, opt, dir, env, NULL);
+}
+
+int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
+ const char *const *env, const char *tr2_class)
+{
struct child_process cmd = CHILD_PROCESS_INIT;
cmd.argv = argv;
cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
@@ -1004,6 +1041,7 @@
cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
cmd.dir = dir;
cmd.env = env;
+ cmd.trace2_child_class = tr2_class;
return run_command(&cmd);
}
@@ -1319,6 +1357,7 @@
hook.env = env;
hook.no_stdin = 1;
hook.stdout_to_stderr = 1;
+ hook.trace2_hook_name = name;
return run_command(&hook);
}
@@ -1807,3 +1846,21 @@
pp_cleanup(&pp);
return 0;
}
+
+int run_processes_parallel_tr2(int n, get_next_task_fn get_next_task,
+ start_failure_fn start_failure,
+ task_finished_fn task_finished, void *pp_cb,
+ const char *tr2_category, const char *tr2_label)
+{
+ int result;
+
+ trace2_region_enter_printf(tr2_category, tr2_label, NULL, "max:%d",
+ ((n < 1) ? online_cpus() : n));
+
+ result = run_processes_parallel(n, get_next_task, start_failure,
+ task_finished, pp_cb);
+
+ trace2_region_leave(tr2_category, tr2_label, NULL);
+
+ return result;
+}
diff --git a/run-command.h b/run-command.h
index 68f5369..f769e03 100644
--- a/run-command.h
+++ b/run-command.h
@@ -10,6 +10,12 @@
struct argv_array args;
struct argv_array env_array;
pid_t pid;
+
+ int trace2_child_id;
+ uint64_t trace2_child_us_start;
+ const char *trace2_child_class;
+ const char *trace2_hook_name;
+
/*
* Using .in, .out, .err:
* - Specify 0 for no redirections (child inherits stdin, stdout,
@@ -49,7 +55,7 @@
#define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT }
void child_process_init(struct child_process *);
void child_process_clear(struct child_process *);
-extern int is_executable(const char *name);
+int is_executable(const char *name);
int start_command(struct child_process *);
int finish_command(struct child_process *);
@@ -61,10 +67,10 @@
* or disabled. Note that this points to static storage that will be
* overwritten by further calls to find_hook and run_hook_*.
*/
-extern const char *find_hook(const char *name);
+const char *find_hook(const char *name);
LAST_ARG_MUST_BE_NULL
-extern int run_hook_le(const char *const *env, const char *name, ...);
-extern int run_hook_ve(const char *const *env, const char *name, va_list args);
+int run_hook_le(const char *const *env, const char *name, ...);
+int run_hook_ve(const char *const *env, const char *name, va_list args);
#define RUN_COMMAND_NO_STDIN 1
#define RUN_GIT_CMD 2 /*If this is to be git sub-command */
@@ -73,12 +79,14 @@
#define RUN_USING_SHELL 16
#define RUN_CLEAN_ON_EXIT 32
int run_command_v_opt(const char **argv, int opt);
-
+int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);
/*
* env (the environment) is to be formatted like environ: "VAR=VALUE".
* To unset an environment variable use just "VAR".
*/
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
+int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
+ const char *const *env, const char *tr2_class);
/**
* Execute the given command, sending "in" to its stdin, and capturing its
@@ -220,5 +228,8 @@
start_failure_fn,
task_finished_fn,
void *pp_cb);
+int run_processes_parallel_tr2(int n, get_next_task_fn, start_failure_fn,
+ task_finished_fn, void *pp_cb,
+ const char *tr2_category, const char *tr2_label);
#endif
diff --git a/sequencer.c b/sequencer.c
index 972402e..d648aaf 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -35,7 +35,7 @@
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
-const char sign_off_header[] = "Signed-off-by: ";
+static const char sign_off_header[] = "Signed-off-by: ";
static const char cherry_picked_prefix[] = "(cherry picked from commit ";
GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG")
@@ -55,8 +55,7 @@
* file and written to the tail of 'done'.
*/
GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
-static GIT_PATH_FUNC(rebase_path_todo_backup,
- "rebase-merge/git-rebase-todo.backup")
+GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup")
/*
* The rebase command lines that have already been processed. A line
@@ -172,17 +171,22 @@
if (status)
return status;
- if (!strcmp(s, "verbatim"))
+ if (!strcmp(s, "verbatim")) {
opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_NONE;
- else if (!strcmp(s, "whitespace"))
+ opts->explicit_cleanup = 1;
+ } else if (!strcmp(s, "whitespace")) {
opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_SPACE;
- else if (!strcmp(s, "strip"))
+ opts->explicit_cleanup = 1;
+ } else if (!strcmp(s, "strip")) {
opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_ALL;
- else if (!strcmp(s, "scissors"))
- opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_SPACE;
- else
+ opts->explicit_cleanup = 1;
+ } else if (!strcmp(s, "scissors")) {
+ opts->default_msg_cleanup = COMMIT_MSG_CLEANUP_SCISSORS;
+ opts->explicit_cleanup = 1;
+ } else {
warning(_("invalid commit message cleanup mode '%s'"),
s);
+ }
free((char *)s);
return status;
@@ -275,7 +279,7 @@
int sequencer_remove_state(struct replay_opts *opts)
{
struct strbuf buf = STRBUF_INIT;
- int i;
+ int i, ret = 0;
if (is_rebase_i(opts) &&
strbuf_read_file(&buf, rebase_path_refs_to_delete(), 0) > 0) {
@@ -284,8 +288,10 @@
char *eol = strchr(p, '\n');
if (eol)
*eol = '\0';
- if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0)
+ if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) {
warning(_("could not delete '%s'"), p);
+ ret = -1;
+ }
if (!eol)
break;
p = eol + 1;
@@ -301,10 +307,11 @@
strbuf_reset(&buf);
strbuf_addstr(&buf, get_dir(opts));
- remove_dir_recursively(&buf, 0);
+ if (remove_dir_recursively(&buf, 0))
+ ret = error(_("could not remove '%s'"), buf.buf);
strbuf_release(&buf);
- return 0;
+ return ret;
}
static const char *action_name(const struct replay_opts *opts)
@@ -384,8 +391,8 @@
}
}
-int write_message(const void *buf, size_t len, const char *filename,
- int append_eol)
+static int write_message(const void *buf, size_t len, const char *filename,
+ int append_eol)
{
struct lock_file msg_file = LOCK_INIT;
@@ -511,11 +518,54 @@
return 0;
}
+enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
+ int use_editor)
+{
+ if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
+ return use_editor ? COMMIT_MSG_CLEANUP_ALL :
+ COMMIT_MSG_CLEANUP_SPACE;
+ else if (!strcmp(cleanup_arg, "verbatim"))
+ return COMMIT_MSG_CLEANUP_NONE;
+ else if (!strcmp(cleanup_arg, "whitespace"))
+ return COMMIT_MSG_CLEANUP_SPACE;
+ else if (!strcmp(cleanup_arg, "strip"))
+ return COMMIT_MSG_CLEANUP_ALL;
+ else if (!strcmp(cleanup_arg, "scissors"))
+ return use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
+ COMMIT_MSG_CLEANUP_SPACE;
+ else
+ die(_("Invalid cleanup mode %s"), cleanup_arg);
+}
+
+/*
+ * NB using int rather than enum cleanup_mode to stop clang's
+ * -Wtautological-constant-out-of-range-compare complaining that the comparison
+ * is always true.
+ */
+static const char *describe_cleanup_mode(int cleanup_mode)
+{
+ static const char *modes[] = { "whitespace",
+ "verbatim",
+ "scissors",
+ "strip" };
+
+ if (cleanup_mode < ARRAY_SIZE(modes))
+ return modes[cleanup_mode];
+
+ BUG("invalid cleanup_mode provided (%d)", cleanup_mode);
+}
+
void append_conflicts_hint(struct index_state *istate,
- struct strbuf *msgbuf)
+ struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode)
{
int i;
+ if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
+ strbuf_addch(msgbuf, '\n');
+ wt_status_append_cut_line(msgbuf);
+ strbuf_addch(msgbuf, comment_line_char);
+ }
+
strbuf_addch(msgbuf, '\n');
strbuf_commented_addf(msgbuf, "Conflicts:\n");
for (i = 0; i < istate->cache_nr;) {
@@ -583,7 +633,8 @@
_(action_name(opts)));
if (!clean)
- append_conflicts_hint(r->index, msgbuf);
+ append_conflicts_hint(r->index, msgbuf,
+ opts->default_msg_cleanup);
return !clean;
}
@@ -719,7 +770,7 @@
* GIT_AUTHOR_DATE='$author_date'
*
* where $author_name, $author_email and $author_date are quoted. We are strict
- * with our parsing, as the file was meant to be eval'd in the old
+ * with our parsing, as the file was meant to be eval'd in the now-removed
* git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs
* from what this function expects, it is better to bail out than to do
* something that the user does not expect.
@@ -837,7 +888,7 @@
}
strbuf_reset(&out);
- strbuf_addstr(&out, fmt_ident(name, email, date, 0));
+ strbuf_addstr(&out, fmt_ident(name, email, WANT_AUTHOR_IDENT, date, 0));
strbuf_swap(buf, &out);
strbuf_release(&out);
free(name);
@@ -902,7 +953,6 @@
unsigned int flags)
{
struct child_process cmd = CHILD_PROCESS_INIT;
- const char *value;
if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) {
struct strbuf msg = STRBUF_INIT, script = STRBUF_INIT;
@@ -972,7 +1022,7 @@
argv_array_push(&cmd.args, "-e");
else if (!(flags & CLEANUP_MSG) &&
!opts->signoff && !opts->record_origin &&
- git_config_get_value("commit.cleanup", &value))
+ !opts->explicit_cleanup)
argv_array_push(&cmd.args, "--cleanup=verbatim");
if ((flags & ALLOW_EMPTY))
@@ -1013,6 +1063,16 @@
return 1;
}
+void cleanup_message(struct strbuf *msgbuf,
+ enum commit_msg_cleanup_mode cleanup_mode, int verbose)
+{
+ if (verbose || /* Truncate the message just before the diff, if any. */
+ cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
+ strbuf_setlen(msgbuf, wt_status_locate_end(msgbuf->buf, msgbuf->len));
+ if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE)
+ strbuf_stripspace(msgbuf, cleanup_mode == COMMIT_MSG_CLEANUP_ALL);
+}
+
/*
* Find out if the message in the strbuf contains only whitespace and
* Signed-off-by lines.
@@ -1103,6 +1163,7 @@
proc.argv = argv;
proc.in = -1;
proc.stdout_to_stderr = 1;
+ proc.trace2_hook_name = "post-rewrite";
code = start_command(&proc);
if (code)
@@ -1382,8 +1443,13 @@
msg = &commit_msg;
}
- cleanup = (flags & CLEANUP_MSG) ? COMMIT_MSG_CLEANUP_ALL :
- opts->default_msg_cleanup;
+ if (flags & CLEANUP_MSG)
+ cleanup = COMMIT_MSG_CLEANUP_ALL;
+ else if ((opts->signoff || opts->record_origin) &&
+ !opts->explicit_cleanup)
+ cleanup = COMMIT_MSG_CLEANUP_SPACE;
+ else
+ cleanup = opts->default_msg_cleanup;
if (cleanup != COMMIT_MSG_CLEANUP_NONE)
strbuf_stripspace(msg, cleanup == COMMIT_MSG_CLEANUP_ALL);
@@ -1512,32 +1578,6 @@
return 1;
}
-/*
- * Note that ordering matters in this enum. Not only must it match the mapping
- * below, it is also divided into several sections that matter. When adding
- * new commands, make sure you add it in the right section.
- */
-enum todo_command {
- /* commands that handle commits */
- TODO_PICK = 0,
- TODO_REVERT,
- TODO_EDIT,
- TODO_REWORD,
- TODO_FIXUP,
- TODO_SQUASH,
- /* commands that do something else than handling a single commit */
- TODO_EXEC,
- TODO_BREAK,
- TODO_LABEL,
- TODO_RESET,
- TODO_MERGE,
- /* commands that do nothing but are counted for reporting progress */
- TODO_NOOP,
- TODO_DROP,
- /* comments (not counted for reporting progress) */
- TODO_COMMENT
-};
-
static struct {
char c;
const char *str;
@@ -2020,26 +2060,7 @@
TODO_EDIT_MERGE_MSG = 1
};
-struct todo_item {
- enum todo_command command;
- struct commit *commit;
- unsigned int flags;
- const char *arg;
- int arg_len;
- size_t offset_in_buf;
-};
-
-struct todo_list {
- struct strbuf buf;
- struct todo_item *items;
- int nr, alloc, current;
- int done_nr, total_nr;
- struct stat_data stat;
-};
-
-#define TODO_LIST_INIT { STRBUF_INIT }
-
-static void todo_list_release(struct todo_list *todo_list)
+void todo_list_release(struct todo_list *todo_list)
{
strbuf_release(&todo_list->buf);
FREE_AND_NULL(todo_list->items);
@@ -2052,8 +2073,26 @@
return todo_list->items + todo_list->nr++;
}
+const char *todo_item_get_arg(struct todo_list *todo_list,
+ struct todo_item *item)
+{
+ return todo_list->buf.buf + item->arg_offset;
+}
+
+static int is_command(enum todo_command command, const char **bol)
+{
+ const char *str = todo_command_info[command].str;
+ const char nick = todo_command_info[command].c;
+ const char *p = *bol + 1;
+
+ return skip_prefix(*bol, str, bol) ||
+ ((nick && **bol == nick) &&
+ (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) &&
+ (*bol = p));
+}
+
static int parse_insn_line(struct repository *r, struct todo_item *item,
- const char *bol, char *eol)
+ const char *buf, const char *bol, char *eol)
{
struct object_id commit_oid;
char *end_of_object_name;
@@ -2067,18 +2106,13 @@
if (bol == eol || *bol == '\r' || *bol == comment_line_char) {
item->command = TODO_COMMENT;
item->commit = NULL;
- item->arg = bol;
+ item->arg_offset = bol - buf;
item->arg_len = eol - bol;
return 0;
}
for (i = 0; i < TODO_COMMENT; i++)
- if (skip_prefix(bol, todo_command_info[i].str, &bol)) {
- item->command = i;
- break;
- } else if ((bol + 1 == eol || bol[1] == ' ') &&
- *bol == todo_command_info[i].c) {
- bol++;
+ if (is_command(i, &bol)) {
item->command = i;
break;
}
@@ -2094,7 +2128,7 @@
return error(_("%s does not accept arguments: '%s'"),
command_to_string(item->command), bol);
item->commit = NULL;
- item->arg = bol;
+ item->arg_offset = bol - buf;
item->arg_len = eol - bol;
return 0;
}
@@ -2106,7 +2140,7 @@
if (item->command == TODO_EXEC || item->command == TODO_LABEL ||
item->command == TODO_RESET) {
item->commit = NULL;
- item->arg = bol;
+ item->arg_offset = bol - buf;
item->arg_len = (int)(eol - bol);
return 0;
}
@@ -2120,7 +2154,7 @@
} else {
item->flags |= TODO_EDIT_MERGE_MSG;
item->commit = NULL;
- item->arg = bol;
+ item->arg_offset = bol - buf;
item->arg_len = (int)(eol - bol);
return 0;
}
@@ -2132,23 +2166,54 @@
status = get_oid(bol, &commit_oid);
*end_of_object_name = saved;
- item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
- item->arg_len = (int)(eol - item->arg);
+ bol = end_of_object_name + strspn(end_of_object_name, " \t");
+ item->arg_offset = bol - buf;
+ item->arg_len = (int)(eol - bol);
if (status < 0)
- return -1;
+ return error(_("could not parse '%.*s'"),
+ (int)(end_of_object_name - bol), bol);
item->commit = lookup_commit_reference(r, &commit_oid);
return !item->commit;
}
-static int parse_insn_buffer(struct repository *r, char *buf,
- struct todo_list *todo_list)
+int sequencer_get_last_command(struct repository *r, enum replay_action *action)
+{
+ const char *todo_file, *bol;
+ struct strbuf buf = STRBUF_INIT;
+ int ret = 0;
+
+ todo_file = git_path_todo_file();
+ if (strbuf_read_file(&buf, todo_file, 0) < 0) {
+ if (errno == ENOENT || errno == ENOTDIR)
+ return -1;
+ else
+ return error_errno("unable to open '%s'", todo_file);
+ }
+ bol = buf.buf + strspn(buf.buf, " \t\r\n");
+ if (is_command(TODO_PICK, &bol) && (*bol == ' ' || *bol == '\t'))
+ *action = REPLAY_PICK;
+ else if (is_command(TODO_REVERT, &bol) &&
+ (*bol == ' ' || *bol == '\t'))
+ *action = REPLAY_REVERT;
+ else
+ ret = -1;
+
+ strbuf_release(&buf);
+
+ return ret;
+}
+
+int todo_list_parse_insn_buffer(struct repository *r, char *buf,
+ struct todo_list *todo_list)
{
struct todo_item *item;
char *p = buf, *next_p;
int i, res = 0, fixup_okay = file_exists(rebase_path_done());
+ todo_list->current = todo_list->nr = 0;
+
for (i = 1; *p; i++, p = next_p) {
char *eol = strchrnul(p, '\n');
@@ -2159,10 +2224,13 @@
item = append_new_todo(todo_list);
item->offset_in_buf = p - todo_list->buf.buf;
- if (parse_insn_line(r, item, p, eol)) {
+ if (parse_insn_line(r, item, buf, p, eol)) {
res = error(_("invalid line %d: %.*s"),
i, (int)(eol - p), p);
- item->command = TODO_NOOP;
+ item->command = TODO_COMMENT + 1;
+ item->arg_offset = p - buf;
+ item->arg_len = (int)(eol - p);
+ item->commit = NULL;
}
if (fixup_okay)
@@ -2220,6 +2288,59 @@
return len;
}
+static int have_finished_the_last_pick(void)
+{
+ struct strbuf buf = STRBUF_INIT;
+ const char *eol;
+ const char *todo_path = git_path_todo_file();
+ int ret = 0;
+
+ if (strbuf_read_file(&buf, todo_path, 0) < 0) {
+ if (errno == ENOENT) {
+ return 0;
+ } else {
+ error_errno("unable to open '%s'", todo_path);
+ return 0;
+ }
+ }
+ /* If there is only one line then we are done */
+ eol = strchr(buf.buf, '\n');
+ if (!eol || !eol[1])
+ ret = 1;
+
+ strbuf_release(&buf);
+
+ return ret;
+}
+
+void sequencer_post_commit_cleanup(struct repository *r, int verbose)
+{
+ struct replay_opts opts = REPLAY_OPTS_INIT;
+ int need_cleanup = 0;
+
+ if (file_exists(git_path_cherry_pick_head(r))) {
+ if (!unlink(git_path_cherry_pick_head(r)) && verbose)
+ warning(_("cancelling a cherry picking in progress"));
+ opts.action = REPLAY_PICK;
+ need_cleanup = 1;
+ }
+
+ if (file_exists(git_path_revert_head(r))) {
+ if (!unlink(git_path_revert_head(r)) && verbose)
+ warning(_("cancelling a revert in progress"));
+ opts.action = REPLAY_REVERT;
+ need_cleanup = 1;
+ }
+
+ if (!need_cleanup)
+ return;
+
+ if (!have_finished_the_last_pick())
+ return;
+
+ sequencer_remove_state(&opts);
+}
+
static int read_populate_todo(struct repository *r,
struct todo_list *todo_list,
struct replay_opts *opts)
@@ -2237,7 +2358,7 @@
return error(_("could not stat '%s'"), todo_file);
fill_stat_data(&todo_list->stat, &st);
- res = parse_insn_buffer(r, todo_list->buf.buf, todo_list);
+ res = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
if (res) {
if (is_rebase_i(opts))
return error(_("please fix this using "
@@ -2268,7 +2389,7 @@
FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 &&
- !parse_insn_buffer(r, done.buf.buf, &done))
+ !todo_list_parse_insn_buffer(r, done.buf.buf, &done))
todo_list->done_nr = count_commands(&done);
else
todo_list->done_nr = 0;
@@ -2307,6 +2428,15 @@
opts->no_commit = git_config_bool_or_int(key, value, &error_flag);
else if (!strcmp(key, "options.edit"))
opts->edit = git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "options.allow-empty"))
+ opts->allow_empty =
+ git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "options.allow-empty-message"))
+ opts->allow_empty_message =
+ git_config_bool_or_int(key, value, &error_flag);
+ else if (!strcmp(key, "options.keep-redundant-commits"))
+ opts->keep_redundant_commits =
+ git_config_bool_or_int(key, value, &error_flag);
else if (!strcmp(key, "options.signoff"))
opts->signoff = git_config_bool_or_int(key, value, &error_flag);
else if (!strcmp(key, "options.record-origin"))
@@ -2326,7 +2456,10 @@
opts->allow_rerere_auto =
git_config_bool_or_int(key, value, &error_flag) ?
RERERE_AUTOUPDATE : RERERE_NOAUTOUPDATE;
- else
+ else if (!strcmp(key, "options.default-msg-cleanup")) {
+ opts->explicit_cleanup = 1;
+ opts->default_msg_cleanup = get_cleanup_mode(value, 1);
+ } else
return error(_("invalid key: %s"), key);
if (!error_flag)
@@ -2451,14 +2584,15 @@
}
int write_basic_state(struct replay_opts *opts, const char *head_name,
- const char *onto, const char *orig_head)
+ struct commit *onto, const char *orig_head)
{
const char *quiet = getenv("GIT_QUIET");
if (head_name)
write_file(rebase_path_head_name(), "%s\n", head_name);
if (onto)
- write_file(rebase_path_onto(), "%s\n", onto);
+ write_file(rebase_path_onto(), "%s\n",
+ oid_to_hex(&onto->object.oid));
if (orig_head)
write_file(rebase_path_orig_head(), "%s\n", orig_head);
@@ -2505,7 +2639,7 @@
item->command = command;
item->commit = commit;
- item->arg = NULL;
+ item->arg_offset = 0;
item->arg_len = 0;
item->offset_in_buf = todo_list->buf.len;
subject_len = find_commit_subject(commit_buffer, &subject);
@@ -2520,15 +2654,41 @@
return 0;
}
-static int create_seq_dir(void)
+static int create_seq_dir(struct repository *r)
{
- if (file_exists(git_path_seq_dir())) {
- error(_("a cherry-pick or revert is already in progress"));
- advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
+ enum replay_action action;
+ const char *in_progress_error = NULL;
+ const char *in_progress_advice = NULL;
+ unsigned int advise_skip = file_exists(git_path_revert_head(r)) ||
+ file_exists(git_path_cherry_pick_head(r));
+
+ if (!sequencer_get_last_command(r, &action)) {
+ switch (action) {
+ case REPLAY_REVERT:
+ in_progress_error = _("revert is already in progress");
+ in_progress_advice =
+ _("try \"git revert (--continue | %s--abort | --quit)\"");
+ break;
+ case REPLAY_PICK:
+ in_progress_error = _("cherry-pick is already in progress");
+ in_progress_advice =
+ _("try \"git cherry-pick (--continue | %s--abort | --quit)\"");
+ break;
+ default:
+ BUG("unexpected action in create_seq_dir");
+ }
+ }
+ if (in_progress_error) {
+ error("%s", in_progress_error);
+ if (advice_sequencer_in_use)
+ advise(in_progress_advice,
+ advise_skip ? "--skip | " : "");
return -1;
- } else if (mkdir(git_path_seq_dir(), 0777) < 0)
+ }
+ if (mkdir(git_path_seq_dir(), 0777) < 0)
return error_errno(_("could not create sequencer directory '%s'"),
git_path_seq_dir());
+
return 0;
}
@@ -2579,15 +2739,20 @@
return oideq(&actual_head, &expected_head);
}
-static int reset_for_rollback(const struct object_id *oid)
+static int reset_merge(const struct object_id *oid)
{
- const char *argv[4]; /* reset --merge <arg> + NULL */
+ int ret;
+ struct argv_array argv = ARGV_ARRAY_INIT;
- argv[0] = "reset";
- argv[1] = "--merge";
- argv[2] = oid_to_hex(oid);
- argv[3] = NULL;
- return run_command_v_opt(argv, RUN_GIT_CMD);
+ argv_array_pushl(&argv, "reset", "--merge", NULL);
+
+ if (!is_null_oid(oid))
+ argv_array_push(&argv, oid_to_hex(oid));
+
+ ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv);
+
+ return ret;
}
static int rollback_single_pick(struct repository *r)
@@ -2601,7 +2766,16 @@
return error(_("cannot resolve HEAD"));
if (is_null_oid(&head_oid))
return error(_("cannot abort from a branch yet to be born"));
- return reset_for_rollback(&head_oid);
+ return reset_merge(&head_oid);
+}
+
+static int skip_single_pick(void)
+{
+ struct object_id head;
+
+ if (read_ref_full("HEAD", 0, &head, NULL))
+ return error(_("cannot resolve HEAD"));
+ return reset_merge(&head);
}
int sequencer_rollback(struct repository *r, struct replay_opts *opts)
@@ -2644,7 +2818,7 @@
warning(_("You seem to have moved HEAD. "
"Not rewinding, check your HEAD!"));
} else
- if (reset_for_rollback(&oid))
+ if (reset_merge(&oid))
goto fail;
strbuf_release(&buf);
return sequencer_remove_state(opts);
@@ -2653,6 +2827,70 @@
return -1;
}
+int sequencer_skip(struct repository *r, struct replay_opts *opts)
+{
+ enum replay_action action = -1;
+ sequencer_get_last_command(r, &action);
+
+ /*
+ * Check whether the subcommand requested to skip the commit is actually
+ * in progress and that it's safe to skip the commit.
+ *
+ * opts->action tells us which subcommand requested to skip the commit.
+ * If the corresponding .git/<ACTION>_HEAD exists, we know that the
+ * action is in progress and we can skip the commit.
+ *
+ * Otherwise we check that the last instruction was related to the
+ * particular subcommand we're trying to execute and barf if that's not
+ * the case.
+ *
+ * Finally we check that the rollback is "safe", i.e., has the HEAD
+ * moved? In this case, it doesn't make sense to "reset the merge" and
+ * "skip the commit" as the user already handled this by committing. But
+ * we'd not want to barf here, instead give advice on how to proceed. We
+ * only need to check that when .git/<ACTION>_HEAD doesn't exist because
+ * it gets removed when the user commits, so if it still exists we're
+ * sure the user can't have committed before.
+ */
+ switch (opts->action) {
+ case REPLAY_REVERT:
+ if (!file_exists(git_path_revert_head(r))) {
+ if (action != REPLAY_REVERT)
+ return error(_("no revert in progress"));
+ if (!rollback_is_safe())
+ goto give_advice;
+ }
+ break;
+ case REPLAY_PICK:
+ if (!file_exists(git_path_cherry_pick_head(r))) {
+ if (action != REPLAY_PICK)
+ return error(_("no cherry-pick in progress"));
+ if (!rollback_is_safe())
+ goto give_advice;
+ }
+ break;
+ default:
+ BUG("unexpected action in sequencer_skip");
+ }
+
+ if (skip_single_pick())
+ return error(_("failed to skip the commit"));
+ if (!is_directory(git_path_seq_dir()))
+ return 0;
+
+ return sequencer_continue(r, opts);
+
+give_advice:
+ error(_("there is nothing to skip"));
+
+ if (advice_resolve_conflict) {
+ advise(_("have you committed already?\n"
+ "try \"git %s --continue\""),
+ action == REPLAY_REVERT ? "revert" : "cherry-pick");
+ }
+ return -1;
+}
+
static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
{
struct lock_file todo_lock = LOCK_INIT;
@@ -2700,36 +2938,59 @@
int res = 0;
if (opts->no_commit)
- res |= git_config_set_in_file_gently(opts_file, "options.no-commit", "true");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.no-commit", "true");
if (opts->edit)
- res |= git_config_set_in_file_gently(opts_file, "options.edit", "true");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.edit", "true");
+ if (opts->allow_empty)
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.allow-empty", "true");
+ if (opts->allow_empty_message)
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.allow-empty-message", "true");
+ if (opts->keep_redundant_commits)
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.keep-redundant-commits", "true");
if (opts->signoff)
- res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.signoff", "true");
if (opts->record_origin)
- res |= git_config_set_in_file_gently(opts_file, "options.record-origin", "true");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.record-origin", "true");
if (opts->allow_ff)
- res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.allow-ff", "true");
if (opts->mainline) {
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "%d", opts->mainline);
- res |= git_config_set_in_file_gently(opts_file, "options.mainline", buf.buf);
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.mainline", buf.buf);
strbuf_release(&buf);
}
if (opts->strategy)
- res |= git_config_set_in_file_gently(opts_file, "options.strategy", opts->strategy);
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.strategy", opts->strategy);
if (opts->gpg_sign)
- res |= git_config_set_in_file_gently(opts_file, "options.gpg-sign", opts->gpg_sign);
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.gpg-sign", opts->gpg_sign);
if (opts->xopts) {
int i;
for (i = 0; i < opts->xopts_nr; i++)
res |= git_config_set_multivar_in_file_gently(opts_file,
- "options.strategy-option",
- opts->xopts[i], "^$", 0);
+ "options.strategy-option",
+ opts->xopts[i], "^$", 0);
}
if (opts->allow_rerere_auto)
- res |= git_config_set_in_file_gently(opts_file, "options.allow-rerere-auto",
- opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
- "true" : "false");
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.allow-rerere-auto",
+ opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
+ "true" : "false");
+
+ if (opts->explicit_cleanup)
+ res |= git_config_set_in_file_gently(opts_file,
+ "options.default-msg-cleanup",
+ describe_cleanup_mode(opts->default_msg_cleanup));
return res;
}
@@ -3041,7 +3302,7 @@
return error_resolve_conflict(_(action_name(opts)));
}
- if (!fill_tree_descriptor(&desc, &oid)) {
+ if (!fill_tree_descriptor(r, &desc, &oid)) {
error(_("failed to find tree of %s"), oid_to_hex(&oid));
rollback_lock_file(&lock);
free((void *)desc.buffer);
@@ -3103,6 +3364,9 @@
struct commit *head_commit, *merge_commit, *i;
struct commit_list *bases, *j, *reversed = NULL;
struct commit_list *to_merge = NULL, **tail = &to_merge;
+ const char *strategy = !opts->xopts_nr &&
+ (!opts->strategy || !strcmp(opts->strategy, "recursive")) ?
+ NULL : opts->strategy;
struct merge_options o;
int merge_arg_len, oneline_offset, can_fast_forward, ret, k;
static struct lock_file lock;
@@ -3248,10 +3512,14 @@
rollback_lock_file(&lock);
ret = fast_forward_to(r, &commit->object.oid,
&head_commit->object.oid, 0, opts);
+ if (flags & TODO_EDIT_MERGE_MSG) {
+ run_commit_flags |= AMEND_MSG;
+ goto fast_forward_edit;
+ }
goto leave_merge;
}
- if (to_merge->next) {
+ if (strategy || to_merge->next) {
/* Octopus merge */
struct child_process cmd = CHILD_PROCESS_INIT;
@@ -3265,7 +3533,14 @@
cmd.git_cmd = 1;
argv_array_push(&cmd.args, "merge");
argv_array_push(&cmd.args, "-s");
- argv_array_push(&cmd.args, "octopus");
+ if (!strategy)
+ argv_array_push(&cmd.args, "octopus");
+ else {
+ argv_array_push(&cmd.args, strategy);
+ for (k = 0; k < opts->xopts_nr; k++)
+ argv_array_pushf(&cmd.args,
+ "-X%s", opts->xopts[k]);
+ }
argv_array_push(&cmd.args, "--no-edit");
argv_array_push(&cmd.args, "--no-ff");
argv_array_push(&cmd.args, "--no-log");
@@ -3351,6 +3626,7 @@
* value (a negative one would indicate that the `merge`
* command needs to be rescheduled).
*/
+ fast_forward_edit:
ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
run_commit_flags);
@@ -3451,10 +3727,11 @@
return buf.buf;
}
-static int run_git_checkout(struct replay_opts *opts, const char *commit,
- const char *action)
+static int run_git_checkout(struct repository *r, struct replay_opts *opts,
+ const char *commit, const char *action)
{
struct child_process cmd = CHILD_PROCESS_INIT;
+ int ret;
cmd.git_cmd = 1;
@@ -3463,26 +3740,32 @@
argv_array_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);
if (opts->verbose)
- return run_command(&cmd);
+ ret = run_command(&cmd);
else
- return run_command_silent_on_success(&cmd);
+ ret = run_command_silent_on_success(&cmd);
+
+ if (!ret)
+ discard_index(r->index);
+
+ return ret;
}
-int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit)
+int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
+ const char *commit)
{
const char *action;
if (commit && *commit) {
action = reflog_message(opts, "start", "checkout %s", commit);
- if (run_git_checkout(opts, commit, action))
+ if (run_git_checkout(r, opts, commit, action))
return error(_("could not checkout %s"), commit);
}
return 0;
}
-static int checkout_onto(struct replay_opts *opts,
- const char *onto_name, const char *onto,
+static int checkout_onto(struct repository *r, struct replay_opts *opts,
+ const char *onto_name, const struct object_id *onto,
const char *orig_head)
{
struct object_id oid;
@@ -3491,7 +3774,7 @@
if (get_oid(orig_head, &oid))
return error(_("%s: not a valid OID"), orig_head);
- if (run_git_checkout(opts, onto, action)) {
+ if (run_git_checkout(r, opts, oid_to_hex(onto), action)) {
apply_autostash(opts);
sequencer_remove_state(opts);
return error(_("could not detach HEAD"));
@@ -3544,6 +3827,8 @@
while (todo_list->current < todo_list->nr) {
struct todo_item *item = todo_list->items + todo_list->current;
+ const char *arg = todo_item_get_arg(todo_list, item);
+
if (save_todo(todo_list, opts))
return -1;
if (is_rebase_i(opts)) {
@@ -3566,11 +3851,14 @@
unlink(rebase_path_author_script());
unlink(rebase_path_stopped_sha());
unlink(rebase_path_amend());
- unlink(git_path_merge_head(the_repository));
+ unlink(git_path_merge_head(r));
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
- if (item->command == TODO_BREAK)
+ if (item->command == TODO_BREAK) {
+ if (!opts->verbose)
+ term_clear_line();
return stopped_at_head(r);
+ }
}
if (item->command <= TODO_SQUASH) {
if (is_rebase_i(opts))
@@ -3592,14 +3880,16 @@
}
if (item->command == TODO_EDIT) {
struct commit *commit = item->commit;
- if (!res)
+ if (!res) {
+ if (!opts->verbose)
+ term_clear_line();
fprintf(stderr,
_("Stopped at %s... %.*s\n"),
short_commit_name(commit),
- item->arg_len, item->arg);
+ item->arg_len, arg);
+ }
return error_with_patch(r, commit,
- item->arg, item->arg_len, opts, res,
- !res);
+ arg, item->arg_len, opts, res, !res);
}
if (is_rebase_i(opts) && !res)
record_in_rewritten(&item->commit->object.oid,
@@ -3608,7 +3898,7 @@
if (res == 1)
intend_to_amend();
return error_failed_squash(r, item->commit, opts,
- item->arg_len, item->arg);
+ item->arg_len, arg);
} else if (res && is_rebase_i(opts) && item->commit) {
int to_amend = 0;
struct object_id oid;
@@ -3627,19 +3917,20 @@
to_amend = 1;
return res | error_with_patch(r, item->commit,
- item->arg, item->arg_len, opts,
+ arg, item->arg_len, opts,
res, to_amend);
}
} else if (item->command == TODO_EXEC) {
- char *end_of_arg = (char *)(item->arg + item->arg_len);
+ char *end_of_arg = (char *)(arg + item->arg_len);
int saved = *end_of_arg;
struct stat st;
+ if (!opts->verbose)
+ term_clear_line();
*end_of_arg = '\0';
- res = do_exec(r, item->arg);
+ res = do_exec(r, arg);
*end_of_arg = saved;
- /* Reread the todo file if it has changed. */
if (res) {
if (opts->reschedule_failed_exec)
reschedule = 1;
@@ -3647,6 +3938,7 @@
res = error_errno(_("could not stat '%s'"),
get_todo_path(opts));
else if (match_stat_data(&todo_list->stat, &st)) {
+ /* Reread the todo file if it has changed. */
todo_list_release(todo_list);
if (read_populate_todo(r, todo_list, opts))
res = -1; /* message was printed */
@@ -3654,14 +3946,14 @@
todo_list->current = -1;
}
} else if (item->command == TODO_LABEL) {
- if ((res = do_label(r, item->arg, item->arg_len)))
+ if ((res = do_label(r, arg, item->arg_len)))
reschedule = 1;
} else if (item->command == TODO_RESET) {
- if ((res = do_reset(r, item->arg, item->arg_len, opts)))
+ if ((res = do_reset(r, arg, item->arg_len, opts)))
reschedule = 1;
} else if (item->command == TODO_MERGE) {
if ((res = do_merge(r, item->commit,
- item->arg, item->arg_len,
+ arg, item->arg_len,
item->flags, opts)) < 0)
reschedule = 1;
else if (item->commit)
@@ -3670,9 +3962,8 @@
if (res > 0)
/* failed with merge conflicts */
return error_with_patch(r, item->commit,
- item->arg,
- item->arg_len, opts,
- res, 0);
+ arg, item->arg_len,
+ opts, res, 0);
} else if (!is_noop(item->command))
return error(_("unknown command %d"), item->command);
@@ -3687,9 +3978,8 @@
if (item->commit)
return error_with_patch(r,
item->commit,
- item->arg,
- item->arg_len, opts,
- res, 0);
+ arg, item->arg_len,
+ opts, res, 0);
}
todo_list->current++;
@@ -3786,6 +4076,7 @@
hook.in = open(rebase_path_rewritten_list(),
O_RDONLY);
hook.stdout_to_stderr = 1;
+ hook.trace2_hook_name = "post-rewrite";
argv_array_push(&hook.args, post_rewrite_hook);
argv_array_push(&hook.args, "rebase");
/* we don't care if this hook failed */
@@ -3794,10 +4085,13 @@
}
apply_autostash(opts);
- if (!opts->quiet)
+ if (!opts->quiet) {
+ if (!opts->verbose)
+ term_clear_line();
fprintf(stderr,
"Successfully rebased and updated %s.\n",
head_ref.buf);
+ }
strbuf_release(&buf);
strbuf_release(&head_ref);
@@ -3942,7 +4236,7 @@
opts, flags))
return error(_("could not commit staged changes."));
unlink(rebase_path_amend());
- unlink(git_path_merge_head(the_repository));
+ unlink(git_path_merge_head(r));
if (final_fixup) {
unlink(rebase_path_fixup_msg());
unlink(rebase_path_squash_msg());
@@ -4077,7 +4371,7 @@
*/
if (walk_revs_populate_todo(&todo_list, opts) ||
- create_seq_dir() < 0)
+ create_seq_dir(r) < 0)
return -1;
if (get_oid("HEAD", &oid) && (opts->action == REPLAY_REVERT))
return error(_("can't revert as initial commit"));
@@ -4098,8 +4392,7 @@
int has_footer;
strbuf_addstr(&sob, sign_off_header);
- strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
- getenv("GIT_COMMITTER_EMAIL")));
+ strbuf_addstr(&sob, fmt_name(WANT_COMMITTER_IDENT));
strbuf_addch(&sob, '\n');
if (!ignore_footer)
@@ -4266,11 +4559,12 @@
}
static int make_script_with_merges(struct pretty_print_context *pp,
- struct rev_info *revs, FILE *out,
+ struct rev_info *revs, struct strbuf *out,
unsigned flags)
{
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
+ int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
struct strbuf label = STRBUF_INIT;
struct commit_list *commits = NULL, **tail = &commits, *iter;
@@ -4411,7 +4705,7 @@
* gathering commits not yet shown, reversing the list on the fly,
* then outputting that list (labeling revisions as needed).
*/
- fprintf(out, "%s onto\n", cmd_label);
+ strbuf_addf(out, "%s onto\n", cmd_label);
for (iter = tips; iter; iter = iter->next) {
struct commit_list *list = NULL, *iter2;
@@ -4421,9 +4715,9 @@
entry = oidmap_get(&state.commit2label, &commit->object.oid);
if (entry)
- fprintf(out, "\n%c Branch %s\n", comment_line_char, entry->string);
+ strbuf_addf(out, "\n%c Branch %s\n", comment_line_char, entry->string);
else
- fprintf(out, "\n");
+ strbuf_addch(out, '\n');
while (oidset_contains(&interesting, &commit->object.oid) &&
!oidset_contains(&shown, &commit->object.oid)) {
@@ -4436,8 +4730,9 @@
}
if (!commit)
- fprintf(out, "%s %s\n", cmd_reset,
- rebase_cousins ? "onto" : "[new root]");
+ strbuf_addf(out, "%s %s\n", cmd_reset,
+ rebase_cousins || root_with_onto ?
+ "onto" : "[new root]");
else {
const char *to = NULL;
@@ -4450,12 +4745,12 @@
&state);
if (!to || !strcmp(to, "onto"))
- fprintf(out, "%s onto\n", cmd_reset);
+ strbuf_addf(out, "%s onto\n", cmd_reset);
else {
strbuf_reset(&oneline);
pretty_print_commit(pp, commit, &oneline);
- fprintf(out, "%s %s # %s\n",
- cmd_reset, to, oneline.buf);
+ strbuf_addf(out, "%s %s # %s\n",
+ cmd_reset, to, oneline.buf);
}
}
@@ -4464,11 +4759,11 @@
entry = oidmap_get(&commit2todo, oid);
/* only show if not already upstream */
if (entry)
- fprintf(out, "%s\n", entry->string);
+ strbuf_addf(out, "%s\n", entry->string);
entry = oidmap_get(&state.commit2label, oid);
if (entry)
- fprintf(out, "%s %s\n",
- cmd_label, entry->string);
+ strbuf_addf(out, "%s %s\n",
+ cmd_label, entry->string);
oidset_insert(&shown, oid);
}
@@ -4490,13 +4785,11 @@
return 0;
}
-int sequencer_make_script(struct repository *r, FILE *out,
- int argc, const char **argv,
- unsigned flags)
+int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
+ const char **argv, unsigned flags)
{
char *format = NULL;
struct pretty_print_context pp = {0};
- struct strbuf buf = STRBUF_INIT;
struct rev_info revs;
struct commit *commit;
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
@@ -4539,16 +4832,13 @@
if (!is_empty && (commit->object.flags & PATCHSAME))
continue;
- strbuf_reset(&buf);
if (!keep_empty && is_empty)
- strbuf_addf(&buf, "%c ", comment_line_char);
- strbuf_addf(&buf, "%s %s ", insn,
+ strbuf_addf(out, "%c ", comment_line_char);
+ strbuf_addf(out, "%s %s ", insn,
oid_to_hex(&commit->object.oid));
- pretty_print_commit(&pp, commit, &buf);
- strbuf_addch(&buf, '\n');
- fputs(buf.buf, out);
+ pretty_print_commit(&pp, commit, out);
+ strbuf_addch(out, '\n');
}
- strbuf_release(&buf);
return 0;
}
@@ -4556,91 +4846,95 @@
* Add commands after pick and (series of) squash/fixup commands
* in the todo list.
*/
-int sequencer_add_exec_commands(struct repository *r,
- const char *commands)
+void todo_list_add_exec_commands(struct todo_list *todo_list,
+ struct string_list *commands)
{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- struct strbuf *buf = &todo_list.buf;
- size_t offset = 0, commands_len = strlen(commands);
- int i, insert;
+ struct strbuf *buf = &todo_list->buf;
+ size_t base_offset = buf->len;
+ int i, insert, nr = 0, alloc = 0;
+ struct todo_item *items = NULL, *base_items = NULL;
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error(_("could not read '%s'."), todo_file);
+ base_items = xcalloc(commands->nr, sizeof(struct todo_item));
+ for (i = 0; i < commands->nr; i++) {
+ size_t command_len = strlen(commands->items[i].string);
- if (parse_insn_buffer(r, todo_list.buf.buf, &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
+ strbuf_addstr(buf, commands->items[i].string);
+ strbuf_addch(buf, '\n');
+
+ base_items[i].command = TODO_EXEC;
+ base_items[i].offset_in_buf = base_offset;
+ base_items[i].arg_offset = base_offset + strlen("exec ");
+ base_items[i].arg_len = command_len - strlen("exec ");
+
+ base_offset += command_len + 1;
}
/*
* Insert <commands> after every pick. Here, fixup/squash chains
* are considered part of the pick, so we insert the commands *after*
* those chains if there are any.
+ *
+ * As we insert the exec commands immediatly after rearranging
+ * any fixups and before the user edits the list, a fixup chain
+ * can never contain comments (any comments are empty picks that
+ * have been commented out because the user did not specify
+ * --keep-empty). So, it is safe to insert an exec command
+ * without looking at the command following a comment.
*/
- insert = -1;
- for (i = 0; i < todo_list.nr; i++) {
- enum todo_command command = todo_list.items[i].command;
+ insert = 0;
+ for (i = 0; i < todo_list->nr; i++) {
+ enum todo_command command = todo_list->items[i].command;
+ if (insert && !is_fixup(command)) {
+ ALLOC_GROW(items, nr + commands->nr, alloc);
+ COPY_ARRAY(items + nr, base_items, commands->nr);
+ nr += commands->nr;
- if (insert >= 0) {
- /* skip fixup/squash chains */
- if (command == TODO_COMMENT)
- continue;
- else if (is_fixup(command)) {
- insert = i + 1;
- continue;
- }
- strbuf_insert(buf,
- todo_list.items[insert].offset_in_buf +
- offset, commands, commands_len);
- offset += commands_len;
- insert = -1;
+ insert = 0;
}
+ ALLOC_GROW(items, nr + 1, alloc);
+ items[nr++] = todo_list->items[i];
+
if (command == TODO_PICK || command == TODO_MERGE)
- insert = i + 1;
+ insert = 1;
}
/* insert or append final <commands> */
- if (insert >= 0 && insert < todo_list.nr)
- strbuf_insert(buf, todo_list.items[insert].offset_in_buf +
- offset, commands, commands_len);
- else if (insert >= 0 || !offset)
- strbuf_add(buf, commands, commands_len);
-
- i = write_message(buf->buf, buf->len, todo_file, 0);
- todo_list_release(&todo_list);
- return i;
-}
-
-int transform_todos(struct repository *r, unsigned flags)
-{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- struct strbuf buf = STRBUF_INIT;
- struct todo_item *item;
- int i;
-
- if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
- return error(_("could not read '%s'."), todo_file);
-
- if (parse_insn_buffer(r, todo_list.buf.buf, &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
+ if (insert || nr == todo_list->nr) {
+ ALLOC_GROW(items, nr + commands->nr, alloc);
+ COPY_ARRAY(items + nr, base_items, commands->nr);
+ nr += commands->nr;
}
- for (item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) {
+ free(base_items);
+ FREE_AND_NULL(todo_list->items);
+ todo_list->items = items;
+ todo_list->nr = nr;
+ todo_list->alloc = alloc;
+}
+
+static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_list,
+ struct strbuf *buf, int num, unsigned flags)
+{
+ struct todo_item *item;
+ int i, max = todo_list->nr;
+
+ if (num > 0 && num < max)
+ max = num;
+
+ for (item = todo_list->items, i = 0; i < max; i++, item++) {
/* if the item is not a command write it and continue */
if (item->command >= TODO_COMMENT) {
- strbuf_addf(&buf, "%.*s\n", item->arg_len, item->arg);
+ strbuf_addf(buf, "%.*s\n", item->arg_len,
+ todo_item_get_arg(todo_list, item));
continue;
}
/* add command to the buffer */
if (flags & TODO_LIST_ABBREVIATE_CMDS)
- strbuf_addch(&buf, command_to_char(item->command));
+ strbuf_addch(buf, command_to_char(item->command));
else
- strbuf_addstr(&buf, command_to_string(item->command));
+ strbuf_addstr(buf, command_to_string(item->command));
/* add commit id */
if (item->commit) {
@@ -4650,181 +4944,92 @@
if (item->command == TODO_MERGE) {
if (item->flags & TODO_EDIT_MERGE_MSG)
- strbuf_addstr(&buf, " -c");
+ strbuf_addstr(buf, " -c");
else
- strbuf_addstr(&buf, " -C");
+ strbuf_addstr(buf, " -C");
}
- strbuf_addf(&buf, " %s", oid);
+ strbuf_addf(buf, " %s", oid);
}
/* add all the rest */
if (!item->arg_len)
- strbuf_addch(&buf, '\n');
+ strbuf_addch(buf, '\n');
else
- strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);
+ strbuf_addf(buf, " %.*s\n", item->arg_len,
+ todo_item_get_arg(todo_list, item));
}
-
- i = write_message(buf.buf, buf.len, todo_file, 0);
- todo_list_release(&todo_list);
- return i;
}
-enum missing_commit_check_level get_missing_commit_check_level(void)
+int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
+ const char *file, const char *shortrevisions,
+ const char *shortonto, int num, unsigned flags)
{
- const char *value;
+ int res;
+ struct strbuf buf = STRBUF_INIT;
- if (git_config_get_value("rebase.missingcommitscheck", &value) ||
- !strcasecmp("ignore", value))
- return MISSING_COMMIT_CHECK_IGNORE;
- if (!strcasecmp("warn", value))
- return MISSING_COMMIT_CHECK_WARN;
- if (!strcasecmp("error", value))
- return MISSING_COMMIT_CHECK_ERROR;
- warning(_("unrecognized setting %s for option "
- "rebase.missingCommitsCheck. Ignoring."), value);
- return MISSING_COMMIT_CHECK_IGNORE;
-}
+ todo_list_to_strbuf(r, todo_list, &buf, num, flags);
+ if (flags & TODO_LIST_APPEND_TODO_HELP)
+ append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list),
+ shortrevisions, shortonto, &buf);
-define_commit_slab(commit_seen, unsigned char);
-/*
- * Check if the user dropped some commits by mistake
- * Behaviour determined by rebase.missingCommitsCheck.
- * Check if there is an unrecognized command or a
- * bad SHA-1 in a command.
- */
-int check_todo_list(struct repository *r)
-{
- enum missing_commit_check_level check_level = get_missing_commit_check_level();
- struct strbuf todo_file = STRBUF_INIT;
- struct todo_list todo_list = TODO_LIST_INIT;
- struct strbuf missing = STRBUF_INIT;
- int advise_to_edit_todo = 0, res = 0, i;
- struct commit_seen commit_seen;
-
- init_commit_seen(&commit_seen);
-
- strbuf_addstr(&todo_file, rebase_path_todo());
- if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
- res = -1;
- goto leave_check;
- }
- advise_to_edit_todo = res =
- parse_insn_buffer(r, todo_list.buf.buf, &todo_list);
-
- if (res || check_level == MISSING_COMMIT_CHECK_IGNORE)
- goto leave_check;
-
- /* Mark the commits in git-rebase-todo as seen */
- for (i = 0; i < todo_list.nr; i++) {
- struct commit *commit = todo_list.items[i].commit;
- if (commit)
- *commit_seen_at(&commit_seen, commit) = 1;
- }
-
- todo_list_release(&todo_list);
- strbuf_addstr(&todo_file, ".backup");
- if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
- res = -1;
- goto leave_check;
- }
- strbuf_release(&todo_file);
- res = !!parse_insn_buffer(r, todo_list.buf.buf, &todo_list);
-
- /* Find commits in git-rebase-todo.backup yet unseen */
- for (i = todo_list.nr - 1; i >= 0; i--) {
- struct todo_item *item = todo_list.items + i;
- struct commit *commit = item->commit;
- if (commit && !*commit_seen_at(&commit_seen, commit)) {
- strbuf_addf(&missing, " - %s %.*s\n",
- short_commit_name(commit),
- item->arg_len, item->arg);
- *commit_seen_at(&commit_seen, commit) = 1;
- }
- }
-
- /* Warn about missing commits */
- if (!missing.len)
- goto leave_check;
-
- if (check_level == MISSING_COMMIT_CHECK_ERROR)
- advise_to_edit_todo = res = 1;
-
- fprintf(stderr,
- _("Warning: some commits may have been dropped accidentally.\n"
- "Dropped commits (newer to older):\n"));
-
- /* Make the list user-friendly and display */
- fputs(missing.buf, stderr);
- strbuf_release(&missing);
-
- fprintf(stderr, _("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"));
-
-leave_check:
- clear_commit_seen(&commit_seen);
- strbuf_release(&todo_file);
- todo_list_release(&todo_list);
-
- if (advise_to_edit_todo)
- fprintf(stderr,
- _("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"));
+ res = write_message(buf.buf, buf.len, file, 0);
+ strbuf_release(&buf);
return res;
}
-static int rewrite_file(const char *path, const char *buf, size_t len)
+static const char edit_todo_list_advice[] =
+N_("You can fix this with 'git rebase --edit-todo' "
+"and then run 'git rebase --continue'.\n"
+"Or you can abort the rebase with 'git rebase"
+" --abort'.\n");
+
+int check_todo_list_from_file(struct repository *r)
{
- int rc = 0;
- int fd = open(path, O_WRONLY | O_TRUNC);
- if (fd < 0)
- return error_errno(_("could not open '%s' for writing"), path);
- if (write_in_full(fd, buf, len) < 0)
- rc = error_errno(_("could not write to '%s'"), path);
- if (close(fd) && !rc)
- rc = error_errno(_("could not close '%s'"), path);
- return rc;
+ struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
+ int res = 0;
+
+ if (strbuf_read_file_or_whine(&new_todo.buf, rebase_path_todo()) < 0) {
+ res = -1;
+ goto out;
+ }
+
+ if (strbuf_read_file_or_whine(&old_todo.buf, rebase_path_todo_backup()) < 0) {
+ res = -1;
+ goto out;
+ }
+
+ res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
+ if (!res)
+ res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
+ if (!res)
+ res = todo_list_check(&old_todo, &new_todo);
+ if (res)
+ fprintf(stderr, _(edit_todo_list_advice));
+out:
+ todo_list_release(&old_todo);
+ todo_list_release(&new_todo);
+
+ return res;
}
/* skip picking commits whose parents are unchanged */
-static int skip_unnecessary_picks(struct repository *r, struct object_id *output_oid)
+static int skip_unnecessary_picks(struct repository *r,
+ struct todo_list *todo_list,
+ struct object_id *base_oid)
{
- const char *todo_file = rebase_path_todo();
- struct strbuf buf = STRBUF_INIT;
- struct todo_list todo_list = TODO_LIST_INIT;
struct object_id *parent_oid;
- int fd, i;
+ int i;
- if (!read_oneliner(&buf, rebase_path_onto(), 0))
- return error(_("could not read 'onto'"));
- if (get_oid(buf.buf, output_oid)) {
- strbuf_release(&buf);
- return error(_("need a HEAD to fixup"));
- }
- strbuf_release(&buf);
-
- if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
- return -1;
- if (parse_insn_buffer(r, todo_list.buf.buf, &todo_list) < 0) {
- todo_list_release(&todo_list);
- return -1;
- }
-
- for (i = 0; i < todo_list.nr; i++) {
- struct todo_item *item = todo_list.items + i;
+ for (i = 0; i < todo_list->nr; i++) {
+ struct todo_item *item = todo_list->items + i;
if (item->command >= TODO_NOOP)
continue;
if (item->command != TODO_PICK)
break;
if (parse_commit(item->commit)) {
- todo_list_release(&todo_list);
return error(_("could not parse commit '%s'"),
oid_to_hex(&item->commit->object.oid));
}
@@ -4833,137 +5038,103 @@
if (item->commit->parents->next)
break; /* merge commit */
parent_oid = &item->commit->parents->item->object.oid;
- if (!oideq(parent_oid, output_oid))
+ if (!oideq(parent_oid, base_oid))
break;
- oidcpy(output_oid, &item->commit->object.oid);
+ oidcpy(base_oid, &item->commit->object.oid);
}
if (i > 0) {
- int offset = get_item_line_offset(&todo_list, i);
const char *done_path = rebase_path_done();
- fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
- if (fd < 0) {
- error_errno(_("could not open '%s' for writing"),
- done_path);
- todo_list_release(&todo_list);
- return -1;
- }
- if (write_in_full(fd, todo_list.buf.buf, offset) < 0) {
+ if (todo_list_write_to_file(r, todo_list, done_path, NULL, NULL, i, 0)) {
error_errno(_("could not write to '%s'"), done_path);
- todo_list_release(&todo_list);
- close(fd);
- return -1;
- }
- close(fd);
-
- if (rewrite_file(rebase_path_todo(), todo_list.buf.buf + offset,
- todo_list.buf.len - offset) < 0) {
- todo_list_release(&todo_list);
return -1;
}
- todo_list.current = i;
- if (is_fixup(peek_command(&todo_list, 0)))
- record_in_rewritten(output_oid, peek_command(&todo_list, 0));
+ MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i);
+ todo_list->nr -= i;
+ todo_list->current = 0;
+
+ if (is_fixup(peek_command(todo_list, 0)))
+ record_in_rewritten(base_oid, peek_command(todo_list, 0));
}
- todo_list_release(&todo_list);
-
return 0;
}
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
- const char *onto, const char *orig_head, const char *cmd,
- unsigned autosquash)
+ struct commit *onto, const char *orig_head,
+ struct string_list *commands, unsigned autosquash,
+ struct todo_list *todo_list)
{
const char *shortonto, *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
- struct strbuf *buf = &(todo_list.buf);
- struct object_id oid;
- struct stat st;
+ struct todo_list new_todo = TODO_LIST_INIT;
+ struct strbuf *buf = &todo_list->buf;
+ struct object_id oid = onto->object.oid;
+ int res;
- get_oid(onto, &oid);
shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV);
- if (!lstat(todo_file, &st) && st.st_size == 0 &&
- write_message("noop\n", 5, todo_file, 0))
- return -1;
-
- if (autosquash && rearrange_squash(r))
- return -1;
-
- if (cmd && *cmd)
- sequencer_add_exec_commands(r, cmd);
-
- if (strbuf_read_file(buf, todo_file, 0) < 0)
- return error_errno(_("could not read '%s'."), todo_file);
-
- if (parse_insn_buffer(r, buf->buf, &todo_list)) {
- todo_list_release(&todo_list);
- return error(_("unusable todo list: '%s'"), todo_file);
- }
-
- if (count_commands(&todo_list) == 0) {
- apply_autostash(opts);
- sequencer_remove_state(opts);
- todo_list_release(&todo_list);
-
- return error(_("nothing to do"));
- }
-
- strbuf_addch(buf, '\n');
- strbuf_commented_addf(buf, Q_("Rebase %s onto %s (%d command)",
- "Rebase %s onto %s (%d commands)",
- count_commands(&todo_list)),
- shortrevisions, shortonto, count_commands(&todo_list));
- append_todo_help(0, flags & TODO_LIST_KEEP_EMPTY, buf);
-
- if (write_message(buf->buf, buf->len, todo_file, 0)) {
- todo_list_release(&todo_list);
- return -1;
- }
-
- if (copy_file(rebase_path_todo_backup(), todo_file, 0666))
- return error(_("could not copy '%s' to '%s'."), todo_file,
- rebase_path_todo_backup());
-
- if (transform_todos(r, flags | TODO_LIST_SHORTEN_IDS))
- return error(_("could not transform the todo list"));
-
- strbuf_reset(buf);
-
- if (launch_sequence_editor(todo_file, buf, NULL)) {
- apply_autostash(opts);
- sequencer_remove_state(opts);
- todo_list_release(&todo_list);
-
- return -1;
- }
-
- strbuf_stripspace(buf, 1);
if (buf->len == 0) {
+ struct todo_item *item = append_new_todo(todo_list);
+ item->command = TODO_NOOP;
+ item->commit = NULL;
+ item->arg_len = item->arg_offset = item->flags = item->offset_in_buf = 0;
+ }
+
+ if (autosquash && todo_list_rearrange_squash(todo_list))
+ return -1;
+
+ if (commands->nr)
+ todo_list_add_exec_commands(todo_list, commands);
+
+ if (count_commands(todo_list) == 0) {
apply_autostash(opts);
sequencer_remove_state(opts);
- todo_list_release(&todo_list);
return error(_("nothing to do"));
}
- todo_list_release(&todo_list);
+ res = edit_todo_list(r, todo_list, &new_todo, shortrevisions,
+ shortonto, flags);
+ if (res == -1)
+ return -1;
+ else if (res == -2) {
+ apply_autostash(opts);
+ sequencer_remove_state(opts);
- if (check_todo_list(r)) {
- checkout_onto(opts, onto_name, onto, orig_head);
+ return -1;
+ } else if (res == -3) {
+ apply_autostash(opts);
+ sequencer_remove_state(opts);
+ todo_list_release(&new_todo);
+
+ return error(_("nothing to do"));
+ }
+
+ if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) ||
+ todo_list_check(todo_list, &new_todo)) {
+ fprintf(stderr, _(edit_todo_list_advice));
+ checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
+ todo_list_release(&new_todo);
+
return -1;
}
- if (transform_todos(r, flags & ~(TODO_LIST_SHORTEN_IDS)))
- return error(_("could not transform the todo list"));
-
- if (opts->allow_ff && skip_unnecessary_picks(r, &oid))
+ if (opts->allow_ff && skip_unnecessary_picks(r, &new_todo, &oid)) {
+ todo_list_release(&new_todo);
return error(_("could not skip unnecessary pick commands"));
+ }
- if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
+ if (todo_list_write_to_file(r, &new_todo, todo_file, NULL, NULL, -1,
+ flags & ~(TODO_LIST_SHORTEN_IDS))) {
+ todo_list_release(&new_todo);
+ return error_errno(_("could not write '%s'"), todo_file);
+ }
+
+ todo_list_release(&new_todo);
+
+ if (checkout_onto(r, opts, onto_name, &oid, orig_head))
return -1;
if (require_clean_work_tree(r, "rebase", "", 1, 1))
@@ -4996,21 +5167,13 @@
* message will have to be retrieved from the commit (as the oneline in the
* script cannot be trusted) in order to normalize the autosquash arrangement.
*/
-int rearrange_squash(struct repository *r)
+int todo_list_rearrange_squash(struct todo_list *todo_list)
{
- const char *todo_file = rebase_path_todo();
- struct todo_list todo_list = TODO_LIST_INIT;
struct hashmap subject2item;
- int res = 0, rearranged = 0, *next, *tail, i;
+ int rearranged = 0, *next, *tail, i, nr = 0, alloc = 0;
char **subjects;
struct commit_todo_item commit_todo;
-
- if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
- return -1;
- if (parse_insn_buffer(r, todo_list.buf.buf, &todo_list) < 0) {
- todo_list_release(&todo_list);
- return -1;
- }
+ struct todo_item *items = NULL;
init_commit_todo_item(&commit_todo);
/*
@@ -5023,13 +5186,13 @@
* be moved to appear after the i'th.
*/
hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp,
- NULL, todo_list.nr);
- ALLOC_ARRAY(next, todo_list.nr);
- ALLOC_ARRAY(tail, todo_list.nr);
- ALLOC_ARRAY(subjects, todo_list.nr);
- for (i = 0; i < todo_list.nr; i++) {
+ NULL, todo_list->nr);
+ ALLOC_ARRAY(next, todo_list->nr);
+ ALLOC_ARRAY(tail, todo_list->nr);
+ ALLOC_ARRAY(subjects, todo_list->nr);
+ for (i = 0; i < todo_list->nr; i++) {
struct strbuf buf = STRBUF_INIT;
- struct todo_item *item = todo_list.items + i;
+ struct todo_item *item = todo_list->items + i;
const char *commit_buffer, *subject, *p;
size_t subject_len;
int i2 = -1;
@@ -5042,7 +5205,6 @@
}
if (is_fixup(item->command)) {
- todo_list_release(&todo_list);
clear_commit_todo_item(&commit_todo);
return error(_("the script was already rearranged."));
}
@@ -5077,7 +5239,7 @@
*commit_todo_item_at(&commit_todo, commit2))
/* found by commit name */
i2 = *commit_todo_item_at(&commit_todo, commit2)
- - todo_list.items;
+ - todo_list->items;
else {
/* copy can be a prefix of the commit subject */
for (i2 = 0; i2 < i; i2++)
@@ -5090,7 +5252,7 @@
}
if (i2 >= 0) {
rearranged = 1;
- todo_list.items[i].command =
+ todo_list->items[i].command =
starts_with(subject, "fixup!") ?
TODO_FIXUP : TODO_SQUASH;
if (next[i2] < 0)
@@ -5108,10 +5270,8 @@
}
if (rearranged) {
- struct strbuf buf = STRBUF_INIT;
-
- for (i = 0; i < todo_list.nr; i++) {
- enum todo_command command = todo_list.items[i].command;
+ for (i = 0; i < todo_list->nr; i++) {
+ enum todo_command command = todo_list->items[i].command;
int cur = i;
/*
@@ -5122,37 +5282,26 @@
continue;
while (cur >= 0) {
- const char *bol =
- get_item_line(&todo_list, cur);
- const char *eol =
- get_item_line(&todo_list, cur + 1);
-
- /* replace 'pick', by 'fixup' or 'squash' */
- command = todo_list.items[cur].command;
- if (is_fixup(command)) {
- strbuf_addstr(&buf,
- todo_command_info[command].str);
- bol += strcspn(bol, " \t");
- }
-
- strbuf_add(&buf, bol, eol - bol);
-
+ ALLOC_GROW(items, nr + 1, alloc);
+ items[nr++] = todo_list->items[cur];
cur = next[cur];
}
}
- res = rewrite_file(todo_file, buf.buf, buf.len);
- strbuf_release(&buf);
+ FREE_AND_NULL(todo_list->items);
+ todo_list->items = items;
+ todo_list->nr = nr;
+ todo_list->alloc = alloc;
}
free(next);
free(tail);
- for (i = 0; i < todo_list.nr; i++)
+ for (i = 0; i < todo_list->nr; i++)
free(subjects[i]);
free(subjects);
hashmap_free(&subject2item, 1);
- todo_list_release(&todo_list);
clear_commit_todo_item(&commit_todo);
- return res;
+
+ return 0;
}
diff --git a/sequencer.h b/sequencer.h
index 93e8913..574260f 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -10,6 +10,7 @@
const char *git_path_commit_editmsg(void);
const char *git_path_seq_dir(void);
const char *rebase_path_todo(void);
+const char *rebase_path_todo_backup(void);
#define APPEND_SIGNOFF_DEDUP (1u << 0)
@@ -47,6 +48,7 @@
char *gpg_sign;
enum commit_msg_cleanup_mode default_msg_cleanup;
+ int explicit_cleanup;
/* Merge strategy */
char *strategy;
@@ -66,14 +68,60 @@
};
#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
-enum missing_commit_check_level {
- MISSING_COMMIT_CHECK_IGNORE = 0,
- MISSING_COMMIT_CHECK_WARN,
- MISSING_COMMIT_CHECK_ERROR
+/*
+ * Note that ordering matters in this enum. Not only must it match the mapping
+ * of todo_command_info (in sequencer.c), it is also divided into several
+ * sections that matter. When adding new commands, make sure you add it in the
+ * right section.
+ */
+enum todo_command {
+ /* commands that handle commits */
+ TODO_PICK = 0,
+ TODO_REVERT,
+ TODO_EDIT,
+ TODO_REWORD,
+ TODO_FIXUP,
+ TODO_SQUASH,
+ /* commands that do something else than handling a single commit */
+ TODO_EXEC,
+ TODO_BREAK,
+ TODO_LABEL,
+ TODO_RESET,
+ TODO_MERGE,
+ /* commands that do nothing but are counted for reporting progress */
+ TODO_NOOP,
+ TODO_DROP,
+ /* comments (not counted for reporting progress) */
+ TODO_COMMENT
};
-int write_message(const void *buf, size_t len, const char *filename,
- int append_eol);
+struct todo_item {
+ enum todo_command command;
+ struct commit *commit;
+ unsigned int flags;
+ int arg_len;
+ /* The offset of the command and its argument in the strbuf */
+ size_t offset_in_buf, arg_offset;
+};
+
+struct todo_list {
+ struct strbuf buf;
+ struct todo_item *items;
+ int nr, alloc, current;
+ int done_nr, total_nr;
+ struct stat_data stat;
+};
+
+#define TODO_LIST_INIT { STRBUF_INIT }
+
+int todo_list_parse_insn_buffer(struct repository *r, char *buf,
+ struct todo_list *todo_list);
+int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
+ const char *file, const char *shortrevisions,
+ const char *shortonto, int num, unsigned flags);
+void todo_list_release(struct todo_list *todo_list);
+const char *todo_item_get_arg(struct todo_list *todo_list,
+ struct todo_item *item);
/* Call this to setup defaults before parsing command line options */
void sequencer_init_config(struct replay_opts *opts);
@@ -81,6 +129,7 @@
struct replay_opts *opts);
int sequencer_continue(struct repository *repo, struct replay_opts *opts);
int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
+int sequencer_skip(struct repository *repo, struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
#define TODO_LIST_KEEP_EMPTY (1U << 0)
@@ -93,21 +142,25 @@
* commits should be rebased onto the new base, this flag needs to be passed.
*/
#define TODO_LIST_REBASE_COUSINS (1U << 4)
-int sequencer_make_script(struct repository *repo, FILE *out,
- int argc, const char **argv,
- unsigned flags);
+#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
+/*
+ * When generating a script that rebases merges with `--root` *and* with
+ * `--onto`, we do not want to re-generate the root commits.
+ */
+#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
-int sequencer_add_exec_commands(struct repository *r, const char *command);
-int transform_todos(struct repository *r, unsigned flags);
-enum missing_commit_check_level get_missing_commit_check_level(void);
-int check_todo_list(struct repository *r);
+
+int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
+ const char **argv, unsigned flags);
+
+void todo_list_add_exec_commands(struct todo_list *todo_list,
+ struct string_list *commands);
+int check_todo_list_from_file(struct repository *r);
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
- const char *onto, const char *orig_head, const char *cmd,
- unsigned autosquash);
-int rearrange_squash(struct repository *r);
-
-extern const char sign_off_header[];
+ struct commit *onto, const char *orig_head, struct string_list *commands,
+ unsigned autosquash, struct todo_list *todo_list);
+int todo_list_rearrange_squash(struct todo_list *todo_list);
/*
* Append a signoff to the commit message in "msgbuf". The ignore_footer
@@ -117,7 +170,14 @@
*/
void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
-void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
+void append_conflicts_hint(struct index_state *istate,
+ struct strbuf *msgbuf, enum commit_msg_cleanup_mode cleanup_mode);
+enum commit_msg_cleanup_mode get_cleanup_mode(const char *cleanup_arg,
+ int use_editor);
+
+void cleanup_message(struct strbuf *msgbuf,
+ enum commit_msg_cleanup_mode cleanup_mode, int verbose);
+
int message_is_empty(const struct strbuf *sb,
enum commit_msg_cleanup_mode cleanup_mode);
int template_untouched(const struct strbuf *sb, const char *template_file,
@@ -130,7 +190,8 @@
const struct commit *current_head,
const struct object_id *new_head);
-int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
+int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
+ const char *commit);
#define SUMMARY_INITIAL_COMMIT (1 << 0)
#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
@@ -145,4 +206,7 @@
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
int write_basic_state(struct replay_opts *opts, const char *head_name,
- const char *onto, const char *orig_head);
+ struct commit *onto, const char *orig_head);
+void sequencer_post_commit_cleanup(struct repository *r, int verbose);
+int sequencer_get_last_command(struct repository* r,
+ enum replay_action *action);
diff --git a/serve.h b/serve.h
index fe65ba9..42ddca7 100644
--- a/serve.h
+++ b/serve.h
@@ -2,14 +2,14 @@
#define SERVE_H
struct argv_array;
-extern int has_capability(const struct argv_array *keys, const char *capability,
- const char **value);
+int has_capability(const struct argv_array *keys, const char *capability,
+ const char **value);
struct serve_options {
unsigned advertise_capabilities;
unsigned stateless_rpc;
};
#define SERVE_OPTIONS_INIT { 0 }
-extern void serve(struct serve_options *options);
+void serve(struct serve_options *options);
#endif /* SERVE_H */
diff --git a/server-info.c b/server-info.c
index e2b2d6a2..4d8199b 100644
--- a/server-info.c
+++ b/server-info.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "dir.h"
#include "repository.h"
#include "refs.h"
#include "object.h"
@@ -6,82 +7,174 @@
#include "tag.h"
#include "packfile.h"
#include "object-store.h"
+#include "strbuf.h"
+
+struct update_info_ctx {
+ FILE *cur_fp;
+ FILE *old_fp; /* becomes NULL if it differs from cur_fp */
+ struct strbuf cur_sb;
+ struct strbuf old_sb;
+};
+
+static void uic_mark_stale(struct update_info_ctx *uic)
+{
+ fclose(uic->old_fp);
+ uic->old_fp = NULL;
+}
+
+static int uic_is_stale(const struct update_info_ctx *uic)
+{
+ return uic->old_fp == NULL;
+}
+
+static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
+{
+ va_list ap;
+ int ret = -1;
+
+ va_start(ap, fmt);
+
+ if (uic_is_stale(uic)) {
+ ret = vfprintf(uic->cur_fp, fmt, ap);
+ } else {
+ ssize_t r;
+ struct strbuf *cur = &uic->cur_sb;
+ struct strbuf *old = &uic->old_sb;
+
+ strbuf_reset(cur);
+ strbuf_vinsertf(cur, 0, fmt, ap);
+
+ strbuf_reset(old);
+ strbuf_grow(old, cur->len);
+ r = fread(old->buf, 1, cur->len, uic->old_fp);
+ if (r != cur->len || memcmp(old->buf, cur->buf, r))
+ uic_mark_stale(uic);
+
+ if (fwrite(cur->buf, 1, cur->len, uic->cur_fp) == cur->len)
+ ret = 0;
+ }
+
+ va_end(ap);
+
+ return ret;
+}
/*
* Create the file "path" by writing to a temporary file and renaming
* it into place. The contents of the file come from "generate", which
* should return non-zero if it encounters an error.
*/
-static int update_info_file(char *path, int (*generate)(FILE *))
+static int update_info_file(char *path,
+ int (*generate)(struct update_info_ctx *),
+ int force)
{
char *tmp = mkpathdup("%s_XXXXXX", path);
int ret = -1;
int fd = -1;
- FILE *fp = NULL, *to_close;
+ FILE *to_close;
+ struct update_info_ctx uic = {
+ .cur_fp = NULL,
+ .old_fp = NULL,
+ .cur_sb = STRBUF_INIT,
+ .old_sb = STRBUF_INIT
+ };
safe_create_leading_directories(path);
fd = git_mkstemp_mode(tmp, 0666);
if (fd < 0)
goto out;
- to_close = fp = fdopen(fd, "w");
- if (!fp)
+ to_close = uic.cur_fp = fdopen(fd, "w");
+ if (!uic.cur_fp)
goto out;
fd = -1;
- ret = generate(fp);
+
+ /* no problem on ENOENT and old_fp == NULL, it's stale, now */
+ if (!force)
+ uic.old_fp = fopen_or_warn(path, "r");
+
+ /*
+ * uic_printf will compare incremental comparison aginst old_fp
+ * and mark uic as stale if needed
+ */
+ ret = generate(&uic);
if (ret)
goto out;
- fp = NULL;
+
+ /* new file may be shorter than the old one, check here */
+ if (!uic_is_stale(&uic)) {
+ struct stat st;
+ long new_len = ftell(uic.cur_fp);
+ int old_fd = fileno(uic.old_fp);
+
+ if (new_len < 0) {
+ ret = -1;
+ goto out;
+ }
+ if (fstat(old_fd, &st) || (st.st_size != (size_t)new_len))
+ uic_mark_stale(&uic);
+ }
+
+ uic.cur_fp = NULL;
if (fclose(to_close))
goto out;
- if (adjust_shared_perm(tmp) < 0)
- goto out;
- if (rename(tmp, path) < 0)
- goto out;
+
+ if (uic_is_stale(&uic)) {
+ if (adjust_shared_perm(tmp) < 0)
+ goto out;
+ if (rename(tmp, path) < 0)
+ goto out;
+ } else {
+ unlink(tmp);
+ }
ret = 0;
out:
if (ret) {
error_errno("unable to update %s", path);
- if (fp)
- fclose(fp);
+ if (uic.cur_fp)
+ fclose(uic.cur_fp);
else if (fd >= 0)
close(fd);
unlink(tmp);
}
free(tmp);
+ if (uic.old_fp)
+ fclose(uic.old_fp);
+ strbuf_release(&uic.old_sb);
+ strbuf_release(&uic.cur_sb);
return ret;
}
static int add_info_ref(const char *path, const struct object_id *oid,
int flag, void *cb_data)
{
- FILE *fp = cb_data;
+ struct update_info_ctx *uic = cb_data;
struct object *o = parse_object(the_repository, oid);
if (!o)
return -1;
- if (fprintf(fp, "%s %s\n", oid_to_hex(oid), path) < 0)
+ if (uic_printf(uic, "%s %s\n", oid_to_hex(oid), path) < 0)
return -1;
if (o->type == OBJ_TAG) {
o = deref_tag(the_repository, o, path, 0);
if (o)
- if (fprintf(fp, "%s %s^{}\n",
+ if (uic_printf(uic, "%s %s^{}\n",
oid_to_hex(&o->oid), path) < 0)
return -1;
}
return 0;
}
-static int generate_info_refs(FILE *fp)
+static int generate_info_refs(struct update_info_ctx *uic)
{
- return for_each_ref(add_info_ref, fp);
+ return for_each_ref(add_info_ref, uic);
}
static int update_info_refs(int force)
{
char *path = git_pathdup("info/refs");
- int ret = update_info_file(path, generate_info_refs);
+ int ret = update_info_file(path, generate_info_refs, force);
free(path);
return ret;
}
@@ -91,19 +184,15 @@
struct packed_git *p;
int old_num;
int new_num;
- int nr_alloc;
} **info;
static int num_pack;
-static const char *objdir;
-static int objdirlen;
static struct pack_info *find_pack_by_name(const char *name)
{
int i;
for (i = 0; i < num_pack; i++) {
struct packed_git *p = info[i]->p;
- /* skip "/pack/" after ".git/objects" */
- if (!strcmp(p->pack_name + objdirlen + 6, name))
+ if (!strcmp(pack_basename(p), name))
return info[i];
}
return NULL;
@@ -112,9 +201,9 @@
/* Returns non-zero when we detect that the info in the
* old file is useless.
*/
-static int parse_pack_def(const char *line, int old_cnt)
+static int parse_pack_def(const char *packname, int old_cnt)
{
- struct pack_info *i = find_pack_by_name(line + 2);
+ struct pack_info *i = find_pack_by_name(packname);
if (i) {
i->old_num = old_cnt;
return 0;
@@ -131,39 +220,40 @@
static int read_pack_info_file(const char *infofile)
{
FILE *fp;
- char line[1000];
+ struct strbuf line = STRBUF_INIT;
int old_cnt = 0;
+ int stale = 1;
fp = fopen_or_warn(infofile, "r");
if (!fp)
return 1; /* nonexistent is not an error. */
- while (fgets(line, sizeof(line), fp)) {
- int len = strlen(line);
- if (len && line[len-1] == '\n')
- line[--len] = 0;
+ while (strbuf_getline(&line, fp) != EOF) {
+ const char *arg;
- if (!len)
+ if (!line.len)
continue;
- switch (line[0]) {
- case 'P': /* P name */
- if (parse_pack_def(line, old_cnt++))
+ if (skip_prefix(line.buf, "P ", &arg)) {
+ /* P name */
+ if (parse_pack_def(arg, old_cnt++))
goto out_stale;
- break;
- case 'D': /* we used to emit D but that was misguided. */
- case 'T': /* we used to emit T but nobody uses it. */
+ } else if (line.buf[0] == 'D') {
+ /* we used to emit D but that was misguided. */
goto out_stale;
- default:
- error("unrecognized: %s", line);
- break;
+ } else if (line.buf[0] == 'T') {
+ /* we used to emit T but nobody uses it. */
+ goto out_stale;
+ } else {
+ error("unrecognized: %s", line.buf);
}
}
- fclose(fp);
- return 0;
+ stale = 0;
+
out_stale:
+ strbuf_release(&line);
fclose(fp);
- return 1;
+ return stale;
}
static int compare_info(const void *a_, const void *b_)
@@ -194,28 +284,21 @@
{
struct packed_git *p;
int stale;
- int i = 0;
-
- objdir = get_object_directory();
- objdirlen = strlen(objdir);
+ int i;
+ size_t alloc = 0;
for (p = get_all_packs(the_repository); p; p = p->next) {
/* we ignore things on alternate path since they are
* not available to the pullers in general.
*/
- if (!p->pack_local)
+ if (!p->pack_local || !file_exists(p->pack_name))
continue;
- i++;
- }
- num_pack = i;
- info = xcalloc(num_pack, sizeof(struct pack_info *));
- for (i = 0, p = get_all_packs(the_repository); p; p = p->next) {
- if (!p->pack_local)
- continue;
+
+ i = num_pack++;
+ ALLOC_GROW(info, num_pack, alloc);
info[i] = xcalloc(1, sizeof(struct pack_info));
info[i]->p = p;
info[i]->old_num = -1;
- i++;
}
if (infofile && !force)
@@ -241,14 +324,14 @@
free(info);
}
-static int write_pack_info_file(FILE *fp)
+static int write_pack_info_file(struct update_info_ctx *uic)
{
int i;
for (i = 0; i < num_pack; i++) {
- if (fprintf(fp, "P %s\n", info[i]->p->pack_name + objdirlen + 6) < 0)
+ if (uic_printf(uic, "P %s\n", pack_basename(info[i]->p)) < 0)
return -1;
}
- if (fputc('\n', fp) == EOF)
+ if (uic_printf(uic, "\n") < 0)
return -1;
return 0;
}
@@ -259,7 +342,7 @@
int ret;
init_pack_info(infofile, force);
- ret = update_info_file(infofile, write_pack_info_file);
+ ret = update_info_file(infofile, write_pack_info_file, force);
free_pack_info();
free(infofile);
return ret;
diff --git a/setup.c b/setup.c
index ca9e8a9..e2a479a 100644
--- a/setup.c
+++ b/setup.c
@@ -4,6 +4,7 @@
#include "dir.h"
#include "string-list.h"
#include "chdir-notify.h"
+#include "promisor-remote.h"
static int inside_git_dir = -1;
static int inside_work_tree = -1;
@@ -164,7 +165,8 @@
die_errno(_("failed to stat '%s'"), arg);
}
-static void NORETURN die_verify_filename(const char *prefix,
+static void NORETURN die_verify_filename(struct repository *r,
+ const char *prefix,
const char *arg,
int diagnose_misspelt_rev)
{
@@ -179,7 +181,7 @@
* let maybe_die_on_misspelt_object_name() even trigger.
*/
if (!(arg[0] == ':' && !isalnum(arg[1])))
- maybe_die_on_misspelt_object_name(arg, prefix);
+ maybe_die_on_misspelt_object_name(r, arg, prefix);
/* ... or fall back the most general message. */
die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -234,7 +236,7 @@
die(_("option '%s' must come before non-option arguments"), arg);
if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return;
- die_verify_filename(prefix, arg, diagnose_misspelt_rev);
+ die_verify_filename(the_repository, prefix, arg, diagnose_misspelt_rev);
}
/*
@@ -411,6 +413,7 @@
} else if (strcmp(var, "core.worktree") == 0) {
if (!value)
return config_error_nonbool(var);
+ free(data->work_tree);
data->work_tree = xstrdup(value);
}
return 0;
@@ -476,7 +479,7 @@
}
repository_format_precious_objects = candidate->precious_objects;
- repository_format_partial_clone = candidate->partial_clone;
+ set_repository_format_partial_clone(candidate->partial_clone);
repository_format_worktree_config = candidate->worktree_config;
string_list_clear(&candidate->unknown_extensions, 0);
@@ -499,27 +502,38 @@
}
if (candidate->work_tree) {
free(git_work_tree_cfg);
- git_work_tree_cfg = candidate->work_tree;
+ git_work_tree_cfg = xstrdup(candidate->work_tree);
inside_work_tree = -1;
}
- } else {
- free(candidate->work_tree);
}
return 0;
}
+static void init_repository_format(struct repository_format *format)
+{
+ const struct repository_format fresh = REPOSITORY_FORMAT_INIT;
+
+ memcpy(format, &fresh, sizeof(fresh));
+}
+
int read_repository_format(struct repository_format *format, const char *path)
{
- memset(format, 0, sizeof(*format));
- format->version = -1;
- format->is_bare = -1;
- format->hash_algo = GIT_HASH_SHA1;
- string_list_init(&format->unknown_extensions, 1);
+ clear_repository_format(format);
git_config_from_file(check_repo_format, path, format);
+ if (format->version == -1)
+ clear_repository_format(format);
return format->version;
}
+void clear_repository_format(struct repository_format *format)
+{
+ string_list_clear(&format->unknown_extensions, 0);
+ free(format->work_tree);
+ free(format->partial_clone);
+ init_repository_format(format);
+}
+
int verify_repository_format(const struct repository_format *format,
struct strbuf *err)
{
@@ -784,7 +798,7 @@
set_git_dir(gitdir);
inside_git_dir = 0;
inside_work_tree = 1;
- if (offset == cwd->len)
+ if (offset >= cwd->len)
return NULL;
/* Make "offset" point past the '/' (already the case for root dirs) */
@@ -906,7 +920,7 @@
const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
struct string_list ceiling_dirs = STRING_LIST_INIT_DUP;
const char *gitdirenv;
- int ceil_offset = -1, min_offset = has_dos_drive_prefix(dir->buf) ? 3 : 1;
+ int ceil_offset = -1, min_offset = offset_1st_component(dir->buf);
dev_t current_device = 0;
int one_filesystem = 1;
@@ -934,6 +948,12 @@
if (ceil_offset < 0)
ceil_offset = min_offset - 2;
+ if (min_offset && min_offset == dir->len &&
+ !is_dir_sep(dir->buf[min_offset - 1])) {
+ strbuf_addch(dir, '/');
+ min_offset++;
+ }
+
/*
* Test in the following order (relative to the dir):
* - .git (file containing "gitdir: <path>")
@@ -997,7 +1017,7 @@
struct strbuf dir = STRBUF_INIT, err = STRBUF_INIT;
size_t gitdir_offset = gitdir->len, cwd_len;
size_t commondir_offset = commondir->len;
- struct repository_format candidate;
+ struct repository_format candidate = REPOSITORY_FORMAT_INIT;
if (strbuf_getcwd(&dir))
return -1;
@@ -1034,9 +1054,11 @@
strbuf_release(&err);
strbuf_setlen(commondir, commondir_offset);
strbuf_setlen(gitdir, gitdir_offset);
+ clear_repository_format(&candidate);
return -1;
}
+ clear_repository_format(&candidate);
return 0;
}
@@ -1045,7 +1067,7 @@
static struct strbuf cwd = STRBUF_INIT;
struct strbuf dir = STRBUF_INIT, gitdir = STRBUF_INIT;
const char *prefix = NULL;
- struct repository_format repo_fmt;
+ struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
/*
* We may have read an incomplete configuration before
@@ -1157,6 +1179,7 @@
strbuf_release(&dir);
strbuf_release(&gitdir);
+ clear_repository_format(&repo_fmt);
return prefix;
}
@@ -1214,9 +1237,10 @@
void check_repository_format(void)
{
- struct repository_format repo_fmt;
+ struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);
startup_info->have_repository = 1;
+ clear_repository_format(&repo_fmt);
}
/*
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 09c6b44..e7430b9 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -14,6 +14,7 @@
*/
#include "git-compat-util.h"
+#include "trace2.h"
/* Substitution of environment variables in shell format strings.
Copyright (C) 2003-2007 Free Software Foundation, Inc.
@@ -67,6 +68,8 @@
/* Default values for command line options. */
/* unsigned short int show_variables = 0; */
+ trace2_cmd_name("sh-i18n--envsubst");
+
switch (argc)
{
case 1:
@@ -246,7 +249,7 @@
{
/* Here we know that if s is in the list, it is at an index j
with j1 <= j < j2. */
- size_t j = (j1 + j2) >> 1;
+ size_t j = j1 + ((j2 - j1) >> 1);
int result = strcmp (slp->item[j], s);
if (result > 0)
diff --git a/sha1-file.c b/sha1-file.c
index 494606f..e85f249 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -30,8 +30,8 @@
#include "mergesort.h"
#include "quote.h"
#include "packfile.h"
-#include "fetch-object.h"
#include "object-store.h"
+#include "promisor-remote.h"
/* The maximum size for an object header. */
#define MAX_HEADER_LEN 32
@@ -189,6 +189,14 @@
return GIT_HASH_UNKNOWN;
}
+int hash_algo_by_length(int len)
+{
+ int i;
+ for (i = 1; i < GIT_HASH_NALGOS; i++)
+ if (len == hash_algos[i].rawsz)
+ return i;
+ return GIT_HASH_UNKNOWN;
+}
/*
* This is meant to hold a *small* number of objects that you would
@@ -735,6 +743,104 @@
return ref_git;
}
+static void fill_alternate_refs_command(struct child_process *cmd,
+ const char *repo_path)
+{
+ const char *value;
+
+ if (!git_config_get_value("core.alternateRefsCommand", &value)) {
+ cmd->use_shell = 1;
+
+ argv_array_push(&cmd->args, value);
+ argv_array_push(&cmd->args, repo_path);
+ } else {
+ cmd->git_cmd = 1;
+
+ argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path);
+ argv_array_push(&cmd->args, "for-each-ref");
+ argv_array_push(&cmd->args, "--format=%(objectname)");
+
+ if (!git_config_get_value("core.alternateRefsPrefixes", &value)) {
+ argv_array_push(&cmd->args, "--");
+ argv_array_split(&cmd->args, value);
+ }
+ }
+
+ cmd->env = local_repo_env;
+ cmd->out = -1;
+}
+
+static void read_alternate_refs(const char *path,
+ alternate_ref_fn *cb,
+ void *data)
+{
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct strbuf line = STRBUF_INIT;
+ FILE *fh;
+
+ fill_alternate_refs_command(&cmd, path);
+
+ if (start_command(&cmd))
+ return;
+
+ fh = xfdopen(cmd.out, "r");
+ while (strbuf_getline_lf(&line, fh) != EOF) {
+ struct object_id oid;
+ const char *p;
+
+ if (parse_oid_hex(line.buf, &oid, &p) || *p) {
+ warning(_("invalid line while parsing alternate refs: %s"),
+ line.buf);
+ break;
+ }
+
+ cb(&oid, data);
+ }
+
+ fclose(fh);
+ finish_command(&cmd);
+ strbuf_release(&line);
+}
+
+struct alternate_refs_data {
+ alternate_ref_fn *fn;
+ void *data;
+};
+
+static int refs_from_alternate_cb(struct object_directory *e,
+ void *data)
+{
+ struct strbuf path = STRBUF_INIT;
+ size_t base_len;
+ struct alternate_refs_data *cb = data;
+
+ if (!strbuf_realpath(&path, e->path, 0))
+ goto out;
+ if (!strbuf_strip_suffix(&path, "/objects"))
+ goto out;
+ base_len = path.len;
+
+ /* Is this a git repository with refs? */
+ strbuf_addstr(&path, "/refs");
+ if (!is_directory(path.buf))
+ goto out;
+ strbuf_setlen(&path, base_len);
+
+ read_alternate_refs(path.buf, cb->fn, cb->data);
+
+out:
+ strbuf_release(&path);
+ return 0;
+}
+
+void for_each_alternate_ref(alternate_ref_fn fn, void *data)
+{
+ struct alternate_refs_data cb;
+ cb.fn = fn;
+ cb.data = data;
+ foreach_alt_odb(refs_from_alternate_cb, &cb);
+}
+
int foreach_alt_odb(alt_odb_fn fn, void *cb)
{
struct object_directory *ent;
@@ -846,12 +952,8 @@
mmap_limit_check(length);
ret = mmap(start, length, prot, flags, fd, offset);
- if (ret == MAP_FAILED) {
- if (!length)
- return NULL;
- release_pack_memory(length);
- ret = mmap(start, length, prot, flags, fd, offset);
- }
+ if (ret == MAP_FAILED && !length)
+ ret = NULL;
return ret;
}
@@ -1369,15 +1471,17 @@
}
/* Check if it is a missing object */
- if (fetch_if_missing && repository_format_partial_clone &&
- !already_retried && r == the_repository) {
+ if (fetch_if_missing && has_promisor_remote() &&
+ !already_retried && r == the_repository &&
+ !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
/*
- * TODO Investigate having fetch_object() return
- * TODO error/success and stopping the music here.
- * TODO Pass a repository struct through fetch_object,
- * such that arbitrary repositories work.
+ * TODO Investigate checking promisor_remote_get_direct()
+ * TODO return value and stopping on error here.
+ * TODO Pass a repository struct through
+ * promisor_remote_get_direct(), such that arbitrary
+ * repositories work.
*/
- fetch_objects(repository_format_partial_clone, real, 1);
+ promisor_remote_get_direct(r, real, 1);
already_retried = 1;
continue;
}
@@ -1496,7 +1600,8 @@
return NULL;
}
-void *read_object_with_reference(const struct object_id *oid,
+void *read_object_with_reference(struct repository *r,
+ const struct object_id *oid,
const char *required_type_name,
unsigned long *size,
struct object_id *actual_oid_return)
@@ -1512,7 +1617,7 @@
int ref_length = -1;
const char *ref_type = NULL;
- buffer = read_object_file(&actual_oid, &type, &isize);
+ buffer = repo_read_object_file(r, &actual_oid, &type, &isize);
if (!buffer)
return NULL;
if (type == required_type) {
diff --git a/sha1-lookup.h b/sha1-lookup.h
index 7678b23..5afcd01 100644
--- a/sha1-lookup.h
+++ b/sha1-lookup.h
@@ -3,10 +3,10 @@
typedef const unsigned char *sha1_access_fn(size_t index, void *table);
-extern int sha1_pos(const unsigned char *sha1,
- void *table,
- size_t nr,
- sha1_access_fn fn);
+int sha1_pos(const unsigned char *sha1,
+ void *table,
+ size_t nr,
+ sha1_access_fn fn);
/*
* Searches for sha1 in table, using the given fanout table to determine the
diff --git a/sha1-name.c b/sha1-name.c
index d1cc77c..c665e3f 100644
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -12,18 +12,20 @@
#include "packfile.h"
#include "object-store.h"
#include "repository.h"
+#include "submodule.h"
#include "midx.h"
#include "commit-reach.h"
-static int get_oid_oneline(const char *, struct object_id *, struct commit_list *);
+static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *);
-typedef int (*disambiguate_hint_fn)(const struct object_id *, void *);
+typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
struct disambiguate_state {
int len; /* length of prefix in hex chars */
char hex_pfx[GIT_MAX_HEXSZ + 1];
struct object_id bin_pfx;
+ struct repository *repo;
disambiguate_hint_fn fn;
void *cb_data;
struct object_id candidate;
@@ -38,7 +40,7 @@
static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)
{
if (ds->always_call_fn) {
- ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
+ ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0;
return;
}
if (!ds->candidate_exists) {
@@ -58,7 +60,7 @@
}
if (!ds->candidate_checked) {
- ds->candidate_ok = ds->fn(&ds->candidate, ds->cb_data);
+ ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data);
ds->disambiguate_fn_used = 1;
ds->candidate_checked = 1;
}
@@ -71,7 +73,7 @@
}
/* if we reach this point, we know ds->candidate satisfies fn */
- if (ds->fn(current, ds->cb_data)) {
+ if (ds->fn(ds->repo, current, ds->cb_data)) {
/*
* if both current and candidate satisfy fn, we cannot
* disambiguate.
@@ -89,9 +91,7 @@
{
struct object_directory *odb;
- for (odb = the_repository->objects->odb;
- odb && !ds->ambiguous;
- odb = odb->next) {
+ for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next) {
int pos;
struct oid_array *loose_objects;
@@ -157,6 +157,9 @@
uint32_t num, i, first = 0;
const struct object_id *current = NULL;
+ if (p->multi_pack_index)
+ return;
+
if (open_pack_index(p) || !p->num_objects)
return;
@@ -182,10 +185,10 @@
struct multi_pack_index *m;
struct packed_git *p;
- for (m = get_multi_pack_index(the_repository); m && !ds->ambiguous;
+ for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous;
m = m->next)
unique_in_midx(m, ds);
- for (p = get_packed_git(the_repository); p && !ds->ambiguous;
+ for (p = get_packed_git(ds->repo); p && !ds->ambiguous;
p = p->next)
unique_in_pack(p, ds);
}
@@ -215,7 +218,7 @@
* same repository!
*/
ds->candidate_ok = (!ds->disambiguate_fn_used ||
- ds->fn(&ds->candidate, ds->cb_data));
+ ds->fn(ds->repo, &ds->candidate, ds->cb_data));
if (!ds->candidate_ok)
return SHORT_NAME_AMBIGUOUS;
@@ -224,59 +227,67 @@
return 0;
}
-static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)
+static int disambiguate_commit_only(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data_unused)
{
- int kind = oid_object_info(the_repository, oid, NULL);
+ int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_COMMIT;
}
-static int disambiguate_committish_only(const struct object_id *oid, void *cb_data_unused)
+static int disambiguate_committish_only(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data_unused)
{
struct object *obj;
int kind;
- kind = oid_object_info(the_repository, oid, NULL);
+ kind = oid_object_info(r, oid, NULL);
if (kind == OBJ_COMMIT)
return 1;
if (kind != OBJ_TAG)
return 0;
/* We need to do this the hard way... */
- obj = deref_tag(the_repository, parse_object(the_repository, oid),
- NULL, 0);
+ obj = deref_tag(r, parse_object(r, oid), NULL, 0);
if (obj && obj->type == OBJ_COMMIT)
return 1;
return 0;
}
-static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)
+static int disambiguate_tree_only(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data_unused)
{
- int kind = oid_object_info(the_repository, oid, NULL);
+ int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_TREE;
}
-static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_unused)
+static int disambiguate_treeish_only(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data_unused)
{
struct object *obj;
int kind;
- kind = oid_object_info(the_repository, oid, NULL);
+ kind = oid_object_info(r, oid, NULL);
if (kind == OBJ_TREE || kind == OBJ_COMMIT)
return 1;
if (kind != OBJ_TAG)
return 0;
/* We need to do this the hard way... */
- obj = deref_tag(the_repository, parse_object(the_repository, oid),
- NULL, 0);
+ obj = deref_tag(r, parse_object(r, oid), NULL, 0);
if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
return 1;
return 0;
}
-static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)
+static int disambiguate_blob_only(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data_unused)
{
- int kind = oid_object_info(the_repository, oid, NULL);
+ int kind = oid_object_info(r, oid, NULL);
return kind == OBJ_BLOB;
}
@@ -310,7 +321,8 @@
return error("unknown hint type for '%s': %s", var, value);
}
-static int init_object_disambiguation(const char *name, int len,
+static int init_object_disambiguation(struct repository *r,
+ const char *name, int len,
struct disambiguate_state *ds)
{
int i;
@@ -341,7 +353,8 @@
ds->len = len;
ds->hex_pfx[len] = '\0';
- prepare_alt_odb(the_repository);
+ ds->repo = r;
+ prepare_alt_odb(r);
return 0;
}
@@ -351,25 +364,25 @@
struct strbuf desc = STRBUF_INIT;
int type;
- if (ds->fn && !ds->fn(oid, ds->cb_data))
+ if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
return 0;
- type = oid_object_info(the_repository, oid, NULL);
+ type = oid_object_info(ds->repo, oid, NULL);
if (type == OBJ_COMMIT) {
- struct commit *commit = lookup_commit(the_repository, oid);
+ struct commit *commit = lookup_commit(ds->repo, oid);
if (commit) {
struct pretty_print_context pp = {0};
pp.date_mode.type = DATE_SHORT;
format_commit_message(commit, " %ad - %s", &desc, &pp);
}
} else if (type == OBJ_TAG) {
- struct tag *tag = lookup_tag(the_repository, oid);
+ struct tag *tag = lookup_tag(ds->repo, oid);
if (!parse_tag(tag) && tag->tag)
strbuf_addf(&desc, " %s", tag->tag);
}
advise(" %s %s%s",
- find_unique_abbrev(oid, DEFAULT_ABBREV),
+ repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV),
type_name(type) ? type_name(type) : "unknown type",
desc.buf);
@@ -383,10 +396,18 @@
return 0;
}
-static int sort_ambiguous(const void *a, const void *b)
+static int repo_collect_ambiguous(struct repository *r,
+ const struct object_id *oid,
+ void *data)
{
- int a_type = oid_object_info(the_repository, a, NULL);
- int b_type = oid_object_info(the_repository, b, NULL);
+ return collect_ambiguous(oid, data);
+}
+
+static int sort_ambiguous(const void *a, const void *b, void *ctx)
+{
+ struct repository *sort_ambiguous_repo = ctx;
+ int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
+ int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
int a_type_sort;
int b_type_sort;
@@ -411,7 +432,13 @@
return a_type_sort > b_type_sort ? 1 : -1;
}
-static enum get_oid_result get_short_oid(const char *name, int len,
+static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
+{
+ QSORT_S(a->oid, a->nr, sort_ambiguous, r);
+}
+
+static enum get_oid_result get_short_oid(struct repository *r,
+ const char *name, int len,
struct object_id *oid,
unsigned flags)
{
@@ -419,7 +446,7 @@
struct disambiguate_state ds;
int quietly = !!(flags & GET_OID_QUIETLY);
- if (init_object_disambiguation(name, len, &ds) < 0)
+ if (init_object_disambiguation(r, name, len, &ds) < 0)
return -1;
if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
@@ -442,6 +469,18 @@
find_short_packed_object(&ds);
status = finish_object_disambiguation(&ds, oid);
+ /*
+ * If we didn't find it, do the usual reprepare() slow-path,
+ * since the object may have recently been added to the repository
+ * or migrated from loose to packed.
+ */
+ if (status == MISSING_OBJECT) {
+ reprepare_packed_git(r);
+ find_short_object_filename(&ds);
+ find_short_packed_object(&ds);
+ status = finish_object_disambiguation(&ds, oid);
+ }
+
if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
struct oid_array collect = OID_ARRAY_INIT;
@@ -457,8 +496,8 @@
ds.fn = NULL;
advise(_("The candidates are:"));
- for_each_abbrev(ds.hex_pfx, collect_ambiguous, &collect);
- QSORT(collect.oid, collect.nr, sort_ambiguous);
+ repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
+ sort_ambiguous_oid_array(r, &collect);
if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
BUG("show_ambiguous_object shouldn't return non-zero");
@@ -468,17 +507,18 @@
return status;
}
-int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
+int repo_for_each_abbrev(struct repository *r, const char *prefix,
+ each_abbrev_fn fn, void *cb_data)
{
struct oid_array collect = OID_ARRAY_INIT;
struct disambiguate_state ds;
int ret;
- if (init_object_disambiguation(prefix, strlen(prefix), &ds) < 0)
+ if (init_object_disambiguation(r, prefix, strlen(prefix), &ds) < 0)
return -1;
ds.always_call_fn = 1;
- ds.fn = collect_ambiguous;
+ ds.fn = repo_collect_ambiguous;
ds.cb_data = &collect;
find_short_object_filename(&ds);
find_short_packed_object(&ds);
@@ -505,6 +545,7 @@
unsigned int init_len;
unsigned int cur_len;
char *hex;
+ struct repository *repo;
const struct object_id *oid;
};
@@ -533,6 +574,13 @@
return 0;
}
+static int repo_extend_abbrev_len(struct repository *r,
+ const struct object_id *oid,
+ void *cb_data)
+{
+ return extend_abbrev_len(oid, cb_data);
+}
+
static void find_abbrev_len_for_midx(struct multi_pack_index *m,
struct min_abbrev_data *mad)
{
@@ -577,6 +625,9 @@
struct object_id oid;
const struct object_id *mad_oid;
+ if (p->multi_pack_index)
+ return;
+
if (open_pack_index(p) || !p->num_objects)
return;
@@ -610,21 +661,22 @@
struct multi_pack_index *m;
struct packed_git *p;
- for (m = get_multi_pack_index(the_repository); m; m = m->next)
+ for (m = get_multi_pack_index(mad->repo); m; m = m->next)
find_abbrev_len_for_midx(m, mad);
- for (p = get_packed_git(the_repository); p; p = p->next)
+ for (p = get_packed_git(mad->repo); p; p = p->next)
find_abbrev_len_for_pack(p, mad);
}
-int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
+int repo_find_unique_abbrev_r(struct repository *r, char *hex,
+ const struct object_id *oid, int len)
{
struct disambiguate_state ds;
struct min_abbrev_data mad;
struct object_id oid_ret;
- const unsigned hexsz = the_hash_algo->hexsz;
+ const unsigned hexsz = r->hash_algo->hexsz;
if (len < 0) {
- unsigned long count = approximate_object_count();
+ unsigned long count = repo_approximate_object_count(r);
/*
* Add one because the MSB only tells us the highest bit set,
* not including the value of all the _other_ bits (so "15"
@@ -649,6 +701,7 @@
if (len == hexsz || !len)
return hexsz;
+ mad.repo = r;
mad.init_len = len;
mad.cur_len = len;
mad.hex = hex;
@@ -656,10 +709,10 @@
find_abbrev_len_packed(&mad);
- if (init_object_disambiguation(hex, mad.cur_len, &ds) < 0)
+ if (init_object_disambiguation(r, hex, mad.cur_len, &ds) < 0)
return -1;
- ds.fn = extend_abbrev_len;
+ ds.fn = repo_extend_abbrev_len;
ds.always_call_fn = 1;
ds.cb_data = (void *)&mad;
@@ -670,13 +723,15 @@
return mad.cur_len;
}
-const char *find_unique_abbrev(const struct object_id *oid, int len)
+const char *repo_find_unique_abbrev(struct repository *r,
+ const struct object_id *oid,
+ int len)
{
static int bufno;
static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
char *hex = hexbuffer[bufno];
bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
- find_unique_abbrev_r(hex, oid, len);
+ repo_find_unique_abbrev_r(r, hex, oid, len);
return hex;
}
@@ -731,11 +786,11 @@
return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
}
-static enum get_oid_result get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags);
-static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
+static enum get_oid_result get_oid_1(struct repository *r, const char *name, int len, struct object_id *oid, unsigned lookup_flags);
+static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf);
-static int get_oid_basic(const char *str, int len, struct object_id *oid,
- unsigned int flags)
+static int get_oid_basic(struct repository *r, const char *str, int len,
+ struct object_id *oid, unsigned int flags)
{
static const char *warn_msg = "refname '%.*s' is ambiguous.";
static const char *object_name_msg = N_(
@@ -743,7 +798,7 @@
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
- " git checkout -b $br $(git rev-parse ...)\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"
@@ -753,9 +808,9 @@
int refs_found = 0;
int at, reflog_len, nth_prior = 0;
- if (len == the_hash_algo->hexsz && !get_oid_hex(str, oid)) {
+ if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
- refs_found = dwim_ref(str, len, &tmp_oid, &real_ref);
+ refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref);
if (refs_found > 0) {
warning(warn_msg, len, str);
if (advice_object_name_warning)
@@ -796,8 +851,8 @@
struct strbuf buf = STRBUF_INIT;
int detached;
- if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
- detached = (buf.len == the_hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
+ if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) {
+ detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid));
strbuf_release(&buf);
if (detached)
return 0;
@@ -806,18 +861,18 @@
if (!len && reflog_len)
/* allow "@{...}" to mean the current branch reflog */
- refs_found = dwim_ref("HEAD", 4, oid, &real_ref);
+ refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref);
else if (reflog_len)
- refs_found = dwim_log(str, len, oid, &real_ref);
+ refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
else
- refs_found = dwim_ref(str, len, oid, &real_ref);
+ refs_found = repo_dwim_ref(r, str, len, oid, &real_ref);
if (!refs_found)
return -1;
if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
(refs_found > 1 ||
- !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY)))
+ !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY)))
warning(warn_msg, len, str);
if (reflog_len) {
@@ -849,7 +904,8 @@
return -1;
}
}
- if (read_ref_at(real_ref, flags, at_time, nth, oid, NULL,
+ if (read_ref_at(get_main_ref_store(r),
+ real_ref, flags, at_time, nth, oid, NULL,
&co_time, &co_tz, &co_cnt)) {
if (!len) {
if (starts_with(real_ref, "refs/heads/")) {
@@ -881,18 +937,19 @@
return 0;
}
-static enum get_oid_result get_parent(const char *name, int len,
+static enum get_oid_result get_parent(struct repository *r,
+ const char *name, int len,
struct object_id *result, int idx)
{
struct object_id oid;
- enum get_oid_result ret = get_oid_1(name, len, &oid,
+ enum get_oid_result ret = get_oid_1(r, name, len, &oid,
GET_OID_COMMITTISH);
struct commit *commit;
struct commit_list *p;
if (ret)
return ret;
- commit = lookup_commit_reference(the_repository, &oid);
+ commit = lookup_commit_reference(r, &oid);
if (parse_commit(commit))
return MISSING_OBJECT;
if (!idx) {
@@ -910,7 +967,8 @@
return MISSING_OBJECT;
}
-static enum get_oid_result get_nth_ancestor(const char *name, int len,
+static enum get_oid_result get_nth_ancestor(struct repository *r,
+ const char *name, int len,
struct object_id *result,
int generation)
{
@@ -918,10 +976,10 @@
struct commit *commit;
int ret;
- ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
+ ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH);
if (ret)
return ret;
- commit = lookup_commit_reference(the_repository, &oid);
+ commit = lookup_commit_reference(r, &oid);
if (!commit)
return MISSING_OBJECT;
@@ -934,20 +992,20 @@
return FOUND;
}
-struct object *peel_to_type(const char *name, int namelen,
- struct object *o, enum object_type expected_type)
+struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen,
+ struct object *o, enum object_type expected_type)
{
if (name && !namelen)
namelen = strlen(name);
while (1) {
- if (!o || (!o->parsed && !parse_object(the_repository, &o->oid)))
+ if (!o || (!o->parsed && !parse_object(r, &o->oid)))
return NULL;
if (expected_type == OBJ_ANY || o->type == expected_type)
return o;
if (o->type == OBJ_TAG)
o = ((struct tag*) o)->tagged;
else if (o->type == OBJ_COMMIT)
- o = &(get_commit_tree(((struct commit *)o))->object);
+ o = &(repo_get_commit_tree(r, ((struct commit *)o))->object);
else {
if (name)
error("%.*s: expected %s type, but the object "
@@ -959,8 +1017,8 @@
}
}
-static int peel_onion(const char *name, int len, struct object_id *oid,
- unsigned lookup_flags)
+static int peel_onion(struct repository *r, const char *name, int len,
+ struct object_id *oid, unsigned lookup_flags)
{
struct object_id outer;
const char *sp;
@@ -1010,15 +1068,15 @@
else if (expected_type == OBJ_TREE)
lookup_flags |= GET_OID_TREEISH;
- if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
+ if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags))
return -1;
- o = parse_object(the_repository, &outer);
+ o = parse_object(r, &outer);
if (!o)
return -1;
if (!expected_type) {
- o = deref_tag(the_repository, o, name, sp - name - 2);
- if (!o || (!o->parsed && !parse_object(the_repository, &o->oid)))
+ o = deref_tag(r, o, name, sp - name - 2);
+ if (!o || (!o->parsed && !parse_object(r, &o->oid)))
return -1;
oidcpy(oid, &o->oid);
return 0;
@@ -1029,7 +1087,7 @@
* if we do not get the needed object, we should
* barf.
*/
- o = peel_to_type(name, len, o, expected_type);
+ o = repo_peel_to_type(r, name, len, o, expected_type);
if (!o)
return -1;
@@ -1049,14 +1107,16 @@
prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
commit_list_insert((struct commit *)o, &list);
- ret = get_oid_oneline(prefix, oid, list);
+ ret = get_oid_oneline(r, prefix, oid, list);
free(prefix);
return ret;
}
return 0;
}
-static int get_describe_name(const char *name, int len, struct object_id *oid)
+static int get_describe_name(struct repository *r,
+ const char *name, int len,
+ struct object_id *oid)
{
const char *cp;
unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
@@ -1070,14 +1130,16 @@
if (ch == 'g' && cp[-1] == '-') {
cp++;
len -= cp - name;
- return get_short_oid(cp, len, oid, flags);
+ return get_short_oid(r,
+ cp, len, oid, flags);
}
}
}
return -1;
}
-static enum get_oid_result get_oid_1(const char *name, int len,
+static enum get_oid_result get_oid_1(struct repository *r,
+ const char *name, int len,
struct object_id *oid,
unsigned lookup_flags)
{
@@ -1106,25 +1168,25 @@
if (!num && len1 == len - 1)
num = 1;
if (has_suffix == '^')
- return get_parent(name, len1, oid, num);
+ return get_parent(r, name, len1, oid, num);
/* else if (has_suffix == '~') -- goes without saying */
- return get_nth_ancestor(name, len1, oid, num);
+ return get_nth_ancestor(r, name, len1, oid, num);
}
- ret = peel_onion(name, len, oid, lookup_flags);
+ ret = peel_onion(r, name, len, oid, lookup_flags);
if (!ret)
return FOUND;
- ret = get_oid_basic(name, len, oid, lookup_flags);
+ ret = get_oid_basic(r, name, len, oid, lookup_flags);
if (!ret)
return FOUND;
/* It could be describe output that is "SOMETHING-gXXXX" */
- ret = get_describe_name(name, len, oid);
+ ret = get_describe_name(r, name, len, oid);
if (!ret)
return FOUND;
- return get_short_oid(name, len, oid, lookup_flags);
+ return get_short_oid(r, name, len, oid, lookup_flags);
}
/*
@@ -1143,15 +1205,21 @@
/* Remember to update object flag allocation in object.h */
#define ONELINE_SEEN (1u<<20)
+struct handle_one_ref_cb {
+ struct repository *repo;
+ struct commit_list **list;
+};
+
static int handle_one_ref(const char *path, const struct object_id *oid,
int flag, void *cb_data)
{
- struct commit_list **list = cb_data;
- struct object *object = parse_object(the_repository, oid);
+ struct handle_one_ref_cb *cb = cb_data;
+ struct commit_list **list = cb->list;
+ struct object *object = parse_object(cb->repo, oid);
if (!object)
return 0;
if (object->type == OBJ_TAG) {
- object = deref_tag(the_repository, object, path,
+ object = deref_tag(cb->repo, object, path,
strlen(path));
if (!object)
return 0;
@@ -1162,8 +1230,9 @@
return 0;
}
-static int get_oid_oneline(const char *prefix, struct object_id *oid,
- struct commit_list *list)
+static int get_oid_oneline(struct repository *r,
+ const char *prefix, struct object_id *oid,
+ struct commit_list *list)
{
struct commit_list *backup = NULL, *l;
int found = 0;
@@ -1194,7 +1263,7 @@
int matches;
commit = pop_most_recent_commit(&list, ONELINE_SEEN);
- if (!parse_object(the_repository, &commit->object.oid))
+ if (!parse_object(r, &commit->object.oid))
continue;
buf = get_commit_buffer(commit, NULL);
p = strstr(buf, "\n\n");
@@ -1246,7 +1315,8 @@
* Parse @{-N} syntax, return the number of characters parsed
* if successful; otherwise signal an error with negative value.
*/
-static int interpret_nth_prior_checkout(const char *name, int namelen,
+static int interpret_nth_prior_checkout(struct repository *r,
+ const char *name, int namelen,
struct strbuf *buf)
{
long nth;
@@ -1270,18 +1340,22 @@
cb.remaining = nth;
strbuf_init(&cb.buf, 20);
- retval = 0;
- if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) {
+ retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r),
+ "HEAD", grab_nth_branch_switch, &cb);
+ if (0 < retval) {
strbuf_reset(buf);
strbuf_addbuf(buf, &cb.buf);
retval = brace - name + 1;
- }
+ } else
+ retval = 0;
strbuf_release(&cb.buf);
return retval;
}
-int get_oid_mb(const char *name, struct object_id *oid)
+int repo_get_oid_mb(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct commit *one, *two;
struct commit_list *mbs;
@@ -1291,28 +1365,28 @@
dots = strstr(name, "...");
if (!dots)
- return get_oid(name, oid);
+ return repo_get_oid(r, name, oid);
if (dots == name)
- st = get_oid("HEAD", &oid_tmp);
+ st = repo_get_oid(r, "HEAD", &oid_tmp);
else {
struct strbuf sb;
strbuf_init(&sb, dots - name);
strbuf_add(&sb, name, dots - name);
- st = get_oid_committish(sb.buf, &oid_tmp);
+ st = repo_get_oid_committish(r, sb.buf, &oid_tmp);
strbuf_release(&sb);
}
if (st)
return st;
- one = lookup_commit_reference_gently(the_repository, &oid_tmp, 0);
+ one = lookup_commit_reference_gently(r, &oid_tmp, 0);
if (!one)
return -1;
- if (get_oid_committish(dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
+ if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
return -1;
- two = lookup_commit_reference_gently(the_repository, &oid_tmp, 0);
+ two = lookup_commit_reference_gently(r, &oid_tmp, 0);
if (!two)
return -1;
- mbs = get_merge_bases(one, two);
+ mbs = repo_get_merge_bases(r, one, two);
if (!mbs || mbs->next)
st = -1;
else {
@@ -1345,7 +1419,8 @@
return 1;
}
-static int reinterpret(const char *name, int namelen, int len,
+static int reinterpret(struct repository *r,
+ const char *name, int namelen, int len,
struct strbuf *buf, unsigned allowed)
{
/* we have extra data, which might need further processing */
@@ -1354,7 +1429,7 @@
int ret;
strbuf_add(buf, name + len, namelen - len);
- ret = interpret_branch_name(buf->buf, buf->len, &tmp, allowed);
+ ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, allowed);
/* that data was not interpreted, remove our cruft */
if (ret < 0) {
strbuf_setlen(buf, used);
@@ -1367,9 +1442,9 @@
return ret - used + len;
}
-static void set_shortened_ref(struct strbuf *buf, const char *ref)
+static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref)
{
- char *s = shorten_unambiguous_ref(ref, 0);
+ char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0);
strbuf_reset(buf);
strbuf_addstr(buf, s);
free(s);
@@ -1390,7 +1465,8 @@
return 0;
}
-static int interpret_branch_mark(const char *name, int namelen,
+static int interpret_branch_mark(struct repository *r,
+ const char *name, int namelen,
int at, struct strbuf *buf,
int (*get_mark)(const char *, int),
const char *(*get_data)(struct branch *,
@@ -1423,12 +1499,14 @@
if (!branch_interpret_allowed(value, allowed))
return -1;
- set_shortened_ref(buf, value);
+ set_shortened_ref(r, buf, value);
return len + at;
}
-int interpret_branch_name(const char *name, int namelen, struct strbuf *buf,
- unsigned allowed)
+int repo_interpret_branch_name(struct repository *r,
+ const char *name, int namelen,
+ struct strbuf *buf,
+ unsigned allowed)
{
char *at;
const char *start;
@@ -1438,14 +1516,14 @@
namelen = strlen(name);
if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {
- len = interpret_nth_prior_checkout(name, namelen, buf);
+ len = interpret_nth_prior_checkout(r, name, namelen, buf);
if (!len) {
return len; /* syntax Ok, not enough switches */
} else if (len > 0) {
if (len == namelen)
return len; /* consumed all */
else
- return reinterpret(name, namelen, len, buf, allowed);
+ return reinterpret(r, name, namelen, len, buf, allowed);
}
}
@@ -1456,17 +1534,17 @@
if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) {
len = interpret_empty_at(name, namelen, at - name, buf);
if (len > 0)
- return reinterpret(name, namelen, len, buf,
+ return reinterpret(r, name, namelen, len, buf,
allowed);
}
- len = interpret_branch_mark(name, namelen, at - name, buf,
+ len = interpret_branch_mark(r, name, namelen, at - name, buf,
upstream_mark, branch_get_upstream,
allowed);
if (len > 0)
return len;
- len = interpret_branch_mark(name, namelen, at - name, buf,
+ len = interpret_branch_mark(r, name, namelen, at - name, buf,
push_mark, branch_get_push,
allowed);
if (len > 0)
@@ -1512,12 +1590,31 @@
* This is like "get_oid_basic()", except it allows "object ID expressions",
* notably "xyz^" for "parent of xyz"
*/
-int get_oid(const char *name, struct object_id *oid)
+int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository, name, 0, oid, &unused);
+ return get_oid_with_context(r, name, 0, oid, &unused);
}
+/*
+ * This returns a non-zero value if the string (built using printf
+ * format and the given arguments) is not a valid object.
+ */
+int get_oidf(struct object_id *oid, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+ struct strbuf sb = STRBUF_INIT;
+
+ va_start(ap, fmt);
+ strbuf_vaddf(&sb, fmt, ap);
+ va_end(ap);
+
+ ret = get_oid(sb.buf, oid);
+ strbuf_release(&sb);
+
+ return ret;
+}
/*
* Many callers know that the user meant to name a commit-ish by
@@ -1529,55 +1626,61 @@
* commit-ish. It is merely to give a hint to the disambiguation
* machinery.
*/
-int get_oid_committish(const char *name, struct object_id *oid)
+int repo_get_oid_committish(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository,
- name, GET_OID_COMMITTISH,
+ return get_oid_with_context(r, name, GET_OID_COMMITTISH,
oid, &unused);
}
-int get_oid_treeish(const char *name, struct object_id *oid)
+int repo_get_oid_treeish(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository,
- name, GET_OID_TREEISH,
+ return get_oid_with_context(r, name, GET_OID_TREEISH,
oid, &unused);
}
-int get_oid_commit(const char *name, struct object_id *oid)
+int repo_get_oid_commit(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository,
- name, GET_OID_COMMIT,
+ return get_oid_with_context(r, name, GET_OID_COMMIT,
oid, &unused);
}
-int get_oid_tree(const char *name, struct object_id *oid)
+int repo_get_oid_tree(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository,
- name, GET_OID_TREE,
+ return get_oid_with_context(r, name, GET_OID_TREE,
oid, &unused);
}
-int get_oid_blob(const char *name, struct object_id *oid)
+int repo_get_oid_blob(struct repository *r,
+ const char *name,
+ struct object_id *oid)
{
struct object_context unused;
- return get_oid_with_context(the_repository,
- name, GET_OID_BLOB,
+ return get_oid_with_context(r, name, GET_OID_BLOB,
oid, &unused);
}
/* Must be called only when object_name:filename doesn't exist. */
-static void diagnose_invalid_oid_path(const char *prefix,
+static void diagnose_invalid_oid_path(struct repository *r,
+ const char *prefix,
const char *filename,
const struct object_id *tree_oid,
const char *object_name,
int object_name_len)
{
struct object_id oid;
- unsigned mode;
+ unsigned short mode;
if (!prefix)
prefix = "";
@@ -1588,7 +1691,7 @@
if (is_missing_file_error(errno)) {
char *fullname = xstrfmt("%s%s", prefix, filename);
- if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) {
+ if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
die("Path '%s' exists, but not '%s'.\n"
"Did you mean '%.*s:%s' aka '%.*s:./%s'?",
fullname,
@@ -1604,11 +1707,12 @@
}
/* Must be called only when :stage:filename doesn't exist. */
-static void diagnose_invalid_index_path(struct index_state *istate,
+static void diagnose_invalid_index_path(struct repository *r,
int stage,
const char *prefix,
const char *filename)
{
+ struct index_state *istate = r->index;
const struct cache_entry *ce;
int pos;
unsigned namelen = strlen(filename);
@@ -1648,7 +1752,7 @@
ce_stage(ce), filename);
}
- if (file_exists(filename))
+ if (repo_file_exists(r, filename))
die("Path '%s' exists on disk, but not in the index.", filename);
if (is_missing_file_error(errno))
die("Path '%s' does not exist (neither on disk nor in the index).",
@@ -1658,12 +1762,12 @@
}
-static char *resolve_relative_path(const char *rel)
+static char *resolve_relative_path(struct repository *r, const char *rel)
{
if (!starts_with(rel, "./") && !starts_with(rel, "../"))
return NULL;
- if (!is_inside_work_tree())
+ if (r != the_repository || !is_inside_work_tree())
die("relative path syntax can't be used outside working tree.");
/* die() inside prefix_path() if resolved path is outside worktree */
@@ -1690,7 +1794,7 @@
memset(oc, 0, sizeof(*oc));
oc->mode = S_IFINVALID;
strbuf_init(&oc->symlink_path, 0);
- ret = get_oid_1(name, namelen, oid, flags);
+ ret = get_oid_1(repo, name, namelen, oid, flags);
if (!ret)
return ret;
/*
@@ -1706,12 +1810,15 @@
char *new_path = NULL;
int pos;
if (!only_to_die && namelen > 2 && name[1] == '/') {
+ struct handle_one_ref_cb cb;
struct commit_list *list = NULL;
- for_each_ref(handle_one_ref, &list);
- head_ref(handle_one_ref, &list);
+ cb.repo = repo;
+ cb.list = &list;
+ refs_for_each_ref(repo->refs, handle_one_ref, &cb);
+ refs_head_ref(repo->refs, handle_one_ref, &cb);
commit_list_sort_by_date(&list);
- return get_oid_oneline(name + 2, oid, list);
+ return get_oid_oneline(repo, name + 2, oid, list);
}
if (namelen < 3 ||
name[2] != ':' ||
@@ -1721,7 +1828,7 @@
stage = name[1] - '0';
cp = name + 3;
}
- new_path = resolve_relative_path(cp);
+ new_path = resolve_relative_path(repo, cp);
if (!new_path) {
namelen = namelen - (cp - name);
} else {
@@ -1732,8 +1839,8 @@
if (flags & GET_OID_RECORD_PATH)
oc->path = xstrdup(cp);
- if (!repo->index->cache)
- repo_read_index(the_repository);
+ if (!repo->index || !repo->index->cache)
+ repo_read_index(repo);
pos = index_name_pos(repo->index, cp, namelen);
if (pos < 0)
pos = -pos - 1;
@@ -1751,7 +1858,7 @@
pos++;
}
if (only_to_die && name[1] && name[1] != '/')
- diagnose_invalid_index_path(repo->index, stage, prefix, cp);
+ diagnose_invalid_index_path(repo, stage, prefix, cp);
free(new_path);
return -1;
}
@@ -1771,22 +1878,22 @@
sub_flags &= ~GET_OID_DISAMBIGUATORS;
sub_flags |= GET_OID_TREEISH;
- if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
+ if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) {
const char *filename = cp+1;
char *new_filename = NULL;
- new_filename = resolve_relative_path(filename);
+ new_filename = resolve_relative_path(repo, filename);
if (new_filename)
filename = new_filename;
if (flags & GET_OID_FOLLOW_SYMLINKS) {
- ret = get_tree_entry_follow_symlinks(&tree_oid,
+ ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
filename, oid, &oc->symlink_path,
&oc->mode);
} else {
- ret = get_tree_entry(&tree_oid, filename, oid,
+ ret = get_tree_entry(repo, &tree_oid, filename, oid,
&oc->mode);
if (ret && only_to_die) {
- diagnose_invalid_oid_path(prefix,
+ diagnose_invalid_oid_path(repo, prefix,
filename,
&tree_oid,
name, len);
@@ -1812,17 +1919,21 @@
* exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
* you have a chance to diagnose the error further.
*/
-void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
+void maybe_die_on_misspelt_object_name(struct repository *r,
+ const char *name,
+ const char *prefix)
{
struct object_context oc;
struct object_id oid;
- get_oid_with_context_1(the_repository, name, GET_OID_ONLY_TO_DIE,
+ get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
prefix, &oid, &oc);
}
-int get_oid_with_context(struct repository *repo, const char *str,
- unsigned flags, struct object_id *oid,
- struct object_context *oc)
+enum get_oid_result get_oid_with_context(struct repository *repo,
+ const char *str,
+ unsigned flags,
+ struct object_id *oid,
+ struct object_context *oc)
{
if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
BUG("incompatible flags for get_sha1_with_context");
diff --git a/sha1collisiondetection b/sha1collisiondetection
index 232357e..855827c 160000
--- a/sha1collisiondetection
+++ b/sha1collisiondetection
@@ -1 +1 @@
-Subproject commit 232357eb2ea0397388254a4b188333a227bf5b10
+Subproject commit 855827c583bc30645ba427885caa40c5b81764d2
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index df0630b..9d3cf81 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -93,7 +93,7 @@
#define SHA1DC_BIGENDIAN
/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
-#elif (defined(_AIX))
+#elif (defined(_AIX) || defined(__hpux))
/*
* Defines Big Endian on a whitelist of OSs that are known to be Big
@@ -124,10 +124,11 @@
#endif
/*ENDIANNESS SELECTION*/
+#ifndef SHA1DC_FORCE_ALIGNED_ACCESS
#if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
-#endif /*UNALIGNMENT DETECTION*/
-
+#endif /*UNALIGNED ACCESS DETECTION*/
+#endif /*FORCE ALIGNED ACCESS*/
#define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n))))
#define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n))))
diff --git a/shallow.c b/shallow.c
index ce45297..5fa2b15 100644
--- a/shallow.c
+++ b/shallow.c
@@ -248,7 +248,8 @@
if (r->parsed_objects->is_shallow == -1)
BUG("shallow must be initialized by now");
- if (!stat_validity_check(r->parsed_objects->shallow_stat, git_path_shallow(the_repository)))
+ if (!stat_validity_check(r->parsed_objects->shallow_stat,
+ git_path_shallow(r)))
die("shallow file has changed since we read it");
}
diff --git a/split-index.c b/split-index.c
index 5820412..e6154e4 100644
--- a/split-index.c
+++ b/split-index.c
@@ -162,7 +162,7 @@
ewah_each_bit(si->replace_bitmap, replace_entry, istate);
ewah_each_bit(si->delete_bitmap, mark_entry_for_delete, istate);
if (si->nr_deletions)
- remove_marked_cache_entries(istate);
+ remove_marked_cache_entries(istate, 0);
for (i = si->nr_replacements; i < si->saved_cache_nr; i++) {
if (!ce_namelen(si->saved_cache[i]))
@@ -440,24 +440,26 @@
void remove_split_index(struct index_state *istate)
{
if (istate->split_index) {
- /*
- * When removing the split index, we need to move
- * ownership of the mem_pool associated with the
- * base index to the main index. There may be cache entries
- * allocated from the base's memory pool that are shared with
- * the_index.cache[].
- */
- mem_pool_combine(istate->ce_mem_pool, istate->split_index->base->ce_mem_pool);
+ if (istate->split_index->base) {
+ /*
+ * When removing the split index, we need to move
+ * ownership of the mem_pool associated with the
+ * base index to the main index. There may be cache entries
+ * allocated from the base's memory pool that are shared with
+ * the_index.cache[].
+ */
+ mem_pool_combine(istate->ce_mem_pool,
+ istate->split_index->base->ce_mem_pool);
- /*
- * The split index no longer owns the mem_pool backing
- * its cache array. As we are discarding this index,
- * mark the index as having no cache entries, so it
- * will not attempt to clean up the cache entries or
- * validate them.
- */
- if (istate->split_index->base)
+ /*
+ * The split index no longer owns the mem_pool backing
+ * its cache array. As we are discarding this index,
+ * mark the index as having no cache entries, so it
+ * will not attempt to clean up the cache entries or
+ * validate them.
+ */
istate->split_index->base->cache_nr = 0;
+ }
/*
* We can discard the split index because its
diff --git a/strbuf.c b/strbuf.c
index f6a6cf7..aa48d17 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -249,6 +249,42 @@
strbuf_splice(sb, pos, 0, data, len);
}
+void strbuf_vinsertf(struct strbuf *sb, size_t pos, const char *fmt, va_list ap)
+{
+ int len, len2;
+ char save;
+ va_list cp;
+
+ if (pos > sb->len)
+ die("`pos' is too far after the end of the buffer");
+ va_copy(cp, ap);
+ len = vsnprintf(sb->buf + sb->len, 0, fmt, cp);
+ va_end(cp);
+ if (len < 0)
+ BUG("your vsnprintf is broken (returned %d)", len);
+ if (!len)
+ return; /* nothing to do */
+ if (unsigned_add_overflows(sb->len, len))
+ die("you want to use way too much memory");
+ strbuf_grow(sb, len);
+ memmove(sb->buf + pos + len, sb->buf + pos, sb->len - pos);
+ /* vsnprintf() will append a NUL, overwriting one of our characters */
+ save = sb->buf[pos + len];
+ len2 = vsnprintf(sb->buf + pos, len + 1, fmt, ap);
+ sb->buf[pos + len] = save;
+ if (len2 != len)
+ BUG("your vsnprintf is broken (returns inconsistent lengths)");
+ strbuf_setlen(sb, sb->len + len);
+}
+
+void strbuf_insertf(struct strbuf *sb, size_t pos, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ strbuf_vinsertf(sb, pos, fmt, ap);
+ va_end(ap);
+}
+
void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)
{
strbuf_splice(sb, pos, len, "", 0);
@@ -268,6 +304,21 @@
strbuf_setlen(sb, sb->len + sb2->len);
}
+const char *strbuf_join_argv(struct strbuf *buf,
+ int argc, const char **argv, char delim)
+{
+ if (!argc)
+ return buf->buf;
+
+ strbuf_addstr(buf, *argv);
+ while (--argc) {
+ strbuf_addch(buf, delim);
+ strbuf_addstr(buf, *(++argv));
+ }
+
+ return buf->buf;
+}
+
void strbuf_addchars(struct strbuf *sb, int c, size_t n)
{
strbuf_grow(sb, n);
@@ -380,6 +431,27 @@
}
}
+size_t strbuf_expand_literal_cb(struct strbuf *sb,
+ const char *placeholder,
+ void *context)
+{
+ int ch;
+
+ switch (placeholder[0]) {
+ case 'n': /* newline */
+ strbuf_addch(sb, '\n');
+ return 1;
+ case 'x':
+ /* %x00 == NUL, %x0a == LF, etc. */
+ ch = hex2chr(placeholder + 1);
+ if (ch < 0)
+ return 0;
+ strbuf_addch(sb, ch);
+ return 3;
+ }
+ return 0;
+}
+
size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder,
void *context)
{
@@ -702,8 +774,10 @@
}
}
-static int is_rfc3986_reserved(char ch)
+int is_rfc3986_reserved_or_unreserved(char ch)
{
+ if (is_rfc3986_unreserved(ch))
+ return 1;
switch (ch) {
case '!': case '*': case '\'': case '(': case ')': case ';':
case ':': case '@': case '&': case '=': case '+': case '$':
@@ -713,20 +787,19 @@
return 0;
}
-static int is_rfc3986_unreserved(char ch)
+int is_rfc3986_unreserved(char ch)
{
return isalnum(ch) ||
ch == '-' || ch == '_' || ch == '.' || ch == '~';
}
static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
- int reserved)
+ char_predicate allow_unencoded_fn)
{
strbuf_grow(sb, len);
while (len--) {
char ch = *s++;
- if (is_rfc3986_unreserved(ch) ||
- (!reserved && is_rfc3986_reserved(ch)))
+ if (allow_unencoded_fn(ch))
strbuf_addch(sb, ch);
else
strbuf_addf(sb, "%%%02x", (unsigned char)ch);
@@ -734,30 +807,62 @@
}
void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
- int reserved)
+ char_predicate allow_unencoded_fn)
{
- strbuf_add_urlencode(sb, s, strlen(s), reserved);
+ strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn);
}
-void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+static void strbuf_humanise(struct strbuf *buf, off_t bytes,
+ int humanise_rate)
{
if (bytes > 1 << 30) {
- strbuf_addf(buf, "%u.%2.2u GiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 gibibyte */
+ _("%u.%2.2u GiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */
+ _("%u.%2.2u GiB/s"),
(unsigned)(bytes >> 30),
(unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
} else if (bytes > 1 << 20) {
unsigned x = bytes + 5243; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u MiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 mebibyte */
+ _("%u.%2.2u MiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */
+ _("%u.%2.2u MiB/s"),
x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
} else if (bytes > 1 << 10) {
unsigned x = bytes + 5; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u KiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 kibibyte */
+ _("%u.%2.2u KiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */
+ _("%u.%2.2u KiB/s"),
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
} else {
- strbuf_addf(buf, "%u bytes", (unsigned)bytes);
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 byte */
+ Q_("%u byte", "%u bytes", (unsigned)bytes) :
+ /* TRANSLATORS: IEC 80000-13:2008 byte/second */
+ Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
+ (unsigned)bytes);
}
}
+void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+{
+ strbuf_humanise(buf, bytes, 0);
+}
+
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
+{
+ strbuf_humanise(buf, bytes, 1);
+}
+
void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
{
if (!*path)
diff --git a/strbuf.h b/strbuf.h
index fc40873..84cf969 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -245,6 +245,15 @@
void strbuf_insert(struct strbuf *sb, size_t pos, const void *, size_t);
/**
+ * Insert data to the given position of the buffer giving a printf format
+ * string. The contents will be shifted, not overwritten.
+ */
+void strbuf_vinsertf(struct strbuf *sb, size_t pos, const char *fmt,
+ va_list ap);
+
+void strbuf_insertf(struct strbuf *sb, size_t pos, const char *fmt, ...);
+
+/**
* Remove given amount of data from a given position of the buffer.
*/
void strbuf_remove(struct strbuf *sb, size_t pos, size_t len);
@@ -289,6 +298,13 @@
void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2);
/**
+ * Join the arguments into a buffer. `delim` is put between every
+ * two arguments.
+ */
+const char *strbuf_join_argv(struct strbuf *buf, int argc,
+ const char **argv, char delim);
+
+/**
* This function can be used to expand a format string containing
* placeholders. To that end, it parses the string and calls the specified
* function for every percent sign found.
@@ -321,6 +337,14 @@
void *context);
/**
+ * Used as callback for `strbuf_expand` to only expand literals
+ * (i.e. %n and %xNN). The context argument is ignored.
+ */
+size_t strbuf_expand_literal_cb(struct strbuf *sb,
+ const char *placeholder,
+ void *context);
+
+/**
* Used as callback for `strbuf_expand()`, expects an array of
* struct strbuf_expand_dict_entry as context, i.e. pairs of
* placeholder and replacement string. The array needs to be
@@ -349,6 +373,12 @@
void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes);
/**
+ * Append the given byte rate as a human-readable string (i.e. 12.23 KiB/s,
+ * 3.50 MiB/s).
+ */
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes);
+
+/**
* Add a formatted string to the buffer.
*/
__attribute__((format (printf,2,3)))
@@ -642,8 +672,13 @@
*/
int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
+typedef int (*char_predicate)(char ch);
+
+int is_rfc3986_unreserved(char ch);
+int is_rfc3986_reserved_or_unreserved(char ch);
+
void strbuf_addstr_urlencode(struct strbuf *sb, const char *name,
- int reserved);
+ char_predicate allow_unencoded_fn);
__attribute__((format (printf,1,2)))
int printf_ln(const char *fmt, ...);
diff --git a/streaming.h b/streaming.h
index 32f4626..f465a3c 100644
--- a/streaming.h
+++ b/streaming.h
@@ -8,10 +8,10 @@
/* opaque */
struct git_istream;
-extern struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
-extern int close_istream(struct git_istream *);
-extern ssize_t read_istream(struct git_istream *, void *, size_t);
+struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
+int close_istream(struct git_istream *);
+ssize_t read_istream(struct git_istream *, void *, size_t);
-extern int stream_blob_to_fd(int fd, const struct object_id *, struct stream_filter *, int can_seek);
+int stream_blob_to_fd(int fd, const struct object_id *, struct stream_filter *, int can_seek);
#endif /* STREAMING_H */
diff --git a/string-list.h b/string-list.h
index 18c718c..f964399 100644
--- a/string-list.h
+++ b/string-list.h
@@ -174,8 +174,8 @@
* Remove the given string from the sorted list. If the string
* doesn't exist, the list is not altered.
*/
-extern void string_list_remove(struct string_list *list, const char *string,
- int free_util);
+void string_list_remove(struct string_list *list, const char *string,
+ int free_util);
/**
* Check if the given string is part of a sorted list. If it is part of the list,
diff --git a/sub-process.c b/sub-process.c
index 8d2a170..3f4af93 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -88,6 +88,7 @@
process->out = -1;
process->clean_on_exit = 1;
process->clean_on_exit_handler = subprocess_exit_handler;
+ process->trace2_child_class = "subprocess";
err = start_command(process);
if (err) {
diff --git a/sub-process.h b/sub-process.h
index 71b18ad..5c182fa 100644
--- a/sub-process.h
+++ b/sub-process.h
@@ -42,10 +42,10 @@
/* subprocess functions */
/* Function to test two subprocess hashmap entries for equality. */
-extern int cmd2process_cmp(const void *unused_cmp_data,
- const void *e1,
- const void *e2,
- const void *unused_keydata);
+int cmd2process_cmp(const void *unused_cmp_data,
+ const void *e1,
+ const void *e2,
+ const void *unused_keydata);
/*
* User-supplied function to initialize the sub-process. This is
diff --git a/submodule-config.c b/submodule-config.c
index 52702c6..4264ee2 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -281,7 +281,10 @@
default:
if (!strcmp(arg, "on-demand"))
return RECURSE_SUBMODULES_ON_DEMAND;
-
+ /*
+ * Please update $__git_fetch_recurse_submodules in
+ * git-completion.bash when you add new options.
+ */
if (die_on_error)
die("bad %s argument: %s", opt, arg);
else
@@ -362,6 +365,10 @@
return RECURSE_SUBMODULES_CHECK;
else if (!strcmp(arg, "only"))
return RECURSE_SUBMODULES_ONLY;
+ /*
+ * Please update $__git_push_recurse_submodules in
+ * git-completion.bash when you add new modes.
+ */
else if (die_on_error)
die("bad %s argument: %s", opt, arg);
else
@@ -618,23 +625,16 @@
const struct config_options opts = { 0 };
struct object_id oid;
char *file;
+ char *oidstr = NULL;
file = repo_worktree_path(repo, GITMODULES_FILE);
if (file_exists(file)) {
config_source.file = file;
- } else if (repo->submodule_prefix) {
- /*
- * When get_oid and config_with_options, used below,
- * become able to work on a specific repository, this
- * warning branch can be removed.
- */
- warning("nested submodules without %s in the working tree are not supported yet",
- GITMODULES_FILE);
- goto out;
- } else if (get_oid(GITMODULES_INDEX, &oid) >= 0) {
- config_source.blob = GITMODULES_INDEX;
- } else if (get_oid(GITMODULES_HEAD, &oid) >= 0) {
- config_source.blob = GITMODULES_HEAD;
+ } else if (repo_get_oid(repo, GITMODULES_INDEX, &oid) >= 0 ||
+ repo_get_oid(repo, GITMODULES_HEAD, &oid) >= 0) {
+ config_source.blob = oidstr = xstrdup(oid_to_hex(&oid));
+ if (repo != the_repository)
+ add_to_alternates_memory(repo->objects->odb->path);
} else {
goto out;
}
@@ -642,6 +642,7 @@
config_with_options(fn, data, &config_source, &opts);
out:
+ free(oidstr);
free(file);
}
}
diff --git a/submodule-config.h b/submodule-config.h
index 4dc9b07..1b4e2da 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -30,17 +30,17 @@
struct submodule_cache;
struct repository;
-extern void submodule_cache_free(struct submodule_cache *cache);
+void submodule_cache_free(struct submodule_cache *cache);
-extern int parse_submodule_fetchjobs(const char *var, const char *value);
-extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
+int parse_submodule_fetchjobs(const char *var, const char *value);
+int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
struct option;
-extern int option_fetch_parse_recurse_submodules(const struct option *opt,
- const char *arg, int unset);
-extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
-extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_oid(const struct object_id *commit_oid);
+int option_fetch_parse_recurse_submodules(const struct option *opt,
+ const char *arg, int unset);
+int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
+int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
+void repo_read_gitmodules(struct repository *repo);
+void gitmodules_config_oid(const struct object_id *commit_oid);
const struct submodule *submodule_from_name(struct repository *r,
const struct object_id *commit_or_tree,
const char *name);
@@ -66,7 +66,7 @@
* New helpers to retrieve arbitrary configuration from the '.gitmodules' file
* should NOT be added.
*/
-extern void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
-extern void update_clone_config_from_gitmodules(int *max_jobs);
+void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
+void update_clone_config_from_gitmodules(int *max_jobs);
#endif /* SUBMODULE_CONFIG_H */
diff --git a/submodule.c b/submodule.c
index 934ecfa..0f199c5 100644
--- a/submodule.c
+++ b/submodule.c
@@ -432,6 +432,10 @@
diffopt->flags.ignore_dirty_submodules = 1;
else if (strcmp(arg, "none"))
die("bad --ignore-submodules argument: %s", arg);
+ /*
+ * Please update _git_status() in git-completion.bash when you
+ * add new options
+ */
}
static int prepare_submodule_summary(struct rev_info *rev, const char *path,
@@ -990,7 +994,7 @@
if (start_command(&cp))
die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
path);
- if (strbuf_read(&buf, cp.out, 41))
+ if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
needs_pushing = 1;
finish_command(&cp);
close(cp.out);
@@ -1544,6 +1548,13 @@
struct oid_array *commits;
if (retvalue)
+ /*
+ * NEEDSWORK: This indicates that the overall fetch
+ * failed, even though there may be a subsequent fetch
+ * by commit hash that might work. It may be a good
+ * idea to not indicate failure in this case, and only
+ * indicate failure if the subsequent fetch fails.
+ */
spf->result = 1;
if (!task || !task->sub)
@@ -1609,11 +1620,12 @@
calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
string_list_sort(&spf.changed_submodule_names);
- run_processes_parallel(max_parallel_jobs,
- get_next_submodule,
- fetch_start_failure,
- fetch_finish,
- &spf);
+ run_processes_parallel_tr2(max_parallel_jobs,
+ get_next_submodule,
+ fetch_start_failure,
+ fetch_finish,
+ &spf,
+ "submodule", "parallel/fetch");
argv_array_clear(&spf.args);
out:
@@ -1898,7 +1910,7 @@
if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
if (old_head) {
if (!submodule_uses_gitfile(path))
- absorb_git_dir_into_superproject("", path,
+ absorb_git_dir_into_superproject(path,
ABSORB_GITDIR_RECURSE_SUBMODULES);
} else {
char *gitdir = xstrfmt("%s/modules/%s",
@@ -1985,8 +1997,7 @@
* Embeds a single submodules git directory into the superprojects git dir,
* non recursively.
*/
-static void relocate_single_git_dir_into_superproject(const char *prefix,
- const char *path)
+static void relocate_single_git_dir_into_superproject(const char *path)
{
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
const char *new_git_dir;
@@ -2028,8 +2039,7 @@
* having its git directory within the working tree to the git dir nested
* in its superprojects git dir under modules/.
*/
-void absorb_git_dir_into_superproject(const char *prefix,
- const char *path,
+void absorb_git_dir_into_superproject(const char *path,
unsigned flags)
{
int err_code;
@@ -2070,7 +2080,7 @@
char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
if (!starts_with(real_sub_git_dir, real_common_git_dir))
- relocate_single_git_dir_into_superproject(prefix, path);
+ relocate_single_git_dir_into_superproject(path);
free(real_sub_git_dir);
free(real_common_git_dir);
diff --git a/submodule.h b/submodule.h
index 9e18e9b..8072e6d 100644
--- a/submodule.h
+++ b/submodule.h
@@ -141,8 +141,7 @@
void prepare_submodule_repo_env(struct argv_array *out);
#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
-void absorb_git_dir_into_superproject(const char *prefix,
- const char *path,
+void absorb_git_dir_into_superproject(const char *path,
unsigned flags);
/*
diff --git a/t/README b/t/README
index 1326fd7..60d5b77 100644
--- a/t/README
+++ b/t/README
@@ -196,11 +196,10 @@
variable to "1" or "0", respectively.
--stress::
---stress=<N>::
Run the test script repeatedly in multiple parallel jobs until
one of them fails. Useful for reproducing rare failures in
flaky tests. The number of parallel jobs is, in order of
- precedence: <N>, or the value of the GIT_TEST_STRESS_LOAD
+ precedence: the value of the GIT_TEST_STRESS_LOAD
environment variable, or twice the number of available
processors (as shown by the 'getconf' utility), or 8.
Implies `--verbose -x --immediate` to get the most information
@@ -211,6 +210,14 @@
'.stress-<nr>' suffix, and the trash directory of the failed
test job is renamed to end with a '.stress-failed' suffix.
+--stress-jobs=<N>::
+ Override the number of parallel jobs. Implies `--stress`.
+
+--stress-limit=<N>::
+ When combined with --stress run the test script repeatedly
+ this many times in each of the parallel jobs or until one of
+ them fails, whichever comes first. Implies `--stress`.
+
You can also set the GIT_TEST_INSTALLED environment variable to
the bindir of an existing git installation to test that installation.
You still need to have built this git sandbox, from which various
@@ -327,15 +334,27 @@
could be enabled by running the test suite with correct GIT_TEST_
environment set.
-GIT_TEST_GETTEXT_POISON=<non-empty?> turns all strings marked for
-translation into gibberish if non-empty (think "test -n"). Used for
-spotting those tests that need to be marked with a C_LOCALE_OUTPUT
-prerequisite when adding more strings for translation. See "Testing
-marked strings" in po/README for details.
+GIT_TEST_FAIL_PREREQS=<boolean> fails all prerequisites. This is
+useful for discovering issues with the tests where say a later test
+implicitly depends on an optional earlier test.
+
+There's a "FAIL_PREREQS" prerequisite that can be used to test for
+whether this mode is active, and e.g. skip some tests that are hard to
+refactor to deal with it. The "SYMLINKS" prerequisite is currently
+excluded as so much relies on it, but this might change in the future.
+
+GIT_TEST_GETTEXT_POISON=<boolean> turns all strings marked for
+translation into gibberish if true. Used for spotting those tests that
+need to be marked with a C_LOCALE_OUTPUT prerequisite when adding more
+strings for translation. See "Testing marked strings" in po/README for
+details.
GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
test suite. Accept any boolean values that are accepted by git-config.
+GIT_TEST_PROTOCOL_VERSION=<n>, when set, overrides the
+'protocol.version' setting to n if it is less than n.
+
GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
pack-objects code path where there are more than 1024 packs even if
the actual number of packs in repository is below this limit. Accept
@@ -374,8 +393,8 @@
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
by overriding the minimum number of cache entries required per thread.
-GIT_TEST_REBASE_USE_BUILTIN=<boolean>, when false, disables the
-builtin version of git-rebase. See 'rebase.useBuiltin' in
+GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
+built-in version of git-stash. See 'stash.useBuiltin' in
git-config(1).
GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
@@ -392,6 +411,10 @@
fetch-pack to not request sideband-all (even if the server advertises
sideband-all).
+GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=<boolean>, when true (which is
+the default when running tests), errors out when an abbreviated option
+is used.
+
Naming Tests
------------
@@ -857,6 +880,26 @@
...
'
+ - test_atexit <script>
+
+ Prepend <script> to a list of commands to run unconditionally to
+ clean up before the test script exits, e.g. to stop a daemon:
+
+ test_expect_success 'test git daemon' '
+ git daemon &
+ daemon_pid=$! &&
+ test_atexit 'kill $daemon_pid' &&
+ hello world
+ '
+
+ The commands will be executed before the trash directory is removed,
+ i.e. the atexit commands will still be able to access any pidfiles or
+ socket files.
+
+ Note that these commands will be run even when a test script run
+ with '--immediate' fails. Be careful with your atexit commands to
+ minimize any changes to the failed state.
+
- test_write_lines <lines>
Write <lines> on standard output, one line per argument.
@@ -927,6 +970,15 @@
test_oid_init or test_oid_cache. Providing an unknown key is an
error.
+ - yes [<string>]
+
+ This is often seen in modern UNIX but some platforms lack it, so
+ the test harness overrides the platform implementation with a
+ more limited one. Use this only when feeding a handful lines of
+ output to the downstream---unlike the real version, it generates
+ only up to 99 lines.
+
+
Prerequisites
-------------
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 6da48a2..d933af5 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -68,6 +68,14 @@
check_count A 2
'
+test_expect_success 'blame in a bare repo without starting commit' '
+ git clone --bare . bare.git &&
+ (
+ cd bare.git &&
+ check_count A 2
+ )
+'
+
test_expect_success 'blame by tag objects' '
git tag -m "test tag" testTag &&
git tag -m "test tag #2" testTag2 testTag &&
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
index 166d64d..38bfeeb 100755
--- a/t/check-non-portable-shell.pl
+++ b/t/check-non-portable-shell.pl
@@ -27,14 +27,14 @@
close $f;
}
+my $line = '';
while (<>) {
chomp;
+ $line .= $_;
# stitch together incomplete lines (those ending with "\")
- while (s/\\$//) {
- $_ .= readline;
- chomp;
- }
+ next if $line =~ s/\\$//;
+ $_ = $line;
/\bcp\s+-a/ and err 'cp -a is not portable';
/\bsed\s+-[^efn]\s+/ and err 'sed option not portable (use only -n, -e, -f)';
/\becho\s+-[neE]/ and err 'echo with option is not portable (use printf)';
@@ -48,6 +48,7 @@
/\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)';
/^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
err '"FOO=bar shell_func" assignment extends beyond "shell_func"';
+ $line = '';
# this resets our $. for each file
close ARGV if eof;
}
diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index b325380..099eff4 100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -12,13 +12,13 @@
" test-tool date is64bit\n"
" test-tool date time_t-is64bit\n";
-static void show_relative_dates(const char **argv, struct timeval *now)
+static void show_relative_dates(const char **argv)
{
struct strbuf buf = STRBUF_INIT;
for (; *argv; argv++) {
time_t t = atoi(*argv);
- show_date_relative(t, now, &buf);
+ show_date_relative(t, &buf);
printf("%s -> %s\n", *argv, buf.buf);
}
strbuf_release(&buf);
@@ -55,7 +55,7 @@
}
}
-static void parse_dates(const char **argv, struct timeval *now)
+static void parse_dates(const char **argv)
{
struct strbuf result = STRBUF_INIT;
@@ -74,20 +74,20 @@
strbuf_release(&result);
}
-static void parse_approxidate(const char **argv, struct timeval *now)
+static void parse_approxidate(const char **argv)
{
for (; *argv; argv++) {
timestamp_t t;
- t = approxidate_relative(*argv, now);
+ t = approxidate_relative(*argv);
printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
}
}
-static void parse_approx_timestamp(const char **argv, struct timeval *now)
+static void parse_approx_timestamp(const char **argv)
{
for (; *argv; argv++) {
timestamp_t t;
- t = approxidate_relative(*argv, now);
+ t = approxidate_relative(*argv);
printf("%s -> %"PRItime"\n", *argv, t);
}
}
@@ -103,32 +103,23 @@
int cmd__date(int argc, const char **argv)
{
- struct timeval now;
const char *x;
- x = getenv("GIT_TEST_DATE_NOW");
- if (x) {
- now.tv_sec = atoi(x);
- now.tv_usec = 0;
- }
- else
- gettimeofday(&now, NULL);
-
argv++;
if (!*argv)
usage(usage_msg);
if (!strcmp(*argv, "relative"))
- show_relative_dates(argv+1, &now);
+ show_relative_dates(argv+1);
else if (!strcmp(*argv, "human"))
show_human_dates(argv+1);
else if (skip_prefix(*argv, "show:", &x))
show_dates(argv+1, x);
else if (!strcmp(*argv, "parse"))
- parse_dates(argv+1, &now);
+ parse_dates(argv+1);
else if (!strcmp(*argv, "approxidate"))
- parse_approxidate(argv+1, &now);
+ parse_approxidate(argv+1);
else if (!strcmp(*argv, "timestamp"))
- parse_approx_timestamp(argv+1, &now);
+ parse_approx_timestamp(argv+1);
else if (!strcmp(*argv, "getnanos"))
getnanos(argv+1);
else if (!strcmp(*argv, "is64bit"))
diff --git a/t/helper/test-dir-iterator.c b/t/helper/test-dir-iterator.c
new file mode 100644
index 0000000..659b6bf
--- /dev/null
+++ b/t/helper/test-dir-iterator.c
@@ -0,0 +1,65 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "iterator.h"
+#include "dir-iterator.h"
+
+static const char *error_name(int error_number)
+{
+ switch (error_number) {
+ case ENOENT: return "ENOENT";
+ case ENOTDIR: return "ENOTDIR";
+ default: return "ESOMETHINGELSE";
+ }
+}
+
+/*
+ * usage:
+ * tool-test dir-iterator [--follow-symlinks] [--pedantic] directory_path
+ */
+int cmd__dir_iterator(int argc, const char **argv)
+{
+ struct dir_iterator *diter;
+ unsigned int flags = 0;
+ int iter_status;
+
+ for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
+ if (strcmp(*argv, "--follow-symlinks") == 0)
+ flags |= DIR_ITERATOR_FOLLOW_SYMLINKS;
+ else if (strcmp(*argv, "--pedantic") == 0)
+ flags |= DIR_ITERATOR_PEDANTIC;
+ else
+ die("invalid option '%s'", *argv);
+ }
+
+ if (!*argv || argc != 1)
+ die("dir-iterator needs exactly one non-option argument");
+
+ diter = dir_iterator_begin(*argv, flags);
+
+ if (!diter) {
+ printf("dir_iterator_begin failure: %s\n", error_name(errno));
+ exit(EXIT_FAILURE);
+ }
+
+ while ((iter_status = dir_iterator_advance(diter)) == ITER_OK) {
+ if (S_ISDIR(diter->st.st_mode))
+ printf("[d] ");
+ else if (S_ISREG(diter->st.st_mode))
+ printf("[f] ");
+ else if (S_ISLNK(diter->st.st_mode))
+ printf("[s] ");
+ else
+ printf("[?] ");
+
+ printf("(%s) [%s] %s\n", diter->relative_path, diter->basename,
+ diter->path.buf);
+ }
+
+ if (iter_status != ITER_DONE) {
+ printf("dir_iterator_advance failure\n");
+ return 1;
+ }
+
+ return 0;
+}
diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c
index a20a616..c8a1cde 100644
--- a/t/helper/test-example-decorate.c
+++ b/t/helper/test-example-decorate.c
@@ -26,8 +26,8 @@
* Add 2 objects, one with a non-NULL decoration and one with a NULL
* decoration.
*/
- one = lookup_unknown_object(one_oid.hash);
- two = lookup_unknown_object(two_oid.hash);
+ one = lookup_unknown_object(&one_oid);
+ two = lookup_unknown_object(&two_oid);
ret = add_decoration(&n, one, &decoration_a);
if (ret)
BUG("when adding a brand-new object, NULL should be returned");
@@ -56,7 +56,7 @@
ret = lookup_decoration(&n, two);
if (ret != &decoration_b)
BUG("lookup should return added declaration");
- three = lookup_unknown_object(three_oid.hash);
+ three = lookup_unknown_object(&three_oid);
ret = lookup_decoration(&n, three);
if (ret)
BUG("lookup for unknown object should return NULL");
diff --git a/t/helper/test-genzeros.c b/t/helper/test-genzeros.c
new file mode 100644
index 0000000..9532f5b
--- /dev/null
+++ b/t/helper/test-genzeros.c
@@ -0,0 +1,21 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+
+int cmd__genzeros(int argc, const char **argv)
+{
+ long count;
+
+ if (argc > 2) {
+ fprintf(stderr, "usage: %s [<count>]\n", argv[0]);
+ return 1;
+ }
+
+ count = argc > 1 ? strtol(argv[1], NULL, 0) : -1L;
+
+ while (count < 0 || count--) {
+ if (putchar(0) == EOF)
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index 23d2b17..aaf17b0 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -173,14 +173,7 @@
p2 = strtok(NULL, DELIM);
}
- if (!strcmp("hash", cmd) && p1) {
-
- /* print results of different hash functions */
- printf("%u %u %u %u\n",
- strhash(p1), memhash(p1, strlen(p1)),
- strihash(p1), memihash(p1, strlen(p1)));
-
- } else if (!strcmp("add", cmd) && p1 && p2) {
+ if (!strcmp("add", cmd) && p1 && p2) {
/* create entry with key = p1, value = p2 */
entry = alloc_test_entry(hash, p1, p2);
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index 96857f2..b9fd427 100644
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -20,7 +20,7 @@
if (!two)
die("not a tree-ish %s", av[2]);
- shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
+ shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
printf("shifted: %s\n", oid_to_hex(&shifted));
exit(0);
diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c
new file mode 100644
index 0000000..0acf999
--- /dev/null
+++ b/t/helper/test-oidmap.c
@@ -0,0 +1,112 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "oidmap.h"
+#include "strbuf.h"
+
+/* key is an oid and value is a name (could be a refname for example) */
+struct test_entry {
+ struct oidmap_entry entry;
+ char name[FLEX_ARRAY];
+};
+
+#define DELIM " \t\r\n"
+
+/*
+ * Read stdin line by line and print result of commands to stdout:
+ *
+ * hash oidkey -> sha1hash(oidkey)
+ * put oidkey namevalue -> NULL / old namevalue
+ * get oidkey -> NULL / namevalue
+ * remove oidkey -> NULL / old namevalue
+ * iterate -> oidkey1 namevalue1\noidkey2 namevalue2\n...
+ *
+ */
+int cmd__oidmap(int argc, const char **argv)
+{
+ struct strbuf line = STRBUF_INIT;
+ struct oidmap map = OIDMAP_INIT;
+
+ setup_git_directory();
+
+ /* init oidmap */
+ oidmap_init(&map, 0);
+
+ /* process commands from stdin */
+ while (strbuf_getline(&line, stdin) != EOF) {
+ char *cmd, *p1 = NULL, *p2 = NULL;
+ struct test_entry *entry;
+ struct object_id oid;
+
+ /* break line into command and up to two parameters */
+ cmd = strtok(line.buf, DELIM);
+ /* ignore empty lines */
+ if (!cmd || *cmd == '#')
+ continue;
+
+ p1 = strtok(NULL, DELIM);
+ if (p1)
+ p2 = strtok(NULL, DELIM);
+
+ if (!strcmp("put", cmd) && p1 && p2) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* create entry with oid_key = p1, name_value = p2 */
+ FLEX_ALLOC_STR(entry, name, p2);
+ oidcpy(&entry->entry.oid, &oid);
+
+ /* add / replace entry */
+ entry = oidmap_put(&map, entry);
+
+ /* print and free replaced entry, if any */
+ puts(entry ? entry->name : "NULL");
+ free(entry);
+
+ } else if (!strcmp("get", cmd) && p1) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* lookup entry in oidmap */
+ entry = oidmap_get(&map, &oid);
+
+ /* print result */
+ puts(entry ? entry->name : "NULL");
+
+ } else if (!strcmp("remove", cmd) && p1) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* remove entry from oidmap */
+ entry = oidmap_remove(&map, &oid);
+
+ /* print result and free entry*/
+ puts(entry ? entry->name : "NULL");
+ free(entry);
+
+ } else if (!strcmp("iterate", cmd)) {
+
+ struct oidmap_iter iter;
+ oidmap_iter_init(&map, &iter);
+ while ((entry = oidmap_iter_next(&iter)))
+ printf("%s %s\n", oid_to_hex(&entry->entry.oid), entry->name);
+
+ } else {
+
+ printf("Unknown command %s\n", cmd);
+
+ }
+ }
+
+ strbuf_release(&line);
+ oidmap_free(&map, 1);
+ return 0;
+}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 47fee66..af82db0 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -2,6 +2,7 @@
#include "cache.h"
#include "parse-options.h"
#include "string-list.h"
+#include "trace2.h"
static int boolean = 0;
static int integer = 0;
@@ -131,7 +132,7 @@
OPT_NOOP_NOARG(0, "obsolete"),
OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
OPT_GROUP("Magic arguments"),
- OPT_ARGUMENT("quux", "means --quux"),
+ OPT_ARGUMENT("quux", NULL, "means --quux"),
OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
number_callback),
{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
@@ -148,11 +149,16 @@
OPT_CALLBACK(0, "expect", &expect, "string",
"expected output in the variable dump",
collect_expect),
+ OPT_GROUP("Alias"),
+ OPT_STRING('A', "alias-source", &string, "string", "get a string"),
+ OPT_ALIAS('Z', "alias-target", "alias-source"),
OPT_END(),
};
int i;
int ret = 0;
+ trace2_cmd_name("_parse_");
+
argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
if (length_cb.called) {
diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c
index 5bc9c46..f402844 100644
--- a/t/helper/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
@@ -40,7 +40,7 @@
} else if (!strcmp(*argv, "stack")) {
pq.compare = NULL;
} else {
- int *v = malloc(sizeof(*v));
+ int *v = xmalloc(sizeof(*v));
*v = atoi(*argv);
prio_queue_put(&pq, v);
}
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index d674c88..244977a 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,14 +1,35 @@
#include "test-tool.h"
#include "cache.h"
+#include "config.h"
int cmd__read_cache(int argc, const char **argv)
{
int i, cnt = 1;
+ const char *name = NULL;
+
+ if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
+ argc--;
+ argv++;
+ }
+
if (argc == 2)
cnt = strtol(argv[1], NULL, 0);
setup_git_directory();
+ git_config(git_default_config, NULL);
for (i = 0; i < cnt; i++) {
read_cache();
+ if (name) {
+ int pos;
+
+ refresh_index(&the_index, REFRESH_QUIET,
+ NULL, NULL, NULL);
+ pos = index_name_pos(&the_index, name, strlen(name));
+ if (pos < 0)
+ die("%s not in index", name);
+ printf("%s is%s up to date\n", name,
+ ce_uptodate(the_index.cache[pos]) ? "" : " not");
+ write_file(name, "%d\n", i);
+ }
discard_cache();
}
return 0;
diff --git a/builtin/serve.c b/t/helper/test-serve-v2.c
similarity index 80%
rename from builtin/serve.c
rename to t/helper/test-serve-v2.c
index d3fd240..aee35e5 100644
--- a/builtin/serve.c
+++ b/t/helper/test-serve-v2.c
@@ -1,14 +1,14 @@
+#include "test-tool.h"
#include "cache.h"
-#include "builtin.h"
#include "parse-options.h"
#include "serve.h"
static char const * const serve_usage[] = {
- N_("git serve [<options>]"),
+ N_("test-tool serve-v2 [<options>]"),
NULL
};
-int cmd_serve(int argc, const char **argv, const char *prefix)
+int cmd__serve_v2(int argc, const char **argv)
{
struct serve_options opts = SERVE_OPTIONS_INIT;
@@ -19,6 +19,7 @@
N_("exit immediately after advertising capabilities")),
OPT_END()
};
+ const char *prefix = setup_git_directory();
/* ignore all unknown cmdline switches for now */
argc = parse_options(argc, argv, prefix, options, serve_usage,
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 50c55f8..ce7e890 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -1,5 +1,12 @@
#include "git-compat-util.h"
#include "test-tool.h"
+#include "trace2.h"
+#include "parse-options.h"
+
+static const char * const test_tool_usage[] = {
+ "test-tool [-C <directory>] <command [<arguments>...]]",
+ NULL
+};
struct test_cmd {
const char *name;
@@ -12,6 +19,7 @@
{ "ctype", cmd__ctype },
{ "date", cmd__date },
{ "delta", cmd__delta },
+ { "dir-iterator", cmd__dir_iterator },
{ "drop-caches", cmd__drop_caches },
{ "dump-cache-tree", cmd__dump_cache_tree },
{ "dump-fsmonitor", cmd__dump_fsmonitor },
@@ -19,6 +27,7 @@
{ "dump-untracked-cache", cmd__dump_untracked_cache },
{ "example-decorate", cmd__example_decorate },
{ "genrandom", cmd__genrandom },
+ { "genzeros", cmd__genzeros },
{ "hashmap", cmd__hashmap },
{ "hash-speed", cmd__hash_speed },
{ "index-version", cmd__index_version },
@@ -27,6 +36,7 @@
{ "match-trees", cmd__match_trees },
{ "mergesort", cmd__mergesort },
{ "mktemp", cmd__mktemp },
+ { "oidmap", cmd__oidmap },
{ "online-cpus", cmd__online_cpus },
{ "parse-options", cmd__parse_options },
{ "path-utils", cmd__path_utils },
@@ -41,6 +51,7 @@
{ "revision-walking", cmd__revision_walking },
{ "run-command", cmd__run_command },
{ "scrap-cache-tree", cmd__scrap_cache_tree },
+ { "serve-v2", cmd__serve_v2 },
{ "sha1", cmd__sha1 },
{ "sha1-array", cmd__sha1_array },
{ "sha256", cmd__sha256 },
@@ -50,6 +61,7 @@
{ "submodule-config", cmd__submodule_config },
{ "submodule-nested-repo-config", cmd__submodule_nested_repo_config },
{ "subprocess", cmd__subprocess },
+ { "trace2", cmd__trace2 },
{ "urlmatch-normalization", cmd__urlmatch_normalization },
{ "xml-encode", cmd__xml_encode },
{ "wildmatch", cmd__wildmatch },
@@ -72,15 +84,30 @@
int cmd_main(int argc, const char **argv)
{
int i;
+ const char *working_directory = NULL;
+ struct option options[] = {
+ OPT_STRING('C', NULL, &working_directory, "directory",
+ "change the working directory"),
+ OPT_END()
+ };
BUG_exit_code = 99;
+ argc = parse_options(argc, argv, NULL, options, test_tool_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION |
+ PARSE_OPT_KEEP_ARGV0);
+
if (argc < 2)
die_usage();
+ if (working_directory && chdir(working_directory) < 0)
+ die("Could not cd to '%s'", working_directory);
+
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
if (!strcmp(cmds[i].name, argv[1])) {
argv++;
argc--;
+ trace2_cmd_name(cmds[i].name);
+ trace2_cmd_list_config();
return cmds[i].fn(argc, argv);
}
}
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index a563df4..f805bb3 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -9,6 +9,7 @@
int cmd__ctype(int argc, const char **argv);
int cmd__date(int argc, const char **argv);
int cmd__delta(int argc, const char **argv);
+int cmd__dir_iterator(int argc, const char **argv);
int cmd__drop_caches(int argc, const char **argv);
int cmd__dump_cache_tree(int argc, const char **argv);
int cmd__dump_fsmonitor(int argc, const char **argv);
@@ -16,6 +17,7 @@
int cmd__dump_untracked_cache(int argc, const char **argv);
int cmd__example_decorate(int argc, const char **argv);
int cmd__genrandom(int argc, const char **argv);
+int cmd__genzeros(int argc, const char **argv);
int cmd__hashmap(int argc, const char **argv);
int cmd__hash_speed(int argc, const char **argv);
int cmd__index_version(int argc, const char **argv);
@@ -24,6 +26,7 @@
int cmd__match_trees(int argc, const char **argv);
int cmd__mergesort(int argc, const char **argv);
int cmd__mktemp(int argc, const char **argv);
+int cmd__oidmap(int argc, const char **argv);
int cmd__online_cpus(int argc, const char **argv);
int cmd__parse_options(int argc, const char **argv);
int cmd__path_utils(int argc, const char **argv);
@@ -38,6 +41,7 @@
int cmd__revision_walking(int argc, const char **argv);
int cmd__run_command(int argc, const char **argv);
int cmd__scrap_cache_tree(int argc, const char **argv);
+int cmd__serve_v2(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv);
int cmd__sha1_array(int argc, const char **argv);
int cmd__sha256(int argc, const char **argv);
@@ -47,6 +51,7 @@
int cmd__submodule_config(int argc, const char **argv);
int cmd__submodule_nested_repo_config(int argc, const char **argv);
int cmd__subprocess(int argc, const char **argv);
+int cmd__trace2(int argc, const char **argv);
int cmd__urlmatch_normalization(int argc, const char **argv);
int cmd__xml_encode(int argc, const char **argv);
int cmd__wildmatch(int argc, const char **argv);
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
new file mode 100644
index 0000000..197819c
--- /dev/null
+++ b/t/helper/test-trace2.c
@@ -0,0 +1,273 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "argv-array.h"
+#include "run-command.h"
+#include "exec-cmd.h"
+#include "config.h"
+
+typedef int(fn_unit_test)(int argc, const char **argv);
+
+struct unit_test {
+ fn_unit_test *ut_fn;
+ const char *ut_name;
+ const char *ut_usage;
+};
+
+#define MyOk 0
+#define MyError 1
+
+static int get_i(int *p_value, const char *data)
+{
+ char *endptr;
+
+ if (!data || !*data)
+ return MyError;
+
+ *p_value = strtol(data, &endptr, 10);
+ if (*endptr || errno == ERANGE)
+ return MyError;
+
+ return MyOk;
+}
+
+/*
+ * Cause process to exit with the requested value via "return".
+ *
+ * Rely on test-tool.c:cmd_main() to call trace2_cmd_exit()
+ * with our result.
+ *
+ * Test harness can confirm:
+ * [] the process-exit value.
+ * [] the "code" field in the "exit" trace2 event.
+ * [] the "code" field in the "atexit" trace2 event.
+ * [] the "name" field in the "cmd_name" trace2 event.
+ * [] "def_param" events for all of the "interesting" pre-defined
+ * config settings.
+ */
+static int ut_001return(int argc, const char **argv)
+{
+ int rc;
+
+ if (get_i(&rc, argv[0]))
+ die("expect <exit_code>");
+
+ return rc;
+}
+
+/*
+ * Cause the process to exit with the requested value via "exit()".
+ *
+ * Test harness can confirm:
+ * [] the "code" field in the "exit" trace2 event.
+ * [] the "code" field in the "atexit" trace2 event.
+ * [] the "name" field in the "cmd_name" trace2 event.
+ * [] "def_param" events for all of the "interesting" pre-defined
+ * config settings.
+ */
+static int ut_002exit(int argc, const char **argv)
+{
+ int rc;
+
+ if (get_i(&rc, argv[0]))
+ die("expect <exit_code>");
+
+ exit(rc);
+}
+
+/*
+ * Send an "error" event with each value in argv. Normally, git only issues
+ * a single "error" event immediately before issuing an "exit" event (such
+ * as in die() or BUG()), but multiple "error" events are allowed.
+ *
+ * Test harness can confirm:
+ * [] a trace2 "error" event for each value in argv.
+ * [] the "name" field in the "cmd_name" trace2 event.
+ * [] (optional) the file:line in the "exit" event refers to this function.
+ */
+static int ut_003error(int argc, const char **argv)
+{
+ int k;
+
+ if (!argv[0] || !*argv[0])
+ die("expect <error_message>");
+
+ for (k = 0; k < argc; k++)
+ error("%s", argv[k]);
+
+ return 0;
+}
+
+/*
+ * Run a child process and wait for it to finish and exit with its return code.
+ * test-tool trace2 004child [<child-command-line>]
+ *
+ * For example:
+ * test-tool trace2 004child git version
+ * test-tool trace2 004child test-tool trace2 001return 0
+ * test-tool trace2 004child test-tool trace2 004child test-tool trace2 004child
+ * test-tool trace2 004child git -c alias.xyz=version xyz
+ *
+ * Test harness can confirm:
+ * [] the "name" field in the "cmd_name" trace2 event.
+ * [] that the outer process has a single component SID (or depth "d0" in
+ * the PERF stream).
+ * [] that "child_start" and "child_exit" events are generated for the child.
+ * [] if the child process is an instrumented executable:
+ * [] that "version", "start", ..., "exit", and "atexit" events are
+ * generated by the child process.
+ * [] that the child process events have a multiple component SID (or
+ * depth "dN+1" in the PERF stream).
+ * [] that the child exit code is propagated to the parent process "exit"
+ * and "atexit" events..
+ * [] (optional) that the "t_abs" field in the child process "atexit" event
+ * is less than the "t_rel" field in the "child_exit" event of the parent
+ * process.
+ * [] if the child process is like the alias example above,
+ * [] (optional) the child process attempts to run "git-xyx" as a dashed
+ * command.
+ * [] the child process emits an "alias" event with "xyz" => "version"
+ * [] the child process runs "git version" as a child process.
+ * [] the child process has a 3 component SID (or depth "d2" in the PERF
+ * stream).
+ */
+static int ut_004child(int argc, const char **argv)
+{
+ int result;
+
+ /*
+ * Allow empty <child_command_line> so we can do arbitrarily deep
+ * command nesting and let the last one be null.
+ */
+ if (!argc)
+ return 0;
+
+ result = run_command_v_opt(argv, 0);
+ exit(result);
+}
+
+/*
+ * Exec a git command. This may either create a child process (Windows)
+ * or replace the existing process.
+ * test-tool trace2 005exec <git_command_args>
+ *
+ * For example:
+ * test-tool trace2 005exec version
+ *
+ * Test harness can confirm (on Windows):
+ * [] the "name" field in the "cmd_name" trace2 event.
+ * [] that the outer process has a single component SID (or depth "d0" in
+ * the PERF stream).
+ * [] that "exec" and "exec_result" events are generated for the child
+ * process (since the Windows compatibility layer fakes an exec() with
+ * a CreateProcess(), WaitForSingleObject(), and exit()).
+ * [] that the child process has multiple component SID (or depth "dN+1"
+ * in the PERF stream).
+ *
+ * Test harness can confirm (on platforms with a real exec() function):
+ * [] TODO talk about process replacement and how it affects SID.
+ */
+static int ut_005exec(int argc, const char **argv)
+{
+ int result;
+
+ if (!argc)
+ return 0;
+
+ result = execv_git_cmd(argv);
+ return result;
+}
+
+static int ut_006data(int argc, const char **argv)
+{
+ const char *usage_error =
+ "expect <cat0> <k0> <v0> [<cat1> <k1> <v1> [...]]";
+
+ if (argc % 3 != 0)
+ die("%s", usage_error);
+
+ while (argc) {
+ if (!argv[0] || !*argv[0] || !argv[1] || !*argv[1] ||
+ !argv[2] || !*argv[2])
+ die("%s", usage_error);
+
+ trace2_data_string(argv[0], the_repository, argv[1], argv[2]);
+ argv += 3;
+ argc -= 3;
+ }
+
+ return 0;
+}
+
+/*
+ * Usage:
+ * test-tool trace2 <ut_name_1> <ut_usage_1>
+ * test-tool trace2 <ut_name_2> <ut_usage_2>
+ * ...
+ */
+#define USAGE_PREFIX "test-tool trace2"
+
+/* clang-format off */
+static struct unit_test ut_table[] = {
+ { ut_001return, "001return", "<exit_code>" },
+ { ut_002exit, "002exit", "<exit_code>" },
+ { ut_003error, "003error", "<error_message>+" },
+ { ut_004child, "004child", "[<child_command_line>]" },
+ { ut_005exec, "005exec", "<git_command_args>" },
+ { ut_006data, "006data", "[<category> <key> <value>]+" },
+};
+/* clang-format on */
+
+/* clang-format off */
+#define for_each_ut(k, ut_k) \
+ for (k = 0, ut_k = &ut_table[k]; \
+ k < ARRAY_SIZE(ut_table); \
+ k++, ut_k = &ut_table[k])
+/* clang-format on */
+
+static int print_usage(void)
+{
+ int k;
+ struct unit_test *ut_k;
+
+ fprintf(stderr, "usage:\n");
+ for_each_ut (k, ut_k)
+ fprintf(stderr, "\t%s %s %s\n", USAGE_PREFIX, ut_k->ut_name,
+ ut_k->ut_usage);
+
+ return 129;
+}
+
+/*
+ * Issue various trace2 events for testing.
+ *
+ * We assume that these trace2 routines has already been called:
+ * [] trace2_initialize() [common-main.c:main()]
+ * [] trace2_cmd_start() [common-main.c:main()]
+ * [] trace2_cmd_name() [test-tool.c:cmd_main()]
+ * [] tracd2_cmd_list_config() [test-tool.c:cmd_main()]
+ * So that:
+ * [] the various trace2 streams are open.
+ * [] the process SID has been created.
+ * [] the "version" event has been generated.
+ * [] the "start" event has been generated.
+ * [] the "cmd_name" event has been generated.
+ * [] this writes various "def_param" events for interesting config values.
+ *
+ * We further assume that if we return (rather than exit()), trace2_cmd_exit()
+ * will be called by test-tool.c:cmd_main().
+ */
+int cmd__trace2(int argc, const char **argv)
+{
+ int k;
+ struct unit_test *ut_k;
+
+ argc--; /* skip over "trace2" arg */
+ argv++;
+
+ if (argc)
+ for_each_ut (k, ut_k)
+ if (!strcmp(argv[0], ut_k->ut_name))
+ return ut_k->ut_fn(argc - 1, argv + 1);
+
+ return print_usage();
+}
diff --git a/t/interop/i5500-git-daemon.sh b/t/interop/i5500-git-daemon.sh
index 1daf694..4d22e42 100755
--- a/t/interop/i5500-git-daemon.sh
+++ b/t/interop/i5500-git-daemon.sh
@@ -37,5 +37,4 @@
test_cmp expect actual
'
-stop_git_daemon
test_done
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 79db3b7..fb8f887 100644
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -13,11 +13,9 @@
#
# test_expect_success ...
#
-# stop_git_daemon
# test_done
-test_tristate GIT_TEST_GIT_DAEMON
-if test "$GIT_TEST_GIT_DAEMON" = false
+if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
then
skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)"
test_done
@@ -25,16 +23,18 @@
if test_have_prereq !PIPE
then
- test_skip_or_die $GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
+ test_skip_or_die GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
fi
test_set_port LIB_GIT_DAEMON_PORT
GIT_DAEMON_PID=
+GIT_DAEMON_PIDFILE="$PWD"/daemon.pid
GIT_DAEMON_DOCUMENT_ROOT_PATH="$PWD"/repo
GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
+registered_stop_git_daemon_atexit_handler=
start_git_daemon() {
if test -n "$GIT_DAEMON_PID"
then
@@ -43,13 +43,19 @@
mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"
- trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
+ # One of the test scripts stops and then re-starts 'git daemon'.
+ # Don't register and then run the same atexit handlers several times.
+ if test -z "$registered_stop_git_daemon_atexit_handler"
+ then
+ test_atexit 'stop_git_daemon'
+ registered_stop_git_daemon_atexit_handler=AlreadyDone
+ fi
say >&3 "Starting git daemon ..."
mkfifo git_daemon_output
${LIB_GIT_DAEMON_COMMAND:-git daemon} \
--listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
- --reuseaddr --verbose \
+ --reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
>&3 2>git_daemon_output &
@@ -65,8 +71,8 @@
then
kill "$GIT_DAEMON_PID"
wait "$GIT_DAEMON_PID"
- trap 'die' EXIT
- test_skip_or_die $GIT_TEST_GIT_DAEMON \
+ unset GIT_DAEMON_PID
+ test_skip_or_die GIT_TEST_GIT_DAEMON \
"git daemon failed to start"
fi
}
@@ -77,8 +83,6 @@
return
fi
- trap 'die' EXIT
-
# kill git-daemon child of git
say >&3 "Stopping git daemon ..."
kill "$GIT_DAEMON_PID"
@@ -88,8 +92,9 @@
then
error "git daemon exited with status: $ret"
fi
+ kill "$(cat "$GIT_DAEMON_PIDFILE")" 2>/dev/null
GIT_DAEMON_PID=
- rm -f git_daemon_output
+ rm -f git_daemon_output "$GIT_DAEMON_PIDFILE"
}
# A stripped-down version of a netcat client, that connects to a "host:port"
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index b3be3ba..547b9f8 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -44,15 +44,6 @@
echo "$path"
}
-# On Solaris the 'date +%s' function is not supported and therefore we
-# need this replacement.
-# Attention: This function is not safe again against time offset updates
-# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
-# function could fix that but it is not in Python until 3.3.
-time_in_seconds () {
- (cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))')
-}
-
test_set_port P4DPORT
P4PORT=localhost:$P4DPORT
@@ -67,14 +58,9 @@
git="$TRASH_DIRECTORY/git"
pidfile="$TRASH_DIRECTORY/p4d.pid"
-# Sometimes "prove" seems to hang on exit because p4d is still running
-cleanup () {
- if test -f "$pidfile"
- then
- kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
- fi
+stop_p4d_and_watchdog () {
+ kill -9 $p4d_pid $watchdog_pid
}
-trap cleanup EXIT
# git p4 submit generates a temp file, which will
# not get cleaned up if the submission fails. Don't
@@ -82,7 +68,16 @@
TMPDIR="$TRASH_DIRECTORY"
export TMPDIR
+registered_stop_p4d_atexit_handler=
start_p4d () {
+ # One of the test scripts stops and then re-starts p4d.
+ # Don't register and then run the same atexit handlers several times.
+ if test -z "$registered_stop_p4d_atexit_handler"
+ then
+ test_atexit 'stop_p4d_and_watchdog'
+ registered_stop_p4d_atexit_handler=AlreadyDone
+ fi
+
mkdir -p "$db" "$cli" "$git" &&
rm -f "$pidfile" &&
(
@@ -92,6 +87,7 @@
echo $! >"$pidfile"
}
) &&
+ p4d_pid=$(cat "$pidfile")
# This gives p4d a long time to start up, as it can be
# quite slow depending on the machine. Set this environment
@@ -99,18 +95,18 @@
# an automated test setup. If the p4d process dies, that
# will be caught with the "kill -0" check below.
i=${P4D_START_PATIENCE:-300}
- pid=$(cat "$pidfile")
- timeout=$(($(time_in_seconds) + $P4D_TIMEOUT))
+ nr_tries_left=$P4D_TIMEOUT
while true
do
- if test $(time_in_seconds) -gt $timeout
+ if test $nr_tries_left -eq 0
then
- kill -9 $pid
+ kill -9 $p4d_pid
exit 1
fi
sleep 1
- done &
+ nr_tries_left=$(($nr_tries_left - 1))
+ done 2>/dev/null 4>&2 &
watchdog_pid=$!
ready=
@@ -123,7 +119,7 @@
break
fi
# fail if p4d died
- kill -0 $pid 2>/dev/null || break
+ kill -0 $p4d_pid 2>/dev/null || break
echo waiting for p4d to start
sleep 1
i=$(( $i - 1 ))
@@ -163,29 +159,18 @@
}
retry_until_success () {
- timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
- until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
+ nr_tries_left=$RETRY_TIMEOUT
+ until "$@" 2>/dev/null || test $nr_tries_left -eq 0
do
sleep 1
+ nr_tries_left=$(($nr_tries_left - 1))
done
}
-retry_until_fail () {
- timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
- until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
- do
- sleep 1
- done
-}
-
-kill_p4d () {
- pid=$(cat "$pidfile")
- retry_until_fail kill $pid
- retry_until_fail kill -9 $pid
- # complain if it would not die
- test_must_fail kill $pid >/dev/null 2>&1 &&
- rm -rf "$db" "$cli" "$pidfile" &&
- retry_until_fail kill -9 $watchdog_pid
+stop_and_cleanup_p4d () {
+ kill -9 $p4d_pid $watchdog_pid
+ wait $p4d_pid
+ rm -rf "$db" "$cli" "$pidfile"
}
cleanup_git () {
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index f3b478c..bc0b9c7 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -69,19 +69,12 @@
maybe_start_httpd () {
loc=${1-svn}
- test_tristate GIT_SVN_TEST_HTTPD
- case $GIT_SVN_TEST_HTTPD in
- true)
+ if git env--helper --type=bool --default=false --exit-code GIT_TEST_SVN_HTTPD
+ then
. "$TEST_DIRECTORY"/lib-httpd.sh
LIB_HTTPD_SVN="$loc"
start_httpd
- ;;
- *)
- stop_httpd () {
- : noop
- }
- ;;
- esac
+ fi
}
convert_to_rev_db () {
@@ -111,8 +104,7 @@
}
require_svnserve () {
- test_tristate GIT_TEST_SVNSERVE
- if ! test "$GIT_TEST_SVNSERVE" = true
+ if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE
then
skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
test_done
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index f1277be..8d28652 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -63,8 +63,7 @@
cut -d" " -f4 |
tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
- echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
- (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-u committer@example.com -o /dev/null --sign - 2>&1 &&
test_set_prereq GPGSM
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index e465116..0d98575 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -14,7 +14,6 @@
#
# test_expect_success ...
#
-# stop_httpd
# test_done
#
# Can be configured using the following variables.
@@ -42,15 +41,14 @@
test_done
fi
-test_tristate GIT_TEST_HTTPD
-if test "$GIT_TEST_HTTPD" = false
+if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD
then
skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)"
test_done
fi
if ! test_have_prereq NOT_ROOT; then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Cannot run httpd tests as root"
fi
@@ -91,11 +89,12 @@
# hack to suppress apache PassEnv warnings
GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND
GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS
+GIT_TEST_SIDEBAND_ALL=$GIT_TEST_SIDEBAND_ALL; export GIT_TEST_SIDEBAND_ALL
GIT_TRACE=$GIT_TRACE; export GIT_TRACE
if ! test -x "$LIB_HTTPD_PATH"
then
- test_skip_or_die $GIT_TEST_HTTPD "no web server found at '$LIB_HTTPD_PATH'"
+ test_skip_or_die GIT_TEST_HTTPD "no web server found at '$LIB_HTTPD_PATH'"
fi
HTTPD_VERSION=$($LIB_HTTPD_PATH -v | \
@@ -107,19 +106,19 @@
then
if ! test $HTTPD_VERSION -ge 2
then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"at least Apache version 2 is required"
fi
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Apache module directory not found"
fi
LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
fi
else
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Could not identify web server at '$LIB_HTTPD_PATH'"
fi
@@ -131,6 +130,7 @@
mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
install_script broken-smart-http.sh
+ install_script error-smart-http.sh
install_script error.sh
install_script apply-one-time-sed.sh
@@ -174,7 +174,7 @@
start_httpd() {
prepare_httpd >&3 2>&4
- trap 'code=$?; stop_httpd; (exit $code); die' EXIT
+ test_atexit stop_httpd
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
@@ -182,15 +182,12 @@
>&3 2>&4
if test $? -ne 0
then
- trap 'die' EXIT
cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
- test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
+ test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
fi
}
stop_httpd() {
- trap 'die' EXIT
-
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
-f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
}
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 5d63ed9..5c1c86c 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -76,6 +76,7 @@
PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
PassEnv ASAN_OPTIONS
+PassEnv LSAN_OPTIONS
PassEnv GIT_TRACE
PassEnv GIT_CONFIG_NOSYSTEM
PassEnv GIT_TEST_SIDEBAND_ALL
@@ -119,6 +120,7 @@
ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
+ScriptAlias /error_smart/ error-smart-http.sh/
ScriptAlias /error/ error.sh/
ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
<Directory ${GIT_EXEC_PATH}>
@@ -127,6 +129,9 @@
<Files broken-smart-http.sh>
Options ExecCGI
</Files>
+<Files error-smart-http.sh>
+ Options ExecCGI
+</Files>
<Files error.sh>
Options ExecCGI
</Files>
diff --git a/t/lib-httpd/error-smart-http.sh b/t/lib-httpd/error-smart-http.sh
new file mode 100644
index 0000000..e65d447
--- /dev/null
+++ b/t/lib-httpd/error-smart-http.sh
@@ -0,0 +1,3 @@
+echo "Content-Type: application/x-git-upload-pack-advertisement"
+echo
+printf "%s" "0019ERR server-side error"
diff --git a/t/lib-patch-mode.sh b/t/lib-patch-mode.sh
index 06c3c91..cfd76bf 100644
--- a/t/lib-patch-mode.sh
+++ b/t/lib-patch-mode.sh
@@ -2,28 +2,40 @@
. ./test-lib.sh
+# set_state <path> <worktree-content> <index-content>
+#
+# Prepare the content for path in worktree and the index as specified.
set_state () {
echo "$3" > "$1" &&
git add "$1" &&
echo "$2" > "$1"
}
+# save_state <path>
+#
+# Save index/worktree content of <path> in the files _worktree_<path>
+# and _index_<path>
save_state () {
noslash="$(echo "$1" | tr / _)" &&
cat "$1" > _worktree_"$noslash" &&
git show :"$1" > _index_"$noslash"
}
+# set_and_save_state <path> <worktree-content> <index-content>
set_and_save_state () {
set_state "$@" &&
save_state "$1"
}
+# verify_state <path> <expected-worktree-content> <expected-index-content>
verify_state () {
test "$(cat "$1")" = "$2" &&
test "$(git show :"$1")" = "$3"
}
+# verify_saved_state <path>
+#
+# Call verify_state with expected contents from the last save_state
verify_saved_state () {
noslash="$(echo "$1" | tr / _)" &&
verify_state "$1" "$(cat _worktree_"$noslash")" "$(cat _index_"$noslash")"
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 7ea30e5..6d87961 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -44,10 +44,10 @@
rm -f "$1"
echo 'rebase -i script before editing:'
cat "$1".tmp
- action=pick
+ action=\&
for line in $FAKE_LINES; do
case $line in
- pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
+ pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
action="$line";;
exec_*|x_*|break|b)
echo "$line" | sed 's/_/ /g' >> "$1";;
@@ -58,11 +58,12 @@
bad)
action="badcmd";;
fakesha)
+ test \& != "$action" || action=pick
echo "$action XXXXXXX False commit" >> "$1"
action=pick;;
*)
- sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
- action=pick;;
+ sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
+ action=\&;;
esac
done
echo 'rebase -i script after editing:'
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 5b56b23..1dd17fc 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -139,7 +139,7 @@
git revert HEAD &&
git checkout -b invalid_sub1 add_sub1 &&
- git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 sub1 &&
+ git update-index --cacheinfo 160000 $(test_oid numeric) sub1 &&
git commit -m "Invalid sub1 commit" &&
git checkout -b valid_sub1 &&
git revert HEAD &&
@@ -196,6 +196,7 @@
# the submodule repo if it doesn't exist and configures the most problematic
# settings for diff.ignoreSubmodules.
prolog () {
+ test_oid_init &&
(test -d submodule_update_repo || create_lib_submodule_repo) &&
test_config_global diff.ignoreSubmodules all &&
test_config diff.ignoreSubmodules all
diff --git a/t/perf/README b/t/perf/README
index be12090..c7b70e2 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -45,7 +45,7 @@
$ ./p0001-rev-list.sh
[...]
- $ GIT_BUILD_DIR=/path/to/other/git ./p0001-rev-list.sh
+ $ ./run /path/to/other/git -- ./p0001-rev-list.sh
[...]
$ ./aggregate.perl . /path/to/other/git ./p0001-rev-list.sh
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 494907a..66554d2 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -3,9 +3,9 @@
use lib '../../perl/build/lib';
use strict;
use warnings;
-use JSON;
use Getopt::Long;
use Git;
+use Cwd qw(realpath);
sub get_times {
my $name = shift;
@@ -99,18 +99,21 @@
while (scalar @ARGV) {
my $arg = $ARGV[0];
my $dir;
+ my $prefix = '';
last if -f $arg or $arg eq "--";
if (! -d $arg) {
my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
$dir = "build/".$rev;
+ } elsif ($arg eq '.') {
+ $dir = '.';
} else {
- $arg =~ s{/*$}{};
- $dir = $arg;
- $dirabbrevs{$dir} = $dir;
+ $dir = realpath($arg);
+ $dirnames{$dir} = $dir;
+ $prefix .= 'bindir';
}
push @dirs, $dir;
- $dirnames{$dir} = $arg;
- my $prefix = $dir;
+ $dirnames{$dir} ||= $arg;
+ $prefix .= $dir;
$prefix =~ tr/^a-zA-Z0-9/_/c;
$prefixes{$dir} = $prefix . '.';
shift @ARGV;
@@ -312,9 +315,6 @@
$environment = $reponame;
} elsif (exists $ENV{GIT_PERF_REPO_NAME} and $ENV{GIT_PERF_REPO_NAME} ne "") {
$environment = $ENV{GIT_PERF_REPO_NAME};
- } elsif (exists $ENV{GIT_TEST_INSTALLED} and $ENV{GIT_TEST_INSTALLED} ne "") {
- $environment = $ENV{GIT_TEST_INSTALLED};
- $environment =~ s|/bin-wrappers$||;
} else {
$environment = `uname -r`;
chomp $environment;
@@ -342,7 +342,8 @@
}
}
- print to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
+ require JSON;
+ print JSON::to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
}
binmode STDOUT, ":utf8" or die "PANIC on binmode: $!";
diff --git a/t/perf/p0001-rev-list.sh b/t/perf/p0001-rev-list.sh
index ebf1724..3042a85 100755
--- a/t/perf/p0001-rev-list.sh
+++ b/t/perf/p0001-rev-list.sh
@@ -14,6 +14,24 @@
git rev-list --all --objects >/dev/null
'
+test_perf 'rev-list --parents' '
+ git rev-list --parents HEAD >/dev/null
+'
+
+test_expect_success 'create dummy file' '
+ echo unlikely-to-already-be-there >dummy &&
+ git add dummy &&
+ git commit -m dummy
+'
+
+test_perf 'rev-list -- dummy' '
+ git rev-list HEAD -- dummy
+'
+
+test_perf 'rev-list --parents -- dummy' '
+ git rev-list --parents HEAD -- dummy
+'
+
test_expect_success 'create new unreferenced commit' '
commit=$(git commit-tree HEAD^{tree} -p HEAD) &&
test_export commit
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index 99bdb16..a9b3e11 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -13,35 +13,40 @@
export PACK
'
-test_expect_success 'create target repositories' '
- for repo in t1 t2 t3 t4 t5 t6
- do
- git init --bare $repo
- done
-'
-
test_perf 'index-pack 0 threads' '
- GIT_DIR=t1 git index-pack --threads=1 --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
'
test_perf 'index-pack 1 thread ' '
- GIT_DIR=t2 GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK
'
test_perf 'index-pack 2 threads' '
- GIT_DIR=t3 git index-pack --threads=2 --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git git index-pack --threads=2 --stdin < $PACK
'
test_perf 'index-pack 4 threads' '
- GIT_DIR=t4 git index-pack --threads=4 --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git git index-pack --threads=4 --stdin < $PACK
'
test_perf 'index-pack 8 threads' '
- GIT_DIR=t5 git index-pack --threads=8 --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git git index-pack --threads=8 --stdin < $PACK
'
test_perf 'index-pack default number of threads' '
- GIT_DIR=t6 git index-pack --stdin < $PACK
+ rm -rf repo.git &&
+ git init --bare repo.git &&
+ GIT_DIR=repo.git git index-pack --stdin < $PACK
'
test_done
diff --git a/t/perf/p5304-prune.sh b/t/perf/p5304-prune.sh
new file mode 100755
index 0000000..83baedb
--- /dev/null
+++ b/t/perf/p5304-prune.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+test_description='performance tests of prune'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'remove reachable loose objects' '
+ git repack -ad
+'
+
+test_expect_success 'remove unreachable loose objects' '
+ git prune
+'
+
+test_expect_success 'confirm there are no loose objects' '
+ git count-objects | grep ^0
+'
+
+test_perf 'prune with no objects' '
+ git prune
+'
+
+test_expect_success 'repack with bitmaps' '
+ git repack -adb
+'
+
+# We have to create the object in each trial run, since otherwise
+# runs after the first see no object and just skip the traversal entirely!
+test_perf 'prune with bitmaps' '
+ echo "probably not present in repo" | git hash-object -w --stdin &&
+ git prune
+'
+
+test_done
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index bb91dbb..6a3a425 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -12,8 +12,7 @@
# We intentionally use the deprecated pack.writebitmaps
# config so that we can test against older versions of git.
test_expect_success 'setup bitmap config' '
- git config pack.writebitmaps true &&
- git config pack.writebitmaphashcache true
+ git config pack.writebitmaps true
'
test_perf 'repack to disk' '
diff --git a/t/perf/p5311-pack-bitmaps-fetch.sh b/t/perf/p5311-pack-bitmaps-fetch.sh
index b045759..47c3fd7 100755
--- a/t/perf/p5311-pack-bitmaps-fetch.sh
+++ b/t/perf/p5311-pack-bitmaps-fetch.sh
@@ -7,7 +7,6 @@
test_expect_success 'create bitmapped server repo' '
git config pack.writebitmaps true &&
- git config pack.writebitmaphashcache true &&
git repack -ad
'
diff --git a/t/perf/p5600-partial-clone.sh b/t/perf/p5600-partial-clone.sh
new file mode 100755
index 0000000..3e04bd2
--- /dev/null
+++ b/t/perf/p5600-partial-clone.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+test_description='performance of partial clones'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'enable server-side config' '
+ git config uploadpack.allowFilter true &&
+ git config uploadpack.allowAnySHA1InWant true
+'
+
+test_perf 'clone without blobs' '
+ rm -rf bare.git &&
+ git clone --no-local --bare --filter=blob:none . bare.git
+'
+
+test_perf 'checkout of result' '
+ rm -rf worktree &&
+ mkdir -p worktree/.git &&
+ tar -C bare.git -cf - . | tar -C worktree/.git -xf - &&
+ git -C worktree config core.bare false &&
+ git -C worktree checkout -f
+'
+
+test_done
diff --git a/t/perf/p5601-clone-reference.sh b/t/perf/p5601-clone-reference.sh
new file mode 100755
index 0000000..68fed66
--- /dev/null
+++ b/t/perf/p5601-clone-reference.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='speed of clone --reference'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'create shareable repository' '
+ git clone --bare . shared.git
+'
+
+test_expect_success 'advance base repository' '
+ # Do not use test_commit here; its test_tick will
+ # use some ancient hard-coded date. The resulting clock
+ # skew will cause pack-objects to traverse in a very
+ # sub-optimal order, skewing the results.
+ echo content >new-file-that-does-not-exist &&
+ git add new-file-that-does-not-exist &&
+ git commit -m "new commit"
+'
+
+test_perf 'clone --reference' '
+ rm -rf dst.git &&
+ git clone --no-local --bare --reference shared.git . dst.git
+'
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 2e33ab3..b58a43e 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -17,37 +17,27 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/ .
-# do the --tee work early; it otherwise confuses our careful
-# GIT_BUILD_DIR mangling
-case "$GIT_TEST_TEE_STARTED, $* " in
-done,*)
- # do not redirect again
- ;;
-*' --tee '*|*' --va'*)
- mkdir -p test-results
- BASE=test-results/$(basename "$0" .sh)
- (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
- echo $? > $BASE.exit) | tee $BASE.out
- test "$(cat $BASE.exit)" = 0
- exit
- ;;
-esac
-
+# These variables must be set before the inclusion of test-lib.sh below,
+# because it will change our working directory.
TEST_DIRECTORY=$(pwd)/..
TEST_OUTPUT_DIRECTORY=$(pwd)
-if test -z "$GIT_TEST_INSTALLED"; then
- perf_results_prefix=
-else
- perf_results_prefix=$(printf "%s" "${GIT_TEST_INSTALLED%/bin-wrappers}" | tr -c "[a-zA-Z0-9]" "[_*]")"."
- # make the tested dir absolute
- GIT_TEST_INSTALLED=$(cd "$GIT_TEST_INSTALLED" && pwd)
-fi
TEST_NO_CREATE_REPO=t
TEST_NO_MALLOC_CHECK=t
. ../test-lib.sh
+if test -n "$GIT_TEST_INSTALLED" -a -z "$PERF_SET_GIT_TEST_INSTALLED"
+then
+ error "Do not use GIT_TEST_INSTALLED with the perf tests.
+
+Instead use:
+
+ ./run <path-to-git> -- <tests>
+
+See t/perf/README for details."
+fi
+
# Variables from test-lib that are normally internal to the tests; we
# need to export them for test_perf subshells
export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
@@ -191,7 +181,7 @@
base=$(basename "$0" .sh)
echo "$test_count" >>"$perf_results_dir"/$base.subtests
echo "$1" >"$perf_results_dir"/$base.$test_count.descr
- base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
+ base="$perf_results_dir"/"$PERF_RESULTS_PREFIX$(basename "$0" .sh)"."$test_count"
"$test_wrapper_func_" "$@"
fi
diff --git a/t/perf/run b/t/perf/run
index 9aaa733..c7b8610 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -70,6 +70,24 @@
) || die "failed to build revision '$mydir'"
}
+set_git_test_installed () {
+ mydir=$1
+
+ mydir_abs=$(cd $mydir && pwd)
+ mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers"
+ if test -d "$mydir_abs_wrappers"
+ then
+ GIT_TEST_INSTALLED=$mydir_abs_wrappers
+ else
+ # Older versions of git lacked bin-wrappers;
+ # fallback to the files in the root.
+ GIT_TEST_INSTALLED=$mydir_abs
+ fi
+ export GIT_TEST_INSTALLED
+ PERF_SET_GIT_TEST_INSTALLED=true
+ export PERF_SET_GIT_TEST_INSTALLED
+}
+
run_dirs_helper () {
mydir=${1%/}
shift
@@ -79,7 +97,16 @@
if test $# -gt 0 -a "$1" = --; then
shift
fi
- if [ ! -d "$mydir" ]; then
+
+ PERF_RESULTS_PREFIX=
+ if test "$mydir" = "."
+ then
+ unset GIT_TEST_INSTALLED
+ elif test -d "$mydir"
+ then
+ PERF_RESULTS_PREFIX=bindir$(cd $mydir && printf "%s" "$(pwd)" | tr -c "[a-zA-Z0-9]" "_").
+ set_git_test_installed "$mydir"
+ else
rev=$(git rev-parse --verify "$mydir" 2>/dev/null) ||
die "'$mydir' is neither a directory nor a valid revision"
if [ ! -d build/$rev ]; then
@@ -87,16 +114,12 @@
fi
build_git_rev $rev "$mydir"
mydir=build/$rev
+
+ PERF_RESULTS_PREFIX=build_$rev.
+ set_git_test_installed "$mydir"
fi
- if test "$mydir" = .; then
- unset GIT_TEST_INSTALLED
- else
- GIT_TEST_INSTALLED="$mydir/bin-wrappers"
- # Older versions of git lacked bin-wrappers; fallback to the
- # files in the root.
- test -d "$GIT_TEST_INSTALLED" || GIT_TEST_INSTALLED=$mydir
- export GIT_TEST_INSTALLED
- fi
+ export PERF_RESULTS_PREFIX
+
run_one_dir "$@"
}
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index b656600..4c01f60 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -25,16 +25,14 @@
echo "$x"
}
-# This test is an experiment to check whether any Git users are using
-# Shells that don't support the "local" keyword. "local" is not
+# Check whether the shell supports the "local" keyword. "local" is not
# POSIX-standard, but it is very widely supported by POSIX-compliant
-# shells, and if it doesn't cause problems for people, we would like
-# to be able to use it in Git code.
+# shells, and we rely on it within Git's test framework.
#
-# For now, this is the only test that requires "local". If your shell
-# fails this test, you can ignore the failure, but please report the
-# problem to the Git mailing list <git@vger.kernel.org>, as it might
-# convince us to continue avoiding the use of "local".
+# If your shell fails this test, the results of other tests may be
+# unreliable. You may wish to report the problem to the Git mailing
+# list <git@vger.kernel.org>, as it could cause us to reconsider
+# relying on "local".
test_expect_success 'verify that the running shell supports "local"' '
x="notlocal" &&
echo "local" >expected1 &&
@@ -276,23 +274,23 @@
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
test_must_fail run_sub_test_lib_test \
- test-verbose "test verbose" --verbose <<-\EOF &&
+ t1234-verbose "test verbose" --verbose <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
test_done
EOF
- mv test-verbose/out test-verbose/out+ &&
- grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
- check_sub_test_lib_test test-verbose <<-\EOF
- > expecting success: true
+ mv t1234-verbose/out t1234-verbose/out+ &&
+ grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
+ check_sub_test_lib_test t1234-verbose <<-\EOF
+ > expecting success of 1234.1 '\''passing test'\'': true
> ok 1 - passing test
> Z
- > expecting success: echo foo
+ > expecting success of 1234.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
- > expecting success: false
+ > expecting success of 1234.3 '\''failing test'\'': false
> not ok 3 - failing test
> # false
> Z
@@ -303,17 +301,17 @@
test_expect_success 'test --verbose-only' '
test_must_fail run_sub_test_lib_test \
- test-verbose-only-2 "test verbose-only=2" \
+ t2345-verbose-only-2 "test verbose-only=2" \
--verbose-only=2 <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
test_done
EOF
- check_sub_test_lib_test test-verbose-only-2 <<-\EOF
+ check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
> ok 1 - passing test
> Z
- > expecting success: echo foo
+ > expecting success of 2345.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
@@ -726,7 +724,7 @@
test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
donthaveit=no
'
-if test $haveit$donthaveit != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes
then
say "bug in test framework: prerequisite tags do not work reliably"
exit 1
@@ -747,7 +745,7 @@
test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
donthaveiteither=no
'
-if test $haveit$donthaveit$donthaveiteither != yesyesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes
then
say "bug in test framework: multiple prerequisite tags do not work reliably"
exit 1
@@ -763,7 +761,7 @@
donthavetrue=no
'
-if test "$havetrue$donthavetrue" != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$havetrue$donthavetrue" != yesyes
then
say 'bug in test framework: lazy prerequisites do not work'
exit 1
@@ -779,7 +777,7 @@
havefalse=no
'
-if test "$nothavefalse$havefalse" != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$nothavefalse$havefalse" != yesyes
then
say 'bug in test framework: negative lazy prerequisites do not work'
exit 1
@@ -790,7 +788,7 @@
test_when_finished clean=yes
'
-if test $clean != yes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $clean != yes
then
say "bug in test framework: basic cleanup command does not work reliably"
exit 1
@@ -825,6 +823,24 @@
EOF
"
+test_expect_success 'test_atexit is run' "
+ test_must_fail run_sub_test_lib_test \
+ atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
+ test_expect_success 'tests clean up even after a failure' '
+ > ../../clean-atexit &&
+ test_atexit rm ../../clean-atexit &&
+ > ../../also-clean-atexit &&
+ test_atexit rm ../../also-clean-atexit &&
+ > ../../dont-clean-atexit &&
+ (exit 1)
+ '
+ test_done
+ EOF
+ test_path_is_file dont-clean-atexit &&
+ test_path_is_missing clean-atexit &&
+ test_path_is_missing also-clean-atexit
+"
+
test_expect_success 'test_oid setup' '
test_oid_init
'
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 42a263c..26f8206 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -93,6 +93,7 @@
sed -n \
-e "/^GIT_PREFIX=/d" \
-e "/^GIT_TEXTDOMAINDIR=/d" \
+ -e "/^GIT_TRACE2_PARENT/d" \
-e "/^GIT_/s/=.*//p" |
sort
EOF
@@ -174,7 +175,7 @@
test_expect_success 'init with --template' '
mkdir template-source &&
echo content >template-source/file &&
- git init --template=../template-source template-custom &&
+ git init --template=template-source template-custom &&
test_cmp template-source/file template-custom/.git/file
'
@@ -310,8 +311,8 @@
test_expect_success 'init with separate gitdir' '
rm -rf newdir &&
git init --separate-git-dir realgitdir newdir &&
- echo "gitdir: $(pwd)/realgitdir" >expected &&
- test_cmp expected newdir/.git &&
+ newdir_git="$(cat newdir/.git)" &&
+ test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
test_path_is_dir realgitdir/refs
'
@@ -360,12 +361,9 @@
'
test_expect_success 're-init to update git link' '
- (
- cd newdir &&
- git init --separate-git-dir ../surrealgitdir
- ) &&
- echo "gitdir: $(pwd)/surrealgitdir" >expected &&
- test_cmp expected newdir/.git &&
+ git -C newdir init --separate-git-dir ../surrealgitdir &&
+ newdir_git="$(cat newdir/.git)" &&
+ test_cmp_fspath "$(pwd)/surrealgitdir" "${newdir_git#gitdir: }" &&
test_path_is_dir surrealgitdir/refs &&
test_path_is_missing realgitdir/refs
'
@@ -373,12 +371,9 @@
test_expect_success 're-init to move gitdir' '
rm -rf newdir realgitdir surrealgitdir &&
git init newdir &&
- (
- cd newdir &&
- git init --separate-git-dir ../realgitdir
- ) &&
- echo "gitdir: $(pwd)/realgitdir" >expected &&
- test_cmp expected newdir/.git &&
+ git -C newdir init --separate-git-dir ../realgitdir &&
+ newdir_git="$(cat newdir/.git)" &&
+ test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
test_path_is_dir realgitdir/refs
'
@@ -453,6 +448,17 @@
)
'
+test_expect_success MINGW 'core.hidedotfiles = false' '
+ git config --global core.hidedotfiles false &&
+ rm -rf newdir &&
+ mkdir newdir &&
+ (
+ sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
+ git -C newdir init
+ ) &&
+ ! is_hidden newdir/.git
+'
+
test_expect_success MINGW 'redirect std handles' '
GIT_REDIRECT_STDOUT=output.txt git rev-parse --git-dir &&
test .git = "$(cat output.txt)" &&
@@ -461,8 +467,8 @@
GIT_REDIRECT_STDOUT=output.txt \
GIT_REDIRECT_STDERR="2>&1" \
git rev-parse --git-dir --verify refs/invalid &&
- printf ".git\nfatal: Needed a single revision\n" >expect &&
- test_cmp expect output.txt
+ grep "^\\.git\$" output.txt &&
+ grep "Needed a single revision" output.txt
'
test_done
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 5868a87..1f600e2 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -17,7 +17,7 @@
test_cmp expect actual
'
-test_expect_success !AUTOIDENT 'requested identites are strict' '
+test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' '
(
sane_unset GIT_COMMITTER_NAME &&
sane_unset GIT_COMMITTER_EMAIL &&
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh
index 3f1f505..5343ffd 100755
--- a/t/t0011-hashmap.sh
+++ b/t/t0011-hashmap.sh
@@ -9,15 +9,6 @@
test_cmp expect actual
}
-test_expect_success 'hash functions' '
-
-test_hashmap "hash key1" "2215982743 2215982743 116372151 116372151" &&
-test_hashmap "hash key2" "2215982740 2215982740 116372148 116372148" &&
-test_hashmap "hash fooBarFrotz" "1383912807 1383912807 3189766727 3189766727" &&
-test_hashmap "hash foobarfrotz" "2862305959 2862305959 3189766727 3189766727"
-
-'
-
test_expect_success 'put' '
test_hashmap "put key1 value1
@@ -179,31 +170,45 @@
'
test_expect_success 'iterate' '
+ test-tool hashmap >actual.raw <<-\EOF &&
+ put key1 value1
+ put key2 value2
+ put fooBarFrotz value3
+ iterate
+ EOF
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-iterate" "NULL
-NULL
-NULL
-key2 value2
-key1 value1
-fooBarFrotz value3"
+ cat >expect <<-\EOF &&
+ NULL
+ NULL
+ NULL
+ fooBarFrotz value3
+ key1 value1
+ key2 value2
+ EOF
+ sort <actual.raw >actual &&
+ test_cmp expect actual
'
test_expect_success 'iterate (case insensitive)' '
+ test-tool hashmap ignorecase >actual.raw <<-\EOF &&
+ put key1 value1
+ put key2 value2
+ put fooBarFrotz value3
+ iterate
+ EOF
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-iterate" "NULL
-NULL
-NULL
-fooBarFrotz value3
-key2 value2
-key1 value1" ignorecase
+ cat >expect <<-\EOF &&
+ NULL
+ NULL
+ NULL
+ fooBarFrotz value3
+ key1 value1
+ key2 value2
+ EOF
+ sort <actual.raw >actual &&
+ test_cmp expect actual
'
test_expect_success 'grow / shrink' '
diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh
new file mode 100755
index 0000000..31f8276
--- /dev/null
+++ b/t/t0016-oidmap.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+test_description='test oidmap'
+. ./test-lib.sh
+
+# This purposefully is very similar to t0011-hashmap.sh
+
+test_oidmap () {
+ echo "$1" | test-tool oidmap $3 >actual &&
+ echo "$2" >expect &&
+ test_cmp expect actual
+}
+
+
+test_expect_success 'setup' '
+
+ test_commit one &&
+ test_commit two &&
+ test_commit three &&
+ test_commit four
+
+'
+
+test_expect_success 'put' '
+
+test_oidmap "put one 1
+put two 2
+put invalidOid 4
+put three 3" "NULL
+NULL
+Unknown oid: invalidOid
+NULL"
+
+'
+
+test_expect_success 'replace' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+put invalidOid 4
+put two deux
+put one un" "NULL
+NULL
+NULL
+Unknown oid: invalidOid
+2
+1"
+
+'
+
+test_expect_success 'get' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+get two
+get four
+get invalidOid
+get one" "NULL
+NULL
+NULL
+2
+NULL
+Unknown oid: invalidOid
+1"
+
+'
+
+test_expect_success 'remove' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+remove one
+remove two
+remove invalidOid
+remove four" "NULL
+NULL
+NULL
+1
+2
+Unknown oid: invalidOid
+NULL"
+
+'
+
+test_expect_success 'iterate' '
+ test-tool oidmap >actual.raw <<-\EOF &&
+ put one 1
+ put two 2
+ put three 3
+ iterate
+ EOF
+
+ # sort "expect" too so we do not rely on the order of particular oids
+ sort >expect <<-EOF &&
+ NULL
+ NULL
+ NULL
+ $(git rev-parse one) 1
+ $(git rev-parse two) 2
+ $(git rev-parse three) 3
+ EOF
+
+ sort <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh
new file mode 100755
index 0000000..c1ecf6a
--- /dev/null
+++ b/t/t0017-env-helper.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+test_description='test env--helper'
+
+. ./test-lib.sh
+
+
+test_expect_success 'env--helper usage' '
+ test_must_fail git env--helper &&
+ test_must_fail git env--helper --type=bool &&
+ test_must_fail git env--helper --type=ulong &&
+ test_must_fail git env--helper --type=bool &&
+ test_must_fail git env--helper --type=bool --default &&
+ test_must_fail git env--helper --type=bool --default= &&
+ test_must_fail git env--helper --defaultxyz
+'
+
+test_expect_success 'env--helper bad default values' '
+ test_must_fail git env--helper --type=bool --default=1xyz MISSING &&
+ test_must_fail git env--helper --type=ulong --default=1xyz MISSING
+'
+
+test_expect_success 'env--helper --type=bool' '
+ # Test various --default bool values
+ echo true >expected &&
+ git env--helper --type=bool --default=1 MISSING >actual &&
+ test_cmp expected actual &&
+ git env--helper --type=bool --default=yes MISSING >actual &&
+ test_cmp expected actual &&
+ git env--helper --type=bool --default=true MISSING >actual &&
+ test_cmp expected actual &&
+ echo false >expected &&
+ test_must_fail git env--helper --type=bool --default=0 MISSING >actual &&
+ test_cmp expected actual &&
+ test_must_fail git env--helper --type=bool --default=no MISSING >actual &&
+ test_cmp expected actual &&
+ test_must_fail git env--helper --type=bool --default=false MISSING >actual &&
+ test_cmp expected actual &&
+
+ # No output with --exit-code
+ git env--helper --type=bool --default=true --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+ test_must_fail git env--helper --type=bool --default=false --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ # Existing variable
+ EXISTS=true git env--helper --type=bool --default=false --exit-code EXISTS >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+ test_must_fail \
+ env EXISTS=false \
+ git env--helper --type=bool --default=true --exit-code EXISTS >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
+'
+
+test_expect_success 'env--helper --type=ulong' '
+ echo 1234567890 >expected &&
+ git env--helper --type=ulong --default=1234567890 MISSING >actual.out 2>actual.err &&
+ test_cmp expected actual.out &&
+ test_must_be_empty actual.err &&
+
+ echo 0 >expected &&
+ test_must_fail git env--helper --type=ulong --default=0 MISSING >actual &&
+ test_cmp expected actual &&
+
+ git env--helper --type=ulong --default=1234567890 --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ EXISTS=1234567890 git env--helper --type=ulong --default=0 EXISTS --exit-code >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ echo 1234567890 >expected &&
+ EXISTS=1234567890 git env--helper --type=ulong --default=0 EXISTS >actual.out 2>actual.err &&
+ test_cmp expected actual.out &&
+ test_must_be_empty actual.err
+'
+
+test_expect_success 'env--helper reads config thanks to trace2' '
+ mkdir home &&
+ git config -f home/.gitconfig include.path cycle &&
+ git config -f home/cycle include.path .gitconfig &&
+
+ test_must_fail \
+ env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=false \
+ git config -l 2>err &&
+ grep "exceeded maximum include depth" err &&
+
+ test_must_fail \
+ env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=true \
+ git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON 2>err &&
+ grep "# GETTEXT POISON #" err
+'
+
+test_done
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index e10f5f7..c954c70 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -390,6 +390,9 @@
EOF
test_cmp_exclude_clean expected.log debug.log &&
+ # Make sure that the file appears dirty, so checkout below has to
+ # run the configured filter.
+ touch test.r &&
filter_git checkout --quiet --no-progress empty-branch &&
cat >expected.log <<-EOF &&
START
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 3587e45..959b6da 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -15,8 +15,10 @@
pfx=$1
exp=$2.expect
act=$pfx.actual.$3
- tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" >"$exp" &&
- tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" >"$act" &&
+ tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" |
+ sed -e "s/0000*/$ZERO_OID/" >"$exp" &&
+ tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" |
+ sed -e "s/0000*/$ZERO_OID/" >"$act" &&
test_cmp "$exp" "$act" &&
rm "$exp" "$act"
}
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index e58ecbf..1090e65 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -6,6 +6,30 @@
GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING
+test_lazy_prereq NO_UTF16_BOM '
+ test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
+'
+
+test_lazy_prereq NO_UTF32_BOM '
+ test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
+'
+
+write_utf16 () {
+ if test_have_prereq NO_UTF16_BOM
+ then
+ printf '\xfe\xff'
+ fi &&
+ iconv -f UTF-8 -t UTF-16
+}
+
+write_utf32 () {
+ if test_have_prereq NO_UTF32_BOM
+ then
+ printf '\x00\x00\xfe\xff'
+ fi &&
+ iconv -f UTF-8 -t UTF-32
+}
+
test_expect_success 'setup test files' '
git config core.eol lf &&
@@ -13,8 +37,8 @@
echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes &&
echo "*.utf16lebom text working-tree-encoding=UTF-16LE-BOM" >>.gitattributes &&
printf "$text" >test.utf8.raw &&
- printf "$text" | iconv -f UTF-8 -t UTF-16 >test.utf16.raw &&
- printf "$text" | iconv -f UTF-8 -t UTF-32 >test.utf32.raw &&
+ printf "$text" | write_utf16 >test.utf16.raw &&
+ printf "$text" | write_utf32 >test.utf32.raw &&
printf "\377\376" >test.utf16lebom.raw &&
printf "$text" | iconv -f UTF-8 -t UTF-32LE >>test.utf16lebom.raw &&
@@ -25,12 +49,12 @@
# BOM tests
printf "\0a\0b\0c" >nobom.utf16be.raw &&
printf "a\0b\0c\0" >nobom.utf16le.raw &&
- printf "\376\777\0a\0b\0c" >bebom.utf16be.raw &&
- printf "\777\376a\0b\0c\0" >lebom.utf16le.raw &&
+ printf "\376\377\0a\0b\0c" >bebom.utf16be.raw &&
+ printf "\377\376a\0b\0c\0" >lebom.utf16le.raw &&
printf "\0\0\0a\0\0\0b\0\0\0c" >nobom.utf32be.raw &&
printf "a\0\0\0b\0\0\0c\0\0\0" >nobom.utf32le.raw &&
- printf "\0\0\376\777\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw &&
- printf "\777\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw &&
+ printf "\0\0\376\377\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw &&
+ printf "\377\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw &&
# Add only UTF-16 file, we will add the UTF-32 file later
cp test.utf16.raw test.utf16 &&
@@ -124,8 +148,8 @@
test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
test_when_finished "git reset --hard HEAD^" &&
- cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw &&
- cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw &&
+ cat lf.utf8.raw | write_utf${i} >lf.utf${i}.raw &&
+ cat crlf.utf8.raw | write_utf${i} >crlf.utf${i}.raw &&
cp crlf.utf${i}.raw eol.utf${i} &&
cat >expectIndexLF <<-EOF &&
@@ -223,7 +247,7 @@
text="hallo there!\nroundtrip test here!" &&
printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift &&
- printf "$text" | iconv -f UTF-8 -t UTF-16 >roundtrip.utf16 &&
+ printf "$text" | write_utf16 >roundtrip.utf16 &&
echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes &&
# SHIFT-JIS encoded files are round-trip checked by default...
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index b8f366c..705a136 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -48,6 +48,12 @@
-q, --quiet be quiet
--expect <string> expected output in the variable dump
+Alias
+ -A, --alias-source <string>
+ get a string
+ -Z, --alias-target <string>
+ get a string
+
EOF
test_expect_success 'test help' '
@@ -203,23 +209,38 @@
EOF
test_expect_success 'unambiguously abbreviated option' '
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
test_expect_success 'unambiguously abbreviated option with "="' '
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
test-tool parse-options --expect="integer: 2" --int=2
'
test_expect_success 'ambiguously abbreviated option' '
- test_expect_code 129 test-tool parse-options --strin 123
+ test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+ test-tool parse-options --strin 123
'
test_expect_success 'non ambiguous option (after two options it abbreviates)' '
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
test-tool parse-options --expect="string: 123" --st 123
'
+test_expect_success 'Alias options do not contribute to abbreviation' '
+ test-tool parse-options --alias-source 123 >output &&
+ grep "^string: 123" output &&
+ test-tool parse-options --alias-target 123 >output &&
+ grep "^string: 123" output &&
+ test_must_fail test-tool parse-options --alias &&
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+ test-tool parse-options --alias 123 >output &&
+ grep "^string: 123" output
+'
+
cat >typo.err <<\EOF
error: did you mean `--boolean` (with two dashes ?)
EOF
@@ -325,6 +346,7 @@
EOF
test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
test-tool parse-options --no-ambig >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
@@ -370,4 +392,18 @@
test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
'
+test_expect_success 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works' '
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+ test-tool parse-options --ye &&
+ test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
+ test-tool parse-options --ye
+'
+
+test_expect_success '--end-of-options treats remainder as args' '
+ test-tool parse-options \
+ --expect="verbose: -1" \
+ --expect="arg 00: --verbose" \
+ --end-of-options --verbose
+'
+
test_done
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index ebc4956..015fac8 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -210,4 +210,10 @@
test_cmp expect actual
'
+test_expect_success MINGW 'can spawn with argv[0] containing spaces' '
+ cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" ./ &&
+ test_must_fail "$PWD/test-fake-ssh$X" 2>err &&
+ grep TRASH_DIRECTORY err
+'
+
test_done
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
new file mode 100755
index 0000000..92910e4
--- /dev/null
+++ b/t/t0066-dir-iterator.sh
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+test_description='Test the dir-iterator functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ mkdir -p dir &&
+ mkdir -p dir/a/b/c/ &&
+ >dir/b &&
+ >dir/c &&
+ mkdir -p dir/d/e/d/ &&
+ >dir/a/b/c/d &&
+ >dir/a/e &&
+ >dir/d/e/d/a &&
+
+ mkdir -p dir2/a/b/c/ &&
+ >dir2/a/b/c/d
+'
+
+test_expect_success 'dir-iterator should iterate through all files' '
+ cat >expected-iteration-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir/a
+ [d] (a/b) [b] ./dir/a/b
+ [d] (a/b/c) [c] ./dir/a/b/c
+ [d] (d) [d] ./dir/d
+ [d] (d/e) [e] ./dir/d/e
+ [d] (d/e/d) [d] ./dir/d/e/d
+ [f] (a/b/c/d) [d] ./dir/a/b/c/d
+ [f] (a/e) [e] ./dir/a/e
+ [f] (b) [b] ./dir/b
+ [f] (c) [c] ./dir/c
+ [f] (d/e/d/a) [a] ./dir/d/e/d/a
+ EOF
+
+ test-tool dir-iterator ./dir >out &&
+ sort out >./actual-iteration-sorted-output &&
+
+ test_cmp expected-iteration-sorted-output actual-iteration-sorted-output
+'
+
+test_expect_success 'dir-iterator should list files in the correct order' '
+ cat >expected-pre-order-output <<-EOF &&
+ [d] (a) [a] ./dir2/a
+ [d] (a/b) [b] ./dir2/a/b
+ [d] (a/b/c) [c] ./dir2/a/b/c
+ [f] (a/b/c/d) [d] ./dir2/a/b/c/d
+ EOF
+
+ test-tool dir-iterator ./dir2 >actual-pre-order-output &&
+
+ test_cmp expected-pre-order-output actual-pre-order-output
+'
+
+test_expect_success 'begin should fail upon inexistent paths' '
+ test_must_fail test-tool dir-iterator ./inexistent-path \
+ >actual-inexistent-path-output &&
+ echo "dir_iterator_begin failure: ENOENT" >expected-inexistent-path-output &&
+ test_cmp expected-inexistent-path-output actual-inexistent-path-output
+'
+
+test_expect_success 'begin should fail upon non directory paths' '
+ test_must_fail test-tool dir-iterator ./dir/b >actual-non-dir-output &&
+ echo "dir_iterator_begin failure: ENOTDIR" >expected-non-dir-output &&
+ test_cmp expected-non-dir-output actual-non-dir-output
+'
+
+test_expect_success POSIXPERM,SANITY 'advance should not fail on errors by default' '
+ cat >expected-no-permissions-output <<-EOF &&
+ [d] (a) [a] ./dir3/a
+ EOF
+
+ mkdir -p dir3/a &&
+ >dir3/a/b &&
+ chmod 0 dir3/a &&
+
+ test-tool dir-iterator ./dir3 >actual-no-permissions-output &&
+ test_cmp expected-no-permissions-output actual-no-permissions-output &&
+ chmod 755 dir3/a &&
+ rm -rf dir3
+'
+
+test_expect_success POSIXPERM,SANITY 'advance should fail on errors, w/ pedantic flag' '
+ cat >expected-no-permissions-pedantic-output <<-EOF &&
+ [d] (a) [a] ./dir3/a
+ dir_iterator_advance failure
+ EOF
+
+ mkdir -p dir3/a &&
+ >dir3/a/b &&
+ chmod 0 dir3/a &&
+
+ test_must_fail test-tool dir-iterator --pedantic ./dir3 \
+ >actual-no-permissions-pedantic-output &&
+ test_cmp expected-no-permissions-pedantic-output \
+ actual-no-permissions-pedantic-output &&
+ chmod 755 dir3/a &&
+ rm -rf dir3
+'
+
+test_expect_success SYMLINKS 'setup dirs with symlinks' '
+ mkdir -p dir4/a &&
+ mkdir -p dir4/b/c &&
+ >dir4/a/d &&
+ ln -s d dir4/a/e &&
+ ln -s ../b dir4/a/f &&
+
+ mkdir -p dir5/a/b &&
+ mkdir -p dir5/a/c &&
+ ln -s ../c dir5/a/b/d &&
+ ln -s ../ dir5/a/b/e &&
+ ln -s ../../ dir5/a/b/f
+'
+
+test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default' '
+ cat >expected-no-follow-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir4/a
+ [d] (b) [b] ./dir4/b
+ [d] (b/c) [c] ./dir4/b/c
+ [f] (a/d) [d] ./dir4/a/d
+ [s] (a/e) [e] ./dir4/a/e
+ [s] (a/f) [f] ./dir4/a/f
+ EOF
+
+ test-tool dir-iterator ./dir4 >out &&
+ sort out >actual-no-follow-sorted-output &&
+
+ test_cmp expected-no-follow-sorted-output actual-no-follow-sorted-output
+'
+
+test_expect_success SYMLINKS 'dir-iterator should follow symlinks w/ follow flag' '
+ cat >expected-follow-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir4/a
+ [d] (a/f) [f] ./dir4/a/f
+ [d] (a/f/c) [c] ./dir4/a/f/c
+ [d] (b) [b] ./dir4/b
+ [d] (b/c) [c] ./dir4/b/c
+ [f] (a/d) [d] ./dir4/a/d
+ [f] (a/e) [e] ./dir4/a/e
+ EOF
+
+ test-tool dir-iterator --follow-symlinks ./dir4 >out &&
+ sort out >actual-follow-sorted-output &&
+
+ test_cmp expected-follow-sorted-output actual-follow-sorted-output
+'
+
+test_done
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 504334e..ce9a4a5 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -162,8 +162,8 @@
'
test_expect_success PERL 'commit -p with shrinking cache-tree' '
- mkdir -p deep/subdir &&
- echo content >deep/subdir/file &&
+ mkdir -p deep/very-long-subdir &&
+ echo content >deep/very-long-subdir/file &&
git add deep &&
git commit -m add &&
git rm -r deep &&
diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh
index a06269f..f9fa16a 100755
--- a/t/t0205-gettext-poison.sh
+++ b/t/t0205-gettext-poison.sh
@@ -5,7 +5,7 @@
test_description='Gettext Shell poison'
-GIT_TEST_GETTEXT_POISON=YesPlease
+GIT_TEST_GETTEXT_POISON=true
export GIT_TEST_GETTEXT_POISON
. ./lib-gettext.sh
@@ -31,4 +31,9 @@
test_cmp expect actual
'
+test_expect_success "gettext: invalid GIT_TEST_GETTEXT_POISON value doesn't infinitely loop" "
+ test_must_fail env GIT_TEST_GETTEXT_POISON=xyz git version 2>error &&
+ grep \"fatal: bad numeric config value 'xyz' for 'GIT_TEST_GETTEXT_POISON': invalid unit\" error
+"
+
test_done
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
new file mode 100755
index 0000000..ce7574e
--- /dev/null
+++ b/t/t0210-trace2-normal.sh
@@ -0,0 +1,189 @@
+#!/bin/sh
+
+test_description='test trace2 facility (normal target)'
+. ./test-lib.sh
+
+# Turn off any inherited trace2 settings for this test.
+sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
+sane_unset GIT_TRACE2_BRIEF
+sane_unset GIT_TRACE2_CONFIG_PARAMS
+
+# Add t/helper directory to PATH so that we can use a relative
+# path to run nested instances of test-tool.exe (see 004child).
+# This helps with HEREDOC comparisons later.
+TTDIR="$GIT_BUILD_DIR/t/helper/" && export TTDIR
+PATH="$TTDIR:$PATH" && export PATH
+
+# Warning: use of 'test_cmp' may run test-tool.exe and/or git.exe
+# Warning: to do the actual diff/comparison, so the HEREDOCs here
+# Warning: only cover our actual calls to test-tool and/or git.
+# Warning: So you may see extra lines in artifact files when
+# Warning: interactively debugging.
+
+V=$(git version | sed -e 's/^git version //') && export V
+
+# There are multiple trace2 targets: normal, perf, and event.
+# Trace2 events will/can be written to each active target (subject
+# to whatever filtering that target decides to do).
+# This script tests the normal target in isolation.
+#
+# Defer setting GIT_TRACE2 until the actual command line we want to test
+# because hidden git and test-tool commands run by the test harness
+# can contaminate our output.
+
+# Enable "brief" feature which turns off "<clock> <file>:<line> " prefix.
+GIT_TRACE2_BRIEF=1 && export GIT_TRACE2_BRIEF
+
+# Basic tests of the trace2 normal stream. Since this stream is used
+# primarily with printf-style debugging/tracing, we do limited testing
+# here.
+#
+# We do confirm the following API features:
+# [] the 'version <v>' event
+# [] the 'start <argv>' event
+# [] the 'cmd_name <name>' event
+# [] the 'exit <time> code:<code>' event
+# [] the 'atexit <time> code:<code>' event
+#
+# Fields of the form _FIELD_ are tokens that have been replaced (such
+# as the elapsed time).
+
+# Verb 001return
+#
+# Implicit return from cmd_<verb> function propagates <code>.
+
+test_expect_success 'normal stream, return code 0' '
+ test_when_finished "rm trace.normal actual expect" &&
+ GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 001return 0
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'normal stream, return code 1' '
+ test_when_finished "rm trace.normal actual expect" &&
+ test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 001return 1
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:1
+ atexit elapsed:_TIME_ code:1
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'automatic filename' '
+ test_when_finished "rm -r traces actual expect" &&
+ mkdir traces &&
+ GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 001return 0
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+# Verb 002exit
+#
+# Explicit exit(code) from within cmd_<verb> propagates <code>.
+
+test_expect_success 'normal stream, exit code 0' '
+ test_when_finished "rm trace.normal actual expect" &&
+ GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 002exit 0
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'normal stream, exit code 1' '
+ test_when_finished "rm trace.normal actual expect" &&
+ test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 002exit 1
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:1
+ atexit elapsed:_TIME_ code:1
+ EOF
+ test_cmp expect actual
+'
+
+# Verb 003error
+#
+# To the above, add multiple 'error <msg>' events
+
+test_expect_success 'normal stream, error event' '
+ test_when_finished "rm trace.normal actual expect" &&
+ GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 003error '\''hello world'\'' '\''this is a test'\''
+ cmd_name trace2 (trace2)
+ error hello world
+ error this is a test
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+sane_unset GIT_TRACE2_BRIEF
+
+# Now test without environment variables and get all Trace2 settings
+# from the global config.
+
+test_expect_success 'using global config, normal stream, return code 0' '
+ test_when_finished "rm trace.normal actual expect" &&
+ test_config_global trace2.normalBrief 1 &&
+ test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+ test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 001return 0
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'using global config with include' '
+ test_when_finished "rm trace.normal actual expect real.gitconfig" &&
+ test_config_global trace2.normalBrief 1 &&
+ test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+ mv "$(pwd)/.gitconfig" "$(pwd)/real.gitconfig" &&
+ test_config_global include.path "$(pwd)/real.gitconfig" &&
+ test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 001return 0
+ cmd_name trace2 (trace2)
+ exit elapsed:_TIME_ code:0
+ atexit elapsed:_TIME_ code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0210/scrub_normal.perl b/t/t0210/scrub_normal.perl
new file mode 100644
index 0000000..c65d1a8
--- /dev/null
+++ b/t/t0210/scrub_normal.perl
@@ -0,0 +1,48 @@
+#!/usr/bin/perl
+#
+# Scrub the variable fields from the normal trace2 output to
+# make testing easier.
+
+use strict;
+use warnings;
+
+my $float = '[0-9]*\.[0-9]+([eE][-+]?[0-9]+)?';
+
+# This code assumes that the trace2 data was written with bare
+# turned on (which omits the "<clock> <file>:<line>" prefix.
+
+while (<>) {
+ # Various messages include an elapsed time in the middle
+ # of the message. Replace the time with a placeholder to
+ # simplify our HEREDOC in the test script.
+ s/elapsed:$float/elapsed:_TIME_/g;
+
+ my $line = $_;
+
+ # we expect:
+ # start <argv0> [<argv1> [<argv2> [...]]]
+ #
+ # where argv0 might be a relative or absolute path, with
+ # or without quotes, and platform dependent. Replace argv0
+ # with a token for HEREDOC matching in the test script.
+
+ if ($line =~ m/^start/) {
+ $line =~ /^start\s+(.*)/;
+ my $argv = $1;
+ $argv =~ m/(\'[^\']*\'|[^ ]+)\s+(.*)/;
+ my $argv_0 = $1;
+ my $argv_rest = $2;
+
+ print "start _EXE_ $argv_rest\n";
+ }
+ elsif ($line =~ m/^cmd_path/) {
+ # Likewise, the 'cmd_path' message breaks out argv[0].
+ #
+ # This line is only emitted when RUNTIME_PREFIX is defined,
+ # so just omit it for testing purposes.
+ # print "cmd_path _EXE_\n";
+ }
+ else {
+ print "$line";
+ }
+}
diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh
new file mode 100755
index 0000000..6ee8ee3
--- /dev/null
+++ b/t/t0211-trace2-perf.sh
@@ -0,0 +1,174 @@
+#!/bin/sh
+
+test_description='test trace2 facility (perf target)'
+. ./test-lib.sh
+
+# Turn off any inherited trace2 settings for this test.
+sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
+sane_unset GIT_TRACE2_PERF_BRIEF
+sane_unset GIT_TRACE2_CONFIG_PARAMS
+
+# Add t/helper directory to PATH so that we can use a relative
+# path to run nested instances of test-tool.exe (see 004child).
+# This helps with HEREDOC comparisons later.
+TTDIR="$GIT_BUILD_DIR/t/helper/" && export TTDIR
+PATH="$TTDIR:$PATH" && export PATH
+
+# Warning: use of 'test_cmp' may run test-tool.exe and/or git.exe
+# Warning: to do the actual diff/comparison, so the HEREDOCs here
+# Warning: only cover our actual calls to test-tool and/or git.
+# Warning: So you may see extra lines in artifact files when
+# Warning: interactively debugging.
+
+V=$(git version | sed -e 's/^git version //') && export V
+
+# There are multiple trace2 targets: normal, perf, and event.
+# Trace2 events will/can be written to each active target (subject
+# to whatever filtering that target decides to do).
+# Test each target independently.
+#
+# Defer setting GIT_TRACE2_PERF until the actual command we want to
+# test because hidden git and test-tool commands in the test
+# harness can contaminate our output.
+
+# Enable "brief" feature which turns off the prefix:
+# "<clock> <file>:<line> | <nr_parents> | "
+GIT_TRACE2_PERF_BRIEF=1 && export GIT_TRACE2_PERF_BRIEF
+
+# Repeat some of the t0210 tests using the perf target stream instead of
+# the normal stream.
+#
+# Tokens here of the form _FIELD_ have been replaced in the observed output.
+
+# Verb 001return
+#
+# Implicit return from cmd_<verb> function propagates <code>.
+
+test_expect_success 'perf stream, return code 0' '
+ test_when_finished "rm trace.perf actual expect" &&
+ GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+ cat >expect <<-EOF &&
+ d0|main|version|||||$V
+ d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
+ d0|main|cmd_name|||||trace2 (trace2)
+ d0|main|exit||_T_ABS_|||code:0
+ d0|main|atexit||_T_ABS_|||code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'perf stream, return code 1' '
+ test_when_finished "rm trace.perf actual expect" &&
+ test_must_fail env GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 1 &&
+ perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+ cat >expect <<-EOF &&
+ d0|main|version|||||$V
+ d0|main|start||_T_ABS_|||_EXE_ trace2 001return 1
+ d0|main|cmd_name|||||trace2 (trace2)
+ d0|main|exit||_T_ABS_|||code:1
+ d0|main|atexit||_T_ABS_|||code:1
+ EOF
+ test_cmp expect actual
+'
+
+# Verb 003error
+#
+# To the above, add multiple 'error <msg>' events
+
+test_expect_success 'perf stream, error event' '
+ test_when_finished "rm trace.perf actual expect" &&
+ GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 003error "hello world" "this is a test" &&
+ perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+ cat >expect <<-EOF &&
+ d0|main|version|||||$V
+ d0|main|start||_T_ABS_|||_EXE_ trace2 003error '\''hello world'\'' '\''this is a test'\''
+ d0|main|cmd_name|||||trace2 (trace2)
+ d0|main|error|||||hello world
+ d0|main|error|||||this is a test
+ d0|main|exit||_T_ABS_|||code:0
+ d0|main|atexit||_T_ABS_|||code:0
+ EOF
+ test_cmp expect actual
+'
+
+# Verb 004child
+#
+# Test nested spawning of child processes.
+#
+# Conceptually, this looks like:
+# P1: TT trace2 004child
+# P2: |--- TT trace2 004child
+# P3: |--- TT trace2 001return 0
+#
+# Which should generate events:
+# P1: version
+# P1: start
+# P1: cmd_name
+# P1: child_start
+# P2: version
+# P2: start
+# P2: cmd_name
+# P2: child_start
+# P3: version
+# P3: start
+# P3: cmd_name
+# P3: exit
+# P3: atexit
+# P2: child_exit
+# P2: exit
+# P2: atexit
+# P1: child_exit
+# P1: exit
+# P1: atexit
+
+test_expect_success 'perf stream, child processes' '
+ test_when_finished "rm trace.perf actual expect" &&
+ GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+ cat >expect <<-EOF &&
+ d0|main|version|||||$V
+ d0|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 004child test-tool trace2 001return 0
+ d0|main|cmd_name|||||trace2 (trace2)
+ d0|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 004child test-tool trace2 001return 0]
+ d1|main|version|||||$V
+ d1|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 001return 0
+ d1|main|cmd_name|||||trace2 (trace2/trace2)
+ d1|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 001return 0]
+ d2|main|version|||||$V
+ d2|main|start||_T_ABS_|||_EXE_ trace2 001return 0
+ d2|main|cmd_name|||||trace2 (trace2/trace2/trace2)
+ d2|main|exit||_T_ABS_|||code:0
+ d2|main|atexit||_T_ABS_|||code:0
+ d1|main|child_exit||_T_ABS_|_T_REL_||[ch0] pid:_PID_ code:0
+ d1|main|exit||_T_ABS_|||code:0
+ d1|main|atexit||_T_ABS_|||code:0
+ d0|main|child_exit||_T_ABS_|_T_REL_||[ch0] pid:_PID_ code:0
+ d0|main|exit||_T_ABS_|||code:0
+ d0|main|atexit||_T_ABS_|||code:0
+ EOF
+ test_cmp expect actual
+'
+
+sane_unset GIT_TRACE2_PERF_BRIEF
+
+# Now test without environment variables and get all Trace2 settings
+# from the global config.
+
+test_expect_success 'using global config, perf stream, return code 0' '
+ test_when_finished "rm trace.perf actual expect" &&
+ test_config_global trace2.perfBrief 1 &&
+ test_config_global trace2.perfTarget "$(pwd)/trace.perf" &&
+ test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+ cat >expect <<-EOF &&
+ d0|main|version|||||$V
+ d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
+ d0|main|cmd_name|||||trace2 (trace2)
+ d0|main|exit||_T_ABS_|||code:0
+ d0|main|atexit||_T_ABS_|||code:0
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0211/scrub_perf.perl b/t/t0211/scrub_perf.perl
new file mode 100644
index 0000000..351af78
--- /dev/null
+++ b/t/t0211/scrub_perf.perl
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+#
+# Scrub the variable fields from the perf trace2 output to
+# make testing easier.
+
+use strict;
+use warnings;
+
+my $qpath = '\'[^\']*\'|[^ ]*';
+
+my $col_depth=0;
+my $col_thread=1;
+my $col_event=2;
+my $col_repo=3;
+my $col_t_abs=4;
+my $col_t_rel=5;
+my $col_category=6;
+my $col_rest=7;
+
+# This code assumes that the trace2 data was written with bare
+# turned on (which omits the "<clock> <file>:<line> | <parents>"
+# prefix.
+
+while (<>) {
+ my @tokens = split /\|/;
+
+ foreach my $col (@tokens) { $col =~ s/^\s+|\s+$//g; }
+
+ if ($tokens[$col_event] =~ m/^start/) {
+ # The 'start' message lists the contents of argv in $col_rest.
+ # On some platforms (Windows), argv[0] is *sometimes* a canonical
+ # absolute path to the EXE rather than the value passed in the
+ # shell script. Replace it with a placeholder to simplify our
+ # HEREDOC in the test script.
+ my $argv0;
+ my $argvRest;
+ $tokens[$col_rest] =~ s/^($qpath)\W*(.*)/_EXE_ $2/;
+ }
+ elsif ($tokens[$col_event] =~ m/cmd_path/) {
+ # Likewise, the 'cmd_path' message breaks out argv[0].
+ #
+ # This line is only emitted when RUNTIME_PREFIX is defined,
+ # so just omit it for testing purposes.
+ # $tokens[$col_rest] = "_EXE_";
+ goto SKIP_LINE;
+ }
+ elsif ($tokens[$col_event] =~ m/child_exit/) {
+ $tokens[$col_rest] =~ s/ pid:\d* / pid:_PID_ /;
+ }
+ elsif ($tokens[$col_event] =~ m/data/) {
+ if ($tokens[$col_category] =~ m/process/) {
+ # 'data' and 'data_json' events containing 'process'
+ # category data are assumed to be platform-specific
+ # and highly variable. Just omit them.
+ goto SKIP_LINE;
+ }
+ }
+
+ # t_abs and t_rel are either blank or a float. Replace the float
+ # with a constant for matching the HEREDOC in the test script.
+ if ($tokens[$col_t_abs] =~ m/\d/) {
+ $tokens[$col_t_abs] = "_T_ABS_";
+ }
+ if ($tokens[$col_t_rel] =~ m/\d/) {
+ $tokens[$col_t_rel] = "_T_REL_";
+ }
+
+ my $out;
+
+ $out = join('|', @tokens);
+ print "$out\n";
+
+ SKIP_LINE:
+}
+
+
diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh
new file mode 100755
index 0000000..ff5b9cc
--- /dev/null
+++ b/t/t0212-trace2-event.sh
@@ -0,0 +1,268 @@
+#!/bin/sh
+
+test_description='test trace2 facility'
+. ./test-lib.sh
+
+# Turn off any inherited trace2 settings for this test.
+sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
+sane_unset GIT_TRACE2_BARE
+sane_unset GIT_TRACE2_CONFIG_PARAMS
+
+perl -MJSON::PP -e 0 >/dev/null 2>&1 && test_set_prereq JSON_PP
+
+# Add t/helper directory to PATH so that we can use a relative
+# path to run nested instances of test-tool.exe (see 004child).
+# This helps with HEREDOC comparisons later.
+TTDIR="$GIT_BUILD_DIR/t/helper/" && export TTDIR
+PATH="$TTDIR:$PATH" && export PATH
+
+# Warning: use of 'test_cmp' may run test-tool.exe and/or git.exe
+# Warning: to do the actual diff/comparison, so the HEREDOCs here
+# Warning: only cover our actual calls to test-tool and/or git.
+# Warning: So you may see extra lines in artifact files when
+# Warning: interactively debugging.
+
+V=$(git version | sed -e 's/^git version //') && export V
+
+# There are multiple trace2 targets: normal, perf, and event.
+# Trace2 events will/can be written to each active target (subject
+# to whatever filtering that target decides to do).
+# Test each target independently.
+#
+# Defer setting GIT_TRACE2_PERF until the actual command we want to
+# test because hidden git and test-tool commands in the test
+# harness can contaminate our output.
+
+# We don't bother repeating the 001return and 002exit tests, since they
+# have coverage in the normal and perf targets.
+
+# Verb 003error
+#
+# To the above, add multiple 'error <msg>' events
+
+test_expect_success JSON_PP 'event stream, error event' '
+ test_when_finished "rm trace.event actual expect" &&
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello world" "this is a test" &&
+ perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+ sed -e "s/^|//" >expect <<-EOF &&
+ |VAR1 = {
+ | "_SID0_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "003error",
+ | "hello world",
+ | "this is a test"
+ | ],
+ | "errors":[
+ | "%s",
+ | "%s"
+ | ],
+ | "exit_code":0,
+ | "hierarchy":"trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | }
+ |};
+ EOF
+ test_cmp expect actual
+'
+
+# Verb 004child
+#
+# Test nested spawning of child processes.
+#
+# Conceptually, this looks like:
+# P1: TT trace2 004child
+# P2: |--- TT trace2 004child
+# P3: |--- TT trace2 001return 0
+
+test_expect_success JSON_PP 'event stream, return code 0' '
+ test_when_finished "rm trace.event actual expect" &&
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+ sed -e "s/^|//" >expect <<-EOF &&
+ |VAR1 = {
+ | "_SID0_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "004child",
+ | "test-tool",
+ | "trace2",
+ | "004child",
+ | "test-tool",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "child":{
+ | "0":{
+ | "child_argv":[
+ | "_EXE_",
+ | "trace2",
+ | "004child",
+ | "test-tool",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "child_class":"?",
+ | "child_code":0,
+ | "use_shell":0
+ | }
+ | },
+ | "exit_code":0,
+ | "hierarchy":"trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | },
+ | "_SID0_/_SID1_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "004child",
+ | "test-tool",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "child":{
+ | "0":{
+ | "child_argv":[
+ | "_EXE_",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "child_class":"?",
+ | "child_code":0,
+ | "use_shell":0
+ | }
+ | },
+ | "exit_code":0,
+ | "hierarchy":"trace2/trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | },
+ | "_SID0_/_SID1_/_SID2_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "exit_code":0,
+ | "hierarchy":"trace2/trace2/trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | }
+ |};
+ EOF
+ test_cmp expect actual
+'
+
+# Test listing of all "interesting" config settings.
+
+test_expect_success JSON_PP 'event stream, list config' '
+ test_when_finished "rm trace.event actual expect" &&
+ git config --local t0212.abc 1 &&
+ git config --local t0212.def "hello world" &&
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" GIT_TRACE2_CONFIG_PARAMS="t0212.*" test-tool trace2 001return 0 &&
+ perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+ sed -e "s/^|//" >expect <<-EOF &&
+ |VAR1 = {
+ | "_SID0_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "001return",
+ | "0"
+ | ],
+ | "exit_code":0,
+ | "hierarchy":"trace2",
+ | "name":"trace2",
+ | "params":[
+ | {
+ | "param":"t0212.abc",
+ | "value":"1"
+ | },
+ | {
+ | "param":"t0212.def",
+ | "value":"hello world"
+ | }
+ | ],
+ | "version":"$V"
+ | }
+ |};
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success JSON_PP 'basic trace2_data' '
+ test_when_finished "rm trace.event actual expect" &&
+ GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
+ perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+ sed -e "s/^|//" >expect <<-EOF &&
+ |VAR1 = {
+ | "_SID0_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "006data",
+ | "test_category",
+ | "k1",
+ | "v1",
+ | "test_category",
+ | "k2",
+ | "v2"
+ | ],
+ | "data":{
+ | "test_category":{
+ | "k1":"v1",
+ | "k2":"v2"
+ | }
+ | },
+ | "exit_code":0,
+ | "hierarchy":"trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | }
+ |};
+ EOF
+ test_cmp expect actual
+'
+
+# Now test without environment variables and get all Trace2 settings
+# from the global config.
+
+test_expect_success JSON_PP 'using global config, event stream, error event' '
+ test_when_finished "rm trace.event actual expect" &&
+ test_config_global trace2.eventTarget "$(pwd)/trace.event" &&
+ test-tool trace2 003error "hello world" "this is a test" &&
+ perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+ sed -e "s/^|//" >expect <<-EOF &&
+ |VAR1 = {
+ | "_SID0_":{
+ | "argv":[
+ | "_EXE_",
+ | "trace2",
+ | "003error",
+ | "hello world",
+ | "this is a test"
+ | ],
+ | "errors":[
+ | "%s",
+ | "%s"
+ | ],
+ | "exit_code":0,
+ | "hierarchy":"trace2",
+ | "name":"trace2",
+ | "version":"$V"
+ | }
+ |};
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0212/parse_events.perl b/t/t0212/parse_events.perl
new file mode 100644
index 0000000..6584bb5
--- /dev/null
+++ b/t/t0212/parse_events.perl
@@ -0,0 +1,251 @@
+#!/usr/bin/perl
+#
+# Parse event stream and convert individual events into a summary
+# record for the process.
+#
+# Git.exe generates one or more "event" records for each API method,
+# such as "start <argv>" and "exit <code>", during the life of the git
+# process. Additionally, the input may contain interleaved events
+# from multiple concurrent git processes and/or multiple threads from
+# within a git process.
+#
+# Accumulate events for each process (based on its unique SID) in a
+# dictionary and emit process summary records.
+#
+# Convert some of the variable fields (such as elapsed time) into
+# placeholders (or omit them) to make HEREDOC comparisons easier in
+# the test scripts.
+#
+# We may also omit fields not (currently) useful for testing purposes.
+
+use strict;
+use warnings;
+use JSON::PP;
+use Data::Dumper;
+use Getopt::Long;
+
+# The version of the trace2 event target format that we understand.
+# This is reported in the 'version' event in the 'evt' field.
+# It comes from the GIT_TRACE2_EVENT_VERSION macro in trace2/tr2_tgt_event.c
+my $evt_version = '1';
+
+my $show_children = 1;
+my $show_exec = 1;
+my $show_threads = 1;
+
+# A hack to generate test HEREDOC data for pasting into the test script.
+# Usage:
+# cd "t/trash directory.t0212-trace2-event"
+# $TT trace ... >trace.event
+# VV=$(../../git.exe version | sed -e 's/^git version //')
+# perl ../t0212/parse_events.perl --HEREDOC --VERSION=$VV <trace.event >heredoc
+# Then paste heredoc into your new test.
+
+my $gen_heredoc = 0;
+my $gen_version = '';
+
+GetOptions("children!" => \$show_children,
+ "exec!" => \$show_exec,
+ "threads!" => \$show_threads,
+ "HEREDOC!" => \$gen_heredoc,
+ "VERSION=s" => \$gen_version )
+ or die("Error in command line arguments\n");
+
+
+# SIDs contains timestamps and PIDs of the process and its parents.
+# This makes it difficult to match up in a HEREDOC in the test script.
+# Build a map from actual SIDs to predictable constant values and yet
+# keep the parent/child relationships. For example:
+# {..., "sid":"1539706952458276-8652", ...}
+# {..., "sid":"1539706952458276-8652/1539706952649493-15452", ...}
+# becomes:
+# {..., "sid":"_SID1_", ...}
+# {..., "sid":"_SID1_/_SID2_", ...}
+my $sid_map;
+my $sid_count = 0;
+
+my $processes;
+
+while (<>) {
+ my $line = decode_json( $_ );
+
+ my $sid = "";
+ my $sid_sep = "";
+
+ my $raw_sid = $line->{'sid'};
+ my @raw_sid_parts = split /\//, $raw_sid;
+ foreach my $raw_sid_k (@raw_sid_parts) {
+ if (!exists $sid_map->{$raw_sid_k}) {
+ $sid_map->{$raw_sid_k} = '_SID' . $sid_count . '_';
+ $sid_count++;
+ }
+ $sid = $sid . $sid_sep . $sid_map->{$raw_sid_k};
+ $sid_sep = '/';
+ }
+
+ my $event = $line->{'event'};
+
+ if ($event eq 'version') {
+ $processes->{$sid}->{'version'} = $line->{'exe'};
+ if ($gen_heredoc == 1 && $gen_version eq $line->{'exe'}) {
+ # If we are generating data FOR the test script, replace
+ # the reported git.exe version with a reference to an
+ # environment variable. When our output is pasted into
+ # the test script, it will then be expanded in future
+ # test runs to the THEN current version of git.exe.
+ # We assume that the test script uses env var $V.
+ $processes->{$sid}->{'version'} = "\$V";
+ }
+ }
+
+ elsif ($event eq 'start') {
+ $processes->{$sid}->{'argv'} = $line->{'argv'};
+ $processes->{$sid}->{'argv'}[0] = "_EXE_";
+ }
+
+ elsif ($event eq 'exit') {
+ $processes->{$sid}->{'exit_code'} = $line->{'code'};
+ }
+
+ elsif ($event eq 'atexit') {
+ $processes->{$sid}->{'exit_code'} = $line->{'code'};
+ }
+
+ elsif ($event eq 'error') {
+ # For HEREDOC purposes, use the error message format string if
+ # available, rather than the formatted message (which probably
+ # has an absolute pathname).
+ if (exists $line->{'fmt'}) {
+ push( @{$processes->{$sid}->{'errors'}}, $line->{'fmt'} );
+ }
+ elsif (exists $line->{'msg'}) {
+ push( @{$processes->{$sid}->{'errors'}}, $line->{'msg'} );
+ }
+ }
+
+ elsif ($event eq 'cmd_path') {
+ ## $processes->{$sid}->{'path'} = $line->{'path'};
+ #
+ # Like in the 'start' event, we need to replace the value of
+ # argv[0] with a token for HEREDOC purposes. However, the
+ # event is only emitted when RUNTIME_PREFIX is defined, so
+ # just omit it for testing purposes.
+ # $processes->{$sid}->{'path'} = "_EXE_";
+ }
+
+ elsif ($event eq 'cmd_name') {
+ $processes->{$sid}->{'name'} = $line->{'name'};
+ $processes->{$sid}->{'hierarchy'} = $line->{'hierarchy'};
+ }
+
+ elsif ($event eq 'alias') {
+ $processes->{$sid}->{'alias'}->{'key'} = $line->{'alias'};
+ $processes->{$sid}->{'alias'}->{'argv'} = $line->{'argv'};
+ }
+
+ elsif ($event eq 'def_param') {
+ my $kv;
+ $kv->{'param'} = $line->{'param'};
+ $kv->{'value'} = $line->{'value'};
+ push( @{$processes->{$sid}->{'params'}}, $kv );
+ }
+
+ elsif ($event eq 'child_start') {
+ if ($show_children == 1) {
+ $processes->{$sid}->{'child'}->{$line->{'child_id'}}->{'child_class'} = $line->{'child_class'};
+ $processes->{$sid}->{'child'}->{$line->{'child_id'}}->{'child_argv'} = $line->{'argv'};
+ $processes->{$sid}->{'child'}->{$line->{'child_id'}}->{'child_argv'}[0] = "_EXE_";
+ $processes->{$sid}->{'child'}->{$line->{'child_id'}}->{'use_shell'} = $line->{'use_shell'} ? 1 : 0;
+ }
+ }
+
+ elsif ($event eq 'child_exit') {
+ if ($show_children == 1) {
+ $processes->{$sid}->{'child'}->{$line->{'child_id'}}->{'child_code'} = $line->{'code'};
+ }
+ }
+
+ # TODO decide what information we want to test from thread events.
+
+ elsif ($event eq 'thread_start') {
+ if ($show_threads == 1) {
+ }
+ }
+
+ elsif ($event eq 'thread_exit') {
+ if ($show_threads == 1) {
+ }
+ }
+
+ # TODO decide what information we want to test from exec events.
+
+ elsif ($event eq 'exec') {
+ if ($show_exec == 1) {
+ }
+ }
+
+ elsif ($event eq 'exec_result') {
+ if ($show_exec == 1) {
+ }
+ }
+
+ elsif ($event eq 'def_param') {
+ # Accumulate parameter key/value pairs by key rather than in an array
+ # so that we get overwrite (last one wins) effects.
+ $processes->{$sid}->{'params'}->{$line->{'param'}} = $line->{'value'};
+ }
+
+ elsif ($event eq 'def_repo') {
+ # $processes->{$sid}->{'repos'}->{$line->{'repo'}} = $line->{'worktree'};
+ $processes->{$sid}->{'repos'}->{$line->{'repo'}} = "_WORKTREE_";
+ }
+
+ # A series of potentially nested and threaded region and data events
+ # is fundamentally incompatibile with the type of summary record we
+ # are building in this script. Since they are intended for
+ # perf-trace-like analysis rather than a result summary, we ignore
+ # most of them here.
+
+ # elsif ($event eq 'region_enter') {
+ # }
+ # elsif ($event eq 'region_leave') {
+ # }
+
+ elsif ($event eq 'data') {
+ my $cat = $line->{'category'};
+ if ($cat eq 'test_category') {
+
+ my $key = $line->{'key'};
+ my $value = $line->{'value'};
+ $processes->{$sid}->{'data'}->{$cat}->{$key} = $value;
+ }
+ }
+
+ # This trace2 target does not emit 'printf' events.
+ #
+ # elsif ($event eq 'printf') {
+ # }
+}
+
+# Dump the resulting hash into something that we can compare against
+# in the test script. These options make Dumper output look a little
+# bit like JSON. Also convert variable references of the form "$VAR*"
+# so that the matching HEREDOC doesn't need to escape it.
+
+$Data::Dumper::Sortkeys = 1;
+$Data::Dumper::Indent = 1;
+$Data::Dumper::Purity = 1;
+$Data::Dumper::Pair = ':';
+
+my $out = Dumper($processes);
+$out =~ s/'/"/g;
+$out =~ s/\$VAR/VAR/g;
+
+# Finally, if we're running this script to generate (manually confirmed)
+# data to add to the test script, guard the indentation.
+
+if ($gen_heredoc == 1) {
+ $out =~ s/^/\t\|/gms;
+}
+
+print $out;
diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
index fd92533..ebd5fa5 100755
--- a/t/t0301-credential-cache.sh
+++ b/t/t0301-credential-cache.sh
@@ -10,7 +10,7 @@
}
# don't leave a stale daemon running
-trap 'code=$?; git credential-cache exit; (exit $code); die' EXIT
+test_atexit 'git credential-cache exit'
# test that the daemon works with no special setup
helper_test cache
@@ -108,9 +108,4 @@
helper_test_timeout cache --timeout=1
-# we can't rely on our "trap" above working after test_done,
-# as test_done will delete the trash directory containing
-# our socket, leaving us with no way to access the daemon.
-git credential-cache exit
-
test_done
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index bce0278..d4b7e53 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -26,7 +26,7 @@
test_expect_success 'extensions.partialclone without filter' '
test_create_repo server &&
git clone --filter="blob:none" "file://$(pwd)/server" client &&
- git -C client config --unset core.partialclonefilter &&
+ git -C client config --unset remote.origin.partialclonefilter &&
git -C client fetch origin
'
@@ -166,8 +166,9 @@
# associated packfile contains the object
ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
test_line_count = 1 promisorlist &&
- IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
- git verify-pack --verbose "$IDX" | grep "$HASH"
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH" out
'
test_expect_success 'fetching of missing objects works with ref-in-want enabled' '
@@ -182,8 +183,55 @@
grep "git< fetch=.*ref-in-want" trace
'
+test_expect_success 'fetching of missing objects from another promisor remote' '
+ git clone "file://$(pwd)/server" server2 &&
+ test_commit -C server2 bar &&
+ git -C server2 repack -a -d --write-bitmap-index &&
+ HASH2=$(git -C server2 rev-parse bar) &&
+
+ git -C repo remote add server2 "file://$(pwd)/server2" &&
+ git -C repo config remote.server2.promisor true &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ git -C repo fetch server2 &&
+ rm -rf repo/.git/objects/* &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ # Ensure that the .promisor file is written, and check that its
+ # associated packfile contains the object
+ ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+ test_line_count = 1 promisorlist &&
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH2" out
+'
+
+test_expect_success 'fetching of missing objects configures a promisor remote' '
+ git clone "file://$(pwd)/server" server3 &&
+ test_commit -C server3 baz &&
+ git -C server3 repack -a -d --write-bitmap-index &&
+ HASH3=$(git -C server3 rev-parse baz) &&
+ git -C server3 config uploadpack.allowfilter 1 &&
+
+ rm repo/.git/objects/pack/pack-*.promisor &&
+
+ git -C repo remote add server3 "file://$(pwd)/server3" &&
+ git -C repo fetch --filter="blob:none" server3 $HASH3 &&
+
+ test_cmp_config -C repo true remote.server3.promisor &&
+
+ # Ensure that the .promisor file is written, and check that its
+ # associated packfile contains the object
+ ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+ test_line_count = 1 promisorlist &&
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH3" out
+'
+
test_expect_success 'fetching of missing blobs works' '
- rm -rf server repo &&
+ rm -rf server server2 repo &&
+ rm -rf server server3 repo &&
test_create_repo server &&
test_commit -C server foo &&
git -C server repack -a -d --write-bitmap-index &&
@@ -234,7 +282,7 @@
git -C repo config core.repositoryformatversion 1 &&
git -C repo config extensions.partialclone "arbitrary string" &&
- GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
+ GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
grep $(git -C repo rev-parse bar) out &&
! grep $FOO out
'
@@ -514,10 +562,12 @@
# associated packfile contains the object
ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
test_line_count = 1 promisorlist &&
- IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
- git verify-pack --verbose "$IDX" | grep "$HASH"
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH" out
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index a377530..64b340f 100755
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -9,22 +9,19 @@
}
test_blob_does_not_exist() {
- test_expect_success SHA1 'blob does not exist in database' "
+ test_expect_success 'blob does not exist in database' "
test_must_fail git cat-file blob $1
"
}
test_blob_exists() {
- test_expect_success SHA1 'blob exists in database' "
+ test_expect_success 'blob exists in database' "
git cat-file blob $1
"
}
hello_content="Hello World"
-hello_sha1=5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-
example_content="This is an example"
-example_sha1=ddd3f836d3e3fbb7ae289aa9ae83536f76956399
setup_repo() {
echo_without_newline "$hello_content" > hello
@@ -44,7 +41,16 @@
rm -rf $test_repo
}
-setup_repo
+test_expect_success 'setup' '
+ setup_repo &&
+ test_oid_cache <<-EOF
+ hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+ hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
+
+ example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+ example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+ EOF
+'
# Argument checking
@@ -73,23 +79,23 @@
push_repo
-test_expect_success SHA1 'hash a file' '
- test $hello_sha1 = $(git hash-object hello)
+test_expect_success 'hash a file' '
+ test "$(test_oid hello)" = $(git hash-object hello)
'
-test_blob_does_not_exist $hello_sha1
+test_blob_does_not_exist "$(test_oid hello)"
-test_expect_success SHA1 'hash from stdin' '
- test $example_sha1 = $(git hash-object --stdin < example)
+test_expect_success 'hash from stdin' '
+ test "$(test_oid example)" = $(git hash-object --stdin < example)
'
-test_blob_does_not_exist $example_sha1
+test_blob_does_not_exist "$(test_oid example)"
-test_expect_success SHA1 'hash a file and write to database' '
- test $hello_sha1 = $(git hash-object -w hello)
+test_expect_success 'hash a file and write to database' '
+ test "$(test_oid hello)" = $(git hash-object -w hello)
'
-test_blob_exists $hello_sha1
+test_blob_exists "$(test_oid hello)"
test_expect_success 'git hash-object --stdin file1 <file0 first operates on file0, then file1' '
echo foo > file1 &&
@@ -161,11 +167,11 @@
for args in "-w --stdin" "--stdin -w"; do
push_repo
- test_expect_success SHA1 "hash from stdin and write to database ($args)" '
- test $example_sha1 = $(git hash-object $args < example)
+ test_expect_success "hash from stdin and write to database ($args)" '
+ test "$(test_oid example)" = $(git hash-object $args < example)
'
- test_blob_exists $example_sha1
+ test_blob_exists "$(test_oid example)"
pop_repo
done
@@ -173,22 +179,22 @@
filenames="hello
example"
-sha1s="$hello_sha1
-$example_sha1"
+oids="$(test_oid hello)
+$(test_oid example)"
-test_expect_success SHA1 "hash two files with names on stdin" '
- test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
+test_expect_success "hash two files with names on stdin" '
+ test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
'
for args in "-w --stdin-paths" "--stdin-paths -w"; do
push_repo
- test_expect_success SHA1 "hash two files with names on stdin and write to database ($args)" '
- test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+ test_expect_success "hash two files with names on stdin and write to database ($args)" '
+ test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
'
- test_blob_exists $hello_sha1
- test_blob_exists $example_sha1
+ test_blob_exists "$(test_oid hello)"
+ test_blob_exists "$(test_oid example)"
pop_repo
done
@@ -199,10 +205,6 @@
test_i18ngrep "too-short tree object" err
'
-hex2oct() {
- perl -ne 'printf "\\%03o", hex for /../g'
-}
-
test_expect_success 'malformed mode in tree' '
hex_sha1=$(echo foo | git hash-object --stdin -w) &&
bin_sha1=$(echo $hex_sha1 | hex2oct) &&
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index 4feb651..bc89371 100755
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -127,4 +127,14 @@
)
'
+test_expect_success 'internal tree objects are not "missing"' '
+ git init missing-empty &&
+ (
+ cd missing-empty &&
+ empty_tree=$(git hash-object -t tree /dev/null) &&
+ commit=$(echo foo | git commit-tree $empty_tree) &&
+ git rev-list --objects $commit
+ )
+'
+
test_done
diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 090b7fc..40cc004 100755
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -31,20 +31,6 @@
test_path_is_file c
'
-test_expect_success 'checkout -b checkout.optimizeNewBranch interaction' '
- cp .git/info/sparse-checkout .git/info/sparse-checkout.bak &&
- test_when_finished "
- mv -f .git/info/sparse-checkout.bak .git/info/sparse-checkout
- git checkout master
- " &&
- echo "/b" >>.git/info/sparse-checkout &&
- test "$(git ls-files -t b)" = "S b" &&
- git -c checkout.optimizeNewBranch=true checkout -b fast &&
- test "$(git ls-files -t b)" = "S b" &&
- git checkout -b slow &&
- test "$(git ls-files -t b)" = "H b"
-'
-
test_expect_success 'merge feature branch into sparse checkout of master' '
git merge feature &&
test_path_is_file a &&
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9652b24..983a0a1 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -892,6 +892,7 @@
1510348087
0
EOF
+ : "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
{
echo "$rel_out $(git config --expiry-date date.valid1)"
git config --expiry-date date.valid2 &&
@@ -1293,26 +1294,25 @@
GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
'
-sq="'"
test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
cat >expect <<-\EOF &&
env.one one
env.two two
EOF
- GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq} ${sq}env.two=two${sq}" \
+ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ} ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*" >actual &&
test_cmp expect actual &&
cat >expect <<-EOF &&
- env.one one${sq}
+ env.one one${SQ}
env.two two
EOF
- GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq$sq$sq ${sq}env.two=two${sq}" \
+ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ$SQ$SQ ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*" >actual &&
test_cmp expect actual &&
test_must_fail env \
- GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq ${sq}env.two=two${sq}" \
+ GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ ${SQ}env.two=two${SQ}" \
git config --get-regexp "env.*"
'
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index dfece75..2dc853d 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -136,7 +136,7 @@
(
cd new &&
umask 002 &&
- git init --shared=0660 --template=../templates &&
+ git init --shared=0660 --template=templates &&
>frotz &&
git add frotz &&
git commit -a -m initial &&
@@ -192,7 +192,7 @@
umask 0022 &&
git init --bare --shared=0666 child.git &&
test_path_is_missing child.git/foo &&
- git init --bare --template=../templates child.git &&
+ git init --bare --template=templates child.git &&
echo "-rw-rw-rw-" >expect &&
test_modebits child.git/foo >actual &&
test_cmp expect actual
@@ -203,7 +203,7 @@
umask 0022 &&
git config core.sharedrepository 0666 &&
cp .git/config templates/config &&
- git init --bare --template=../templates child.git &&
+ git init --bare --template=templates child.git &&
echo "-rw-rw-rw-" >expect &&
test_modebits child.git/HEAD >actual &&
test_cmp expect actual
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index 6359185..d20b4d1 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -229,6 +229,19 @@
)
'
+test_expect_success 'conditional include with /**/' '
+ REPO=foo/bar/repo &&
+ git init $REPO &&
+ cat >>$REPO/.git/config <<-\EOF &&
+ [includeIf "gitdir:**/foo/**/bar/**"]
+ path=bar7
+ EOF
+ echo "[test]seven=7" >$REPO/.git/bar7 &&
+ echo 7 >expect &&
+ git -C $REPO config test.seven >actual &&
+ test_cmp expect actual
+'
+
test_expect_success SYMLINKS 'conditional include, set up symlinked $HOME' '
mkdir real-home &&
ln -s real-home home &&
@@ -296,21 +309,53 @@
)
'
+test_expect_success 'conditional include, onbranch' '
+ echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
+ echo "[test]nine=9" >.git/bar9 &&
+ git checkout -b master &&
+ test_must_fail git config test.nine &&
+ git checkout -b foo-branch &&
+ echo 9 >expect &&
+ git config test.nine >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'conditional include, onbranch, wildcard' '
+ echo "[includeIf \"onbranch:?oo-*/**\"]path=bar10" >>.git/config &&
+ echo "[test]ten=10" >.git/bar10 &&
+ git checkout -b not-foo-branch/a &&
+ test_must_fail git config test.ten &&
+
+ echo 10 >expect &&
+ git checkout -b foo-branch/a/b/c &&
+ git config test.ten >actual &&
+ test_cmp expect actual &&
+
+ git checkout -b moo-bar/a &&
+ git config test.ten >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'conditional include, onbranch, implicit /** for /' '
+ echo "[includeIf \"onbranch:foo-dir/\"]path=bar11" >>.git/config &&
+ echo "[test]eleven=11" >.git/bar11 &&
+ git checkout -b not-foo-dir/a &&
+ test_must_fail git config test.eleven &&
+
+ echo 11 >expect &&
+ git checkout -b foo-dir/a/b/c &&
+ git config test.eleven >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'include cycles are detected' '
- cat >.gitconfig <<-\EOF &&
- [test]value = gitconfig
- [include]path = cycle
- EOF
- cat >cycle <<-\EOF &&
- [test]value = cycle
- [include]path = .gitconfig
- EOF
- cat >expect <<-\EOF &&
- gitconfig
- cycle
- EOF
- test_must_fail git config --get-all test.value 2>stderr &&
- test_i18ngrep "exceeded maximum include depth" stderr
+ git init --bare cycle &&
+ git -C cycle config include.path cycle &&
+ git config -f cycle/cycle include.path config &&
+ test_must_fail \
+ env GIT_TEST_GETTEXT_POISON=false \
+ git -C cycle config --get-all test.value 2>stderr &&
+ grep "exceeded maximum include depth" stderr
'
test_done
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 413642a..3a0de0d 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -89,4 +89,14 @@
test_with_config "["
'
+test_expect_success 'early config and onbranch' '
+ echo "[broken" >broken &&
+ test_with_config "[includeif \"onbranch:master\"]path=../broken"
+'
+
+test_expect_success 'onbranch config outside of git repo' '
+ test_config_global includeIf.onbranch:master.path non-existent &&
+ nongit git help
+'
+
test_done
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index 51a4f4c..2d142e5 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -32,8 +32,6 @@
test_cmp unchanged actual
}
-Q="'"
-
# Test adding and deleting D/F-conflicting references in a single
# transaction.
df_test() {
@@ -93,7 +91,7 @@
delname="$delref"
fi &&
cat >expected-err <<-EOF &&
- fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q
+ fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ
EOF
$pack &&
if $add_del
@@ -123,7 +121,7 @@
prefix=refs/1l &&
test_update_rejected "a c e" false "b c/x d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+ "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
'
@@ -131,7 +129,7 @@
prefix=refs/1p &&
test_update_rejected "a c e" true "b c/x d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+ "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
'
@@ -139,7 +137,7 @@
prefix=refs/2l &&
test_update_rejected "a c e" false "b c/x/y d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+ "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
'
@@ -147,7 +145,7 @@
prefix=refs/2p &&
test_update_rejected "a c e" true "b c/x/y d" \
- "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+ "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
'
@@ -155,7 +153,7 @@
prefix=refs/3l &&
test_update_rejected "a c/x e" false "b c d" \
- "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+ "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
'
@@ -163,7 +161,7 @@
prefix=refs/3p &&
test_update_rejected "a c/x e" true "b c d" \
- "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+ "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
'
@@ -171,7 +169,7 @@
prefix=refs/4l &&
test_update_rejected "a c/x/y e" false "b c d" \
- "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+ "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
'
@@ -179,7 +177,7 @@
prefix=refs/4p &&
test_update_rejected "a c/x/y e" true "b c d" \
- "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+ "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
'
@@ -187,7 +185,7 @@
prefix=refs/5 &&
test_update_rejected "a e" false "b c c/x d" \
- "cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
+ "cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time"
'
@@ -334,7 +332,7 @@
test_expect_success 'missing old value blocks update' '
prefix=refs/missing-update &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/foo $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -345,7 +343,7 @@
prefix=refs/incorrect-update &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
EOF
printf "%s\n" "update $prefix/foo $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -356,7 +354,7 @@
prefix=refs/existing-create &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists
EOF
printf "%s\n" "create $prefix/foo $E" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -367,7 +365,7 @@
prefix=refs/incorrect-delete &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
EOF
printf "%s\n" "delete $prefix/foo $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -378,7 +376,7 @@
prefix=refs/missing-indirect-update &&
git symbolic-ref $prefix/symref $prefix/foo &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -390,7 +388,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF
printf "%s\n" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -402,7 +400,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
EOF
printf "%s\n" "create $prefix/symref $E" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -414,7 +412,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF
printf "%s\n" "delete $prefix/symref $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -425,7 +423,7 @@
prefix=refs/missing-noderef-update &&
git symbolic-ref $prefix/symref $prefix/foo &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D
EOF
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -437,7 +435,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -449,7 +447,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
EOF
printf "%s\n" "option no-deref" "create $prefix/symref $E" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -461,7 +459,7 @@
git symbolic-ref $prefix/symref $prefix/foo &&
git update-ref $prefix/foo $C &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
EOF
printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -474,13 +472,13 @@
: >.git/$prefix/foo/bar/baz.lock &&
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/foo $C" |
test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/foo $D $C" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -493,13 +491,13 @@
echo "gobbledigook" >.git/$prefix/foo &&
test_when_finished "rm -f .git/$prefix/foo" &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF
printf "%s\n" "update $prefix/foo $C" |
test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF
printf "%s\n" "update $prefix/foo $D $C" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -513,13 +511,13 @@
: >.git/$prefix/foo/bar/baz.lock &&
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/symref $C" |
test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
EOF
printf "%s\n" "update $prefix/symref $D $C" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -532,13 +530,13 @@
echo "gobbledigook" >.git/$prefix/foo &&
test_when_finished "rm -f .git/$prefix/foo" &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF
printf "%s\n" "update $prefix/symref $C" |
test_must_fail git update-ref --stdin 2>output.err &&
test_cmp expected output.err &&
cat >expected <<-EOF &&
- fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
+ fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken
EOF
printf "%s\n" "update $prefix/symref $D $C" |
test_must_fail git update-ref --stdin 2>output.err &&
@@ -614,7 +612,23 @@
test_when_finished "rm -f .git/packed-refs.lock" &&
test_must_fail git update-ref -d $prefix/foo >out 2>err &&
git for-each-ref $prefix >actual &&
- test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+ test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err &&
+ test_cmp unchanged actual
+'
+
+test_expect_success 'delete fails cleanly if packed-refs.new write fails' '
+ # Setup and expectations are similar to the test above.
+ prefix=refs/failed-packed-refs &&
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ git update-ref $prefix/foo $D &&
+ git for-each-ref $prefix >unchanged &&
+ # This should not happen in practice, but it is an easy way to get a
+ # reliable error (we open with create_tempfile(), which uses O_EXCL).
+ : >.git/packed-refs.new &&
+ test_when_finished "rm -f .git/packed-refs.new" &&
+ test_must_fail git update-ref -d $prefix/foo &&
+ git for-each-ref $prefix >actual &&
test_cmp unchanged actual
'
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index ae8a448..82950c0 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -30,14 +30,13 @@
}
corrupt () {
- aa=${1%??????????????????????????????????????} zz=${1#??}
- mv .git/objects/$aa/$zz .git/$aa$zz
+ mv .git/objects/$(test_oid_to_path $1) .git/$1
}
recover () {
- aa=${1%??????????????????????????????????????} zz=${1#??}
+ aa=$(echo $1 | cut -c 1-2)
mkdir -p .git/objects/$aa
- mv .git/$aa$zz .git/objects/$aa/$zz
+ mv .git/$1 .git/objects/$(test_oid_to_path $1)
}
check_dont_have () {
@@ -55,6 +54,7 @@
}
test_expect_success setup '
+ test_oid_init &&
mkdir -p A/B &&
echo rat >C &&
echo ox >A/D &&
@@ -232,25 +232,34 @@
'
test_expect_success 'gc.reflogexpire=never' '
+ test_config gc.reflogexpire never &&
+ test_config gc.reflogexpireunreachable never &&
- git config gc.reflogexpire never &&
- git config gc.reflogexpireunreachable never &&
- git reflog expire --verbose --all &&
+ git reflog expire --verbose --all >output &&
+ test_line_count = 9 output &&
+
git reflog refs/heads/master >output &&
test_line_count = 4 output
'
test_expect_success 'gc.reflogexpire=false' '
+ test_config gc.reflogexpire false &&
+ test_config gc.reflogexpireunreachable false &&
- git config gc.reflogexpire false &&
- git config gc.reflogexpireunreachable false &&
git reflog expire --verbose --all &&
git reflog refs/heads/master >output &&
- test_line_count = 4 output &&
+ test_line_count = 4 output
- git config --unset gc.reflogexpire &&
- git config --unset gc.reflogexpireunreachable
+'
+test_expect_success 'git reflog expire unknown reference' '
+ test_config gc.reflogexpire never &&
+ test_config gc.reflogexpireunreachable never &&
+
+ test_must_fail git reflog expire master@{123} 2>stderr &&
+ test_i18ngrep "points nowhere" stderr &&
+ test_must_fail git reflog expire does-not-exist 2>stderr &&
+ test_i18ngrep "points nowhere" stderr
'
test_expect_success 'checkout should not delete log for packed ref' '
@@ -304,12 +313,12 @@
# Each line is 114 characters, so we need 75 to still have a few before the
# last 8K. The 89-character padding on the final entry lines up our
# newline exactly.
-test_expect_success 'parsing reverse reflogs at BUFSIZ boundaries' '
+test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
git checkout -b reflogskip &&
- z38=00000000000000000000000000000000000000 &&
+ zf=$(test_oid zero_2) &&
ident="abc <xyz> 0000000001 +0000" &&
for i in $(test_seq 1 75); do
- printf "$z38%02d $z38%02d %s\t" $i $(($i+1)) "$ident" &&
+ printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
if test $i = 75; then
for j in $(test_seq 1 89); do
printf X
@@ -320,7 +329,7 @@
printf "\n"
done >.git/logs/refs/heads/reflogskip &&
git rev-parse reflogskip@{73} >actual &&
- echo ${z38}03 >expect &&
+ echo ${zf}03 >expect &&
test_cmp expect actual
'
diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh
index feb1efd..1181a9f 100755
--- a/t/t1414-reflog-walk.sh
+++ b/t/t1414-reflog-walk.sh
@@ -18,10 +18,9 @@
git log -g --format="%gd %gs" "$@"
}
-sq="'"
test_expect_success 'set up expected reflog' '
cat >expect.all <<-EOF
- HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side
+ HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side
HEAD@{1} commit: three
HEAD@{2} checkout: moving from master to side
HEAD@{3} commit: two
diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index b664e51..bb2c757 100755
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -76,4 +76,39 @@
test_cmp expected actual.wt2
'
+test_expect_success 'for-each-ref from main repo' '
+ mkdir fer1 &&
+ git -C fer1 init repo &&
+ test_commit -C fer1/repo initial &&
+ git -C fer1/repo worktree add ../second &&
+ git -C fer1/repo update-ref refs/bisect/main HEAD &&
+ git -C fer1/repo update-ref refs/rewritten/main HEAD &&
+ git -C fer1/repo update-ref refs/worktree/main HEAD &&
+ git -C fer1/repo for-each-ref --format="%(refname)" | grep main >actual &&
+ cat >expected <<-\EOF &&
+ refs/bisect/main
+ refs/rewritten/main
+ refs/worktree/main
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'for-each-ref from linked repo' '
+ mkdir fer2 &&
+ git -C fer2 init repo &&
+ test_commit -C fer2/repo initial &&
+ git -C fer2/repo worktree add ../second &&
+ git -C fer2/second update-ref refs/bisect/second HEAD &&
+ git -C fer2/second update-ref refs/rewritten/second HEAD &&
+ git -C fer2/second update-ref refs/worktree/second HEAD &&
+ git -C fer2/second for-each-ref --format="%(refname)" | grep second >actual &&
+ cat >expected <<-\EOF &&
+ refs/bisect/second
+ refs/heads/second
+ refs/rewritten/second
+ refs/worktree/second
+ EOF
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index c61f972..b36e052 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -9,6 +9,7 @@
. ./test-lib.sh
test_expect_success setup '
+ test_oid_init &&
git config gc.auto 0 &&
git config i18n.commitencoding ISO-8859-1 &&
test_commit A fileA one &&
@@ -54,8 +55,8 @@
test_expect_success 'object with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(echo $sha | sed "s+^..+&/+") &&
- new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
+ old=$(test_oid_to_path "$sha") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
sha="$(dirname $new)$(basename $new)" &&
mv .git/objects/$old .git/objects/$new &&
test_when_finished "remove_object $sha" &&
@@ -84,7 +85,7 @@
test_expect_success 'HEAD link pointing at a funny object' '
test_when_finished "mv .git/SAVED_HEAD .git/HEAD" &&
mv .git/HEAD .git/SAVED_HEAD &&
- echo 0000000000000000000000000000000000000000 >.git/HEAD &&
+ echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail env GIT_DIR=.git git fsck 2>out &&
cat out &&
@@ -244,10 +245,16 @@
'
test_expect_success 'unparseable tree object' '
+ test_oid_cache <<-\EOF &&
+ junk sha1:twenty-bytes-of-junk
+ junk sha256:twenty-bytes-of-junk-twelve-more
+ EOF
+
test_when_finished "git update-ref -d refs/heads/wrong" &&
test_when_finished "remove_object \$tree_sha1" &&
test_when_finished "remove_object \$commit_sha1" &&
- tree_sha1=$(printf "100644 \0twenty-bytes-of-junk" | git hash-object -t tree --stdin -w --literally) &&
+ junk=$(test_oid junk) &&
+ tree_sha1=$(printf "100644 \0$junk" | git hash-object -t tree --stdin -w --literally) &&
commit_sha1=$(git commit-tree $tree_sha1) &&
git update-ref refs/heads/wrong $commit_sha1 &&
test_must_fail git fsck 2>out &&
@@ -256,10 +263,6 @@
test_i18ngrep ! "fatal: empty filename in tree entry" out
'
-hex2oct() {
- perl -ne 'printf "\\%03o", hex for /../g'
-}
-
test_expect_success 'tree entry with type mismatch' '
test_when_finished "remove_object \$blob" &&
test_when_finished "remove_object \$tree" &&
@@ -279,8 +282,9 @@
'
test_expect_success 'tag pointing to nonexistent' '
- cat >invalid-tag <<-\EOF &&
- object ffffffffffffffffffffffffffffffffffffffff
+ badoid=$(test_oid deadbeef) &&
+ cat >invalid-tag <<-EOF &&
+ object $badoid
type commit
tag invalid
tagger T A Gger <tagger@example.com> 1234567890 -0000
@@ -390,8 +394,8 @@
test_expect_success 'rev-list --verify-objects with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(echo $sha | sed "s+^..+&/+") &&
- new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
+ old=$(test_oid_to_path $sha) &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
sha="$(dirname $new)$(basename $new)" &&
mv .git/objects/$old .git/objects/$new &&
test_when_finished "remove_object $sha" &&
@@ -406,7 +410,7 @@
test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out &&
cat out &&
- test_i18ngrep -q "error: hash mismatch 63ffffffffffffffffffffffffffffffffffffff" out
+ test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out
'
test_expect_success 'force fsck to ignore double author' '
@@ -421,13 +425,12 @@
'
_bz='\0'
-_bz5="$_bz$_bz$_bz$_bz$_bz"
-_bz20="$_bz5$_bz5$_bz5$_bz5"
+_bzoid=$(printf $ZERO_OID | sed -e 's/00/\\0/g')
test_expect_success 'fsck notices blob entry pointing to null sha1' '
(git init null-blob &&
cd null-blob &&
- sha=$(printf "100644 file$_bz$_bz20" |
+ sha=$(printf "100644 file$_bz$_bzoid" |
git hash-object -w --stdin -t tree) &&
git fsck 2>out &&
cat out &&
@@ -438,7 +441,7 @@
test_expect_success 'fsck notices submodule entry pointing to null sha1' '
(git init null-commit &&
cd null-commit &&
- sha=$(printf "160000 submodule$_bz$_bz20" |
+ sha=$(printf "160000 submodule$_bz$_bzoid" |
git hash-object -w --stdin -t tree) &&
git fsck 2>out &&
cat out &&
@@ -590,7 +593,7 @@
# its type. That lets us see that --connectivity-only is
# not actually looking at the contents, but leaves it
# free to examine the type if it chooses.
- empty=.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 &&
+ empty=.git/objects/$(test_oid_to_path $EMPTY_BLOB) &&
blob=$(echo unrelated | git hash-object -w --stdin) &&
mv -f $(sha1_file $blob) $empty &&
@@ -635,10 +638,12 @@
test_expect_success 'alternate objects are correctly blamed' '
test_when_finished "rm -rf alt.git .git/objects/info/alternates" &&
+ name=$(test_oid numeric) &&
+ path=$(test_oid_to_path "$name") &&
git init --bare alt.git &&
echo "../../alt.git/objects" >.git/objects/info/alternates &&
- mkdir alt.git/objects/12 &&
- >alt.git/objects/12/34567890123456789012345678901234567890 &&
+ mkdir alt.git/objects/$(dirname $path) &&
+ >alt.git/objects/$(dirname $path)/$(basename $path) &&
test_must_fail git fsck >out 2>&1 &&
test_i18ngrep alt.git out
'
@@ -740,7 +745,7 @@
# for each of type, we have one version which is referenced by another object
# (and so while unreachable, not dangling), and another variant which really is
# dangling.
-test_expect_success 'fsck notices dangling objects' '
+test_expect_success 'create dangling-object repository' '
git init dangling &&
(
cd dangling &&
@@ -751,12 +756,17 @@
commit=$(git commit-tree $tree) &&
dcommit=$(git commit-tree -p $commit $tree) &&
- cat >expect <<-EOF &&
+ cat >expect <<-EOF
dangling blob $dblob
dangling commit $dcommit
dangling tree $dtree
EOF
+ )
+'
+test_expect_success 'fsck notices dangling objects' '
+ (
+ cd dangling &&
git fsck >actual &&
# the output order is non-deterministic, as it comes from a hash
sort <actual >actual.sorted &&
@@ -764,6 +774,16 @@
)
'
+test_expect_success 'fsck --connectivity-only notices dangling objects' '
+ (
+ cd dangling &&
+ git fsck --connectivity-only >actual &&
+ # the output order is non-deterministic, as it comes from a hash
+ sort <actual >actual.sorted &&
+ test_i18ncmp expect actual.sorted
+ )
+'
+
test_expect_success 'fsck $name notices bogus $name' '
test_must_fail git fsck bogus &&
test_must_fail git fsck $ZERO_OID
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 4ee009d..21a9c8f 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -8,10 +8,9 @@
test_did_you_mean ()
{
- sq="'" &&
cat >expected <<-EOF &&
- fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}.
- Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?
+ fatal: Path '$2$3' $4, but not ${5:-$SQ$3$SQ}.
+ Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
EOF
test_cmp expected error
}
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index fa3e499..8b4cf8a 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -28,8 +28,6 @@
)
'
-sq="'"
-
full_name () {
(cd clone &&
git rev-parse --symbolic-full-name "$@")
@@ -129,7 +127,7 @@
git branch -t new my-side@{u} &&
git merge -s ours new@{u} &&
git show -s --pretty=tformat:%s >actual &&
- echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
+ echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
test_cmp expect actual
)
'
@@ -156,7 +154,7 @@
test_expect_success 'branch@{u} error message when no upstream' '
cat >expect <<-EOF &&
- fatal: no upstream configured for branch ${sq}non-tracking${sq}
+ fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
EOF
error_message non-tracking@{u} &&
test_i18ncmp expect error
@@ -164,7 +162,7 @@
test_expect_success '@{u} error message when no upstream' '
cat >expect <<-EOF &&
- fatal: no upstream configured for branch ${sq}master${sq}
+ fatal: no upstream configured for branch ${SQ}master${SQ}
EOF
test_must_fail git rev-parse --verify @{u} 2>actual &&
test_i18ncmp expect actual
@@ -172,7 +170,7 @@
test_expect_success 'branch@{u} error message with misspelt branch' '
cat >expect <<-EOF &&
- fatal: no such branch: ${sq}no-such-branch${sq}
+ fatal: no such branch: ${SQ}no-such-branch${SQ}
EOF
error_message no-such-branch@{u} &&
test_i18ncmp expect error
@@ -189,7 +187,7 @@
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
cat >expect <<-EOF &&
- fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
+ fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
EOF
error_message bad-upstream@{u} &&
test_i18ncmp expect error
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 42962ed..c77721b 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -59,17 +59,38 @@
)
'
-test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
+test_index_version () {
+ INDEX_VERSION_CONFIG=$1 &&
+ FEATURE_MANY_FILES=$2 &&
+ ENV_VAR_VERSION=$3
+ EXPECTED_OUTPUT_VERSION=$4 &&
(
rm -f .git/index &&
- GIT_INDEX_VERSION=4 &&
- export GIT_INDEX_VERSION &&
- git config --add index.version 2 &&
+ rm -f .git/config &&
+ if test "$INDEX_VERSION_CONFIG" -ne 0
+ then
+ git config --add index.version $INDEX_VERSION_CONFIG
+ fi &&
+ git config --add feature.manyFiles $FEATURE_MANY_FILES
+ if test "$ENV_VAR_VERSION" -ne 0
+ then
+ GIT_INDEX_VERSION=$ENV_VAR_VERSION &&
+ export GIT_INDEX_VERSION
+ else
+ unset GIT_INDEX_VERSION
+ fi &&
git add a 2>&1 &&
- echo 4 >expect &&
+ echo $EXPECTED_OUTPUT_VERSION >expect &&
test-tool index-version <.git/index >actual &&
test_cmp expect actual
)
+}
+
+test_expect_success 'index version config precedence' '
+ test_index_version 2 false 4 4 &&
+ test_index_version 2 true 0 2 &&
+ test_index_version 0 true 0 4 &&
+ test_index_version 0 true 2 2
'
test_done
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 4667e1a..12a5568 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -20,6 +20,22 @@
test-tool chmtime =-5 "$1"
}
+test_expect_success 'setup' '
+ test_oid_cache <<-EOF
+ own_v3 sha1:8299b0bcd1ac364e5f1d7768efb62fa2da79a339
+ own_v3 sha256:38a6d2925e3eceec33ad7b34cbff4e0086caa0daf28f31e51f5bd94b4a7af86b
+
+ base_v3 sha1:39d890139ee5356c7ef572216cebcd27aa41f9df
+ base_v3 sha256:c9baeadf905112bf6c17aefbd7d02267afd70ded613c30cafed2d40cb506e1ed
+
+ own_v4 sha1:432ef4b63f32193984f339431fd50ca796493569
+ own_v4 sha256:6738ac6319c25b694afa7bcc313deb182d1a59b68bf7a47b4296de83478c0420
+
+ base_v4 sha1:508851a7f0dfa8691e9f69c7f055865389012491
+ base_v4 sha256:3177d4adfdd4b6904f7e921d91d715a471c0dde7cf6a4bba574927f02b699508
+ EOF
+'
+
test_expect_success 'enable split index' '
git config splitIndex.maxPercentChange 100 &&
git update-index --split-index &&
@@ -29,11 +45,11 @@
# NEEDSWORK: Stop hard-coding checksums.
if test "$indexversion" = "4"
then
- own=432ef4b63f32193984f339431fd50ca796493569
- base=508851a7f0dfa8691e9f69c7f055865389012491
+ own=$(test_oid own_v4)
+ base=$(test_oid base_v4)
else
- own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
- base=39d890139ee5356c7ef572216cebcd27aa41f9df
+ own=$(test_oid own_v3)
+ base=$(test_oid base_v3)
fi &&
cat >expect <<-EOF &&
@@ -99,17 +115,18 @@
test_expect_success 'modify original file, base index untouched' '
echo modified | create_non_racy_file one &&
+ file1_blob=$(git hash-object one) &&
git update-index one &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
replacements: 0
deletions:
EOF
@@ -121,7 +138,7 @@
git update-index --add two &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
@@ -129,7 +146,7 @@
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
100644 $EMPTY_BLOB 0 two
replacements: 0
deletions:
@@ -141,14 +158,14 @@
git update-index --force-remove two &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
replacements: 0
deletions:
EOF
@@ -237,9 +254,9 @@
git update-index --add three &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 three
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 two
+ 100644 $EMPTY_BLOB 0 one
+ 100644 $EMPTY_BLOB 0 three
+ 100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
@@ -257,8 +274,8 @@
git update-index --force-remove three &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 two
+ 100644 $EMPTY_BLOB 0 one
+ 100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
@@ -285,7 +302,7 @@
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&
$BASE
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 four
+ 100644 $EMPTY_BLOB 0 four
replacements:
deletions:
EOF
@@ -309,7 +326,7 @@
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&
$BASE
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 six
+ 100644 $EMPTY_BLOB 0 six
replacements:
deletions:
EOF
@@ -472,4 +489,22 @@
test_line_count = 0 cache-tree.out
'
+test_expect_success 'do not refresh null base index' '
+ test_create_repo merge &&
+ (
+ cd merge &&
+ test_commit initial &&
+ git checkout -b side-branch &&
+ test_commit extra &&
+ git checkout master &&
+ git update-index --split-index &&
+ test_commit more &&
+ # must not write a new shareindex, or we wont catch the problem
+ git -c splitIndex.maxPercentChange=100 merge --no-edit side-branch 2>err &&
+ # i.e. do not expect warnings like
+ # could not freshen shared index .../shareindex.00000...
+ test_must_be_empty err
+ )
+'
+
test_done
diff --git a/t/t2014-switch.sh b/t/t2014-checkout-switch.sh
similarity index 100%
rename from t/t2014-switch.sh
rename to t/t2014-checkout-switch.sh
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index c5014ad..822381d 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -60,38 +60,47 @@
'
test_expect_success 'checkout -b to a new branch, set to HEAD' '
+ test_when_finished "
+ git checkout branch1 &&
+ test_might_fail git branch -D branch2" &&
do_checkout branch2
'
-test_expect_success 'checkout -b to a new branch, set to an explicit ref' '
- git checkout branch1 &&
- git branch -D branch2 &&
+test_expect_success 'checkout -b to a merge base' '
+ test_when_finished "
+ git checkout branch1 &&
+ test_might_fail git branch -D branch2" &&
+ git checkout -b branch2 branch1...
+'
+test_expect_success 'checkout -b to a new branch, set to an explicit ref' '
+ test_when_finished "
+ git checkout branch1 &&
+ test_might_fail git branch -D branch2" &&
do_checkout branch2 $HEAD1
'
test_expect_success 'checkout -b to a new branch with unmergeable changes fails' '
- git checkout branch1 &&
-
- # clean up from previous test
- git branch -D branch2 &&
-
setup_dirty_unmergeable &&
test_must_fail do_checkout branch2 $HEAD1 &&
test_dirty_unmergeable
'
test_expect_success 'checkout -f -b to a new branch with unmergeable changes discards changes' '
+ test_when_finished "
+ git checkout branch1 &&
+ test_might_fail git branch -D branch2" &&
+
# still dirty and on branch1
do_checkout branch2 $HEAD1 "-f -b" &&
test_must_fail test_dirty_unmergeable
'
test_expect_success 'checkout -b to a new branch preserves mergeable changes' '
- git checkout branch1 &&
-
- # clean up from previous test
- git branch -D branch2 &&
+ test_when_finished "
+ git reset --hard &&
+ git checkout branch1 &&
+ test_might_fail git branch -D branch2" &&
setup_dirty_mergeable &&
do_checkout branch2 $HEAD1 &&
@@ -99,27 +108,18 @@
'
test_expect_success 'checkout -f -b to a new branch with mergeable changes discards changes' '
- # clean up from previous test
- git reset --hard &&
-
- git checkout branch1 &&
-
- # clean up from previous test
- git branch -D branch2 &&
-
+ test_when_finished git reset --hard HEAD &&
setup_dirty_mergeable &&
do_checkout branch2 $HEAD1 "-f -b" &&
test_must_fail test_dirty_mergeable
'
test_expect_success 'checkout -b to an existing branch fails' '
- git reset --hard HEAD &&
-
+ test_when_finished git reset --hard HEAD &&
test_must_fail do_checkout branch2 $HEAD2
'
test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
- git reset --hard HEAD &&
git checkout branch1 &&
git checkout branch2 &&
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
@@ -133,6 +133,12 @@
do_checkout branch2 "" -B
'
+test_expect_success 'checkout -B to a merge base' '
+ git checkout branch1 &&
+
+ git checkout -B branch2 branch1...
+'
+
test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
git checkout $(git rev-parse --verify HEAD) &&
@@ -160,6 +166,7 @@
'
test_expect_success 'checkout -B to an existing branch preserves mergeable changes' '
+ test_when_finished git reset --hard &&
git checkout branch1 &&
setup_dirty_mergeable &&
@@ -168,9 +175,6 @@
'
test_expect_success 'checkout -f -B to an existing branch with mergeable changes discards changes' '
- # clean up from previous test
- git reset --hard &&
-
git checkout branch1 &&
setup_dirty_mergeable &&
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 1fa6706..b748db9 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -195,16 +195,22 @@
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
- Note: checking out 'HEAD^'.
+ Note: switching to 'HEAD^'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
- state without impacting any branches by performing another checkout.
+ state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
- do so (now or later) by using -b with the checkout command again. Example:
+ do so (now or later) by using -c with the switch command. Example:
- git checkout -b <new-branch-name>
+ git switch -c <new-branch-name>
+
+ Or undo this operation with:
+
+ git switch -
+
+ Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at \$commit three
EOF
@@ -271,16 +277,22 @@
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
- Note: checking out 'HEAD^'.
+ Note: switching to 'HEAD^'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
- state without impacting any branches by performing another checkout.
+ state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
- do so (now or later) by using -b with the checkout command again. Example:
+ do so (now or later) by using -c with the switch command. Example:
- git checkout -b <new-branch-name>
+ git switch -c <new-branch-name>
+
+ Or undo this operation with:
+
+ git switch -
+
+ Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at \$commit... three
EOF
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index fc3eb43..6844afa 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -78,4 +78,15 @@
test_cmp expect actual
'
+test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' '
+ echo "nonempty" >nonempty &&
+ >empty &&
+ git add nonempty empty &&
+ git commit -m "create files to be deleted" &&
+ git rm --cached nonempty empty &&
+ git add -N nonempty empty &&
+ git checkout HEAD nonempty empty &&
+ git diff --cached --exit-code
+'
+
test_done
diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh
index 7e18985..fca3f85 100755
--- a/t/t2023-checkout-m.sh
+++ b/t/t2023-checkout-m.sh
@@ -46,4 +46,28 @@
test_cmp both.txt.conflicted.cleaned both.txt.cleaned
'
+test_expect_success 'force checkout a conflict file creates stage zero entry' '
+ git init co-force &&
+ (
+ cd co-force &&
+ echo a >a &&
+ git add a &&
+ git commit -ama &&
+ A_OBJ=$(git rev-parse :a) &&
+ git branch topic &&
+ echo b >a &&
+ git commit -amb &&
+ B_OBJ=$(git rev-parse :a) &&
+ git checkout topic &&
+ echo c >a &&
+ C_OBJ=$(git hash-object a) &&
+ git checkout -m master &&
+ test_cmp_rev :1:a $A_OBJ &&
+ test_cmp_rev :2:a $B_OBJ &&
+ test_cmp_rev :3:a $C_OBJ &&
+ git checkout -f topic &&
+ test_cmp_rev :0:a $A_OBJ
+ )
+'
+
test_done
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
new file mode 100755
index 0000000..76330cb
--- /dev/null
+++ b/t/t2025-checkout-no-overlay.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='checkout --no-overlay <tree-ish> -- <pathspec>'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ git commit --allow-empty -m "initial"
+'
+
+test_expect_success 'checkout --no-overlay deletes files not in <tree-ish>' '
+ >file &&
+ mkdir dir &&
+ >dir/file1 &&
+ git add file dir/file1 &&
+ git checkout --no-overlay HEAD -- file &&
+ test_path_is_missing file &&
+ test_path_is_file dir/file1
+'
+
+test_expect_success 'checkout --no-overlay removing last file from directory' '
+ git checkout --no-overlay HEAD -- dir/file1 &&
+ test_path_is_missing dir
+'
+
+test_expect_success 'checkout -p --overlay is disallowed' '
+ test_must_fail git checkout -p --overlay HEAD 2>actual &&
+ test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual
+'
+
+test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
+ test_commit file1 file1 &&
+ test_commit file2 file2 &&
+ git rm --cached file1 &&
+ echo 1234 >file1 &&
+ F1=$(git rev-parse HEAD:file1) &&
+ F2=$(git rev-parse HEAD:file2) &&
+ {
+ echo "100644 $F1 1 file1" &&
+ echo "100644 $F2 2 file1"
+ } | git update-index --index-info &&
+ test_path_is_file file1 &&
+ git checkout --theirs --no-overlay -- file1 &&
+ test_path_is_missing file1
+'
+
+test_done
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
new file mode 100755
index 0000000..f9efa29
--- /dev/null
+++ b/t/t2060-switch.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+test_description='switch basic functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit first &&
+ git branch first-branch &&
+ test_commit second &&
+ test_commit third &&
+ git remote add origin nohost:/nopath &&
+ git update-ref refs/remotes/origin/foo first-branch
+'
+
+test_expect_success 'switch branch no arguments' '
+ test_must_fail git switch
+'
+
+test_expect_success 'switch branch' '
+ git switch first-branch &&
+ test_path_is_missing second.t
+'
+
+test_expect_success 'switch and detach' '
+ test_when_finished git switch master &&
+ test_must_fail git switch master^{commit} &&
+ git switch --detach master^{commit} &&
+ test_must_fail git symbolic-ref HEAD
+'
+
+test_expect_success 'switch and detach current branch' '
+ test_when_finished git switch master &&
+ git switch master &&
+ git switch --detach &&
+ test_must_fail git symbolic-ref HEAD
+'
+
+test_expect_success 'switch and create branch' '
+ test_when_finished git switch master &&
+ git switch -c temp master^ &&
+ test_cmp_rev master^ refs/heads/temp &&
+ echo refs/heads/temp >expected-branch &&
+ git symbolic-ref HEAD >actual-branch &&
+ test_cmp expected-branch actual-branch
+'
+
+test_expect_success 'force create branch from HEAD' '
+ test_when_finished git switch master &&
+ git switch --detach master &&
+ test_must_fail git switch -c temp &&
+ git switch -C temp &&
+ test_cmp_rev master refs/heads/temp &&
+ echo refs/heads/temp >expected-branch &&
+ git symbolic-ref HEAD >actual-branch &&
+ test_cmp expected-branch actual-branch
+'
+
+test_expect_success 'new orphan branch from empty' '
+ test_when_finished git switch master &&
+ test_must_fail git switch --orphan new-orphan HEAD &&
+ git switch --orphan new-orphan &&
+ test_commit orphan &&
+ git cat-file commit refs/heads/new-orphan >commit &&
+ ! grep ^parent commit &&
+ git ls-files >tracked-files &&
+ echo orphan.t >expected &&
+ test_cmp expected tracked-files
+'
+
+test_expect_success 'switching ignores file of same branch name' '
+ test_when_finished git switch master &&
+ : >first-branch &&
+ git switch first-branch &&
+ echo refs/heads/first-branch >expected &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'guess and create branch ' '
+ test_when_finished git switch master &&
+ test_must_fail git switch --no-guess foo &&
+ git switch foo &&
+ echo refs/heads/foo >expected &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'not switching when something is in progress' '
+ test_when_finished rm -f .git/MERGE_HEAD &&
+ # fake a merge-in-progress
+ cp .git/HEAD .git/MERGE_HEAD &&
+ test_must_fail git switch -d @^
+'
+
+test_done
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
new file mode 100755
index 0000000..21c3f84
--- /dev/null
+++ b/t/t2070-restore.sh
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+test_description='restore basic functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit first &&
+ echo first-and-a-half >>first.t &&
+ git add first.t &&
+ test_commit second &&
+ echo one >one &&
+ echo two >two &&
+ echo untracked >untracked &&
+ echo ignored >ignored &&
+ echo /ignored >.gitignore &&
+ git add one two .gitignore &&
+ git update-ref refs/heads/one master
+'
+
+test_expect_success 'restore without pathspec is not ok' '
+ test_must_fail git restore &&
+ test_must_fail git restore --source=first
+'
+
+test_expect_success 'restore a file, ignoring branch of same name' '
+ cat one >expected &&
+ echo dirty >>one &&
+ git restore one &&
+ test_cmp expected one
+'
+
+test_expect_success 'restore a file on worktree from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first first.t &&
+ test_cmp expected first.t &&
+ git cat-file blob HEAD:./first.t >expected &&
+ git show :first.t >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'restore a file in the index from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first --staged first.t &&
+ git show :first.t >actual &&
+ test_cmp expected actual &&
+ git cat-file blob HEAD:./first.t >expected &&
+ test_cmp expected first.t
+'
+
+test_expect_success 'restore a file in both the index and worktree from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first --staged --worktree first.t &&
+ git show :first.t >actual &&
+ test_cmp expected actual &&
+ test_cmp expected first.t
+'
+
+test_expect_success 'restore --staged uses HEAD as source' '
+ test_when_finished git reset --hard &&
+ git cat-file blob :./first.t >expected &&
+ echo index-dirty >>first.t &&
+ git add first.t &&
+ git restore --staged first.t &&
+ git cat-file blob :./first.t >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
+ git init unmerged &&
+ (
+ cd unmerged &&
+ echo one >unmerged &&
+ echo one >common &&
+ git add unmerged common &&
+ git commit -m common &&
+ git switch -c first &&
+ echo first >unmerged &&
+ git commit -am first &&
+ git switch -c second master &&
+ echo second >unmerged &&
+ git commit -am second &&
+ test_must_fail git merge first &&
+
+ echo dirty >>common &&
+ test_must_fail git restore . &&
+
+ git restore --ignore-unmerged --quiet . >output 2>&1 &&
+ git diff common >diff-output &&
+ test_must_be_empty output &&
+ test_must_be_empty diff-output
+ )
+'
+
+test_expect_success 'restore --staged adds deleted intent-to-add file back to index' '
+ echo "nonempty" >nonempty &&
+ >empty &&
+ git add nonempty empty &&
+ git commit -m "create files to be deleted" &&
+ git rm --cached nonempty empty &&
+ git add -N nonempty empty &&
+ git restore --staged nonempty empty &&
+ git diff --cached --exit-code
+'
+
+test_done
diff --git a/t/t2071-restore-patch.sh b/t/t2071-restore-patch.sh
new file mode 100755
index 0000000..98b2476
--- /dev/null
+++ b/t/t2071-restore-patch.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+test_description='git restore --patch'
+
+. ./lib-patch-mode.sh
+
+test_expect_success PERL 'setup' '
+ mkdir dir &&
+ echo parent >dir/foo &&
+ echo dummy >bar &&
+ git add bar dir/foo &&
+ git commit -m initial &&
+ test_tick &&
+ test_commit second dir/foo head &&
+ set_and_save_state bar bar_work bar_index &&
+ save_head
+'
+
+test_expect_success PERL 'restore -p without pathspec is fine' '
+ echo q >cmd &&
+ git restore -p <cmd
+'
+
+# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
+
+test_expect_success PERL 'saying "n" does nothing' '
+ set_and_save_state dir/foo work head &&
+ test_write_lines n n | git restore -p &&
+ verify_saved_state bar &&
+ verify_saved_state dir/foo
+'
+
+test_expect_success PERL 'git restore -p' '
+ set_and_save_state dir/foo work head &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'git restore -p with staged changes' '
+ set_state dir/foo work index &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo index index
+'
+
+test_expect_success PERL 'git restore -p --source=HEAD' '
+ set_state dir/foo work index &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git restore -p --source=HEAD &&
+ verify_saved_state bar &&
+ verify_state dir/foo head index
+'
+
+test_expect_success PERL 'git restore -p --source=HEAD^' '
+ set_state dir/foo work index &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git restore -p --source=HEAD^ &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent index
+'
+
+test_expect_success PERL 'git restore -p handles deletion' '
+ set_state dir/foo work index &&
+ rm dir/foo &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo index index
+'
+
+# The idea in the rest is that bar sorts first, so we always say 'y'
+# first and if the path limiter fails it'll apply to bar instead of
+# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
+# the failure case (and thus get out of the loop).
+
+test_expect_success PERL 'path limiting works: dir' '
+ set_state dir/foo work head &&
+ test_write_lines y n | git restore -p dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'path limiting works: -- dir' '
+ set_state dir/foo work head &&
+ test_write_lines y n | git restore -p -- dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
+ set_state dir/foo work head &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent head
+'
+
+test_expect_success PERL 'path limiting works: foo inside dir' '
+ set_state dir/foo work head &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines y n n | (cd dir && git restore -p foo) &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'none of this moved HEAD' '
+ verify_saved_head
+'
+
+test_done
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 68e54d5..5bbe8dc 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -247,12 +247,14 @@
test_expect_success '"diff HEAD" includes ita as new files' '
git reset --hard &&
echo new >new-ita &&
+ oid=$(git hash-object new-ita) &&
+ oid=$(git rev-parse --short $oid) &&
git add -N new-ita &&
git diff HEAD >actual &&
- cat >expected <<-\EOF &&
+ cat >expected <<-EOF &&
diff --git a/new-ita b/new-ita
new file mode 100644
- index 0000000..3e75765
+ index 0000000..$oid
--- /dev/null
+++ b/new-ita
@@ -0,0 +1 @@
diff --git a/t/t2025-worktree-add.sh b/t/t2400-worktree-add.sh
similarity index 97%
rename from t/t2025-worktree-add.sh
rename to t/t2400-worktree-add.sh
index 286bba3..e819ba7 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -570,4 +570,21 @@
git worktree add --force --force --detach gnoo
'
+test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
+ git worktree add --detach ". weird*..?.lock.lock" &&
+ test -d .git/worktrees/---weird-.-
+'
+
+test_expect_success '"add" should not fail because of another bad worktree' '
+ git init add-fail &&
+ (
+ cd add-fail &&
+ test_commit first &&
+ mkdir sub &&
+ git worktree add sub/to-be-deleted &&
+ rm -rf sub &&
+ git worktree add second
+ )
+'
+
test_done
diff --git a/t/t2026-worktree-prune.sh b/t/t2401-worktree-prune.sh
similarity index 100%
rename from t/t2026-worktree-prune.sh
rename to t/t2401-worktree-prune.sh
diff --git a/t/t2027-worktree-list.sh b/t/t2402-worktree-list.sh
similarity index 100%
rename from t/t2027-worktree-list.sh
rename to t/t2402-worktree-list.sh
diff --git a/t/t2028-worktree-move.sh b/t/t2403-worktree-move.sh
similarity index 100%
rename from t/t2028-worktree-move.sh
rename to t/t2403-worktree-move.sh
diff --git a/t/t2029-worktree-config.sh b/t/t2404-worktree-config.sh
similarity index 100%
rename from t/t2029-worktree-config.sh
rename to t/t2404-worktree-config.sh
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index afd4756..0aefada 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-test_description='git ls-files test (--others should pick up symlinks).
+test_description='basic tests for ls-files --others
This test runs git ls-files --others with the following on the
filesystem.
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 209b4c7..2ec69a8 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -7,10 +7,6 @@
. ./test-lib.sh
-new_line='
-'
-sq=\'
-
test_expect_success 'prepare' '
: >never-mind-me &&
git add never-mind-me &&
@@ -44,9 +40,9 @@
cd top/sub &&
for f in ../y*
do
- echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+ echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err &&
- echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+ echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
@@ -59,9 +55,9 @@
cd top/sub &&
for f in ../x*
do
- echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+ echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err &&
- echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+ echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh
new file mode 100755
index 0000000..963f346
--- /dev/null
+++ b/t/t3009-ls-files-others-nonsubmodule.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+test_description='test git ls-files --others with non-submodule repositories
+
+This test runs git ls-files --others with the following working tree:
+
+ nonrepo-no-files/
+ plain directory with no files
+ nonrepo-untracked-file/
+ plain directory with an untracked file
+ repo-no-commit-no-files/
+ git repository without a commit or a file
+ repo-no-commit-untracked-file/
+ git repository without a commit but with an untracked file
+ repo-with-commit-no-files/
+ git repository with a commit and no untracked files
+ repo-with-commit-untracked-file/
+ git repository with a commit and an untracked file
+'
+
+. ./test-lib.sh
+
+test_expect_success 'setup: directories' '
+ mkdir nonrepo-no-files/ &&
+ mkdir nonrepo-untracked-file &&
+ : >nonrepo-untracked-file/untracked &&
+ git init repo-no-commit-no-files &&
+ git init repo-no-commit-untracked-file &&
+ : >repo-no-commit-untracked-file/untracked &&
+ git init repo-with-commit-no-files &&
+ git -C repo-with-commit-no-files commit --allow-empty -mmsg &&
+ git init repo-with-commit-untracked-file &&
+ test_commit -C repo-with-commit-untracked-file msg &&
+ : >repo-with-commit-untracked-file/untracked
+'
+
+test_expect_success 'ls-files --others handles untracked git repositories' '
+ git ls-files -o >output &&
+ cat >expect <<-EOF &&
+ nonrepo-untracked-file/untracked
+ output
+ repo-no-commit-no-files/
+ repo-no-commit-untracked-file/
+ repo-with-commit-no-files/
+ repo-with-commit-untracked-file/
+ EOF
+ test_cmp expect output
+'
+
+test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 478b82c..411a70b 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -42,6 +42,10 @@
git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
'
+test_expect_success 'git branch mb master... should create a branch' '
+ git branch mb master... && test_path_is_file .git/refs/heads/mb
+'
+
test_expect_success 'git branch HEAD should fail' '
test_must_fail git branch HEAD
'
@@ -202,18 +206,22 @@
git worktree add -f bazdir2 baz &&
git branch -M baz bam &&
test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
- test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam
+ test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+ rm -r bazdir bazdir2 &&
+ git worktree prune
'
test_expect_success 'git branch -M baz bam should succeed within a worktree in which baz is checked out' '
git checkout -b baz &&
- git worktree add -f bazdir3 baz &&
+ git worktree add -f bazdir baz &&
(
- cd bazdir3 &&
+ cd bazdir &&
git branch -M baz bam &&
test $(git rev-parse --abbrev-ref HEAD) = bam
) &&
- test $(git rev-parse --abbrev-ref HEAD) = bam
+ test $(git rev-parse --abbrev-ref HEAD) = bam &&
+ rm -r bazdir &&
+ git worktree prune
'
test_expect_success 'git branch -M master should work when master is checked out' '
@@ -264,6 +272,30 @@
test_must_fail git rev-parse refs/heads/t
'
+test_expect_success 'deleting checked-out branch from repo that is a submodule' '
+ test_when_finished "rm -rf repo1 repo2" &&
+
+ git init repo1 &&
+ git init repo1/sub &&
+ test_commit -C repo1/sub x &&
+ git -C repo1 submodule add ./sub &&
+ git -C repo1 commit -m "adding sub" &&
+
+ git clone --recurse-submodules repo1 repo2 &&
+ git -C repo2/sub checkout -b work &&
+ test_must_fail git -C repo2/sub branch -D work
+'
+
+test_expect_success 'bare main worktree has HEAD at branch deleted by secondary worktree' '
+ test_when_finished "rm -rf nonbare base secondary" &&
+
+ git init nonbare &&
+ test_commit -C nonbare x &&
+ git clone --bare nonbare bare &&
+ git -C bare worktree add --detach ../secondary master &&
+ git -C secondary branch -D master
+'
+
test_expect_success 'git branch --list -v with --abbrev' '
test_when_finished "git branch -D t" &&
git branch t &&
@@ -292,8 +324,8 @@
test_expect_success 'git branch --column' '
COLUMNS=81 git branch --column=column >actual &&
cat >expected <<\EOF &&
- a/b/c bam foo l * master n o/p r
- abc bar j/k m/m master2 o/o q
+ a/b/c bam foo l * master mb o/o q
+ abc bar j/k m/m master2 n o/p r
EOF
test_cmp expected actual
'
@@ -315,6 +347,7 @@
m/m
* master
master2
+ mb
n
o/o
o/p
@@ -332,8 +365,8 @@
git config --unset column.branch &&
git config --unset column.ui &&
cat >expected <<\EOF &&
- a/b/c bam foo l * master n o/p r
- abc bar j/k m/m master2 o/o q
+ a/b/c bam foo l * master mb o/o q
+ abc bar j/k m/m master2 n o/p r
EOF
test_cmp expected actual
'
@@ -357,6 +390,7 @@
m/m
* master
master2
+ mb
n
o/o
o/p
@@ -774,7 +808,9 @@
test_expect_success 'deleting currently checked out branch fails' '
git worktree add -b my7 my7 &&
test_must_fail git -C my7 branch -d my7 &&
- test_must_fail git branch -d my7
+ test_must_fail git branch -d my7 &&
+ rm -r my7 &&
+ git worktree prune
'
test_expect_success 'test --track without .fetch entries' '
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 0ea4fc4..40251c9 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -192,10 +192,10 @@
EOF
test_cmp expect actual &&
git branch --verbose --merged topic >actual &&
- cat >expect <<-\EOF &&
- master c77a0a9 second on master
- * topic 2c939f4 [ahead 1] foo
- zzz c77a0a9 second on master
+ cat >expect <<-EOF &&
+ master $(git rev-parse --short master) second on master
+ * topic $(git rev-parse --short topic ) [ahead 1] foo
+ zzz $(git rev-parse --short zzz ) second on master
EOF
test_i18ncmp expect actual
'
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index ee67876..71818b9 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -100,6 +100,53 @@
test_must_fail git branch -v branch*
'
+test_expect_success 'git branch `--show-current` shows current branch' '
+ cat >expect <<-\EOF &&
+ branch-two
+ EOF
+ git checkout branch-two &&
+ git branch --show-current >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch `--show-current` is silent when detached HEAD' '
+ git checkout HEAD^0 &&
+ git branch --show-current >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'git branch `--show-current` works properly when tag exists' '
+ cat >expect <<-\EOF &&
+ branch-and-tag-name
+ EOF
+ test_when_finished "
+ git checkout branch-one
+ git branch -D branch-and-tag-name
+ " &&
+ git checkout -b branch-and-tag-name &&
+ test_when_finished "git tag -d branch-and-tag-name" &&
+ git tag branch-and-tag-name &&
+ git branch --show-current >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch `--show-current` works properly with worktrees' '
+ cat >expect <<-\EOF &&
+ branch-one
+ branch-two
+ EOF
+ git checkout branch-one &&
+ test_when_finished "
+ git worktree remove worktree_dir
+ " &&
+ git worktree add worktree_dir branch-two &&
+ {
+ git branch --show-current &&
+ git -C worktree_dir branch --show-current
+ } >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'git branch shows detached HEAD properly' '
cat >expect <<EOF &&
* (HEAD detached at $(git rev-parse --short HEAD^0))
@@ -240,6 +287,24 @@
test_i18ncmp expect actual
'
+test_expect_success 'worktree colors correct' '
+ cat >expect <<-EOF &&
+ * <GREEN>(HEAD detached from fromtag)<RESET>
+ ambiguous<RESET>
+ branch-one<RESET>
+ + <CYAN>branch-two<RESET>
+ master<RESET>
+ ref-to-branch<RESET> -> branch-one
+ ref-to-remote<RESET> -> origin/branch-one
+ EOF
+ git worktree add worktree_dir branch-two &&
+ git branch --color >actual.raw &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_decode_color <actual.raw >actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success "set up color tests" '
echo "<RED>master<RESET>" >expect.color &&
echo "master" >expect.bare &&
@@ -264,4 +329,23 @@
test_cmp expect.color actual
'
+test_expect_success 'verbose output lists worktree path' '
+ one=$(git rev-parse --short HEAD) &&
+ two=$(git rev-parse --short master) &&
+ cat >expect <<-EOF &&
+ * (HEAD detached from fromtag) $one one
+ ambiguous $one one
+ branch-one $two two
+ + branch-two $one ($(pwd)/worktree_dir) one
+ master $two two
+ ref-to-branch $two two
+ ref-to-remote $two two
+ EOF
+ git worktree add worktree_dir branch-two &&
+ git branch -vv >actual &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_i18ncmp expect actual
+'
+
test_done
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 048feaf..0120f76 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -8,17 +8,124 @@
# harm than good. We need some real history.
test_expect_success 'setup' '
- git fast-import < "$TEST_DIRECTORY"/t3206/history.export
+ git fast-import < "$TEST_DIRECTORY"/t3206/history.export &&
+ test_oid_cache <<-EOF
+ # topic
+ t1 sha1:4de457d
+ t2 sha1:fccce22
+ t3 sha1:147e64e
+ t4 sha1:a63e992
+ t1 sha256:b89f8b9
+ t2 sha256:5f12aad
+ t3 sha256:ea8b273
+ t4 sha256:14b7336
+
+ # unmodified
+ u1 sha1:35b9b25
+ u2 sha1:de345ab
+ u3 sha1:9af6654
+ u4 sha1:2901f77
+ u1 sha256:e3731be
+ u2 sha256:14fadf8
+ u3 sha256:736c4bc
+ u4 sha256:673e77d
+
+ # reordered
+ r1 sha1:aca177a
+ r2 sha1:14ad629
+ r3 sha1:ee58208
+ r4 sha1:307b27a
+ r1 sha256:f59d3aa
+ r2 sha256:fb261a8
+ r3 sha256:cb2649b
+ r4 sha256:958577e
+
+ # removed (deleted)
+ d1 sha1:7657159
+ d2 sha1:43d84d3
+ d3 sha1:a740396
+ d1 sha256:e312513
+ d2 sha256:eb19258
+ d3 sha256:1ccb3c1
+
+ # added
+ a1 sha1:2716022
+ a2 sha1:b62accd
+ a3 sha1:df46cfa
+ a4 sha1:3e64548
+ a5 sha1:12b4063
+ a1 sha256:d724f4d
+ a2 sha256:1de7762
+ a3 sha256:e159431
+ a4 sha256:b3e483c
+ a5 sha256:90866a7
+
+ # rebased
+ b1 sha1:cc9c443
+ b2 sha1:c5d9641
+ b3 sha1:28cc2b6
+ b4 sha1:5628ab7
+ b5 sha1:a31b12e
+ b1 sha256:a1a8717
+ b2 sha256:20a5862
+ b3 sha256:587172a
+ b4 sha256:2721c5d
+ b5 sha256:7b57864
+
+ # changed
+ c1 sha1:a4b3333
+ c2 sha1:f51d370
+ c3 sha1:0559556
+ c4 sha1:d966c5c
+ c1 sha256:f8c2b9d
+ c2 sha256:3fb6318
+ c3 sha256:168ab68
+ c4 sha256:3526539
+
+ # changed-message
+ m1 sha1:f686024
+ m2 sha1:4ab067d
+ m3 sha1:b9cb956
+ m4 sha1:8add5f1
+ m1 sha256:31e6281
+ m2 sha256:a06bf1b
+ m3 sha256:82dc654
+ m4 sha256:48470c5
+
+ # renamed
+ n1 sha1:f258d75
+ n2 sha1:017b62d
+ n3 sha1:3ce7af6
+ n4 sha1:1e6226b
+ n1 sha256:ad52114
+ n2 sha256:3b54c8f
+ n3 sha256:3b0a644
+ n4 sha256:e461653
+
+ # added and removed
+ s1 sha1:096b1ba
+ s2 sha1:d92e698
+ s3 sha1:9a1db4d
+ s4 sha1:fea3b5c
+ s1 sha256:a7f9134
+ s2 sha256:b4c2580
+ s3 sha256:1d62aa2
+ s4 sha256:48160e8
+
+ # Empty delimiter (included so lines match neatly)
+ __ sha1:-------
+ __ sha256:-------
+ EOF
'
test_expect_success 'simple A..B A..C (unmodified)' '
git range-diff --no-color master..topic master..unmodified \
>actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 35b9b25 s/5/A/
- 2: fccce22 = 2: de345ab s/4/A/
- 3: 147e64e = 3: 9af6654 s/11/B/
- 4: a63e992 = 4: 2901f77 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
+ 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/
EOF
test_cmp expected actual
'
@@ -38,10 +145,10 @@
test_expect_success 'trivial reordering' '
git range-diff --no-color master topic reordered >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: aca177a s/5/A/
- 3: 147e64e = 2: 14ad629 s/11/B/
- 4: a63e992 = 3: ee58208 s/12/B/
- 2: fccce22 = 4: 307b27a s/4/A/
+ 1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/
+ 3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/
+ 4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/
+ 2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/
EOF
test_cmp expected actual
'
@@ -49,10 +156,10 @@
test_expect_success 'removed a commit' '
git range-diff --no-color master topic removed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 7657159 s/5/A/
- 2: fccce22 < -: ------- s/4/A/
- 3: 147e64e = 2: 43d84d3 s/11/B/
- 4: a63e992 = 3: a740396 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/
+ 2: $(test_oid t2) < -: $(test_oid __) s/4/A/
+ 3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/
+ 4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/
EOF
test_cmp expected actual
'
@@ -60,11 +167,11 @@
test_expect_success 'added a commit' '
git range-diff --no-color master topic added >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 2716022 s/5/A/
- 2: fccce22 = 2: b62accd s/4/A/
- -: ------- > 3: df46cfa s/6/A/
- 3: 147e64e = 4: 3e64548 s/11/B/
- 4: a63e992 = 5: 12b4063 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/
+ -: $(test_oid __) > 3: $(test_oid a3) s/6/A/
+ 3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/
+ 4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/
EOF
test_cmp expected actual
'
@@ -72,10 +179,10 @@
test_expect_success 'new base, A B C' '
git range-diff --no-color master topic rebased >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: cc9c443 s/5/A/
- 2: fccce22 = 2: c5d9641 s/4/A/
- 3: 147e64e = 3: 28cc2b6 s/11/B/
- 4: a63e992 = 4: 5628ab7 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/
+ 3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/
EOF
test_cmp expected actual
'
@@ -84,11 +191,11 @@
# this syntax includes the commits from master!
git range-diff --no-color topic...rebased >actual &&
cat >expected <<-EOF &&
- -: ------- > 1: a31b12e unrelated
- 1: 4de457d = 2: cc9c443 s/5/A/
- 2: fccce22 = 3: c5d9641 s/4/A/
- 3: 147e64e = 4: 28cc2b6 s/11/B/
- 4: a63e992 = 5: 5628ab7 s/12/B/
+ -: $(test_oid __) > 1: $(test_oid b5) unrelated
+ 1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/
+ 2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/
+ 3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/
+ 4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/
EOF
test_cmp expected actual
'
@@ -96,10 +203,10 @@
test_expect_success 'changed commit' '
git range-diff --no-color topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- @@ -10,7 +10,7 @@
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ @@ file: A
9
10
-11
@@ -108,9 +215,9 @@
12
13
14
- 4: a63e992 ! 4: d966c5c s/12/B/
- @@ -8,7 +8,7 @@
- @@
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
+ @@ file
+ @@ file: A
9
10
- B
@@ -125,10 +232,10 @@
test_expect_success 'changed commit with --no-patch diff option' '
git range-diff --no-color --no-patch topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- 4: a63e992 ! 4: d966c5c s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
EOF
test_cmp expected actual
'
@@ -136,16 +243,16 @@
test_expect_success 'changed commit with --stat diff option' '
git range-diff --no-color --stat topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 2: fccce22 = 2: f51d370 s/4/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 3: 147e64e ! 3: 0559556 s/11/B/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 4: a63e992 ! 4: d966c5c s/12/B/
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
EOF
@@ -155,10 +262,10 @@
test_expect_success 'changed commit with sm config' '
git range-diff --no-color --submodule=log topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- @@ -10,7 +10,7 @@
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ @@ file: A
9
10
-11
@@ -167,9 +274,9 @@
12
13
14
- 4: a63e992 ! 4: d966c5c s/12/B/
- @@ -8,7 +8,7 @@
- @@
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
+ @@ file
+ @@ file: A
9
10
- B
@@ -181,6 +288,92 @@
test_cmp expected actual
'
+test_expect_success 'renamed file' '
+ git range-diff --no-color --submodule=log topic...renamed-file >actual &&
+ sed s/Z/\ /g >expected <<-EOF &&
+ 1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/4/A/
+ + s/4/A/ + rename file
+ Z
+ - ## file ##
+ + ## file => renamed-file ##
+ Z@@
+ Z 1
+ Z 2
+ 3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/
+ @@ Metadata
+ Z ## Commit message ##
+ Z s/11/B/
+ Z
+ - ## file ##
+ -@@ file: A
+ + ## renamed-file ##
+ +@@ renamed-file: A
+ Z 8
+ Z 9
+ Z 10
+ 4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/
+ @@ Metadata
+ Z ## Commit message ##
+ Z s/12/B/
+ Z
+ - ## file ##
+ -@@ file: A
+ + ## renamed-file ##
+ +@@ renamed-file: A
+ Z 9
+ Z 10
+ Z B
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'file added and later removed' '
+ git range-diff --no-color --submodule=log topic...added-removed >actual &&
+ sed s/Z/\ /g >expected <<-EOF &&
+ 1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/4/A/
+ + s/4/A/ + new-file
+ Z
+ Z ## file ##
+ Z@@
+ @@ file
+ Z A
+ Z 6
+ Z 7
+ +
+ + ## new-file (new) ##
+ 3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/11/B/
+ + s/11/B/ + remove file
+ Z
+ Z ## file ##
+ Z@@ file: A
+ @@ file: A
+ Z 12
+ Z 13
+ Z 14
+ +
+ + ## new-file (deleted) ##
+ 4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/
+ EOF
+ test_cmp expected actual
+'
+
test_expect_success 'no commits on one side' '
git commit --amend -m "new message" &&
git range-diff master HEAD@{1} HEAD
@@ -189,38 +382,38 @@
test_expect_success 'changed message' '
git range-diff --no-color topic...changed-message >actual &&
sed s/Z/\ /g >expected <<-EOF &&
- 1: 4de457d = 1: f686024 s/5/A/
- 2: fccce22 ! 2: 4ab067d s/4/A/
- @@ -2,6 +2,8 @@
- Z
+ 1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/
+ @@ Metadata
+ Z ## Commit message ##
Z s/4/A/
Z
+ Also a silly comment here!
+
- Z diff --git a/file b/file
- Z --- a/file
- Z +++ b/file
- 3: 147e64e = 3: b9cb956 s/11/B/
- 4: a63e992 = 4: 8add5f1 s/12/B/
+ Z ## file ##
+ Z@@
+ Z 1
+ 3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'dual-coloring' '
- sed -e "s|^:||" >expect <<-\EOF &&
- :<YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET>
- :<RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET>
- : <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
- : <RESET>
+ sed -e "s|^:||" >expect <<-EOF &&
+ :<YELLOW>1: $(test_oid c1) = 1: $(test_oid m1) s/5/A/<RESET>
+ :<RED>2: $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2: $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
+ : ## Commit message ##<RESET>
: s/4/A/<RESET>
: <RESET>
: <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>
: <REVERSE><GREEN>+<RESET>
- : diff --git a/file b/file<RESET>
- : --- a/file<RESET>
- : +++ b/file<RESET>
- :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET>
- : <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
+ : ## file ##<RESET>
+ : <CYAN> @@<RESET>
+ : 1<RESET>
+ :<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
: 9<RESET>
: 10<RESET>
: <RED> -11<RESET>
@@ -229,9 +422,9 @@
: 12<RESET>
: 13<RESET>
: 14<RESET>
- :<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET>
- : <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
- : <CYAN> @@<RESET>
+ :<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
+ : <CYAN> @@ file: A<RESET>
: 9<RESET>
: 10<RESET>
: <REVERSE><RED>-<RESET><FAINT> BB<RESET>
diff --git a/t/t3206/history.export b/t/t3206/history.export
index b8ffff0..7bb3814 100644
--- a/t/t3206/history.export
+++ b/t/t3206/history.export
@@ -22,8 +22,8 @@
19
20
-reset refs/heads/removed
-commit refs/heads/removed
+reset refs/heads/renamed-file
+commit refs/heads/renamed-file
mark :2
author Thomas Rast <trast@inf.ethz.ch> 1374424921 +0200
committer Thomas Rast <trast@inf.ethz.ch> 1374484724 +0200
@@ -599,6 +599,82 @@
from :46
M 100644 :28 file
-reset refs/heads/removed
-from :47
+commit refs/heads/added-removed
+mark :48
+author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574151 +0100
+data 7
+s/5/A/
+from :2
+M 100644 :3 file
+
+blob
+mark :49
+data 0
+
+commit refs/heads/added-removed
+mark :50
+author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 18
+s/4/A/ + new-file
+from :48
+M 100644 :5 file
+M 100644 :49 new-file
+
+commit refs/heads/added-removed
+mark :51
+author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 22
+s/11/B/ + remove file
+from :50
+M 100644 :7 file
+D new-file
+
+commit refs/heads/added-removed
+mark :52
+author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 8
+s/12/B/
+from :51
+M 100644 :9 file
+
+commit refs/heads/renamed-file
+mark :53
+author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574309 +0100
+data 7
+s/5/A/
+from :2
+M 100644 :3 file
+
+commit refs/heads/renamed-file
+mark :54
+author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574312 +0100
+data 21
+s/4/A/ + rename file
+from :53
+D file
+M 100644 :5 renamed-file
+
+commit refs/heads/renamed-file
+mark :55
+author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
+data 8
+s/11/B/
+from :54
+M 100644 :7 renamed-file
+
+commit refs/heads/renamed-file
+mark :56
+author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
+data 8
+s/12/B/
+from :55
+M 100644 :9 renamed-file
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 84bbf88..d3fa298 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -66,8 +66,9 @@
'
test_expect_success 'create reflog entry' '
+ ref=$(git rev-parse --short refs/notes/commits) &&
cat <<-EOF >expect &&
- a1d8fa6 refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
+ $ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
EOF
git reflog show refs/notes/commits >actual &&
test_cmp expect actual
@@ -134,8 +135,9 @@
'
test_expect_success 'show notes' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
@@ -152,8 +154,9 @@
test_expect_success 'show multi-line notes' '
test_commit 3rd &&
MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-multiline <<-EOF &&
- commit d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
@@ -174,8 +177,9 @@
test_commit 4th &&
echo "xyzzy" >note5 &&
git notes add -F note5 &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-F <<-EOF &&
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
@@ -198,10 +202,13 @@
'
test_expect_success 'git log --pretty=raw does not show notes' '
+ commit=$(git rev-parse HEAD) &&
+ tree=$(git rev-parse HEAD^{tree}) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
- tree 05ac65288c4c4b3b709a020ae94b2ece2f2201ae
- parent d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit $commit
+ tree $tree
+ parent $parent
author A U Thor <author@example.com> 1112912173 -0700
committer C O Mitter <committer@example.com> 1112912173 -0700
@@ -291,8 +298,9 @@
test_expect_success 'show -m notes' '
test_commit 5th &&
git notes add -m spam -m "foo${LF}bar${LF}baz" &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-m <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
@@ -313,8 +321,9 @@
test_expect_success 'remove note with add -f -F /dev/null' '
git notes add -f -F /dev/null &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-rm-F <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
@@ -356,14 +365,16 @@
test_expect_success 'remove note with "git notes remove"' '
git notes remove HEAD^ &&
git notes remove &&
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-rm-remove <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
${indent}5th
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
@@ -459,9 +470,11 @@
'
test_expect_success 'list notes with "git notes list"' '
- cat >expect <<-EOF &&
- c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
- c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit_2=$(git rev-parse 2nd) &&
+ commit_3=$(git rev-parse 3rd) &&
+ sort -t" " -k2 >expect <<-EOF &&
+ $(git rev-parse refs/notes/commits:$commit_2) $commit_2
+ $(git rev-parse refs/notes/commits:$commit_3) $commit_3
EOF
git notes list >actual &&
test_cmp expect actual
@@ -474,7 +487,7 @@
test_expect_success 'list specific note with "git notes list <object>"' '
cat >expect <<-EOF &&
- c18dc024e14f08d18d14eea0d747ff692d66d6a3
+ $(git rev-parse refs/notes/commits:$commit_3)
EOF
git notes list HEAD^^ >actual &&
test_cmp expect actual
@@ -498,10 +511,11 @@
'
test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
- cat >expect_list <<-EOF &&
- c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
- 4b6ad22357cc8a1296720574b8d2fbc22fab0671 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
- c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit_5=$(git rev-parse 5th) &&
+ sort -t" " -k2 >expect_list <<-EOF &&
+ $(git rev-parse refs/notes/commits:$commit_2) $commit_2
+ $(git rev-parse refs/notes/commits:$commit_3) $commit_3
+ $(git rev-parse refs/notes/commits:$commit_5) $commit_5
EOF
git notes list >actual &&
test_cmp expect_list actual
@@ -531,8 +545,9 @@
test_expect_success 'create other note on a different notes ref (setup)' '
test_commit 6th &&
GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-not-other <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
@@ -569,8 +584,10 @@
'
test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-both <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
@@ -582,7 +599,7 @@
Notes (other):
${indent}other note
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
@@ -616,8 +633,9 @@
'
test_expect_success 'notes.displayRef respects order' '
+ commit=$(git rev-parse HEAD) &&
cat >expect-both-reversed <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
@@ -642,14 +660,16 @@
'
test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-none <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
${indent}6th
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
@@ -666,8 +686,9 @@
'
test_expect_success '--no-standard-notes' '
+ commit=$(git rev-parse HEAD) &&
cat >expect-commits <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
@@ -712,8 +733,10 @@
'
test_expect_success 'create note from other note with "git notes add -C"' '
+ test_commit 7th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit fb01e0ca8c33b6cc0c6451dde747f97df567cb5c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:19:13 2005 -0700
@@ -722,7 +745,6 @@
Notes:
${indent}order test
EOF
- test_commit 7th &&
git notes add -C $(git notes list HEAD^) &&
git log -1 >actual &&
test_cmp expect actual &&
@@ -744,8 +766,9 @@
'
test_expect_success 'create note from blob with "git notes add -C" reuses blob id' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:20:13 2005 -0700
@@ -762,8 +785,10 @@
'
test_expect_success 'create note from other note with "git notes add -c"' '
+ test_commit 9th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:21:13 2005 -0700
@@ -772,7 +797,6 @@
Notes:
${indent}yet another note
EOF
- test_commit 9th &&
MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
git log -1 >actual &&
test_cmp expect actual
@@ -785,8 +809,9 @@
'
test_expect_success 'append to note from other note with "git notes append -C"' '
+ commit=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:21:13 2005 -0700
@@ -803,8 +828,9 @@
'
test_expect_success 'create note from other note with "git notes append -c"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:22:13 2005 -0700
@@ -819,8 +845,9 @@
'
test_expect_success 'append to note from other note with "git notes append -c"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:22:13 2005 -0700
@@ -837,8 +864,10 @@
'
test_expect_success 'copy note with "git notes copy"' '
+ test_commit 11th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:23:13 2005 -0700
@@ -849,7 +878,6 @@
${indent}
${indent}yet another note
EOF
- test_commit 11th &&
git notes copy HEAD^ HEAD &&
git log -1 >actual &&
test_cmp expect actual &&
@@ -864,8 +892,9 @@
'
test_expect_success 'allow overwrite with "git notes copy -f"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:23:13 2005 -0700
@@ -889,8 +918,10 @@
'
test_expect_success 'git notes copy --stdin' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit e871aa61182b1d95d0a6fb75445d891722863b6b
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:25:13 2005 -0700
@@ -901,7 +932,7 @@
${indent}
${indent}yet another note
- commit 65e263ded02ae4e8839bc151095113737579dc12
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:24:13 2005 -0700
@@ -922,21 +953,23 @@
'
test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
+ test_commit 14th &&
+ test_commit 15th &&
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
${indent}15th
- commit 07c85d77059393ed0154b8c96906547a59dfcddd
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:26:13 2005 -0700
${indent}14th
EOF
- test_commit 14th &&
- test_commit 15th &&
(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
git notes copy --for-rewrite=foo &&
@@ -945,8 +978,10 @@
'
test_expect_success 'git notes copy --for-rewrite (enabled)' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -957,7 +992,7 @@
${indent}
${indent}yet another note
- commit 07c85d77059393ed0154b8c96906547a59dfcddd
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:26:13 2005 -0700
@@ -986,8 +1021,9 @@
'
test_expect_success 'git notes copy --for-rewrite (overwrite)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -1015,8 +1051,9 @@
'
test_expect_success 'git notes copy --for-rewrite (append)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -1037,8 +1074,9 @@
'
test_expect_success 'git notes copy --for-rewrite (append two to one)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -1075,8 +1113,9 @@
'
test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -1095,8 +1134,9 @@
'
test_expect_success 'GIT_NOTES_REWRITE_REF works' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
@@ -1120,9 +1160,10 @@
test_config notes.rewriteMode overwrite &&
test_config notes.rewriteRef refs/notes/other &&
echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
- GIT_NOTES_REWRITE_REF= git notes copy --for-rewrite=foo &&
+ GIT_NOTES_REWRITE_REF=refs/notes/commits \
+ git notes copy --for-rewrite=foo &&
git log -1 >actual &&
- test_cmp expect actual
+ grep "replacement note 3" actual
'
test_expect_success 'git notes copy diagnoses too many or too few parameters' '
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 54460be..831f83d 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -35,15 +35,10 @@
git ls-tree -r --name-only refs/notes/commits |
while read path
do
- case "$path" in
- ??/??????????????????????????????????????)
- : true
- ;;
- *)
+ echo $path | grep "^../[0-9a-f]*$" || {
echo "Invalid path \"$path\"" &&
- return 1
- ;;
- esac
+ return 1;
+ }
done
'
@@ -77,15 +72,10 @@
git ls-tree -r --name-only refs/notes/commits |
while read path
do
- case "$path" in
- ????????????????????????????????????????)
- : true
- ;;
- *)
+ echo $path | grep -v "^../.*" || {
echo "Invalid path \"$path\"" &&
- return 1
- ;;
- esac
+ return 1;
+ }
done
'
diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh
index 6174808..8f4102f 100755
--- a/t/t3306-notes-prune.sh
+++ b/t/t3306-notes-prune.sh
@@ -11,23 +11,26 @@
test_tick &&
git commit -m 1st &&
git notes add -m "Note #1" &&
+ first=$(git rev-parse HEAD) &&
: > file2 &&
git add file2 &&
test_tick &&
git commit -m 2nd &&
git notes add -m "Note #2" &&
+ second=$(git rev-parse HEAD) &&
: > file3 &&
git add file3 &&
test_tick &&
git commit -m 3rd &&
- COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+ third=$(git rev-parse HEAD) &&
+ COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
test -f $COMMIT_FILE &&
test-tool chmtime =+0 $COMMIT_FILE &&
git notes add -m "Note #3"
'
cat > expect <<END_OF_LOG
-commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+commit $third
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
@@ -36,7 +39,7 @@
Notes:
Note #3
-commit 08341ad9e94faa089d60fd3f523affb25c6da189
+commit $second
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
@@ -45,7 +48,7 @@
Notes:
Note #2
-commit ab5f302035f2e7aaf04265f08b42034c23256e1f
+commit $first
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:13:13 2005 -0700
@@ -70,16 +73,16 @@
test_expect_success 'verify that commits are gone' '
- test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git cat-file -p $third &&
+ git cat-file -p $second &&
+ git cat-file -p $first
'
test_expect_success 'verify that notes are still present' '
- git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ git notes show $third &&
+ git notes show $second &&
+ git notes show $first
'
test_expect_success 'prune -n does not remove notes' '
@@ -90,13 +93,10 @@
test_cmp expect actual
'
-cat > expect <<EOF
-5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-EOF
test_expect_success 'prune -n lists prunable notes' '
-
+ echo $third >expect &&
git notes prune -n > actual &&
test_cmp expect actual
'
@@ -109,9 +109,9 @@
test_expect_success 'verify that notes are gone' '
- test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git notes show $third &&
+ git notes show $second &&
+ git notes show $first
'
test_expect_success 'remove some commits' '
@@ -121,21 +121,18 @@
git gc --prune=now
'
-cat > expect <<EOF
-08341ad9e94faa089d60fd3f523affb25c6da189
-EOF
-
test_expect_success 'prune -v notes' '
+ echo $second >expect &&
git notes prune -v > actual &&
test_cmp expect actual
'
test_expect_success 'verify that notes are gone' '
- test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git notes show $third &&
+ test_must_fail git notes show $second &&
+ git notes show $first
'
test_done
diff --git a/t/t3311-notes-merge-fanout.sh b/t/t3311-notes-merge-fanout.sh
index 93516ef..37151a3 100755
--- a/t/t3311-notes-merge-fanout.sh
+++ b/t/t3311-notes-merge-fanout.sh
@@ -114,12 +114,12 @@
test_expect_success 'Add a few hundred commits w/notes to trigger fanout (x -> y)' '
git update-ref refs/notes/y refs/notes/x &&
git config core.notesRef refs/notes/y &&
- i=5 &&
- while test $i -lt $num
+ test_commit_bulk --start=6 --id=commit $((num - 5)) &&
+ i=0 &&
+ while test $i -lt $((num - 5))
do
- i=$(($i + 1)) &&
- test_commit "commit$i" >/dev/null &&
- git notes add -m "notes for commit$i" || return 1
+ git notes add -m "notes for commit$i" HEAD~$i || return 1
+ i=$((i + 1))
done &&
test "$(git rev-parse refs/notes/y)" != "$(git rev-parse refs/notes/x)" &&
# Expected number of commits and notes
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 3e73f75..ab18ac5 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -59,6 +59,14 @@
git rebase master
'
+test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
+ git checkout -b orig-head topic &&
+ pre="$(git rev-parse --verify HEAD)" &&
+ git rebase master &&
+ test_cmp_rev "$pre" ORIG_HEAD &&
+ ! test_cmp_rev "$pre" HEAD
+'
+
test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
test_when_finished "git branch -D torebase" &&
git checkout -b torebase my-topic-branch^ &&
@@ -277,7 +285,7 @@
test_cmp From_.msg out
'
-test_expect_success 'rebase--am.sh and --show-current-patch' '
+test_expect_success 'rebase --am and --show-current-patch' '
test_create_repo conflict-apply &&
(
cd conflict-apply &&
@@ -287,12 +295,48 @@
echo two >>init.t &&
git commit -a -m two &&
git tag two &&
- test_must_fail git rebase --onto init HEAD^ &&
+ test_must_fail git rebase -f --onto init HEAD^ &&
GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
grep "show.*$(git rev-parse two)" stderr
)
'
+test_expect_success 'rebase --am and .gitattributes' '
+ test_create_repo attributes &&
+ (
+ cd attributes &&
+ test_commit init &&
+ git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+ git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+ test_commit second &&
+ git checkout -b test HEAD^ &&
+
+ echo "*.txt filter=test" >.gitattributes &&
+ git add .gitattributes &&
+ test_commit third &&
+
+ echo "This text is smudged." >a.txt &&
+ git add a.txt &&
+ test_commit fourth &&
+
+ git checkout -b removal HEAD^ &&
+ git rm .gitattributes &&
+ git add -u &&
+ test_commit fifth &&
+ git cherry-pick test &&
+
+ git checkout test &&
+ git rebase master &&
+ grep "smudged" a.txt &&
+
+ git checkout removal &&
+ git reset --hard &&
+ git rebase master &&
+ grep "clean" a.txt
+ )
+'
+
test_expect_success 'rebase--merge.sh and --show-current-patch' '
test_create_repo conflict-merge &&
(
@@ -311,4 +355,20 @@
)
'
+test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
+ expected="rebase.useBuiltin support has been removed" &&
+
+ # Only warn when the legacy rebase is requested...
+ test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&
+ test_i18ngrep "$expected" err &&
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&
+ test_i18ngrep "$expected" err &&
+
+ # ...not when we would have used the built-in anyway
+ test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&
+ test_must_be_empty err &&
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&
+ test_must_be_empty err
+'
+
test_done
diff --git a/t/t3401-rebase-and-am-rename.sh b/t/t3401-rebase-and-am-rename.sh
index e0b5111..a0b9438 100755
--- a/t/t3401-rebase-and-am-rename.sh
+++ b/t/t3401-rebase-and-am-rename.sh
@@ -42,7 +42,7 @@
git checkout B^0 &&
set_fake_editor &&
- FAKE_LINES="1" git rebase --interactive A &&
+ FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -58,7 +58,7 @@
git checkout B^0 &&
- git rebase A &&
+ git -c merge.directoryRenames=true rebase A &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -74,7 +74,7 @@
git checkout B^0 &&
- git rebase --merge A &&
+ git -c merge.directoryRenames=true rebase --merge A &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -92,7 +92,7 @@
git format-patch -1 B &&
- git am --3way 0001*.patch &&
+ git -c merge.directoryRenames=true am --3way 0001*.patch &&
git ls-files -s >out &&
test_line_count = 5 out &&
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 52fa41c..29a3584 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -29,9 +29,6 @@
. "$TEST_DIRECTORY"/lib-rebase.sh
-# WARNING: Modifications to the initial repository can change the SHA ID used
-# in the expect2 file for the 'stop on conflicting pick' test.
-
test_expect_success 'setup' '
test_commit A file1 &&
test_commit B file1 &&
@@ -75,11 +72,10 @@
test_line_count = 6 actual
'
-cat > expect <<EOF
-error: nothing to do
-EOF
-
test_expect_success 'rebase -i with empty HEAD' '
+ cat >expect <<-\EOF &&
+ error: nothing to do
+ EOF
set_fake_editor &&
test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
test_i18ncmp expect actual
@@ -149,18 +145,16 @@
test_expect_success 'rebase -x with empty command fails' '
test_when_finished "git rebase --abort ||:" &&
- test_must_fail git rebase -x "" @ 2>actual &&
+ test_must_fail env git rebase -x "" @ 2>actual &&
test_write_lines "error: empty exec command" >expected &&
test_i18ncmp expected actual &&
- test_must_fail git rebase -x " " @ 2>actual &&
+ test_must_fail env git rebase -x " " @ 2>actual &&
test_i18ncmp expected actual
'
-LF='
-'
test_expect_success 'rebase -x with newline in command fails' '
test_when_finished "git rebase --abort ||:" &&
- test_must_fail git rebase -x "a${LF}b" @ 2>actual &&
+ test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
test_write_lines "error: exec commands cannot contain newlines" \
>expected &&
test_i18ncmp expected actual
@@ -234,28 +228,29 @@
set_fake_editor &&
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
- test G = $(git cat-file commit HEAD | sed -ne \$p)
+ test G = $(git cat-file commit HEAD | sed -ne \$p) &&
+ blob1=$(git rev-parse --short HEAD^:file1) &&
+ blob2=$(git rev-parse --short HEAD:file1) &&
+ commit=$(git rev-parse --short HEAD)
'
-cat > expect << EOF
-diff --git a/file1 b/file1
-index f70f10e..fd79235 100644
---- a/file1
-+++ b/file1
-@@ -1 +1 @@
--A
-+G
-EOF
-
-cat > expect2 << EOF
-<<<<<<< HEAD
-D
-=======
-G
->>>>>>> 5d18e54... G
-EOF
-
test_expect_success 'stop on conflicting pick' '
+ cat >expect <<-EOF &&
+ diff --git a/file1 b/file1
+ index $blob1..$blob2 100644
+ --- a/file1
+ +++ b/file1
+ @@ -1 +1 @@
+ -A
+ +G
+ EOF
+ cat >expect2 <<-EOF &&
+ <<<<<<< HEAD
+ D
+ =======
+ G
+ >>>>>>> $commit... G
+ EOF
git tag new-branch1 &&
set_fake_editor &&
test_must_fail git rebase -i master &&
@@ -495,15 +490,14 @@
git branch -D conflict-squash
'
-cat > expect-squash-fixup << EOF
-B
-
-D
-
-ONCE
-EOF
-
test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
+ cat >expect-squash-fixup <<-\EOF &&
+ B
+
+ D
+
+ ONCE
+ EOF
git checkout -b squash-fixup E &&
base=$(git rev-parse HEAD~4) &&
set_fake_editor &&
@@ -799,13 +793,12 @@
test "a note" = "$(git notes show HEAD)"
'
-cat >expect <<EOF
-an earlier note
-
-a note
-EOF
-
test_expect_success 'rebase -i can copy notes over a fixup' '
+ cat >expect <<-\EOF &&
+ an earlier note
+
+ a note
+ EOF
git reset --hard n3 &&
git notes add -m"an earlier note" n2 &&
set_fake_editor &&
@@ -1008,7 +1001,7 @@
git checkout B &&
set_fake_editor &&
test_must_fail env FAKE_LINES="2" git rebase -i --root &&
- git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
+ git cat-file commit HEAD | grep "^tree $EMPTY_TREE" &&
git rebase --abort
'
@@ -1031,7 +1024,7 @@
test -z "$(git show -s --format=%p HEAD^)"
'
-test_expect_success 'rebase -i --root when root has untracked file confilct' '
+test_expect_success 'rebase -i --root when root has untracked file conflict' '
test_when_finished "reset_rebase" &&
git checkout -b failing-root-pick A &&
echo x >file2 &&
@@ -1063,7 +1056,7 @@
git reset --hard &&
git checkout conflict-branch &&
set_fake_editor &&
- test_must_fail git rebase --onto HEAD~2 HEAD~ &&
+ test_must_fail git rebase -f --onto HEAD~2 HEAD~ &&
test_must_fail git rebase --edit-todo &&
git rebase --abort
'
@@ -1166,7 +1159,7 @@
test_expect_code 1 grep " emp" error
'
-test_expect_success 'short SHA-1 setup' '
+test_expect_success SHA1 'short SHA-1 setup' '
test_when_finished "git checkout master" &&
git checkout --orphan collide &&
git rm -rf . &&
@@ -1178,7 +1171,7 @@
)
'
-test_expect_success 'short SHA-1 collide' '
+test_expect_success SHA1 'short SHA-1 collide' '
test_when_finished "reset_rebase && git checkout master" &&
git checkout collide &&
(
@@ -1304,52 +1297,37 @@
actual
'
-cat >expect <<EOF
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
-To avoid this message, use "drop" to explicitly remove a commit.
-
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
-
-Rebasing (1/4)
-Rebasing (2/4)
-Rebasing (3/4)
-Rebasing (4/4)
-Successfully rebased and updated refs/heads/missing-commit.
-EOF
-
-cr_to_nl () {
- tr '\015' '\012'
-}
-
test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
+ cat >expect <<-EOF &&
+ Warning: some commits may have been dropped accidentally.
+ Dropped commits (newer to older):
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
+ To avoid this message, use "drop" to explicitly remove a commit.
+ EOF
test_config rebase.missingCommitsCheck warn &&
rebase_setup_and_clean missing-commit &&
set_fake_editor &&
FAKE_LINES="1 2 3 4" \
git rebase -i --root 2>actual.2 &&
- cr_to_nl <actual.2 >actual &&
+ head -n4 actual.2 >actual &&
test_i18ncmp expect actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p)
'
-cat >expect <<EOF
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
- - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
-To avoid this message, use "drop" to explicitly remove a commit.
-
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
-
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-EOF
-
test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
+ cat >expect <<-EOF &&
+ Warning: some commits may have been dropped accidentally.
+ Dropped commits (newer to older):
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
+ To avoid this message, use "drop" to explicitly remove a commit.
+
+ Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
+ The possible behaviours are: ignore, warn, error.
+
+ You can fix this with '\''git rebase --edit-todo'\'' and then run '\''git rebase --continue'\''.
+ Or you can abort the rebase with '\''git rebase --abort'\''.
+ EOF
test_config rebase.missingCommitsCheck error &&
rebase_setup_and_clean missing-commit &&
set_fake_editor &&
@@ -1439,7 +1417,6 @@
)
'
-SQ="'"
test_expect_success 'rebase -i --gpg-sign=<key-id>' '
test_when_finished "test_might_fail git rebase --abort" &&
set_fake_editor &&
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 13f5688..22d2186 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -277,7 +277,7 @@
(
set_cat_todo_editor &&
test_must_fail git -c rebase.instructionFormat= \
- rebase --autosquash --force -i HEAD^ >actual &&
+ rebase --autosquash --force-rebase -i HEAD^ >actual &&
git log -1 --format="pick %h %s" >expect &&
test_cmp expect actual
)
diff --git a/t/t3416-rebase-onto-threedots.sh b/t/t3416-rebase-onto-threedots.sh
index ddf2f64..9c25484 100755
--- a/t/t3416-rebase-onto-threedots.sh
+++ b/t/t3416-rebase-onto-threedots.sh
@@ -99,7 +99,64 @@
git checkout side &&
git reset --hard K &&
+ set_fake_editor &&
test_must_fail git rebase -i --onto master...side J
'
+test_expect_success 'rebase --keep-base --onto incompatible' '
+ test_must_fail git rebase --keep-base --onto master...
+'
+
+test_expect_success 'rebase --keep-base --root incompatible' '
+ test_must_fail git rebase --keep-base --root
+'
+
+test_expect_success 'rebase --keep-base master from topic' '
+ git reset --hard &&
+ git checkout topic &&
+ git reset --hard G &&
+
+ git rebase --keep-base master &&
+ git rev-parse C >base.expect &&
+ git merge-base master HEAD >base.actual &&
+ test_cmp base.expect base.actual &&
+
+ git rev-parse HEAD~2 >actual &&
+ git rev-parse C^0 >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rebase --keep-base master from side' '
+ git reset --hard &&
+ git checkout side &&
+ git reset --hard K &&
+
+ test_must_fail git rebase --keep-base master
+'
+
+test_expect_success 'rebase -i --keep-base master from topic' '
+ git reset --hard &&
+ git checkout topic &&
+ git reset --hard G &&
+
+ set_fake_editor &&
+ EXPECT_COUNT=2 git rebase -i --keep-base master &&
+ git rev-parse C >base.expect &&
+ git merge-base master HEAD >base.actual &&
+ test_cmp base.expect base.actual &&
+
+ git rev-parse HEAD~2 >actual &&
+ git rev-parse C^0 >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rebase -i --keep-base master from side' '
+ git reset --hard &&
+ git checkout side &&
+ git reset --hard K &&
+
+ set_fake_editor &&
+ test_must_fail git rebase -i --keep-base master
+'
+
test_done
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 25aaaca..7a2da97 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -120,6 +120,20 @@
git rebase --continue
'
+test_expect_success 'rebase -r passes merge strategy options correctly' '
+ rm -fr .git/rebase-* &&
+ git reset --hard commit-new-file-F3-on-topic-branch &&
+ test_commit merge-theirs &&
+ git reset --hard HEAD^ &&
+ test_commit some-other-commit &&
+ test_tick &&
+ git merge --no-ff merge-theirs &&
+ FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
+ -s recursive --strategy-option=theirs HEAD~2 &&
+ test_commit force-change-ours &&
+ git rebase --continue
+'
+
test_expect_success '--skip after failed fixup cleans commit message' '
test_when_finished "test_might_fail git rebase --abort" &&
git checkout -b with-conflicting-fixup &&
@@ -262,10 +276,15 @@
test_must_fail git -c rebase.rescheduleFailedExec=true \
rebase -x false HEAD^ 2>err &&
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
- test_i18ngrep "has been rescheduled" err &&
- git rebase --abort &&
- test_must_fail git rebase -y false HEAD^ 2>err &&
test_i18ngrep "has been rescheduled" err
'
+test_expect_success 'rebase.reschedulefailedexec only affects `rebase -i`' '
+ test_config rebase.reschedulefailedexec true &&
+ test_must_fail git rebase -x false HEAD^ &&
+ grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+ git rebase --abort &&
+ git rebase HEAD^
+'
+
test_done
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 2d1094e..5f7e73c 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -30,13 +30,13 @@
echo conflicting-change >file2 &&
git add . &&
test_tick &&
- git commit -m "related commit"
+ git commit -m "related commit" &&
+ remove_progress_re="$(printf "s/.*\\r//")"
'
create_expected_success_am () {
cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
- HEAD is now at $(git rev-parse --short feature-branch) third commit
First, rewinding head to replay your work on top of it...
Applying: second commit
Applying: third commit
@@ -47,8 +47,7 @@
create_expected_success_interactive () {
q_to_cr >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
- HEAD is now at $(git rev-parse --short feature-branch) third commit
- Rebasing (1/2)QRebasing (2/2)QApplied autostash.
+ Applied autostash.
Successfully rebased and updated refs/heads/rebased-feature-branch.
EOF
}
@@ -56,7 +55,6 @@
create_expected_failure_am () {
cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
- HEAD is now at $(git rev-parse --short feature-branch) third commit
First, rewinding head to replay your work on top of it...
Applying: second commit
Applying: third commit
@@ -67,10 +65,9 @@
}
create_expected_failure_interactive () {
- q_to_cr >expected <<-EOF
+ cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
- HEAD is now at $(git rev-parse --short feature-branch) third commit
- Rebasing (1/2)QRebasing (2/2)QApplying autostash resulted in conflicts.
+ Applying autostash resulted in conflicts.
Your changes are safe in the stash.
You can run "git stash pop" or "git stash drop" at any time.
Successfully rebased and updated refs/heads/rebased-feature-branch.
@@ -109,7 +106,8 @@
suffix=interactive
fi &&
create_expected_success_$suffix &&
- test_i18ncmp expected actual
+ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -209,7 +207,8 @@
suffix=interactive
fi &&
create_expected_failure_$suffix &&
- test_i18ncmp expected actual
+ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
}
@@ -303,4 +302,12 @@
test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
'
+test_expect_success 'never change active branch' '
+ git checkout -b not-the-feature-branch unrelated-onto-branch &&
+ test_when_finished "git reset --hard && git checkout master" &&
+ echo changed >file0 &&
+ git rebase --autostash not-the-feature-branch feature-branch &&
+ test_cmp_rev not-the-feature-branch unrelated-onto-branch
+'
+
test_done
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 7274dca..b847064 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -31,6 +31,16 @@
test_run_rebase success -i
test_have_prereq !REBASE_P || test_run_rebase success -p
+test_expect_success 'setup branches and remote tracking' '
+ git tag -l >tags &&
+ for tag in $(cat tags)
+ do
+ git branch branch-$tag $tag || return 1
+ done &&
+ git remote add origin "file://$PWD" &&
+ git fetch origin
+'
+
test_run_rebase () {
result=$1
shift
@@ -57,6 +67,7 @@
"
}
test_run_rebase success ''
+test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
test_have_prereq !REBASE_P || test_run_rebase failure -p
@@ -64,6 +75,23 @@
test_run_rebase () {
result=$1
shift
+ test_expect_$result "rebase $* -f rewrites even if remote upstream is an ancestor" "
+ reset_rebase &&
+ git rebase $* -f branch-b branch-e &&
+ ! test_cmp_rev branch-e origin/branch-e &&
+ test_cmp_rev branch-b HEAD~2 &&
+ test_linear_range 'd e' branch-b..
+ "
+}
+test_run_rebase success ''
+test_run_rebase success --fork-point
+test_run_rebase success -m
+test_run_rebase success -i
+test_have_prereq !REBASE_P || test_run_rebase success -p
+
+test_run_rebase () {
+ result=$1
+ shift
test_expect_$result "rebase $* fast-forwards from ancestor of upstream" "
reset_rebase &&
git rebase $* e b &&
@@ -71,6 +99,7 @@
"
}
test_run_rebase success ''
+test_run_rebase success --fork-point
test_run_rebase success -m
test_run_rebase success -i
test_have_prereq !REBASE_P || test_run_rebase success -p
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index bb78a6e..50e7960 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -65,24 +65,15 @@
test_rebase_am_only --committer-date-is-author-date
test_rebase_am_only -C4
-test_expect_success '--preserve-merges incompatible with --signoff' '
+test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
git checkout B^0 &&
test_must_fail git rebase --preserve-merges --signoff A
'
-test_expect_success '--preserve-merges incompatible with --rebase-merges' '
+test_expect_success REBASE_P \
+ '--preserve-merges incompatible with --rebase-merges' '
git checkout B^0 &&
test_must_fail git rebase --preserve-merges --rebase-merges A
'
-test_expect_success '--rebase-merges incompatible with --strategy' '
- git checkout B^0 &&
- test_must_fail git rebase --rebase-merges -s resolve A
-'
-
-test_expect_success '--rebase-merges incompatible with --strategy-option' '
- git checkout B^0 &&
- test_must_fail git rebase --rebase-merges -Xignore-space-change A
-'
-
test_done
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 3780877..bec48e6 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -11,108 +11,99 @@
git log --pretty=format:%s -1 "$1"
}
+# There are a few bugs in the rebase with regards to the subtree strategy, and
+# this test script tries to document them. First, the following commit history
+# is generated (the onelines are shown, time flows from left to right):
+#
+# master1 - master2 - master3
+# \
+# README ---------------------- Add subproject master - master4 - files_subtree/master5
+#
+# Where the merge moves the files master[123].t into the subdirectory
+# files_subtree/ and master4 as well as files_subtree/master5 add files to that
+# directory directly.
+#
+# Then, in subsequent test cases, `git filter-branch` is used to distill just
+# the commits that touch files_subtree/. To give it a final pre-rebase touch,
+# an empty commit is added on top. The pre-rebase commit history looks like
+# this:
+#
+# Add subproject master - master4 - files_subtree/master5 - Empty commit
+#
+# where the root commit adds three files: master1.t, master2.t and master3.t.
+#
+# This commit history is then rebased onto `master3` with the
+# `-Xsubtree=files_subtree` option in three different ways:
+#
+# 1. using `--preserve-merges`
+# 2. using `--preserve-merges` and --keep-empty
+# 3. without specifying a rebase backend
+
test_expect_success 'setup' '
test_commit README &&
- mkdir files &&
- (
- cd files &&
- git init &&
- test_commit master1 &&
- test_commit master2 &&
- test_commit master3
- ) &&
- git fetch files master &&
- git branch files-master FETCH_HEAD &&
- git read-tree --prefix=files_subtree files-master &&
- git checkout -- files_subtree &&
- tree=$(git write-tree) &&
- head=$(git rev-parse HEAD) &&
- rev=$(git rev-parse --verify files-master^0) &&
- commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
- git update-ref HEAD $commit &&
- (
- cd files_subtree &&
- test_commit master4
- ) &&
- test_commit files_subtree/master5
+
+ git init files &&
+ test_commit -C files master1 &&
+ test_commit -C files master2 &&
+ test_commit -C files master3 &&
+
+ : perform subtree merge into files_subtree/ &&
+ git fetch files refs/heads/master:refs/heads/files-master &&
+ git merge -s ours --no-commit --allow-unrelated-histories \
+ files-master &&
+ git read-tree --prefix=files_subtree -u files-master &&
+ git commit -m "Add subproject master" &&
+
+ : add two extra commits to rebase &&
+ test_commit -C files_subtree master4 &&
+ test_commit files_subtree/master5 &&
+
+ git checkout -b to-rebase &&
+ git fast-export --no-data HEAD -- files_subtree/ |
+ sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
+ git fast-import --force --quiet &&
+ git reset --hard &&
+ git commit -m "Empty commit" --allow-empty
'
# FAILURE: Does not preserve master4.
-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-preserve-merges-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
+ git checkout -b rebase-preserve-merges to-rebase &&
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' '
- reset_rebase &&
- git checkout -b rebase-preserve-merges-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+ verbose test "$(commit_message HEAD~)" = "master4" &&
verbose test "$(commit_message HEAD)" = "files_subtree/master5"
'
# FAILURE: Does not preserve master4.
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-keep-empty-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
+ git checkout -b rebase-keep-empty to-rebase &&
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
- reset_rebase &&
- git checkout -b rebase-keep-empty-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-
-# FAILURE: Does not preserve Empty.
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
- reset_rebase &&
- git checkout -b rebase-keep-empty-empty master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 4' '
+test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
reset_rebase &&
- git checkout -b rebase-onto-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+ git checkout -b rebase-onto to-rebase &&
+ test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
+ : first pick results in no changes &&
+ git rebase --continue &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+ verbose test "$(commit_message HEAD)" = "Empty commit"
'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 5' '
+test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-onto-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto empty commit' '
- reset_rebase &&
- git checkout -b rebase-onto-empty master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
+ git checkout -b rebase-merges-onto to-rebase &&
+ test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
+ : first pick results in no changes &&
+ git rebase --continue &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh
index b9292df..76f6d30 100755
--- a/t/t3429-rebase-edit-todo.sh
+++ b/t/t3429-rebase-edit-todo.sh
@@ -11,4 +11,26 @@
test -e F
'
+test_expect_success SHA1 'loose object cache vs re-reading todo list' '
+ GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
+ export GIT_REBASE_TODO &&
+ write_script append-todo.sh <<-\EOS &&
+ # For values 5 and 6, this yields SHA-1s with the same first two digits
+ echo "pick $(git rev-parse --short \
+ $(printf "%s\\n" \
+ "tree $EMPTY_TREE" \
+ "author A U Thor <author@example.org> $1 +0000" \
+ "committer A U Thor <author@example.org> $1 +0000" \
+ "" \
+ "$1" |
+ git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
+
+ shift
+ test -z "$*" ||
+ echo "exec $0 $*" >>$GIT_REBASE_TODO
+ EOS
+
+ git rebase HEAD -x "./append-todo.sh 5 6"
+'
+
test_done
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 4c69255..9efcf48 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -37,20 +37,27 @@
test_commit A &&
git checkout -b first &&
test_commit B &&
+ b=$(git rev-parse --short HEAD) &&
git checkout master &&
test_commit C &&
+ c=$(git rev-parse --short HEAD) &&
test_commit D &&
+ d=$(git rev-parse --short HEAD) &&
git merge --no-commit B &&
test_tick &&
git commit -m E &&
git tag -m E E &&
+ e=$(git rev-parse --short HEAD) &&
git checkout -b second C &&
test_commit F &&
+ f=$(git rev-parse --short HEAD) &&
test_commit G &&
+ g=$(git rev-parse --short HEAD) &&
git checkout master &&
git merge --no-commit G &&
test_tick &&
git commit -m H &&
+ h=$(git rev-parse --short HEAD) &&
git tag -m H H &&
git checkout A &&
test_commit conflicting-G G.t
@@ -93,24 +100,24 @@
'
test_expect_success 'generate correct todo list' '
- cat >expect <<-\EOF &&
+ cat >expect <<-EOF &&
label onto
reset onto
- pick d9df450 B
+ pick $b B
label E
reset onto
- pick 5dee784 C
+ pick $c C
label branch-point
- pick ca2c861 F
- pick 088b00a G
+ pick $f F
+ pick $g G
label H
reset branch-point # C
- pick 12bd07b D
- merge -C 2051b56 E # E
- merge -C 233d48a H # H
+ pick $d D
+ merge -C $e E # E
+ merge -C $h H # H
EOF
@@ -151,7 +158,6 @@
test_path_is_file .git/rebase-merge/patch
'
-SQ="'"
test_expect_success 'failed `merge <branch>` does not crash' '
test_when_finished "test_might_fail git rebase --abort" &&
git checkout conflicting-G &&
@@ -164,6 +170,19 @@
grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
'
+test_expect_success 'fast-forward merge -c still rewords' '
+ git checkout -b fast-forward-merge-c H &&
+ (
+ set_fake_editor &&
+ FAKE_COMMIT_MESSAGE=edited \
+ GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
+ git rebase -ir @^
+ ) &&
+ echo edited >expected &&
+ git log --pretty=format:%B -1 >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'with a branch tip that was cherry-picked already' '
git checkout -b already-upstream master &&
base="$(git rev-parse --verify HEAD)" &&
@@ -224,8 +243,24 @@
test_cmp_rev HEAD "$(cat wt/b)"
'
+test_expect_success '--abort cleans up refs/rewritten' '
+ git checkout -b abort-cleans-refs-rewritten H &&
+ GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+ git rev-parse --verify refs/rewritten/onto &&
+ git rebase --abort &&
+ test_must_fail git rev-parse --verify refs/rewritten/onto
+'
+
+test_expect_success '--quit cleans up refs/rewritten' '
+ git checkout -b quit-cleans-refs-rewritten H &&
+ GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+ git rev-parse --verify refs/rewritten/onto &&
+ git rebase --quit &&
+ test_must_fail git rev-parse --verify refs/rewritten/onto
+'
+
test_expect_success 'post-rewrite hook and fixups work for merges' '
- git checkout -b post-rewrite &&
+ git checkout -b post-rewrite H &&
test_commit same1 &&
git reset --hard HEAD^ &&
test_commit same2 &&
@@ -271,7 +306,7 @@
EOF
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick &&
- git rebase -i --force --root -r &&
+ git rebase -i --force-rebase --root -r &&
test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
test $(git rev-parse second-root:second-root.t) = \
@@ -364,7 +399,7 @@
test_cmp_rev HEAD $before &&
test_tick &&
- git rebase -i --force -r HEAD^^ &&
+ git rebase -i --force-rebase -r HEAD^^ &&
test "Hank" = "$(git show -s --format=%an HEAD)" &&
test "$before" != $(git rev-parse HEAD) &&
test_cmp_graph HEAD^^.. <<-\EOF
@@ -412,4 +447,25 @@
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success '--rebase-merges with strategies' '
+ git checkout -b with-a-strategy F &&
+ test_tick &&
+ git merge -m "Merge conflicting-G" conflicting-G &&
+
+ : first, test with a merge strategy option &&
+ git rebase -ir -Xtheirs G &&
+ echo conflicting-G >expect &&
+ test_cmp expect G.t &&
+
+ : now, try with a merge strategy other than recursive &&
+ git reset --hard @{1} &&
+ write_script git-merge-override <<-\EOF &&
+ echo overridden$1 >>G.t
+ git add G.t
+ EOF
+ PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
+ test_write_lines G overridden--xopt >expect &&
+ test_cmp expect G.t
+'
+
test_done
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
new file mode 100755
index 0000000..78851b9
--- /dev/null
+++ b/t/t3431-rebase-fork-point.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='git rebase --fork-point test'
+
+. ./test-lib.sh
+
+# A---B---D---E (master)
+# \
+# C*---F---G (side)
+#
+# C was formerly part of master but master was rewound to remove C
+#
+test_expect_success setup '
+ test_commit A &&
+ test_commit B &&
+ test_commit C &&
+ git branch -t side &&
+ git reset --hard HEAD^ &&
+ test_commit D &&
+ test_commit E &&
+ git checkout side &&
+ test_commit F &&
+ test_commit G
+'
+
+test_rebase () {
+ expected="$1" &&
+ shift &&
+ test_expect_success "git rebase $*" "
+ git checkout master &&
+ git reset --hard E &&
+ git checkout side &&
+ git reset --hard G &&
+ git rebase $* &&
+ test_write_lines $expected >expect &&
+ git log --pretty=%s >actual &&
+ test_cmp expect actual
+ "
+}
+
+test_rebase 'G F E D B A'
+test_rebase 'G F D B A' --onto D
+test_rebase 'G F B A' --keep-base
+test_rebase 'G F C E D B A' --no-fork-point
+test_rebase 'G F C D B A' --no-fork-point --onto D
+test_rebase 'G F C B A' --no-fork-point --keep-base
+test_rebase 'G F E D B A' --fork-point refs/heads/master
+test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
+test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
+test_rebase 'G F C E D B A' refs/heads/master
+test_rebase 'G F C D B A' --onto D refs/heads/master
+test_rebase 'G F C B A' --keep-base refs/heads/master
+
+test_done
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
new file mode 100755
index 0000000..034ffc7
--- /dev/null
+++ b/t/t3432-rebase-fast-forward.sh
@@ -0,0 +1,125 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='ensure rebase fast-forwards commits when possible'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_commit A &&
+ test_commit B &&
+ test_commit C &&
+ test_commit D &&
+ git checkout -t -b side
+'
+
+test_rebase_same_head () {
+ status_n="$1" &&
+ shift &&
+ what_n="$1" &&
+ shift &&
+ cmp_n="$1" &&
+ shift &&
+ status_f="$1" &&
+ shift &&
+ what_f="$1" &&
+ shift &&
+ cmp_f="$1" &&
+ shift &&
+ test_rebase_same_head_ $status_n $what_n $cmp_n "" "$*" &&
+ test_rebase_same_head_ $status_f $what_f $cmp_f " --no-ff" "$*"
+}
+
+test_rebase_same_head_ () {
+ status="$1" &&
+ shift &&
+ what="$1" &&
+ shift &&
+ cmp="$1" &&
+ shift &&
+ flag="$1"
+ shift &&
+ test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
+ oldhead=\$(git rev-parse HEAD) &&
+ test_when_finished 'git reset --hard \$oldhead' &&
+ git rebase$flag $* >stdout &&
+ if test $what = work
+ then
+ # Must check this case first, for 'is up to
+ # date, rebase forced[...]rewinding head' cases
+ test_i18ngrep 'rewinding head' stdout
+ elif test $what = noop
+ then
+ test_i18ngrep 'is up to date' stdout &&
+ test_i18ngrep ! 'rebase forced' stdout
+ elif test $what = noop-force
+ then
+ test_i18ngrep 'is up to date, rebase forced' stdout
+ fi &&
+ newhead=\$(git rev-parse HEAD) &&
+ if test $cmp = same
+ then
+ test_cmp_rev \$oldhead \$newhead
+ elif test $cmp = diff
+ then
+ ! test_cmp_rev \$oldhead \$newhead
+ fi
+ "
+}
+
+changes='no changes'
+test_rebase_same_head success noop same success work same
+test_rebase_same_head success noop same success noop-force same master
+test_rebase_same_head success noop same success noop-force diff --onto B B
+test_rebase_same_head success noop same success noop-force diff --onto B... B
+test_rebase_same_head success noop same success noop-force same --onto master... master
+test_rebase_same_head success noop same success noop-force same --keep-base master
+test_rebase_same_head success noop same success noop-force same --keep-base
+test_rebase_same_head success noop same success noop-force same --no-fork-point
+test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
+test_rebase_same_head success noop same success work same --keep-base --keep-base master
+
+test_expect_success 'add work same to side' '
+ test_commit E
+'
+
+changes='our changes'
+test_rebase_same_head success noop same success work same
+test_rebase_same_head success noop same success noop-force same master
+test_rebase_same_head success noop same success noop-force diff --onto B B
+test_rebase_same_head success noop same success noop-force diff --onto B... B
+test_rebase_same_head success noop same success noop-force same --onto master... master
+test_rebase_same_head success noop same success noop-force same --keep-base master
+test_rebase_same_head success noop same success noop-force same --keep-base
+test_rebase_same_head success noop same success noop-force same --no-fork-point
+test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
+test_rebase_same_head success noop same success work same --fork-point --keep-base master
+
+test_expect_success 'add work same to upstream' '
+ git checkout master &&
+ test_commit F &&
+ git checkout side
+'
+
+changes='our and their changes'
+test_rebase_same_head success noop same success noop-force diff --onto B B
+test_rebase_same_head success noop same success noop-force diff --onto B... B
+test_rebase_same_head success noop same success work diff --onto master... master
+test_rebase_same_head success noop same success work diff --keep-base master
+test_rebase_same_head success noop same success work diff --keep-base
+test_rebase_same_head failure work same success work diff --fork-point --onto B B
+test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+test_rebase_same_head success noop same success work diff --fork-point --onto master... master
+test_rebase_same_head success noop same success work diff --fork-point --keep-base master
+
+test_done
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
index 127dd00..9d5adbc 100755
--- a/t/t3506-cherry-pick-ff.sh
+++ b/t/t3506-cherry-pick-ff.sh
@@ -16,7 +16,11 @@
git add file1 &&
test_tick &&
git commit -m "second" &&
- git tag second
+ git tag second &&
+ test_oid_cache <<-EOF
+ cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
+ cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
+ EOF
'
test_expect_success 'cherry-pick using --ff fast forwards' '
@@ -102,7 +106,7 @@
git add file2 &&
git commit --amend -m "file2" &&
git cherry-pick --ff first &&
- test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
+ test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
'
test_expect_success 'cherry-pick --ff on unborn branch' '
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 0db1661..9b9b4ca 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -25,6 +25,11 @@
test_commit base foo b &&
test_commit picked foo c &&
test_commit --signoff picked-signed foo d &&
+ git checkout -b topic initial &&
+ test_commit redundant-pick foo c redundant &&
+ git commit --allow-empty --allow-empty-message &&
+ git tag empty &&
+ git checkout master &&
git config advice.detachedhead false
'
@@ -88,7 +93,7 @@
test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
pristine_detach initial &&
- echo foo > foo &&
+ echo foo >foo &&
test_must_fail git cherry-pick base &&
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
'
@@ -96,7 +101,7 @@
test_expect_success \
'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' '
pristine_detach initial &&
- echo foo > foo &&
+ echo foo >foo &&
test_must_fail git cherry-pick --strategy=resolve base &&
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
'
@@ -156,6 +161,25 @@
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
'
+test_expect_success 'successful final commit clears cherry-pick state' '
+ pristine_detach initial &&
+
+ test_must_fail git cherry-pick base picked-signed &&
+ echo resolved >foo &&
+ test_path_is_file .git/sequencer/todo &&
+ git commit -a &&
+ test_must_fail test_path_exists .git/sequencer
+'
+
+test_expect_success 'reset after final pick clears cherry-pick state' '
+ pristine_detach initial &&
+
+ test_must_fail git cherry-pick base picked-signed &&
+ echo resolved >foo &&
+ test_path_is_file .git/sequencer/todo &&
+ git reset &&
+ test_must_fail test_path_exists .git/sequencer
+'
test_expect_success 'failed cherry-pick produces dirty index' '
pristine_detach initial &&
@@ -175,23 +199,63 @@
git ls-files --stage foo &&
git checkout picked -- foo &&
git ls-files --stage foo
- } > stages &&
+ } >stages &&
sed "
1 s/ 0 / 1 /
2 s/ 0 / 2 /
3 s/ 0 / 3 /
- " < stages > expected &&
+ " stages >expected &&
git read-tree -u --reset HEAD &&
test_must_fail git cherry-pick picked &&
- git ls-files --stage --unmerged > actual &&
+ git ls-files --stage --unmerged >actual &&
test_cmp expected actual
'
+test_expect_success \
+ 'cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly' '
+ pristine_detach initial &&
+ git config commit.cleanup scissors &&
+ cat <<-EOF >expected &&
+ picked
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # foo
+ EOF
+
+ test_must_fail git cherry-pick picked &&
+
+ test_i18ncmp expected .git/MERGE_MSG
+'
+
+test_expect_success \
+ 'cherry-pick conflict, ensure cleanup=scissors places scissors line properly' '
+ pristine_detach initial &&
+ git config --unset commit.cleanup &&
+ cat <<-EOF >expected &&
+ picked
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # foo
+ EOF
+
+ test_must_fail git cherry-pick --cleanup=scissors picked &&
+
+ test_i18ncmp expected .git/MERGE_MSG
+'
+
test_expect_success 'failed cherry-pick describes conflict in work tree' '
pristine_detach initial &&
- cat <<-EOF > expected &&
+ cat <<-EOF >expected &&
<<<<<<< HEAD
a
=======
@@ -201,14 +265,14 @@
test_must_fail git cherry-pick picked &&
- sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+ sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
test_cmp expected actual
'
test_expect_success 'diff3 -m style' '
pristine_detach initial &&
git config merge.conflictstyle diff3 &&
- cat <<-EOF > expected &&
+ cat <<-EOF >expected &&
<<<<<<< HEAD
a
||||||| parent of objid picked
@@ -220,14 +284,14 @@
test_must_fail git cherry-pick picked &&
- sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+ sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
test_cmp expected actual
'
test_expect_success 'revert also handles conflicts sanely' '
git config --unset merge.conflictstyle &&
pristine_detach initial &&
- cat <<-EOF > expected &&
+ cat <<-EOF >expected &&
<<<<<<< HEAD
a
=======
@@ -241,24 +305,24 @@
git ls-files --stage foo &&
git checkout base -- foo &&
git ls-files --stage foo
- } > stages &&
+ } >stages &&
sed "
1 s/ 0 / 1 /
2 s/ 0 / 2 /
3 s/ 0 / 3 /
- " < stages > expected-stages &&
+ " stages >expected-stages &&
git read-tree -u --reset HEAD &&
head=$(git rev-parse HEAD) &&
test_must_fail git revert picked &&
newhead=$(git rev-parse HEAD) &&
- git ls-files --stage --unmerged > actual-stages &&
+ git ls-files --stage --unmerged >actual-stages &&
test "$head" = "$newhead" &&
test_must_fail git update-index --refresh -q &&
test_must_fail git diff-index --exit-code HEAD &&
test_cmp expected-stages actual-stages &&
- sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+ sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
test_cmp expected actual
'
@@ -284,7 +348,7 @@
test_expect_success 'revert w/dirty tree does not set REVERT_HEAD' '
pristine_detach base &&
- echo foo > foo &&
+ echo foo >foo &&
test_must_fail git revert base &&
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
test_must_fail git rev-parse --verify REVERT_HEAD
@@ -316,10 +380,30 @@
test_cmp_rev picked REVERT_HEAD
'
+test_expect_success 'successful final commit clears revert state' '
+ pristine_detach picked-signed &&
+
+ test_must_fail git revert picked-signed base &&
+ echo resolved >foo &&
+ test_path_is_file .git/sequencer/todo &&
+ git commit -a &&
+ test_must_fail test_path_exists .git/sequencer
+'
+
+test_expect_success 'reset after final pick clears revert state' '
+ pristine_detach picked-signed &&
+
+ test_must_fail git revert picked-signed base &&
+ echo resolved >foo &&
+ test_path_is_file .git/sequencer/todo &&
+ git reset &&
+ test_must_fail test_path_exists .git/sequencer
+'
+
test_expect_success 'revert conflict, diff3 -m style' '
pristine_detach initial &&
git config merge.conflictstyle diff3 &&
- cat <<-EOF > expected &&
+ cat <<-EOF >expected &&
<<<<<<< HEAD
a
||||||| objid picked
@@ -331,10 +415,56 @@
test_must_fail git revert picked &&
- sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+ sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
test_cmp expected actual
'
+test_expect_success \
+ 'revert conflict, ensure commit.cleanup = scissors places scissors line properly' '
+ pristine_detach initial &&
+ git config commit.cleanup scissors &&
+ cat >expected <<-EOF &&
+ Revert "picked"
+
+ This reverts commit OBJID.
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # foo
+ EOF
+
+ test_must_fail git revert picked &&
+
+ sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success \
+ 'revert conflict, ensure cleanup=scissors places scissors line properly' '
+ pristine_detach initial &&
+ git config --unset commit.cleanup &&
+ cat >expected <<-EOF &&
+ Revert "picked"
+
+ This reverts commit OBJID.
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # foo
+ EOF
+
+ test_must_fail git revert --cleanup=scissors picked &&
+
+ sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+ test_i18ncmp expected actual
+'
+
test_expect_success 'failed cherry-pick does not forget -s' '
pristine_detach initial &&
test_must_fail git cherry-pick -s picked &&
@@ -345,7 +475,7 @@
pristine_detach initial &&
test_must_fail git cherry-pick -s picked-signed &&
git commit -a -s &&
- test $(git show -s |grep -c "Signed-off-by") = 1
+ test $(git show -s >tmp && grep -c "Signed-off-by" tmp && rm tmp) = 1
'
test_expect_success 'commit after failed cherry-pick adds -s at the right place' '
@@ -359,7 +489,7 @@
Signed-off-by: C O Mitter <committer@example.com>
# Conflicts:
EOF
- grep -e "^# Conflicts:" -e '^Signed-off-by' <.git/COMMIT_EDITMSG >actual &&
+ grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual &&
cat <<-\EOF >expected &&
@@ -378,7 +508,7 @@
# emulate old-style conflicts block
mv .git/MERGE_MSG .git/MERGE_MSG+ &&
- sed -e "/^# Conflicts:/,\$s/^# *//" <.git/MERGE_MSG+ >.git/MERGE_MSG &&
+ sed -e "/^# Conflicts:/,\$s/^# *//" .git/MERGE_MSG+ >.git/MERGE_MSG &&
git commit -a &&
git commit --amend -s &&
@@ -388,7 +518,7 @@
Signed-off-by: C O Mitter <committer@example.com>
Conflicts:
EOF
- grep -e "^Conflicts:" -e '^Signed-off-by' <.git/COMMIT_EDITMSG >actual &&
+ grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual
'
@@ -405,4 +535,23 @@
test_i18ngrep ! "Changes not staged for commit:" actual
'
+test_expect_success 'cherry-pick --continue remembers --keep-redundant-commits' '
+ test_when_finished "git cherry-pick --abort || :" &&
+ pristine_detach initial &&
+ test_must_fail git cherry-pick --keep-redundant-commits picked redundant &&
+ echo c >foo &&
+ git add foo &&
+ git cherry-pick --continue
+'
+
+test_expect_success 'cherry-pick --continue remembers --allow-empty and --allow-empty-message' '
+ test_when_finished "git cherry-pick --abort || :" &&
+ pristine_detach initial &&
+ test_must_fail git cherry-pick --allow-empty --allow-empty-message \
+ picked empty &&
+ echo c >foo &&
+ git add foo &&
+ git cherry-pick --continue
+'
+
test_done
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 941d502..793bcc7 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -93,6 +93,128 @@
test_path_is_missing .git/sequencer
'
+test_expect_success 'cherry-pick --skip requires cherry-pick in progress' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick --skip
+'
+
+test_expect_success 'revert --skip requires revert in progress' '
+ pristine_detach initial &&
+ test_must_fail git revert --skip
+'
+
+test_expect_success 'cherry-pick --skip to skip commit' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick anotherpick &&
+ test_must_fail git revert --skip &&
+ git cherry-pick --skip &&
+ test_cmp_rev initial HEAD &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD
+'
+
+test_expect_success 'revert --skip to skip commit' '
+ pristine_detach anotherpick &&
+ test_must_fail git revert anotherpick~1 &&
+ test_must_fail git cherry-pick --skip &&
+ git revert --skip &&
+ test_cmp_rev anotherpick HEAD
+'
+
+test_expect_success 'skip "empty" commit' '
+ pristine_detach picked &&
+ test_commit dummy foo d &&
+ test_must_fail git cherry-pick anotherpick &&
+ git cherry-pick --skip &&
+ test_cmp_rev dummy HEAD
+'
+
+test_expect_success 'skip a commit and check if rest of sequence is correct' '
+ pristine_detach initial &&
+ echo e >expect &&
+ cat >expect.log <<-EOF &&
+ OBJID
+ :100644 100644 OBJID OBJID M foo
+ OBJID
+ :100644 100644 OBJID OBJID M foo
+ OBJID
+ :100644 100644 OBJID OBJID M unrelated
+ OBJID
+ :000000 100644 OBJID OBJID A foo
+ :000000 100644 OBJID OBJID A unrelated
+ EOF
+ test_must_fail git cherry-pick base..yetanotherpick &&
+ test_must_fail git cherry-pick --skip &&
+ echo d >foo &&
+ git add foo &&
+ git cherry-pick --continue &&
+ {
+ git rev-list HEAD |
+ git diff-tree --root --stdin |
+ sed "s/$OID_REGEX/OBJID/g"
+ } >actual.log &&
+ test_cmp expect foo &&
+ test_cmp expect.log actual.log
+'
+
+test_expect_success 'check advice when we move HEAD by committing' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: there is nothing to skip
+ hint: have you committed already?
+ hint: try "git cherry-pick --continue"
+ fatal: cherry-pick failed
+ EOF
+ test_must_fail git cherry-pick base..yetanotherpick &&
+ echo c >foo &&
+ git commit -a &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD &&
+ test_must_fail git cherry-pick --skip 2>advice &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'selectively advise --skip while launching another sequence' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: cherry-pick is already in progress
+ hint: try "git cherry-pick (--continue | --skip | --abort | --quit)"
+ fatal: cherry-pick failed
+ EOF
+ test_must_fail git cherry-pick picked..yetanotherpick &&
+ test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+ test_i18ncmp expect advice &&
+ cat >expect <<-EOF &&
+ error: cherry-pick is already in progress
+ hint: try "git cherry-pick (--continue | --abort | --quit)"
+ fatal: cherry-pick failed
+ EOF
+ git reset --merge &&
+ test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'allow skipping commit but not abort for a new history' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: cannot abort from a branch yet to be born
+ fatal: cherry-pick failed
+ EOF
+ git checkout --orphan new_disconnected &&
+ git reset --hard &&
+ test_must_fail git cherry-pick anotherpick &&
+ test_must_fail git cherry-pick --abort 2>advice &&
+ git cherry-pick --skip &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
+ pristine_detach initial &&
+ git rm --cached unrelated &&
+ git commit -m "untrack unrelated" &&
+ test_must_fail git cherry-pick initial base &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD &&
+ git cherry-pick --skip
+'
+
test_expect_success '--quit does not complain when no cherry-pick is in progress' '
pristine_detach initial &&
git cherry-pick --quit
diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh
index 9888bf3..84a587d 100755
--- a/t/t3511-cherry-pick-x.sh
+++ b/t/t3511-cherry-pick-x.sh
@@ -298,4 +298,24 @@
test_cmp expect actual
'
+test_expect_success 'cherry-pick -x cleans commit message' '
+ pristine_detach initial &&
+ git cherry-pick -x mesg-unclean &&
+ git log -1 --pretty=format:%B >actual &&
+ printf "%s\n(cherry picked from commit %s)\n" \
+ "$mesg_unclean" $(git rev-parse mesg-unclean) |
+ git stripspace >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cherry-pick -x respects commit.cleanup' '
+ pristine_detach initial &&
+ git -c commit.cleanup=strip cherry-pick -x mesg-unclean &&
+ git log -1 --pretty=format:%B >actual &&
+ printf "%s\n(cherry picked from commit %s)\n" \
+ "$mesg_unclean" $(git rev-parse mesg-unclean) |
+ git stripspace -s >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 04e5d42..8c8cca5 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -8,91 +8,92 @@
. ./test-lib.sh
# Setup some files to be removed, some with funny characters
-test_expect_success \
- 'Initialize test directory' \
- "touch -- foo bar baz 'space embedded' -q &&
- git add -- foo bar baz 'space embedded' -q &&
- git commit -m 'add normal files'"
+test_expect_success 'Initialize test directory' '
+ touch -- foo bar baz "space embedded" -q &&
+ git add -- foo bar baz "space embedded" -q &&
+ git commit -m "add normal files"
+'
-if test_have_prereq !FUNNYNAMES; then
+if test_have_prereq !FUNNYNAMES
+then
say 'Your filesystem does not allow tabs in filenames.'
fi
-test_expect_success FUNNYNAMES 'add files with funny names' "
- touch -- 'tab embedded' 'newline
-embedded' &&
- git add -- 'tab embedded' 'newline
-embedded' &&
- git commit -m 'add files with tabs and newlines'
-"
-
-test_expect_success \
- 'Pre-check that foo exists and is in index before git rm foo' \
- '[ -f foo ] && git ls-files --error-unmatch foo'
-
-test_expect_success \
- 'Test that git rm foo succeeds' \
- 'git rm --cached foo'
-
-test_expect_success \
- 'Test that git rm --cached foo succeeds if the index matches the file' \
- 'echo content >foo &&
- git add foo &&
- git rm --cached foo'
-
-test_expect_success \
- 'Test that git rm --cached foo succeeds if the index matches the file' \
- 'echo content >foo &&
- git add foo &&
- git commit -m foo &&
- echo "other content" >foo &&
- git rm --cached foo'
-
-test_expect_success \
- 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
- echo content >foo &&
- git add foo &&
- git commit -m foo --allow-empty &&
- echo "other content" >foo &&
- git add foo &&
- echo "yet another content" >foo &&
- test_must_fail git rm --cached foo
+test_expect_success FUNNYNAMES 'add files with funny names' '
+ touch -- "tab embedded" "newline${LF}embedded" &&
+ git add -- "tab embedded" "newline${LF}embedded" &&
+ git commit -m "add files with tabs and newlines"
'
-test_expect_success \
- 'Test that git rm --cached -f foo works in case where --cached only did not' \
- 'echo content >foo &&
- git add foo &&
- git commit -m foo --allow-empty &&
- echo "other content" >foo &&
- git add foo &&
- echo "yet another content" >foo &&
- git rm --cached -f foo'
+test_expect_success 'Pre-check that foo exists and is in index before git rm foo' '
+ test_path_is_file foo &&
+ git ls-files --error-unmatch foo
+'
-test_expect_success \
- 'Post-check that foo exists but is not in index after git rm foo' \
- '[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
+test_expect_success 'Test that git rm foo succeeds' '
+ git rm --cached foo
+'
-test_expect_success \
- 'Pre-check that bar exists and is in index before "git rm bar"' \
- '[ -f bar ] && git ls-files --error-unmatch bar'
+test_expect_success 'Test that git rm --cached foo succeeds if the index matches the file' '
+ echo content >foo &&
+ git add foo &&
+ git rm --cached foo
+'
-test_expect_success \
- 'Test that "git rm bar" succeeds' \
- 'git rm bar'
+test_expect_success 'Test that git rm --cached foo succeeds if the index matches the file' '
+ echo content >foo &&
+ git add foo &&
+ git commit -m foo &&
+ echo "other content" >foo &&
+ git rm --cached foo
+'
-test_expect_success \
- 'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
- '! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
+test_expect_success 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
+ echo content >foo &&
+ git add foo &&
+ git commit -m foo --allow-empty &&
+ echo "other content" >foo &&
+ git add foo &&
+ echo "yet another content" >foo &&
+ test_must_fail git rm --cached foo
+'
-test_expect_success \
- 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
- 'git rm -- -q'
+test_expect_success 'Test that git rm --cached -f foo works in case where --cached only did not' '
+ echo content >foo &&
+ git add foo &&
+ git commit -m foo --allow-empty &&
+ echo "other content" >foo &&
+ git add foo &&
+ echo "yet another content" >foo &&
+ git rm --cached -f foo
+'
-test_expect_success FUNNYNAMES \
- "Test that \"git rm -f\" succeeds with embedded space, tab, or newline characters." \
- "git rm -f 'space embedded' 'tab embedded' 'newline
-embedded'"
+test_expect_success 'Post-check that foo exists but is not in index after git rm foo' '
+ test_path_is_file foo &&
+ test_must_fail git ls-files --error-unmatch foo
+'
+
+test_expect_success 'Pre-check that bar exists and is in index before "git rm bar"' '
+ test_path_is_file bar &&
+ git ls-files --error-unmatch bar
+'
+
+test_expect_success 'Test that "git rm bar" succeeds' '
+ git rm bar
+'
+
+test_expect_success 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '
+ test_path_is_missing bar &&
+ test_must_fail git ls-files --error-unmatch bar
+'
+
+test_expect_success 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' '
+ git rm -- -q
+'
+
+test_expect_success FUNNYNAMES 'Test that "git rm -f" succeeds with embedded space, tab, or newline characters.' '
+ git rm -f "space embedded" "tab embedded" "newline${LF}embedded"
+'
test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
test_when_finished "chmod 775 ." &&
@@ -100,9 +101,9 @@
test_must_fail git rm -f baz
'
-test_expect_success \
- 'When the rm in "git rm -f" fails, it should not remove the file from the index' \
- 'git ls-files --error-unmatch baz'
+test_expect_success 'When the rm in "git rm -f" fails, it should not remove the file from the index' '
+ git ls-files --error-unmatch baz
+'
test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
git rm --ignore-unmatch nonexistent
@@ -137,15 +138,15 @@
test_expect_success 'Modify foo -- rm should refuse' '
echo >>foo &&
test_must_fail git rm foo baz &&
- test -f foo &&
- test -f baz &&
+ test_path_is_file foo &&
+ test_path_is_file baz &&
git ls-files --error-unmatch foo baz
'
test_expect_success 'Modified foo -- rm -f should work' '
git rm -f foo baz &&
- test ! -f foo &&
- test ! -f baz &&
+ test_path_is_missing foo &&
+ test_path_is_missing baz &&
test_must_fail git ls-files --error-unmatch foo &&
test_must_fail git ls-files --error-unmatch bar
'
@@ -159,15 +160,15 @@
test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
test_must_fail git rm foo baz &&
- test -f foo &&
- test -f baz &&
+ test_path_is_file foo &&
+ test_path_is_file baz &&
git ls-files --error-unmatch foo baz
'
test_expect_success 'but with -f it should work.' '
git rm -f foo baz &&
- test ! -f foo &&
- test ! -f baz &&
+ test_path_is_missing foo &&
+ test_path_is_missing baz &&
test_must_fail git ls-files --error-unmatch foo &&
test_must_fail git ls-files --error-unmatch baz
'
@@ -194,21 +195,21 @@
test_expect_success 'Recursive without -r fails' '
test_must_fail git rm frotz &&
- test -d frotz &&
- test -f frotz/nitfol
+ test_path_is_dir frotz &&
+ test_path_is_file frotz/nitfol
'
test_expect_success 'Recursive with -r but dirty' '
echo qfwfq >>frotz/nitfol &&
test_must_fail git rm -r frotz &&
- test -d frotz &&
- test -f frotz/nitfol
+ test_path_is_dir frotz &&
+ test_path_is_file frotz/nitfol
'
test_expect_success 'Recursive with -r -f' '
git rm -f -r frotz &&
- ! test -f frotz/nitfol &&
- ! test -d frotz
+ test_path_is_missing frotz/nitfol &&
+ test_path_is_missing frotz
'
test_expect_success 'Remove nonexistent file returns nonzero exit status' '
@@ -217,44 +218,61 @@
test_expect_success 'Call "rm" from outside the work tree' '
mkdir repo &&
- (cd repo &&
- git init &&
- echo something >somefile &&
- git add somefile &&
- git commit -m "add a file" &&
- (cd .. &&
- git --git-dir=repo/.git --work-tree=repo rm somefile) &&
- test_must_fail git ls-files --error-unmatch somefile)
+ (
+ cd repo &&
+ git init &&
+ echo something >somefile &&
+ git add somefile &&
+ git commit -m "add a file" &&
+ (
+ cd .. &&
+ git --git-dir=repo/.git --work-tree=repo rm somefile
+ ) &&
+ test_must_fail git ls-files --error-unmatch somefile
+ )
'
test_expect_success 'refresh index before checking if it is up-to-date' '
-
git reset --hard &&
test-tool chmtime -86400 frotz/nitfol &&
git rm frotz/nitfol &&
- test ! -f frotz/nitfol
-
+ test_path_is_missing frotz/nitfol
'
test_expect_success 'choking "git rm" should not let it die with cruft' '
+ test_oid_init &&
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 &&
+ hash=$(test_oid deadbeef) &&
while test $i -lt 12000
do
- echo "100644 1234567890123456789012345678901234567890 0 some-file-$i"
- i=$(( $i + 1 ))
+ echo "100644 $hash 0 some-file-$i"
+ i=$(( $i + 1 ))
done | git update-index --index-info &&
git rm -n "some-file-*" | : &&
test_path_is_missing .git/index.lock
'
+test_expect_success 'Resolving by removal is not a warning-worthy event' '
+ git reset -q --hard &&
+ test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
+ blob=$(echo blob | git hash-object -w --stdin) &&
+ for stage in 1 2 3
+ do
+ echo "100644 $blob $stage blob"
+ done | git update-index --index-info &&
+ git rm blob >msg 2>&1 &&
+ test_i18ngrep ! "needs merge" msg &&
+ test_must_fail git ls-files -s --error-unmatch blob
+'
+
test_expect_success 'rm removes subdirectories recursively' '
mkdir -p dir/subdir/subsubdir &&
echo content >dir/subdir/subsubdir/file &&
git add dir/subdir/subsubdir/file &&
git rm -f dir/subdir/subsubdir/file &&
- ! test -d dir
+ test_path_is_missing dir
'
cat >expect <<EOF
@@ -292,7 +310,7 @@
git add .gitmodules &&
git commit -m "add submodule" &&
git rm submod &&
- test ! -e submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual &&
test_must_fail git config -f .gitmodules submodule.sub.url &&
@@ -314,7 +332,7 @@
git reset --hard &&
git submodule update &&
git rm submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual &&
test_must_fail git config -f .gitmodules submodule.sub.url &&
@@ -325,7 +343,7 @@
git reset --hard &&
git submodule update &&
git rm submod/ &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -343,12 +361,12 @@
git submodule update &&
git -C submod checkout HEAD^ &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual &&
test_must_fail git config -f .gitmodules submodule.sub.url &&
@@ -359,8 +377,8 @@
git reset --hard &&
git submodule update &&
git rm --cached submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno >actual &&
test_cmp expect.cached actual &&
git config -f .gitmodules submodule.sub.url &&
@@ -371,7 +389,7 @@
git reset --hard &&
git submodule update &&
git rm -n submod &&
- test -f submod/.git &&
+ test_path_is_file submod/.git &&
git diff-index --exit-code HEAD
'
@@ -381,8 +399,8 @@
git rm .gitmodules &&
git rm submod >actual 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -d submod &&
- ! test -f submod/.git &&
+ test_path_is_missing submod &&
+ test_path_is_missing submod/.git &&
git status -s -uno >actual &&
test_cmp expect.both_deleted actual
'
@@ -392,15 +410,15 @@
git submodule update &&
git config -f .gitmodules foo.bar true &&
test_must_fail git rm submod >actual 2>actual.err &&
- test -s actual.err &&
- test -d submod &&
- test -f submod/.git &&
+ test_file_not_empty actual.err &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git diff-files --quiet -- submod &&
git add .gitmodules &&
git rm submod >actual 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -d submod &&
- ! test -f submod/.git &&
+ test_path_is_missing submod &&
+ test_path_is_missing submod/.git &&
git status -s -uno >actual &&
test_cmp expect actual
'
@@ -413,8 +431,8 @@
echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
git rm submod >actual 2>actual.err &&
test_i18ncmp expect.err actual.err &&
- ! test -d submod &&
- ! test -f submod/.git &&
+ test_path_is_missing submod &&
+ test_path_is_missing submod/.git &&
git status -s -uno >actual &&
test_cmp expect actual
'
@@ -424,12 +442,12 @@
git submodule update &&
echo X >submod/empty &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified_inside actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -439,12 +457,12 @@
git submodule update &&
echo X >submod/untracked &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified_untracked actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -481,7 +499,7 @@
git submodule update &&
test_must_fail git merge conflict2 &&
git rm submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -493,12 +511,12 @@
git -C submod checkout HEAD^ &&
test_must_fail git merge conflict2 &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.conflict actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual &&
test_must_fail git config -f .gitmodules submodule.sub.url &&
@@ -512,12 +530,12 @@
echo X >submod/empty &&
test_must_fail git merge conflict2 &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.conflict actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual &&
test_must_fail git config -f .gitmodules submodule.sub.url &&
@@ -531,12 +549,12 @@
echo X >submod/untracked &&
test_must_fail git merge conflict2 &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.conflict actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -545,20 +563,21 @@
git checkout conflict1 &&
git reset --hard &&
git submodule update &&
- (cd submod &&
+ (
+ cd submod &&
rm .git &&
cp -R ../.git/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree
) &&
test_must_fail git merge conflict2 &&
test_must_fail git rm submod &&
- test -d submod &&
- test -d submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_dir submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.conflict actual &&
test_must_fail git rm -f submod &&
- test -d submod &&
- test -d submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_dir submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.conflict actual &&
git merge --abort &&
@@ -570,7 +589,7 @@
git reset --hard &&
test_must_fail git merge conflict2 &&
git rm submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -579,17 +598,18 @@
git checkout -f master &&
git reset --hard &&
git submodule update &&
- (cd submod &&
+ (
+ cd submod &&
rm .git &&
cp -R ../.git/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree &&
rm -r ../.git/modules/sub
) &&
git rm submod 2>output.err &&
- ! test -d submod &&
- ! test -d submod/.git &&
+ test_path_is_missing submod &&
+ test_path_is_missing submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
- test -s actual &&
+ test_file_not_empty actual &&
test_i18ngrep Migrating output.err
'
@@ -600,7 +620,8 @@
test_expect_success 'setup subsubmodule' '
git reset --hard &&
git submodule update &&
- (cd submod &&
+ (
+ cd submod &&
git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
git config -f .gitmodules submodule.sub.url ../. &&
git config -f .gitmodules submodule.sub.path subsubmod &&
@@ -614,7 +635,7 @@
test_expect_success 'rm recursively removes work tree of unmodified submodules' '
git rm submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -624,12 +645,12 @@
git submodule update --recursive &&
git -C submod/subsubmod checkout HEAD^ &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified_inside actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -639,12 +660,12 @@
git submodule update --recursive &&
echo X >submod/subsubmod/empty &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified_inside actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -654,12 +675,12 @@
git submodule update --recursive &&
echo X >submod/subsubmod/untracked &&
test_must_fail git rm submod &&
- test -d submod &&
- test -f submod/.git &&
+ test_path_is_dir submod &&
+ test_path_is_file submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect.modified_untracked actual &&
git rm -f submod &&
- test ! -d submod &&
+ test_path_is_missing submod &&
git status -s -uno --ignore-submodules=none >actual &&
test_cmp expect actual
'
@@ -667,16 +688,17 @@
test_expect_success "rm absorbs submodule's nested .git directory" '
git reset --hard &&
git submodule update --recursive &&
- (cd submod/subsubmod &&
+ (
+ cd submod/subsubmod &&
rm .git &&
mv ../../.git/modules/sub/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree
) &&
git rm submod 2>output.err &&
- ! test -d submod &&
- ! test -d submod/subsubmod/.git &&
+ test_path_is_missing submod &&
+ test_path_is_missing submod/subsubmod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
- test -s actual &&
+ test_file_not_empty actual &&
test_i18ngrep Migrating output.err
'
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index be582a5..c325167 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -296,6 +296,17 @@
)
'
+test_expect_success 'error on a repository with no commits' '
+ rm -fr empty &&
+ git init empty &&
+ test_must_fail git add empty >actual 2>&1 &&
+ cat >expect <<-EOF &&
+ error: '"'empty/'"' does not have a commit checked out
+ fatal: adding files failed
+ EOF
+ test_i18ncmp expect actual
+'
+
test_expect_success 'git add --dry-run of existing changed file' "
echo new >>track-this &&
git add --dry-run track-this >actual 2>&1 &&
@@ -396,6 +407,7 @@
'
test_expect_success 'all statuses changed in folder if . is given' '
+ rm -fr empty &&
git add --chmod=+x . &&
test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
git add --chmod=-x . &&
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 65dfbc0..69991a3 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -639,4 +639,12 @@
test_cmp expected-2 actual
'
+test_expect_success 'checkout -p works with pathological context lines' '
+ test_write_lines a a a a a a >a &&
+ git add a &&
+ test_write_lines a b a b a b a b a b a > a&&
+ test_write_lines s n n y q | git checkout -p &&
+ test_write_lines a b a b a a b a b a >expect &&
+ test_cmp expect a
+'
test_done
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 8eb4794..64dcc5e 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -23,6 +23,7 @@
# first create a commit, so we have a valid object/type
# for the tag.
test_expect_success 'setup' '
+ test_oid_init &&
echo Hello >A &&
git update-index --add A &&
git commit -m "Initial commit" &&
@@ -69,28 +70,28 @@
# 4. type line label check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
xxxx tag
tag mytag
tagger . <> 0 +0000
EOF
-check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$'
+check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
############################################################
# 5. type line eol check
-echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig
+echo "object $head" >tag.sig
printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig
-check_verify_failure '"type" line eol check' '^error: char48: .*"\\n"$'
+check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$'
############################################################
# 6. tag line label check #1
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type tag
xxx mytag
tagger . <> 0 +0000
@@ -98,37 +99,37 @@
EOF
check_verify_failure '"tag" line label check #1' \
- '^error: char57: no "tag " found$'
+ '^error: char.*: no "tag " found$'
############################################################
# 7. tag line label check #2
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type taggggggggggggggggggggggggggggggg
tag
EOF
check_verify_failure '"tag" line label check #2' \
- '^error: char87: no "tag " found$'
+ '^error: char.*: no "tag " found$'
############################################################
# 8. type line type-name length check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type taggggggggggggggggggggggggggggggg
tag mytag
EOF
check_verify_failure '"type" line type-name length check' \
- '^error: char53: type too long$'
+ '^error: char.*: type too long$'
############################################################
# 9. verify object (SHA1/type) check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $(test_oid deadbeef)
type tagggg
tag mytag
tagger . <> 0 +0000
@@ -150,7 +151,7 @@
EOF
check_verify_failure 'verify tag-name check' \
- '^error: char67: could not verify tag name$'
+ '^error: char.*: could not verify tag name$'
############################################################
# 11. tagger line label check #1
@@ -164,7 +165,7 @@
EOF
check_verify_failure '"tagger" line label check #1' \
- '^error: char70: could not find "tagger "$'
+ '^error: char.*: could not find "tagger "$'
############################################################
# 12. tagger line label check #2
@@ -179,7 +180,7 @@
EOF
check_verify_failure '"tagger" line label check #2' \
- '^error: char70: could not find "tagger "$'
+ '^error: char.*: could not find "tagger "$'
############################################################
# 13. disallow missing tag author name
@@ -194,7 +195,7 @@
EOF
check_verify_failure 'disallow missing tag author name' \
- '^error: char77: missing tagger name$'
+ '^error: char.*: missing tagger name$'
############################################################
# 14. disallow missing tag author name
@@ -209,7 +210,7 @@
EOF
check_verify_failure 'disallow malformed tagger' \
- '^error: char77: malformed tagger field$'
+ '^error: char.*: malformed tagger field$'
############################################################
# 15. allow empty tag email
@@ -238,7 +239,7 @@
EOF
check_verify_failure 'disallow spaces in tag email' \
- '^error: char77: malformed tagger field$'
+ '^error: char.*: malformed tagger field$'
############################################################
# 17. disallow missing tag timestamp
@@ -252,7 +253,7 @@
EOF
check_verify_failure 'disallow missing tag timestamp' \
- '^error: char107: missing tag timestamp$'
+ '^error: char.*: missing tag timestamp$'
############################################################
# 18. detect invalid tag timestamp1
@@ -266,7 +267,7 @@
EOF
check_verify_failure 'detect invalid tag timestamp1' \
- '^error: char107: missing tag timestamp$'
+ '^error: char.*: missing tag timestamp$'
############################################################
# 19. detect invalid tag timestamp2
@@ -280,7 +281,7 @@
EOF
check_verify_failure 'detect invalid tag timestamp2' \
- '^error: char111: malformed tag timestamp$'
+ '^error: char.*: malformed tag timestamp$'
############################################################
# 20. detect invalid tag timezone1
@@ -294,7 +295,7 @@
EOF
check_verify_failure 'detect invalid tag timezone1' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 21. detect invalid tag timezone2
@@ -308,7 +309,7 @@
EOF
check_verify_failure 'detect invalid tag timezone2' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 22. detect invalid tag timezone3
@@ -322,7 +323,7 @@
EOF
check_verify_failure 'detect invalid tag timezone3' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 23. detect invalid header entry
@@ -337,7 +338,7 @@
EOF
check_verify_failure 'detect invalid header entry' \
- '^error: char124: trailing garbage in tag header$'
+ '^error: char.*: trailing garbage in tag header$'
############################################################
# 24. create valid tag
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 5f8272b..580bfbd 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -7,23 +7,35 @@
. ./test-lib.sh
+diff_cmp () {
+ for i in "$1" "$2"
+ do
+ sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+ -e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+ -e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \
+ "$i" >"$i.compare" || return 1
+ done &&
+ test_cmp "$1.compare" "$2.compare" &&
+ rm -f "$1.compare" "$2.compare"
+}
+
test_expect_success 'stash some dirty working directory' '
- echo 1 > file &&
+ echo 1 >file &&
git add file &&
echo unrelated >other-file &&
git add other-file &&
test_tick &&
git commit -m initial &&
- echo 2 > file &&
+ echo 2 >file &&
git add file &&
- echo 3 > file &&
+ echo 3 >file &&
test_tick &&
git stash &&
git diff-files --quiet &&
git diff-index --cached --quiet HEAD
'
-cat > expect << EOF
+cat >expect <<EOF
diff --git a/file b/file
index 0cfbf08..00750ed 100644
--- a/file
@@ -35,8 +47,8 @@
test_expect_success 'parents of stash' '
test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
- git diff stash^2..stash > output &&
- test_cmp expect output
+ git diff stash^2..stash >output &&
+ diff_cmp expect output
'
test_expect_success 'applying bogus stash does nothing' '
@@ -74,7 +86,7 @@
test_expect_success 'apply stashed changes (including index)' '
git reset --hard HEAD^ &&
- echo 6 > other-file &&
+ echo 6 >other-file &&
git add other-file &&
test_tick &&
git commit -m other-file &&
@@ -99,12 +111,12 @@
test_expect_success 'drop top stash' '
git reset --hard &&
- git stash list > stashlist1 &&
- echo 7 > file &&
+ git stash list >expected &&
+ echo 7 >file &&
git stash &&
git stash drop &&
- git stash list > stashlist2 &&
- test_cmp stashlist1 stashlist2 &&
+ git stash list >actual &&
+ test_cmp expected actual &&
git stash apply &&
test 3 = $(cat file) &&
test 1 = $(git show :file) &&
@@ -113,9 +125,9 @@
test_expect_success 'drop middle stash' '
git reset --hard &&
- echo 8 > file &&
+ echo 8 >file &&
git stash &&
- echo 9 > file &&
+ echo 9 >file &&
git stash &&
git stash drop stash@{1} &&
test 2 = $(git stash list | wc -l) &&
@@ -160,7 +172,7 @@
test 0 = $(git stash list | wc -l)
'
-cat > expect << EOF
+cat >expect <<EOF
diff --git a/file2 b/file2
new file mode 100644
index 0000000..1fe912c
@@ -170,7 +182,7 @@
+bar2
EOF
-cat > expect1 << EOF
+cat >expect1 <<EOF
diff --git a/file b/file
index 257cc56..5716ca5 100644
--- a/file
@@ -180,7 +192,7 @@
+bar
EOF
-cat > expect2 << EOF
+cat >expect2 <<EOF
diff --git a/file b/file
index 7601807..5716ca5 100644
--- a/file
@@ -198,79 +210,79 @@
EOF
test_expect_success 'stash branch' '
- echo foo > file &&
+ echo foo >file &&
git commit file -m first &&
- echo bar > file &&
- echo bar2 > file2 &&
+ echo bar >file &&
+ echo bar2 >file2 &&
git add file2 &&
git stash &&
- echo baz > file &&
+ echo baz >file &&
git commit file -m second &&
git stash branch stashbranch &&
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
test $(git rev-parse HEAD) = $(git rev-parse master^) &&
- git diff --cached > output &&
- test_cmp expect output &&
- git diff > output &&
- test_cmp expect1 output &&
+ git diff --cached >output &&
+ diff_cmp expect output &&
+ git diff >output &&
+ diff_cmp expect1 output &&
git add file &&
git commit -m alternate\ second &&
- git diff master..stashbranch > output &&
- test_cmp output expect2 &&
+ git diff master..stashbranch >output &&
+ diff_cmp output expect2 &&
test 0 = $(git stash list | wc -l)
'
test_expect_success 'apply -q is quiet' '
- echo foo > file &&
+ echo foo >file &&
git stash &&
- git stash apply -q > output.out 2>&1 &&
+ git stash apply -q >output.out 2>&1 &&
test_must_be_empty output.out
'
test_expect_success 'save -q is quiet' '
- git stash save --quiet > output.out 2>&1 &&
+ git stash save --quiet >output.out 2>&1 &&
test_must_be_empty output.out
'
test_expect_success 'pop -q is quiet' '
- git stash pop -q > output.out 2>&1 &&
+ git stash pop -q >output.out 2>&1 &&
test_must_be_empty output.out
'
test_expect_success 'pop -q --index works and is quiet' '
- echo foo > file &&
+ echo foo >file &&
git add file &&
git stash save --quiet &&
- git stash pop -q --index > output.out 2>&1 &&
+ git stash pop -q --index >output.out 2>&1 &&
test foo = "$(git show :file)" &&
test_must_be_empty output.out
'
test_expect_success 'drop -q is quiet' '
git stash &&
- git stash drop -q > output.out 2>&1 &&
+ git stash drop -q >output.out 2>&1 &&
test_must_be_empty output.out
'
test_expect_success 'stash -k' '
- echo bar3 > file &&
- echo bar4 > file2 &&
+ echo bar3 >file &&
+ echo bar4 >file2 &&
git add file2 &&
git stash -k &&
test bar,bar4 = $(cat file),$(cat file2)
'
test_expect_success 'stash --no-keep-index' '
- echo bar33 > file &&
- echo bar44 > file2 &&
+ echo bar33 >file &&
+ echo bar44 >file2 &&
git add file2 &&
git stash --no-keep-index &&
test bar,bar2 = $(cat file),$(cat file2)
'
test_expect_success 'stash --invalid-option' '
- echo bar5 > file &&
- echo bar6 > file2 &&
+ echo bar5 >file &&
+ echo bar6 >file2 &&
git add file2 &&
test_must_fail git stash --invalid-option &&
test_must_fail git stash save --invalid-option &&
@@ -287,6 +299,14 @@
test new = "$(cat file3)"
'
+test_expect_success 'stash --intent-to-add file' '
+ git reset --hard &&
+ echo new >file4 &&
+ git add --intent-to-add file4 &&
+ test_when_finished "git rm -f file4" &&
+ test_must_fail git stash
+'
+
test_expect_success 'stash rm then recreate' '
git reset --hard &&
git rm file &&
@@ -444,6 +464,36 @@
test foo = "$(cat file/file)"
'
+test_expect_success 'giving too many ref arguments does not modify files' '
+ git stash clear &&
+ test_when_finished "git reset --hard HEAD" &&
+ echo foo >file2 &&
+ git stash &&
+ echo bar >file2 &&
+ git stash &&
+ test-tool chmtime =123456789 file2 &&
+ for type in apply pop "branch stash-branch"
+ do
+ test_must_fail git stash $type stash@{0} stash@{1} 2>err &&
+ test_i18ngrep "Too many revisions" err &&
+ test 123456789 = $(test-tool chmtime -g file2) || return 1
+ done
+'
+
+test_expect_success 'drop: too many arguments errors out (does nothing)' '
+ git stash list >expect &&
+ test_must_fail git stash drop stash@{0} stash@{1} 2>err &&
+ test_i18ngrep "Too many revisions" err &&
+ git stash list >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'show: too many arguments errors out (does nothing)' '
+ test_must_fail git stash show stash@{0} stash@{1} 2>err 1>out &&
+ test_i18ngrep "Too many revisions" err &&
+ test_must_be_empty out
+'
+
test_expect_success 'stash create - no changes' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
@@ -456,11 +506,12 @@
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
git stash branch stash-branch ${STASH_ID} &&
- test_when_finished "git reset --hard HEAD && git checkout master && git branch -D stash-branch" &&
+ test_when_finished "git reset --hard HEAD && git checkout master &&
+ git branch -D stash-branch" &&
test $(git ls-files --modified | wc -l) -eq 1
'
@@ -468,25 +519,31 @@
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
git stash &&
test_when_finished "git stash drop" &&
- echo bar >> file &&
+ echo bar >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
git stash branch stash-branch ${STASH_ID} &&
- test_when_finished "git reset --hard HEAD && git checkout master && git branch -D stash-branch" &&
+ test_when_finished "git reset --hard HEAD && git checkout master &&
+ git branch -D stash-branch" &&
test $(git ls-files --modified | wc -l) -eq 1
'
+test_expect_success 'stash branch complains with no arguments' '
+ test_must_fail git stash branch 2>err &&
+ test_i18ngrep "No branch name specified" err
+'
+
test_expect_success 'stash show format defaults to --stat' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
git stash &&
test_when_finished "git stash drop" &&
- echo bar >> file &&
+ echo bar >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
cat >expected <<-EOF &&
@@ -501,10 +558,10 @@
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
git stash &&
test_when_finished "git stash drop" &&
- echo bar >> file &&
+ echo bar >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
echo "1 0 file" >expected &&
@@ -516,10 +573,10 @@
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
git stash &&
test_when_finished "git stash drop" &&
- echo bar >> file &&
+ echo bar >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
cat >expected <<-EOF &&
@@ -532,14 +589,14 @@
+bar
EOF
git stash show -p ${STASH_ID} >actual &&
- test_cmp expected actual
+ diff_cmp expected actual
'
test_expect_success 'stash show - no stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
echo "1 0 file" >expected &&
@@ -551,7 +608,7 @@
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
- echo foo >> file &&
+ echo foo >>file &&
STASH_ID=$(git stash create) &&
git reset --hard &&
cat >expected <<-EOF &&
@@ -564,16 +621,34 @@
+foo
EOF
git stash show -p ${STASH_ID} >actual &&
- test_cmp expected actual
+ diff_cmp expected actual
'
-test_expect_success 'stash drop - fail early if specified stash is not a stash reference' '
+test_expect_success 'stash show --patience shows diff' '
+ git reset --hard &&
+ echo foo >>file &&
+ STASH_ID=$(git stash create) &&
+ git reset --hard &&
+ cat >expected <<-EOF &&
+ diff --git a/file b/file
+ index 7601807..71b52c4 100644
+ --- a/file
+ +++ b/file
+ @@ -1 +1,2 @@
+ baz
+ +foo
+ EOF
+ git stash show --patience ${STASH_ID} >actual &&
+ diff_cmp expected actual
+'
+
+test_expect_success 'drop: fail early if specified stash is not a stash ref' '
git stash clear &&
test_when_finished "git reset --hard HEAD && git stash clear" &&
git reset --hard &&
- echo foo > file &&
+ echo foo >file &&
git stash &&
- echo bar > file &&
+ echo bar >file &&
git stash &&
test_must_fail git stash drop $(git rev-parse stash@{0}) &&
git stash pop &&
@@ -581,13 +656,13 @@
git reset --hard HEAD
'
-test_expect_success 'stash pop - fail early if specified stash is not a stash reference' '
+test_expect_success 'pop: fail early if specified stash is not a stash ref' '
git stash clear &&
test_when_finished "git reset --hard HEAD && git stash clear" &&
git reset --hard &&
- echo foo > file &&
+ echo foo >file &&
git stash &&
- echo bar > file &&
+ echo bar >file &&
git stash &&
test_must_fail git stash pop $(git rev-parse stash@{0}) &&
git stash pop &&
@@ -597,8 +672,8 @@
test_expect_success 'ref with non-existent reflog' '
git stash clear &&
- echo bar5 > file &&
- echo bar6 > file2 &&
+ echo bar5 >file &&
+ echo bar6 >file2 &&
git add file2 &&
git stash &&
test_must_fail git rev-parse --quiet --verify does-not-exist &&
@@ -618,8 +693,8 @@
test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
git stash clear &&
test_must_fail git stash drop stash@{0} &&
- echo bar5 > file &&
- echo bar6 > file2 &&
+ echo bar5 >file &&
+ echo bar6 >file2 &&
git add file2 &&
git stash &&
test_must_fail git stash drop stash@{1} &&
@@ -645,7 +720,25 @@
git stash drop
'
-test_expect_success 'stash branch should not drop the stash if the branch exists' '
+test_expect_success 'valid ref of the form "n", n < N' '
+ git stash clear &&
+ echo bar5 >file &&
+ echo bar6 >file2 &&
+ git add file2 &&
+ git stash &&
+ git stash show 0 &&
+ git stash branch tmp 0 &&
+ git checkout master &&
+ git stash &&
+ git stash apply 0 &&
+ git reset --hard &&
+ git stash pop 0 &&
+ git stash &&
+ git stash drop 0 &&
+ test_must_fail git stash drop
+'
+
+test_expect_success 'branch: do not drop the stash if the branch exists' '
git stash clear &&
echo foo >file &&
git add file &&
@@ -656,7 +749,7 @@
git rev-parse stash@{0} --
'
-test_expect_success 'stash branch should not drop the stash if the apply fails' '
+test_expect_success 'branch: should not drop the stash if the apply fails' '
git stash clear &&
git reset HEAD~1 --hard &&
echo foo >file &&
@@ -670,7 +763,7 @@
git rev-parse stash@{0} --
'
-test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
+test_expect_success 'apply: show same status as git status (relative to ./)' '
git stash clear &&
echo 1 >subdir/subfile1 &&
echo 2 >subdir/subfile2 &&
@@ -689,7 +782,7 @@
test_i18ncmp expect actual
'
-cat > expect << EOF
+cat >expect <<EOF
diff --git a/HEAD b/HEAD
new file mode 100644
index 0000000..fe0cbee
@@ -702,15 +795,15 @@
test_expect_success 'stash where working directory contains "HEAD" file' '
git stash clear &&
git reset --hard &&
- echo file-not-a-ref > HEAD &&
+ echo file-not-a-ref >HEAD &&
git add HEAD &&
test_tick &&
git stash &&
git diff-files --quiet &&
git diff-index --cached --quiet HEAD &&
test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
- git diff stash^..stash > output &&
- test_cmp expect output
+ git diff stash^..stash >output &&
+ diff_cmp expect output
'
test_expect_success 'store called with invalid commit' '
@@ -766,7 +859,7 @@
+working
EOF
git stash list --format=%gd -p >actual &&
- test_cmp expect actual
+ diff_cmp expect actual
'
test_expect_success 'stash list --cc shows combined diff' '
@@ -783,7 +876,7 @@
++working
EOF
git stash list --format=%gd -p --cc >actual &&
- test_cmp expect actual
+ diff_cmp expect actual
'
test_expect_success 'stash is not confused by partial renames' '
@@ -1011,7 +1104,7 @@
test_i18ncmp expect actual
'
-test_expect_success 'stash push with pathspec shows no changes when there are none' '
+test_expect_success 'push <pathspec>: show no changes when there are none' '
>foo &&
git add foo &&
git commit -m "tmp" &&
@@ -1021,12 +1114,35 @@
test_i18ncmp expect actual
'
-test_expect_success 'stash push with pathspec not in the repository errors out' '
+test_expect_success 'push: <pathspec> not in the repository errors out' '
>untracked &&
test_must_fail git stash push untracked &&
test_path_is_file untracked
'
+test_expect_success 'push: -q is quiet with changes' '
+ >foo &&
+ git add foo &&
+ git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+'
+
+test_expect_success 'push: -q is quiet with no changes' '
+ git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+'
+
+test_expect_success 'push: -q is quiet even if there is no initial commit' '
+ git init foo_dir &&
+ test_when_finished rm -rf foo_dir &&
+ (
+ cd foo_dir &&
+ >bar &&
+ test_must_fail git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+ )
+'
+
test_expect_success 'untracked files are left in place when -u is not given' '
>file &&
git add file &&
@@ -1096,6 +1212,12 @@
test_path_is_file subdir/untracked
'
+test_expect_success 'stash with user.name and user.email set works' '
+ test_config user.name "A U Thor" &&
+ test_config user.email "a.u@thor" &&
+ git stash
+'
+
test_expect_success 'stash works when user.name and user.email are not set' '
git reset &&
>1 &&
@@ -1124,4 +1246,27 @@
)
'
+test_expect_success 'stash --keep-index with file deleted in index does not resurrect it on disk' '
+ test_commit to-remove to-remove &&
+ git rm to-remove &&
+ git stash --keep-index &&
+ test_path_is_missing to-remove
+'
+
+test_expect_success 'stash apply should succeed with unmodified file' '
+ echo base >file &&
+ git add file &&
+ git commit -m base &&
+
+ # now stash a modification
+ echo modified >file &&
+ git stash &&
+
+ # make the file stat dirty
+ cp file other &&
+ mv other file &&
+
+ git stash apply
+'
+
test_done
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index cc1c8a7..29ca76f 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -283,4 +283,10 @@
test_i18ncmp expect actual
'
+test_expect_success 'stash -u with globs' '
+ >untracked.txt &&
+ git stash -u -- ":(glob)**/*.txt" &&
+ test_path_is_missing untracked.txt
+'
+
test_done
diff --git a/t/t3907-stash-show-config.sh b/t/t3907-stash-show-config.sh
new file mode 100755
index 0000000..10914bb
--- /dev/null
+++ b/t/t3907-stash-show-config.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+test_description='Test git stash show configuration.'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit file
+'
+
+# takes three parameters:
+# 1. the stash.showStat value (or "<unset>")
+# 2. the stash.showPatch value (or "<unset>")
+# 3. the diff options of the expected output (or nothing for no output)
+test_stat_and_patch () {
+ if test "<unset>" = "$1"
+ then
+ test_unconfig stash.showStat
+ else
+ test_config stash.showStat "$1"
+ fi &&
+
+ if test "<unset>" = "$2"
+ then
+ test_unconfig stash.showPatch
+ else
+ test_config stash.showPatch "$2"
+ fi &&
+
+ shift 2 &&
+ echo 2 >file.t &&
+ if test $# != 0
+ then
+ git diff "$@" >expect
+ fi &&
+ git stash &&
+ git stash show >actual &&
+
+ if test $# = 0
+ then
+ test_must_be_empty actual
+ else
+ test_cmp expect actual
+ fi
+}
+
+test_expect_success 'showStat unset showPatch unset' '
+ test_stat_and_patch "<unset>" "<unset>" --stat
+'
+
+test_expect_success 'showStat unset showPatch false' '
+ test_stat_and_patch "<unset>" false --stat
+'
+
+test_expect_success 'showStat unset showPatch true' '
+ test_stat_and_patch "<unset>" true --stat -p
+'
+
+test_expect_success 'showStat false showPatch unset' '
+ test_stat_and_patch false "<unset>"
+'
+
+test_expect_success 'showStat false showPatch false' '
+ test_stat_and_patch false false
+'
+
+test_expect_success 'showStat false showPatch true' '
+ test_stat_and_patch false true -p
+'
+
+test_expect_success 'showStat true showPatch unset' '
+ test_stat_and_patch true "<unset>" --stat
+'
+
+test_expect_success 'showStat true showPatch false' '
+ test_stat_and_patch true false --stat
+'
+
+test_expect_success 'showStat true showPatch true' '
+ test_stat_and_patch true true --stat -p
+'
+
+test_done
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 8de36b7..e5116a7 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -78,7 +78,7 @@
test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' '
git diff-files --no-patch --patch-with-raw >actual &&
- grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M path0\$" actual &&
+ grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual &&
tail -n +4 actual >actual-patch &&
compare_diff_patch expected actual-patch
'
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 3a6c21e..cbcdd10 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -7,123 +7,272 @@
'
. ./test-lib.sh
+
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
-cat >.test-plain-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 040000 0000000000000000000000000000000000000000 6d50f65d3bdab91c63444294d38f08aeff328e42 A DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 5e5f22072bb39f6e12cf663a57cb634c76eefb49 M Z
+test_oid_init
+
+test_oid_cache <<\EOF
+aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
+aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
+
+aa_2 sha1:6aa2b5335b16431a0ef71e5c0a28be69183cf6a2
+aa_2 sha256:6eaa3437de83f145a4aaa6ba355303075ade547b128ec6a2cd00a81ff7ce7a56
+
+an_1 sha1:7e426fb079479fd67f6d81f984e4ec649a44bc25
+an_1 sha256:8f92a0bec99e399a38e3bd0e1bf19fbf121e0160efb29b857df79d439f1c4536
+
+dd_1 sha1:bcc68ef997017466d5c9094bcf7692295f588c9a
+dd_1 sha256:07e17428b00639b85485d2b01083d219e2f3e3ba8579e9ca44e9cc8dd554d952
+
+df_1 sha1:6d50f65d3bdab91c63444294d38f08aeff328e42
+df_1 sha256:e367cecc27e9bf5451b1c65828cb21938d36a5f8e39c1b03ad6509cc36bb8e9d
+
+df_2 sha1:71420ab81e254145d26d6fc0cddee64c1acd4787
+df_2 sha256:0f0a86d10347ff6921d03a3c954679f3f1d14fa3d5cd82f57b32c09755f3a47d
+
+dfd1 sha1:68a6d8b91da11045cf4aa3a5ab9f2a781c701249
+dfd1 sha256:f3bd3265b02b6978ce86490d8ad026c573639c974b3de1d9faf30d8d5a77d3d5
+
+dm_1 sha1:141c1f1642328e4bc46a7d801a71da392e66791e
+dm_1 sha256:c89f8656e7b94e21ee5fbaf0e2149bbf783c51edbe2ce110349cac13059ee7ed
+
+dm_2 sha1:3c4d8de5fbad08572bab8e10eef8dbb264cf0231
+dm_2 sha256:83a572e37e0c94086294dae2cecc43d9131afd6f6c906e495c78972230b54988
+
+dn_1 sha1:35abde1506ddf806572ff4d407bd06885d0f8ee9
+dn_1 sha256:775d5852582070e620be63327bfa515fab8f71c7ac3e4f0c3cd6267b4377ba28
+
+ll_2 sha1:1d41122ebdd7a640f29d3c9cc4f9d70094374762
+ll_2 sha256:7917b4948a883cfed0a77d3d5a625dc8577d6ddcc3c6c3bbc56c4d4226a2246d
+
+md_1 sha1:03f24c8c4700babccfd28b654e7e8eac402ad6cd
+md_1 sha256:fc9f30369b978595ad685ba11ca9a17de0af16d79cd4b629975f4f1590033902
+
+md_2 sha1:103d9f89b50b9aad03054b579be5e7aa665f2d57
+md_2 sha256:fc78ec75275628762fe520479a6b2398dec295ce7aabcb1d15e5963c7b4e9317
+
+mm_1 sha1:b258508afb7ceb449981bd9d63d2d3e971bf8d34
+mm_1 sha256:a4b7847d228e900e3000285e240c20fd96f9dd41ce1445305f6eada126d4a04a
+
+mm_2 sha1:b431b272d829ff3aa4d1a5085f4394ab4d3305b6
+mm_2 sha256:3f8b83ea36aacf689bcf1a1290a9a8ed341564d32682ea6f76fea9a979186782
+
+mm_3 sha1:19989d4559aae417fedee240ccf2ba315ea4dc2b
+mm_3 sha256:71b3bfc5747ac033fff9ea0ab39ee453a3af2969890e75d6ef547b87544e2681
+
+mn_1 sha1:bd084b0c27c7b6cc34f11d6d0509a29be3caf970
+mn_1 sha256:47a67450583d7a329eb01a7c4ba644945af72c0ed2c7c95eb5a00d6e46d4d483
+
+mn_2 sha1:a716d58de4a570e0038f5c307bd8db34daea021f
+mn_2 sha256:f95104c1ebe27acb84bac25a7be98c71f6b8d3054b21f357a5be0c524ad97e08
+
+nm_1 sha1:c8f25781e8f1792e3e40b74225e20553041b5226
+nm_1 sha256:09baddc7afaa62e62e152c23c9c3ab94bf15a3894031e227e9be7fe68e1f4e49
+
+nm_2 sha1:cdb9a8c3da571502ac30225e9c17beccb8387983
+nm_2 sha256:58b5227956ac2d2a08d0efa513c0ae37430948b16791ea3869a1308dbf05536d
+
+na_1 sha1:15885881ea69115351c09b38371f0348a3fb8c67
+na_1 sha256:18e4fdd1670cd7968ee23d35bfd29e5418d56fb190c840094c1c57ceee0aad8f
+
+nd_1 sha1:a4e179e4291e5536a5e1c82e091052772d2c5a93
+nd_1 sha256:07dac9b01d00956ea0c65bd993d7de4864aeef2ed3cbb1255d9f1d949fcd6df6
+
+ss_1 sha1:40c959f984c8b89a2b02520d17f00d717f024397
+ss_1 sha256:50fc1b5df74d9910db2f9270993484235f15b69b75b01bcfb53e059289d14af9
+
+ss_2 sha1:2ac547ae9614a00d1b28275de608131f7a0e259f
+ss_2 sha256:a90f02e6044f1497d13db587d22ab12f90150a7d1e084afcf96065fab35ae2bc
+
+tt_1 sha1:4ac13458899ab908ef3b1128fa378daefc88d356
+tt_1 sha256:c53113c7dd5060e86b5b251428bd058f6726f66273c6a24bff1c61a04f498dd3
+
+tt_2 sha1:4c86f9a85fbc5e6804ee2e17a797538fbe785bca
+tt_2 sha256:0775f2a296129a7cf2862b46bc0e88c14d593f2773a3e3fb1c5193db6f5a7e77
+
+tt_3 sha1:c4e4a12231b9fa79a0053cb6077fcb21bb5b135a
+tt_3 sha256:47860f93cdd211f96443e0560f21c57ab6c2f4b0ac27ff03651a352e53fe8484
+
+z__1 sha1:7d670fdcdb9929f6c7dac196ff78689cd1c566a1
+z__1 sha256:44d0f37aff5e51cfcfdd1134c93a6419bcca7b9964f792ffcd5f9b4fcba1ee63
+
+z__2 sha1:5e5f22072bb39f6e12cf663a57cb634c76eefb49
+z__2 sha256:d29de162113190fed104eb5f010820cef4e315f89b9326e8497f7219fb737894
+
+z__3 sha1:1ba523955d5160681af65cb776411f574c1e8155
+z__3 sha256:07422d772b07794ab4369a5648e617719f89c2d2212cbeab05d97214b6471636
+
+zaa1 sha1:8acb8e9750e3f644bf323fcf3d338849db106c77
+zaa1 sha256:e79b029282c8abec2d9f3f7faceaf2a1405e02d1f368e66450ae66cf5b68d1f4
+
+zaa2 sha1:6c0b99286d0bce551ac4a7b3dff8b706edff3715
+zaa2 sha256:c82bd78c3e69ea1796e6b1a7a3ba45bb106c50e819296475b862123d3f5cc5a0
+
+zan1 sha1:087494262084cefee7ed484d20c8dc0580791272
+zan1 sha256:4b159eb3804d05599023dd074f771d06d02870f4ab24a7165add8ac3d703b8d3
+
+zdd1 sha1:879007efae624d2b1307214b24a956f0a8d686a8
+zdd1 sha256:eecfdd4d8092dd0363fb6d4548b54c6afc8982c3ed9b34e393f1d6a921d8eaa3
+
+zdm1 sha1:9b541b2275c06e3a7b13f28badf5294e2ae63df4
+zdm1 sha256:ab136e88e19a843c4bf7713d2090d5a2186ba16a6a80dacc12eeddd256a8e556
+
+zdm2 sha1:d77371d15817fcaa57eeec27f770c505ba974ec1
+zdm2 sha256:1c1a5f57363f46a15d95ce8527b3c2c158d88d16853b4acbf81bd20fd2c89a46
+
+zdn1 sha1:beb5d38c55283d280685ea21a0e50cfcc0ca064a
+zdn1 sha256:0f0eca66183617b0aa5ad74b256540329f841470922ca6760263c996d825eb18
+
+zmd1 sha1:d41fda41b7ec4de46b43cb7ea42a45001ae393d5
+zmd1 sha256:1ed32d481852eddf31a0ce12652a0ad14bf5b7a842667b5dbb0b50f35bf1c80a
+
+zmd2 sha1:a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9
+zmd2 sha256:b238da211b404f8917df2d9c6f7030535e904b2186131007a3c292ec6902f933
+
+zmm1 sha1:4ca22bae2527d3d9e1676498a0fba3b355bd1278
+zmm1 sha256:072b1d85b5f34fabc99dfa46008c5418df68302d3e317430006f49b32d244226
+
+zmm2 sha1:61422ba9c2c873416061a88cd40a59a35b576474
+zmm2 sha256:81dd5d2b3c5cda16fef552256aed4e2ea0802a8450a08f308a92142112ff6dda
+
+zmm3 sha1:697aad7715a1e7306ca76290a3dd4208fbaeddfa
+zmm3 sha256:8b10fab49e9be3414aa5e9a93d0e46f9569053440138a7c19a5eb5536d8e95bf
+
+zmn1 sha1:b16d7b25b869f2beb124efa53467d8a1550ad694
+zmn1 sha256:609e4f75d1295e844c826feeba213acb0b6cfc609adfe8ff705b19e3829ae3e9
+
+zmn2 sha1:a5c544c21cfcb07eb80a4d89a5b7d1570002edfd
+zmn2 sha256:d6d03edf2dc1a3b267a8205de5f41a2ff4b03def8c7ae02052b543fb09d589fc
+
+zna1 sha1:d12979c22fff69c59ca9409e7a8fe3ee25eaee80
+zna1 sha256:b37b80e789e8ea32aa323f004628f02013f632124b0282c7fe00a127d3c64c3c
+
+znd1 sha1:a18393c636b98e9bd7296b8b437ea4992b72440c
+znd1 sha256:af92a22eee8c38410a0c9d2b5135a10aeb052cbc7cf675541ed9a67bfcaf7cf9
+
+znm1 sha1:3fdbe17fd013303a2e981e1ca1c6cd6e72789087
+znm1 sha256:f75aeaa0c11e76918e381c105f0752932c6150e941fec565d24fa31098a13dc1
+
+znm2 sha1:7e09d6a3a14bd630913e8c75693cea32157b606d
+znm2 sha256:938d73cfbaa1c902a84fb5b3afd9736aa0590367fb9bd59c6c4d072ce70fcd6d
EOF
-cat >.test-recursive-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 A DF/DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT
-:000000 100644 0000000000000000000000000000000000000000 8acb8e9750e3f644bf323fcf3d338849db106c77 A Z/AA
-:000000 100644 0000000000000000000000000000000000000000 087494262084cefee7ed484d20c8dc0580791272 A Z/AN
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD
-:100644 000000 9b541b2275c06e3a7b13f28badf5294e2ae63df4 0000000000000000000000000000000000000000 D Z/DM
-:100644 000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a 0000000000000000000000000000000000000000 D Z/DN
-:100644 100644 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 M Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 61422ba9c2c873416061a88cd40a59a35b576474 M Z/MM
-:100644 100644 b16d7b25b869f2beb124efa53467d8a1550ad694 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd M Z/MN
+cat >.test-plain-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 040000 $(test_oid zero) $(test_oid df_1) A DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT
+:040000 040000 $(test_oid z__1) $(test_oid z__2) M Z
EOF
-cat >.test-plain-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 1ba523955d5160681af65cb776411f574c1e8155 M Z
+
+cat >.test-recursive-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid dfd1) A DF/DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT
+:000000 100644 $(test_oid zero) $(test_oid zaa1) A Z/AA
+:000000 100644 $(test_oid zero) $(test_oid zan1) A Z/AN
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD
+:100644 000000 $(test_oid zdm1) $(test_oid zero) D Z/DM
+:100644 000000 $(test_oid zdn1) $(test_oid zero) D Z/DN
+:100644 100644 $(test_oid zmd1) $(test_oid zmd2) M Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm2) M Z/MM
+:100644 100644 $(test_oid zmn1) $(test_oid zmn2) M Z/MN
EOF
-cat >.test-recursive-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:000000 100644 0000000000000000000000000000000000000000 6c0b99286d0bce551ac4a7b3dff8b706edff3715 A Z/AA
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD
-:100644 100644 9b541b2275c06e3a7b13f28badf5294e2ae63df4 d77371d15817fcaa57eeec27f770c505ba974ec1 M Z/DM
-:100644 000000 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 0000000000000000000000000000000000000000 D Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM
+cat >.test-plain-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT
+:040000 040000 $(test_oid z__1) $(test_oid z__3) M Z
EOF
-cat >.test-plain-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:040000 000000 6d50f65d3bdab91c63444294d38f08aeff328e42 0000000000000000000000000000000000000000 D DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:040000 040000 5e5f22072bb39f6e12cf663a57cb634c76eefb49 1ba523955d5160681af65cb776411f574c1e8155 M Z
+cat >.test-recursive-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT
+:000000 100644 $(test_oid zero) $(test_oid zaa2) A Z/AA
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD
+:100644 100644 $(test_oid zdm1) $(test_oid zdm2) M Z/DM
+:100644 000000 $(test_oid zmd1) $(test_oid zero) D Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm3) M Z/MM
+:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM
EOF
-cat >.test-recursive-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 0000000000000000000000000000000000000000 D DF/DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:100644 100644 8acb8e9750e3f644bf323fcf3d338849db106c77 6c0b99286d0bce551ac4a7b3dff8b706edff3715 M Z/AA
-:100644 000000 087494262084cefee7ed484d20c8dc0580791272 0000000000000000000000000000000000000000 D Z/AN
-:000000 100644 0000000000000000000000000000000000000000 d77371d15817fcaa57eeec27f770c505ba974ec1 A Z/DM
-:000000 100644 0000000000000000000000000000000000000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a A Z/DN
-:100644 000000 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 0000000000000000000000000000000000000000 D Z/MD
-:100644 100644 61422ba9c2c873416061a88cd40a59a35b576474 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM
-:100644 100644 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd b16d7b25b869f2beb124efa53467d8a1550ad694 M Z/MN
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM
+cat >.test-plain-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:040000 000000 $(test_oid df_1) $(test_oid zero) D DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT
+:040000 040000 $(test_oid z__2) $(test_oid z__3) M Z
+EOF
+cat >.test-recursive-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 000000 $(test_oid dfd1) $(test_oid zero) D DF/DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT
+:100644 100644 $(test_oid zaa1) $(test_oid zaa2) M Z/AA
+:100644 000000 $(test_oid zan1) $(test_oid zero) D Z/AN
+:000000 100644 $(test_oid zero) $(test_oid zdm2) A Z/DM
+:000000 100644 $(test_oid zero) $(test_oid zdn1) A Z/DN
+:100644 000000 $(test_oid zmd2) $(test_oid zero) D Z/MD
+:100644 100644 $(test_oid zmm2) $(test_oid zmm3) M Z/MM
+:100644 100644 $(test_oid zmn2) $(test_oid zmn1) M Z/MN
+:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM
EOF
cmp_diff_files_output () {
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index 3641fd8..b63bdf0 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -14,6 +14,7 @@
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
+ orig=$(git hash-object COPYING) &&
tree=$(git write-tree) &&
echo $tree'
@@ -22,6 +23,8 @@
'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
rm -f COPYING &&
+ c1=$(git hash-object COPYING.1) &&
+ c2=$(git hash-object COPYING.2) &&
git update-index --add --remove COPYING COPYING.?'
# tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2,
@@ -31,11 +34,11 @@
git diff-index -z -C $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234
+:100644 100644 $orig $c2 R1234
COPYING
COPYING.2
EOF
@@ -57,10 +60,10 @@
# about rezrov.
git diff-index -z -C $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M
+cat >expected <<EOF
+:100644 100644 $orig $c2 M
COPYING
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
EOF
@@ -82,8 +85,8 @@
git update-index --add --remove COPYING COPYING.1'
git diff-index -z -C --find-copies-harder $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
EOF
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 9f8f0e8..5ac94b3 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -7,9 +7,6 @@
. ./test-lib.sh
-LF='
-'
-
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
@@ -338,6 +335,8 @@
format-patch --stdout --cover-letter -n initial..master^
diff --abbrev initial..side
+diff -U initial..side
+diff -U1 initial..side
diff -r initial..side
diff --stat initial..side
diff -r --stat initial..side
diff --git a/t/t4013/diff.diff_-U1_initial..side b/t/t4013/diff.diff_-U1_initial..side
new file mode 100644
index 0000000..b69f8f0
--- /dev/null
+++ b/t/t4013/diff.diff_-U1_initial..side
@@ -0,0 +1,29 @@
+$ git diff -U1 initial..side
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2 +2,3 @@ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -3 +3,4 @@
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4013/diff.diff_-U2_initial..side b/t/t4013/diff.diff_-U2_initial..side
new file mode 100644
index 0000000..8ffe04f
--- /dev/null
+++ b/t/t4013/diff.diff_-U2_initial..side
@@ -0,0 +1,31 @@
+$ git diff -U2 initial..side
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -2,2 +2,5 @@
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4013/diff.diff_-U_initial..side b/t/t4013/diff.diff_-U_initial..side
new file mode 100644
index 0000000..c66c0dd
--- /dev/null
+++ b/t/t4013/diff.diff_-U_initial..side
@@ -0,0 +1,32 @@
+$ git diff -U initial..side
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 909c743..83f5261 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -9,7 +9,6 @@
. "$TEST_DIRECTORY"/lib-terminal.sh
test_expect_success setup '
-
for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
cat file >elif &&
git add file elif &&
@@ -34,39 +33,54 @@
git commit -m "Side changes #3 with \\n backslash-n in it." &&
git checkout master &&
- git diff-tree -p C2 | git apply --index &&
+ git diff-tree -p C2 >patch &&
+ git apply --index <patch &&
test_tick &&
- git commit -m "Master accepts moral equivalent of #2"
+ git commit -m "Master accepts moral equivalent of #2" &&
+ git checkout side &&
+ git checkout -b patchid &&
+ for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file2 &&
+ for i in 1 2 3 A 4 B C 7 8 9 10 D E F 5 6; do echo "$i"; done >file3 &&
+ for i in 8 9 10; do echo "$i"; done >file &&
+ git add file file2 file3 &&
+ test_tick &&
+ git commit -m "patchid 1" &&
+ for i in 4 A B 7 8 9 10; do echo "$i"; done >file2 &&
+ for i in 8 9 10 5 6; do echo "$i"; done >file3 &&
+ git add file2 file3 &&
+ test_tick &&
+ git commit -m "patchid 2" &&
+ for i in 10 5 6; do echo "$i"; done >file &&
+ git add file &&
+ test_tick &&
+ git commit -m "patchid 3" &&
+
+ git checkout master
'
-test_expect_success "format-patch --ignore-if-in-upstream" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream' '
git format-patch --stdout master..side >patch0 &&
- cnt=$(grep "^From " patch0 | wc -l) &&
- test $cnt = 3
-
+ grep "^From " patch0 >from0 &&
+ test_line_count = 3 from0
'
-test_expect_success "format-patch --ignore-if-in-upstream" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream' '
git format-patch --stdout \
--ignore-if-in-upstream master..side >patch1 &&
- cnt=$(grep "^From " patch1 | wc -l) &&
- test $cnt = 2
-
+ grep "^From " patch1 >from1 &&
+ test_line_count = 2 from1
'
-test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
+test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
git tag -a v1 -m tag side &&
git tag -a v2 -m tag master &&
git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
- cnt=$(grep "^From " patch1 | wc -l) &&
- test $cnt = 2
+ grep "^From " patch1 >from1 &&
+ test_line_count = 2 from1
'
test_expect_success "format-patch doesn't consider merge commits" '
-
git checkout -b slave master &&
echo "Another line" >>file &&
test_tick &&
@@ -77,148 +91,138 @@
git checkout -b merger master &&
test_tick &&
git merge --no-ff slave &&
- cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) &&
- test $cnt = 3
+ git format-patch -3 --stdout >patch &&
+ grep "^From " patch >from &&
+ test_line_count = 3 from
'
-test_expect_success "format-patch result applies" '
-
+test_expect_success 'format-patch result applies' '
git checkout -b rebuild-0 master &&
git am -3 patch0 &&
- cnt=$(git rev-list master.. | wc -l) &&
- test $cnt = 2
+ git rev-list master.. >list &&
+ test_line_count = 2 list
'
-test_expect_success "format-patch --ignore-if-in-upstream result applies" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream result applies' '
git checkout -b rebuild-1 master &&
git am -3 patch1 &&
- cnt=$(git rev-list master.. | wc -l) &&
- test $cnt = 2
+ git rev-list master.. >list &&
+ test_line_count = 2 list
'
test_expect_success 'commit did not screw up the log message' '
-
- git cat-file commit side | grep "^Side .* with .* backslash-n"
-
+ git cat-file commit side >actual &&
+ grep "^Side .* with .* backslash-n" actual
'
test_expect_success 'format-patch did not screw up the log message' '
-
grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
-
'
test_expect_success 'replay did not screw up the log message' '
-
- git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
-
+ git cat-file commit rebuild-1 >actual &&
+ grep "^Side .* with .* backslash-n" actual
'
test_expect_success 'extra headers' '
-
git config format.headers "To: R E Cipient <rcipient@example.com>
" &&
git config --add format.headers "Cc: S E Cipient <scipient@example.com>
" &&
- git format-patch --stdout master..side > patch2 &&
- sed -e "/^\$/q" patch2 > hdrs2 &&
+ git format-patch --stdout master..side >patch2 &&
+ sed -e "/^\$/q" patch2 >hdrs2 &&
grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
-
'
test_expect_success 'extra headers without newlines' '
-
git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
git format-patch --stdout master..side >patch3 &&
- sed -e "/^\$/q" patch3 > hdrs3 &&
+ sed -e "/^\$/q" patch3 >hdrs3 &&
grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
-
'
test_expect_success 'extra headers with multiple To:s' '
-
git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
- git format-patch --stdout master..side > patch4 &&
- sed -e "/^\$/q" patch4 > hdrs4 &&
+ git format-patch --stdout master..side >patch4 &&
+ sed -e "/^\$/q" patch4 >hdrs4 &&
grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
'
test_expect_success 'additional command line cc (ascii)' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
- grep "^ *S E Cipient <scipient@example.com>\$" patch5
+ git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ sed -e "/^\$/q" patch5 >hdrs5 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+ grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
'
test_expect_failure 'additional command line cc (rfc822)' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
- grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5
+ git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ sed -e "/^\$/q" patch5 >hdrs5 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+ grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
'
test_expect_success 'command line headers' '
-
git config --unset-all format.headers &&
- git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 &&
- grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6
+ git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 &&
+ sed -e "/^\$/q" patch6 >hdrs6 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
'
test_expect_success 'configuration headers and command line headers' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 &&
- grep "^ *S E Cipient <scipient@example.com>\$" patch7
+ git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side >patch7 &&
+ sed -e "/^\$/q" patch7 >hdrs7 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
+ grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
'
test_expect_success 'command line To: header (ascii)' '
-
git config --unset-all format.headers &&
- git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: R E Cipient <rcipient@example.com>\$" patch8
+ git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
'
test_expect_failure 'command line To: header (rfc822)' '
-
- git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
+ git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
'
test_expect_failure 'command line To: header (rfc2047)' '
-
- git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
+ git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
'
test_expect_success 'configuration To: header (ascii)' '
-
git config format.to "R E Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: R E Cipient <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
'
test_expect_failure 'configuration To: header (rfc822)' '
-
git config format.to "R. E. Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
'
test_expect_failure 'configuration To: header (rfc2047)' '
-
git config format.to "R Ä Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
'
# check_patch <patch>: Verify that <patch> looks like a half-sane
@@ -230,89 +234,79 @@
}
test_expect_success 'format.from=false' '
-
- git -c format.from=false format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
+ git -c format.from=false format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
check_patch patch &&
- ! grep "^From: C O Mitter <committer@example.com>\$" patch
+ ! grep "^From: C O Mitter <committer@example.com>\$" hdrs
'
test_expect_success 'format.from=true' '
-
- git -c format.from=true format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- grep "^From: C O Mitter <committer@example.com>\$" patch
+ git -c format.from=true format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ grep "^From: C O Mitter <committer@example.com>\$" hdrs
'
test_expect_success 'format.from with address' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--no-from overrides format.from' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- ! grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ ! grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--from overrides format.from' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- ! grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ ! grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--no-to overrides config.to' '
-
git config --replace-all format.to \
"R E Cipient <rcipient@example.com>" &&
- git format-patch --no-to --stdout master..side |
- sed -e "/^\$/q" >patch10 &&
- check_patch patch10 &&
- ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10
+ git format-patch --no-to --stdout master..side >patch10 &&
+ sed -e "/^\$/q" patch10 >hdrs10 &&
+ check_patch hdrs10 &&
+ ! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
'
test_expect_success '--no-to and --to replaces config.to' '
-
git config --replace-all format.to \
"Someone <someone@out.there>" &&
git format-patch --no-to --to="Someone Else <else@out.there>" \
- --stdout master..side |
- sed -e "/^\$/q" >patch11 &&
- check_patch patch11 &&
- ! grep "^To: Someone <someone@out.there>\$" patch11 &&
- grep "^To: Someone Else <else@out.there>\$" patch11
+ --stdout master..side >patch11 &&
+ sed -e "/^\$/q" patch11 >hdrs11 &&
+ check_patch hdrs11 &&
+ ! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
+ grep "^To: Someone Else <else@out.there>\$" hdrs11
'
test_expect_success '--no-cc overrides config.cc' '
-
git config --replace-all format.cc \
"C E Cipient <rcipient@example.com>" &&
- git format-patch --no-cc --stdout master..side |
- sed -e "/^\$/q" >patch12 &&
- check_patch patch12 &&
- ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12
+ git format-patch --no-cc --stdout master..side >patch12 &&
+ sed -e "/^\$/q" patch12 >hdrs12 &&
+ check_patch hdrs12 &&
+ ! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
'
test_expect_success '--no-add-header overrides config.headers' '
-
git config --replace-all format.headers \
"Header1: B E Cipient <rcipient@example.com>" &&
- git format-patch --no-add-header --stdout master..side |
- sed -e "/^\$/q" >patch13 &&
- check_patch patch13 &&
- ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13
+ git format-patch --no-add-header --stdout master..side >patch13 &&
+ sed -e "/^\$/q" patch13 >hdrs13 &&
+ check_patch hdrs13 &&
+ ! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
'
test_expect_success 'multiple files' '
-
rm -rf patches/ &&
git checkout side &&
git format-patch -o patches/ master &&
@@ -338,7 +332,7 @@
check_threading () {
expect="$1" &&
shift &&
- (git format-patch --stdout "$@"; echo $? > status.out) |
+ git format-patch --stdout "$@" >patch &&
# Prints everything between the Message-ID and In-Reply-To,
# and replaces all Message-ID-lookalikes by a sequence number
perl -ne '
@@ -353,12 +347,11 @@
print;
}
print "---\n" if /^From /i;
- ' > actual &&
- test 0 = "$(cat status.out)" &&
+ ' <patch >actual &&
test_cmp "$expect" actual
}
-cat >> expect.no-threading <<EOF
+cat >>expect.no-threading <<EOF
---
---
---
@@ -369,7 +362,7 @@
check_threading expect.no-threading master
'
-cat > expect.thread <<EOF
+cat >expect.thread <<EOF
---
Message-Id: <0>
---
@@ -386,7 +379,7 @@
check_threading expect.thread --thread master
'
-cat > expect.in-reply-to <<EOF
+cat >expect.in-reply-to <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
@@ -406,7 +399,7 @@
--thread master
'
-cat > expect.cover-letter <<EOF
+cat >expect.cover-letter <<EOF
---
Message-Id: <0>
---
@@ -427,7 +420,7 @@
check_threading expect.cover-letter --cover-letter --thread master
'
-cat > expect.cl-irt <<EOF
+cat >expect.cl-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
@@ -459,7 +452,7 @@
--in-reply-to="<test.message>" --thread=shallow master
'
-cat > expect.deep <<EOF
+cat >expect.deep <<EOF
---
Message-Id: <0>
---
@@ -477,7 +470,7 @@
check_threading expect.deep --thread=deep master
'
-cat > expect.deep-irt <<EOF
+cat >expect.deep-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
@@ -500,7 +493,7 @@
--in-reply-to="<test.message>" master
'
-cat > expect.deep-cl <<EOF
+cat >expect.deep-cl <<EOF
---
Message-Id: <0>
---
@@ -524,7 +517,7 @@
check_threading expect.deep-cl --cover-letter --thread=deep master
'
-cat > expect.deep-cl-irt <<EOF
+cat >expect.deep-cl-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
@@ -575,7 +568,6 @@
'
test_expect_success 'excessive subject' '
-
rm -rf patches/ &&
git checkout side &&
before=$(git hash-object file) &&
@@ -589,6 +581,12 @@
ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
'
+test_expect_success 'failure to write cover-letter aborts gracefully' '
+ test_when_finished "rmdir 0000-cover-letter.patch" &&
+ mkdir 0000-cover-letter.patch &&
+ test_must_fail git format-patch --no-renames --cover-letter -1
+'
+
test_expect_success 'cover-letter inherits diff options' '
git mv file foo &&
git commit -m foo &&
@@ -597,10 +595,9 @@
! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
git format-patch --cover-letter -1 -M &&
grep "file => foo .* 0 *\$" 0000-cover-letter.patch
-
'
-cat > expect << EOF
+cat >expect <<EOF
This is an excessively long subject line for a message due to the
habit some projects have of not having a short, one-line subject at
the start of the commit message, but rather sticking a whole
@@ -611,14 +608,12 @@
EOF
test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
-
git format-patch --cover-letter -2 &&
- sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output &&
+ sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
test_cmp expect output
-
'
-cat > expect << EOF
+cat >expect <<EOF
index $before..$after 100644
--- a/file
+++ b/file
@@ -631,16 +626,14 @@
EOF
test_expect_success 'format-patch respects -U' '
-
git format-patch -U4 -2 &&
sed -e "1,/^diff/d" -e "/^+5/q" \
<0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
>output &&
test_cmp expect output
-
'
-cat > expect << EOF
+cat >expect <<EOF
diff --git a/file b/file
index $before..$after 100644
@@ -654,11 +647,9 @@
EOF
test_expect_success 'format-patch -p suppresses stat' '
-
git format-patch -p -2 &&
- sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
+ sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
test_cmp expect output
-
'
test_expect_success 'format-patch from a subdirectory (1)' '
@@ -711,7 +702,7 @@
'
test_expect_success 'format-patch --in-reply-to' '
- git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
+ git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 &&
grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
grep "^References: <baz@foo.bar>" patch8
'
@@ -732,21 +723,94 @@
sed "1,/^---$/d" out | grep "test message"
'
-echo "fatal: --name-only does not make sense" > expect.name-only
-echo "fatal: --name-status does not make sense" > expect.name-status
-echo "fatal: --check does not make sense" > expect.check
+test_expect_success 'format-patch notes output control' '
+ git notes add -m "notes config message" HEAD &&
+ test_when_finished git notes remove HEAD &&
+
+ git format-patch -1 --stdout >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes --notes >out &&
+ grep "notes config message" out &&
+
+ test_config format.notes true &&
+ git format-patch -1 --stdout >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --notes >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes --notes >out &&
+ grep "notes config message" out
+'
+
+test_expect_success 'format-patch with multiple notes refs' '
+ git notes --ref note1 add -m "this is note 1" HEAD &&
+ test_when_finished git notes --ref note1 remove HEAD &&
+ git notes --ref note2 add -m "this is note 2" HEAD &&
+ test_when_finished git notes --ref note2 remove HEAD &&
+
+ git format-patch -1 --stdout >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note1 >out &&
+ grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note2 >out &&
+ ! grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note1 --notes=note2 >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+
+ test_config format.notes note1 &&
+ git format-patch -1 --stdout >out &&
+ grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note2 >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes --notes=note2 >out &&
+ ! grep "this is note 1" out &&
+ grep "this is note 2" out &&
+
+ git config --add format.notes note2 &&
+ git format-patch -1 --stdout >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out
+'
+
+echo "fatal: --name-only does not make sense" >expect.name-only
+echo "fatal: --name-status does not make sense" >expect.name-status
+echo "fatal: --check does not make sense" >expect.check
test_expect_success 'options no longer allowed for format-patch' '
- test_must_fail git format-patch --name-only 2> output &&
+ test_must_fail git format-patch --name-only 2>output &&
test_i18ncmp expect.name-only output &&
- test_must_fail git format-patch --name-status 2> output &&
+ test_must_fail git format-patch --name-status 2>output &&
test_i18ncmp expect.name-status output &&
- test_must_fail git format-patch --check 2> output &&
- test_i18ncmp expect.check output'
+ test_must_fail git format-patch --check 2>output &&
+ test_i18ncmp expect.check output
+'
test_expect_success 'format-patch --numstat should produce a patch' '
- git format-patch --numstat --stdout master..side > output &&
- test 5 = $(grep "^diff --git a/" output | wc -l)'
+ git format-patch --numstat --stdout master..side >output &&
+ grep "^diff --git a/" output >diff &&
+ test_line_count = 5 diff
+'
test_expect_success 'format-patch -- <path>' '
git format-patch master..side -- file 2>error &&
@@ -757,20 +821,25 @@
git format-patch --ignore-if-in-upstream HEAD
'
-git_version="$(git --version | sed "s/.* //")"
+test_expect_success 'get git version' '
+ git_version=$(git --version) &&
+ git_version=${git_version##* }
+'
signature() {
printf "%s\n%s\n\n" "-- " "${1:-$git_version}"
}
test_expect_success 'format-patch default signature' '
- git format-patch --stdout -1 | tail -n 3 >output &&
+ git format-patch --stdout -1 >patch &&
+ tail -n 3 patch >output &&
signature >expect &&
test_cmp expect output
'
test_expect_success 'format-patch --signature' '
- git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output &&
+ git format-patch --stdout --signature="my sig" -1 >patch &&
+ tail -n 3 patch >output &&
signature "my sig" >expect &&
test_cmp expect output
'
@@ -802,8 +871,8 @@
git config --unset-all format.signature &&
git format-patch --stdout --signature="my sig" --cover-letter \
-1 >output &&
- grep "my sig" output &&
- test 2 = $(grep "my sig" output | wc -l)
+ grep "my sig" output >sig &&
+ test_line_count = 2 sig
'
test_expect_success 'format.signature="" suppresses signatures' '
@@ -840,7 +909,7 @@
test_expect_success '--signature-file=file works' '
git format-patch --stdout --signature-file=mail-signature -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat mail-signature && echo
} >expect &&
@@ -851,7 +920,7 @@
test_config format.signaturefile mail-signature &&
git format-patch --stdout -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat mail-signature && echo
} >expect &&
@@ -873,7 +942,7 @@
git format-patch --stdout \
--signature-file=other-mail-signature -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat other-mail-signature && echo
} >expect &&
@@ -942,7 +1011,7 @@
git add file &&
git commit -m "$M512" &&
git format-patch --stdout -1 >patch &&
- sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+ sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
test_cmp expect subject
'
@@ -981,7 +1050,7 @@
git add file &&
git commit -m "$M512" &&
git format-patch --stdout -1 >patch &&
- sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+ sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
test_cmp expect subject
'
@@ -990,7 +1059,7 @@
git add file &&
GIT_AUTHOR_NAME=$1 git commit -m author-check &&
git format-patch --stdout -1 >patch &&
- sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual &&
+ sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
test_cmp expect actual
}
@@ -1110,7 +1179,7 @@
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
@@ -1122,7 +1191,7 @@
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
@@ -1132,7 +1201,7 @@
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
@@ -1147,7 +1216,7 @@
From: éxötìc <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
@@ -1161,283 +1230,283 @@
test_expect_success 'signoff: commit with no body' '
append_signoff </dev/null >actual &&
- cat <<\EOF | sed "s/EOL$//" >expected &&
-4:Subject: [PATCH] EOL
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat <<-\EOF | sed "s/EOL$//" >expect &&
+ 4:Subject: [PATCH] EOL
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: commit with only subject' '
echo subject | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: commit with only subject that does not end with NL' '
printf subject | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: no existing signoffs' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ body
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: no existing signoffs and no trailing NL' '
printf "subject\n\nbody" | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: some random signoff' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: my@house
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: misc conforming footer elements' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: my@house
-(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
-Tested-by: Some One <someone@example.com>
-Bug: 1234
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-15:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: my@house
+ (cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
+ Tested-by: Some One <someone@example.com>
+ Bug: 1234
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: my@house
+ 15:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: some random signoff-alike' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
-Fooled-by-me: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ body
+ Fooled-by-me: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: not really a signoff' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-I want to mention about Signed-off-by: here.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:I want to mention about Signed-off-by: here.
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ I want to mention about Signed-off-by: here.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:I want to mention about Signed-off-by: here.
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: not really a signoff (2)' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-My unfortunate
-Signed-off-by: example happens to be wrapped here.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:Signed-off-by: example happens to be wrapped here.
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ My unfortunate
+ Signed-off-by: example happens to be wrapped here.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:Signed-off-by: example happens to be wrapped here.
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: valid S-o-b paragraph in the middle' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Signed-off-by: my@house
-Signed-off-by: your@house
+ Signed-off-by: my@house
+ Signed-off-by: your@house
-A lot of houses.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: my@house
-10:Signed-off-by: your@house
-11:
-13:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ A lot of houses.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: my@house
+ 10:Signed-off-by: your@house
+ 11:
+ 13:
+ 14:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff at the end' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff at the end, no trailing NL' '
printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff NOT at the end' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: C O Mitter <committer@example.com>
-Signed-off-by: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-12:Signed-off-by: my@house
-EOF
- test_cmp expected actual
+ Signed-off-by: C O Mitter <committer@example.com>
+ Signed-off-by: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ 12:Signed-off-by: my@house
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: tolerate garbage in conforming footer' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Tested-by: my@house
-Some Trash
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-13:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Tested-by: my@house
+ Some Trash
+ Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 13:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: respect trailer config' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Myfooter: x
-Some Trash
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual &&
+ Myfooter: x
+ Some Trash
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual &&
test_config trailer.Myfooter.ifexists add &&
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Myfooter: x
-Some Trash
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Myfooter: x
+ Some Trash
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: footer begins with non-signoff without @ sign' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Reviewed-id: Noone
-Tested-by: my@house
-Change-id: Ideadbeef
-Signed-off-by: C O Mitter <committer@example.com>
-Bug: 1234
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Reviewed-id: Noone
+ Tested-by: my@house
+ Change-id: Ideadbeef
+ Signed-off-by: C O Mitter <committer@example.com>
+ Bug: 1234
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 14:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'format patch ignores color.ui' '
@@ -1452,42 +1521,42 @@
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter master >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (2)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (3)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter ^master rebuild-1 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (4)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter master.. >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (5)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter -2 HEAD >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (6)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter -2 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter with nothing' '
@@ -1541,7 +1610,8 @@
test_config format.outputDirectory patches &&
rm -fr patches &&
git format-patch master..side &&
- test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l)
+ git rev-list master..side >list &&
+ test_line_count = $(ls patches | wc -l) list
'
test_expect_success 'format-patch -o overrides format.outputDirectory' '
@@ -1553,16 +1623,44 @@
'
test_expect_success 'format-patch --base' '
- git checkout side &&
- git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 &&
- git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 &&
- echo >expected &&
- echo "base-commit: $(git rev-parse HEAD~3)" >>expected &&
- echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
- echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
- signature >> expected &&
- test_cmp expected actual1 &&
- test_cmp expected actual2
+ git checkout patchid &&
+
+ git format-patch --stdout --base=HEAD~3 -1 >patch &&
+ tail -n 7 patch >actual1 &&
+
+ git format-patch --stdout --base=HEAD~3 HEAD~.. >patch &&
+ tail -n 7 patch >actual2 &&
+
+ echo >expect &&
+ git rev-parse HEAD~3 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >>expect &&
+
+ git show --patch HEAD~2 >patch &&
+ git patch-id --stable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+ git show --patch HEAD~1 >patch &&
+ git patch-id --stable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+ signature >>expect &&
+ test_cmp expect actual1 &&
+ test_cmp expect actual2 &&
+
+ echo >fail &&
+ echo "base-commit: $(cat commit-id-base)" >>fail &&
+
+ git show --patch HEAD~2 >patch &&
+ git patch-id --unstable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+ git show --patch HEAD~1 >patch &&
+ git patch-id --unstable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+ signature >>fail &&
+ ! test_cmp fail actual1 &&
+ ! test_cmp fail actual2
'
test_expect_success 'format-patch --base errors out when base commit is in revision list' '
@@ -1570,8 +1668,9 @@
test_must_fail git format-patch --base=HEAD~1 -2 &&
git format-patch --stdout --base=HEAD~2 -2 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse HEAD~2)" >expected &&
- test_cmp expected actual
+ git rev-parse HEAD~2 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' '
@@ -1597,8 +1696,8 @@
test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(cat commit-id-base)" >expected &&
- test_cmp expected actual
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base=auto' '
@@ -1609,8 +1708,9 @@
test_commit N2 &&
git format-patch --stdout --base=auto -2 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse upstream)" >expected &&
- test_cmp expected actual
+ git rev-parse upstream >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch errors out when history involves criss-cross' '
@@ -1646,8 +1746,9 @@
git config format.useAutoBase true &&
git format-patch --stdout -1 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse upstream)" >expected &&
- test_cmp expected actual
+ git rev-parse upstream >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base overrides format.useAutoBase' '
@@ -1655,8 +1756,9 @@
git config format.useAutoBase true &&
git format-patch --stdout --base=HEAD~1 -1 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse HEAD~1)" >expected &&
- test_cmp expected actual
+ git rev-parse HEAD~1 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base with --attach' '
@@ -1731,7 +1833,7 @@
git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch &&
test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch &&
- sed "1,/^@@ /d; /^-- $/q" <0000-cover-letter.patch >actual &&
+ sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
test_cmp expect actual
'
@@ -1747,7 +1849,7 @@
EOF
git format-patch --interdiff=boop~2 -1 boop &&
test_i18ngrep "^Interdiff:$" 0001-fleep.patch &&
- sed "1,/^ @@ /d; /^$/q" <0001-fleep.patch >actual &&
+ sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual &&
test_cmp expect actual
'
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index ab4670d..6b087df 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -2008,4 +2008,26 @@
test_cmp expected actual
'
+# Note that the "6" in the expected hunk header below is funny, since we only
+# show 5 lines (the missing one was blank and thus ignored). This is how
+# --ignore-blank-lines behaves even without --function-context, and this test
+# is just checking the interaction of the two features. Don't take it as an
+# endorsement of that output.
+test_expect_success 'combine --ignore-blank-lines with --function-context' '
+ test_write_lines 1 "" 2 3 4 5 >a &&
+ test_write_lines 1 2 3 4 >b &&
+ test_must_fail git diff --no-index \
+ --ignore-blank-lines --function-context a b >actual.raw &&
+ sed -n "/@@/,\$p" <actual.raw >actual &&
+ cat <<-\EOF >expect &&
+ @@ -1,6 +1,4 @@
+ 1
+ 2
+ 3
+ 4
+ -5
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 22f9f88..6f5ef00 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -31,6 +31,7 @@
cpp
csharp
css
+ dts
fortran
fountain
golang
@@ -43,6 +44,7 @@
php
python
ruby
+ rust
tex
custom1
custom2
diff --git a/t/t4018/dts-labels b/t/t4018/dts-labels
new file mode 100644
index 0000000..b21ef87
--- /dev/null
+++ b/t/t4018/dts-labels
@@ -0,0 +1,9 @@
+/ {
+ label_1: node1@ff00 {
+ label2: RIGHT {
+ vendor,some-property;
+
+ ChangeMe = <0x45-30>;
+ };
+ };
+};
diff --git a/t/t4018/dts-node-unitless b/t/t4018/dts-node-unitless
new file mode 100644
index 0000000..c5287d9
--- /dev/null
+++ b/t/t4018/dts-node-unitless
@@ -0,0 +1,8 @@
+/ {
+ label_1: node1 {
+ RIGHT {
+ prop-array = <1>, <4>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
diff --git a/t/t4018/dts-nodes b/t/t4018/dts-nodes
new file mode 100644
index 0000000..5a4334b
--- /dev/null
+++ b/t/t4018/dts-nodes
@@ -0,0 +1,8 @@
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 {
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
diff --git a/t/t4018/dts-nodes-comment1 b/t/t4018/dts-nodes-comment1
new file mode 100644
index 0000000..559dfce
--- /dev/null
+++ b/t/t4018/dts-nodes-comment1
@@ -0,0 +1,8 @@
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 /* &a comment */ {
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
diff --git a/t/t4018/dts-nodes-comment2 b/t/t4018/dts-nodes-comment2
new file mode 100644
index 0000000..27e9718
--- /dev/null
+++ b/t/t4018/dts-nodes-comment2
@@ -0,0 +1,8 @@
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 { /* a trailing comment */
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
diff --git a/t/t4018/dts-reference b/t/t4018/dts-reference
new file mode 100644
index 0000000..8f0c87d
--- /dev/null
+++ b/t/t4018/dts-reference
@@ -0,0 +1,9 @@
+&label_1 {
+ TEST = <455>;
+};
+
+&RIGHT {
+ vendor,some-property;
+
+ ChangeMe = <0x45-30>;
+};
diff --git a/t/t4018/dts-root b/t/t4018/dts-root
new file mode 100644
index 0000000..2ef9e6f
--- /dev/null
+++ b/t/t4018/dts-root
@@ -0,0 +1,5 @@
+/RIGHT { /* Technically just supposed to be a slash */
+ #size-cells = <1>;
+
+ ChangeMe = <0xffeedd00>;
+};
diff --git a/t/t4018/matlab-class-definition b/t/t4018/matlab-class-definition
new file mode 100644
index 0000000..84daedf
--- /dev/null
+++ b/t/t4018/matlab-class-definition
@@ -0,0 +1,5 @@
+classdef RIGHT
+ properties
+ ChangeMe
+ end
+end
diff --git a/t/t4018/matlab-function b/t/t4018/matlab-function
new file mode 100644
index 0000000..897a9b1
--- /dev/null
+++ b/t/t4018/matlab-function
@@ -0,0 +1,4 @@
+function y = RIGHT()
+x = 5;
+y = ChangeMe + x;
+end
diff --git a/t/t4018/matlab-octave-section-1 b/t/t4018/matlab-octave-section-1
new file mode 100644
index 0000000..3bb6c46
--- /dev/null
+++ b/t/t4018/matlab-octave-section-1
@@ -0,0 +1,3 @@
+%%% RIGHT section
+# this is octave script
+ChangeMe = 1;
diff --git a/t/t4018/matlab-octave-section-2 b/t/t4018/matlab-octave-section-2
new file mode 100644
index 0000000..ab2980f
--- /dev/null
+++ b/t/t4018/matlab-octave-section-2
@@ -0,0 +1,3 @@
+## RIGHT section
+# this is octave script
+ChangeMe = 1;
diff --git a/t/t4018/matlab-section b/t/t4018/matlab-section
new file mode 100644
index 0000000..5ea59a5
--- /dev/null
+++ b/t/t4018/matlab-section
@@ -0,0 +1,3 @@
+%% RIGHT section
+% this is understood by both matlab and octave
+ChangeMe = 1;
diff --git a/t/t4018/rust-fn b/t/t4018/rust-fn
new file mode 100644
index 0000000..cbe0215
--- /dev/null
+++ b/t/t4018/rust-fn
@@ -0,0 +1,5 @@
+pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
+ let _ = x;
+ // a comment
+ let a = ChangeMe;
+}
diff --git a/t/t4018/rust-impl b/t/t4018/rust-impl
new file mode 100644
index 0000000..09df3cd
--- /dev/null
+++ b/t/t4018/rust-impl
@@ -0,0 +1,5 @@
+impl<'a, T: AsRef<[u8]>> std::RIGHT for Git<'a> {
+
+ pub fn ChangeMe(&self) -> () {
+ }
+}
diff --git a/t/t4018/rust-struct b/t/t4018/rust-struct
new file mode 100644
index 0000000..76aff1c
--- /dev/null
+++ b/t/t4018/rust-struct
@@ -0,0 +1,5 @@
+#[derive(Debug)]
+pub(super) struct RIGHT<'a> {
+ name: &'a str,
+ age: ChangeMe,
+}
diff --git a/t/t4018/rust-trait b/t/t4018/rust-trait
new file mode 100644
index 0000000..ea397f0
--- /dev/null
+++ b/t/t4018/rust-trait
@@ -0,0 +1,5 @@
+unsafe trait RIGHT<T> {
+ fn len(&self) -> u32;
+ fn ChangeMe(&self, n: u32) -> T;
+ fn iter<F>(&self, f: F) where F: Fn(T);
+}
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 912df91..9a93c2a 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -303,6 +303,7 @@
test_language_driver cpp
test_language_driver csharp
test_language_driver css
+test_language_driver dts
test_language_driver fortran
test_language_driver html
test_language_driver java
diff --git a/t/t4034/dts/expect b/t/t4034/dts/expect
new file mode 100644
index 0000000..560fc99
--- /dev/null
+++ b/t/t4034/dts/expect
@@ -0,0 +1,37 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index b6a9051..7803aee 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,32 +1,32 @@<RESET>
+/ {<RESET>
+ <RED>this_handle<RESET><GREEN>HANDLE_2<RESET>: <RED>node<RESET><GREEN>new-node<RESET>@<RED>f00<RESET><GREEN>eeda<RESET> {
+ compatible = "<RED>mydev<RESET><GREEN>vendor,compat<RESET>";
+ string-prop = <RED>start<RESET><GREEN>end<RESET>: "hello <RED>world!<RESET><GREEN>world?<RESET>" <RED>end<RESET><GREEN>start<RESET>: ;
+ <RED>#size-cells<RESET><GREEN>#address-cells<RESET> = <<RED>0+0<RESET><GREEN>0+40<RESET>>;
+ reg = <<RED>0xf00<RESET><GREEN>0xeeda<RESET>>;
+ prop = <<GREEN>(<RESET>1<GREEN>)<RESET>>;
+ prop = <<GREEN>(<RESET>-1e10<GREEN>)<RESET>>;
+ prop = <(!<RED>3<RESET><GREEN>1<RESET>)>;
+ prop = <(~<RED>3<RESET><GREEN>1<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>/<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>%<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3+4<RESET><GREEN>1+2<RESET>)>;
+ prop = <(<RED>3-4<RESET><GREEN>1-2<RESET>)>;
+ prop = /bits/ <RED>64<RESET><GREEN>32<RESET> <(<RED>3<RESET><GREEN>1<RESET><<<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>>><RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>^<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>|<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>||<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>4?5<RESET><GREEN>1?2<RESET>:3)>;
+ list = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>, <0 0 0 <RED>0<RESET><GREEN>1<RESET>>;
+ };<RESET>
+
+ &<RED>phandle<RESET><GREEN>phandle2<RESET> {
+ <RED>pre-phandle<RESET><GREEN>prop_handle<RESET> = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>;
+ };<RESET>
+};<RESET>
diff --git a/t/t4034/dts/post b/t/t4034/dts/post
new file mode 100644
index 0000000..7803aee
--- /dev/null
+++ b/t/t4034/dts/post
@@ -0,0 +1,32 @@
+/ {
+ HANDLE_2: new-node@eeda {
+ compatible = "vendor,compat";
+ string-prop = end: "hello world?" start: ;
+ #address-cells = <0+40>;
+ reg = <0xeeda>;
+ prop = <(1)>;
+ prop = <(-1e10)>;
+ prop = <(!1)>;
+ prop = <(~1)>;
+ prop = <(1*2)>;
+ prop = <(1&2)>;
+ prop = <(1*2)>;
+ prop = <(1/2)>;
+ prop = <(1%2)>;
+ prop = <(1+2)>;
+ prop = <(1-2)>;
+ prop = /bits/ 32 <(1<<2)>;
+ prop = <(1>>2)>;
+ prop = <(1&2)>;
+ prop = <(1^2)>;
+ prop = <(1|2)>;
+ prop = <(1&&2)>;
+ prop = <(1||2)>;
+ prop = <(1?2:3)>;
+ list = <&HANDLE_2>, <0 0 0 1>;
+ };
+
+ &phandle2 {
+ prop_handle = <&HANDLE_2>;
+ };
+};
diff --git a/t/t4034/dts/pre b/t/t4034/dts/pre
new file mode 100644
index 0000000..b6a9051
--- /dev/null
+++ b/t/t4034/dts/pre
@@ -0,0 +1,32 @@
+/ {
+ this_handle: node@f00 {
+ compatible = "mydev";
+ string-prop = start: "hello world!" end: ;
+ #size-cells = <0+0>;
+ reg = <0xf00>;
+ prop = <1>;
+ prop = <-1e10>;
+ prop = <(!3)>;
+ prop = <(~3)>;
+ prop = <(3*4)>;
+ prop = <(3&4)>;
+ prop = <(3*4)>;
+ prop = <(3/4)>;
+ prop = <(3%4)>;
+ prop = <(3+4)>;
+ prop = <(3-4)>;
+ prop = /bits/ 64 <(3<<4)>;
+ prop = <(3>>4)>;
+ prop = <(3&4)>;
+ prop = <(3^4)>;
+ prop = <(3|4)>;
+ prop = <(3&&4)>;
+ prop = <(3||4)>;
+ prop = <(4?5:3)>;
+ list = <&this_handle>, <0 0 0 0>;
+ };
+
+ &phandle {
+ pre-phandle = <&this_handle>;
+ };
+};
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index e2824d3..d4afe12 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -435,4 +435,92 @@
test_cmp expect actual
'
+test_expect_success 'setup for --combined-all-paths' '
+ git branch side1c &&
+ git branch side2c &&
+ git checkout side1c &&
+ test_seq 1 10 >filename-side1c &&
+ git add filename-side1c &&
+ git commit -m with &&
+ git checkout side2c &&
+ test_seq 1 9 >filename-side2c &&
+ echo ten >>filename-side2c &&
+ git add filename-side2c &&
+ git commit -m iam &&
+ git checkout -b mergery side1c &&
+ git merge --no-commit side2c &&
+ git rm filename-side1c &&
+ echo eleven >>filename-side2c &&
+ git mv filename-side2c filename-merged &&
+ git add filename-merged &&
+ git commit
+'
+
+test_expect_success '--combined-all-paths and --raw' '
+ cat <<-\EOF >expect &&
+ ::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR filename-side1c filename-side2c filename-merged
+ EOF
+ git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
+ sed 1d <actual.tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--combined-all-paths and --cc' '
+ cat <<-\EOF >expect &&
+ --- a/filename-side1c
+ --- a/filename-side2c
+ +++ b/filename-merged
+ EOF
+ git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
+ grep ^[-+][-+][-+] <actual.tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names' '
+ git branch side1d &&
+ git branch side2d &&
+ git checkout side1d &&
+ test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
+ git add file* &&
+ git commit -m with &&
+ git checkout side2d &&
+ test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
+ echo ten >>"$(printf "i\tam\ttabbed")" &&
+ git add *tabbed &&
+ git commit -m iam &&
+ git checkout -b funny-names-mergery side1d &&
+ git merge --no-commit side2d &&
+ git rm *tabs &&
+ echo eleven >>"$(printf "i\tam\ttabbed")" &&
+ git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
+ git add fickle* &&
+ git commit
+'
+
+test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' '
+ cat <<-\EOF >expect &&
+ ::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR "file\twith\ttabs" "i\tam\ttabbed" "fickle\tnaming"
+ EOF
+ git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
+ sed 1d <actual.tmp >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES '--combined-all-paths and --raw -and -z and funny names' '
+ printf "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
+ git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual &&
+ test_cmp -a expect actual
+'
+
+test_expect_success FUNNYNAMES '--combined-all-paths and --cc and funny names' '
+ cat <<-\EOF >expect &&
+ --- "a/file\twith\ttabs"
+ --- "a/i\tam\ttabbed"
+ +++ "b/fickle\tnaming"
+ EOF
+ git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
+ grep ^[-+][-+][-+] <actual.tmp >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 6e0dd6f..0168946 100755
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -50,8 +50,7 @@
export GIT_CEILING_DIRECTORIES &&
cd non/git &&
test_must_fail git diff --no-index a 2>actual.err &&
- echo "usage: git diff --no-index <path> <path>" >expect.err &&
- test_cmp expect.err actual.err
+ test_i18ngrep "usage: git diff --no-index" actual.err
)
'
@@ -137,4 +136,12 @@
test_cmp expect actual
'
+test_expect_success 'diff --no-index allows external diff' '
+ test_expect_code 1 \
+ env GIT_EXTERNAL_DIFF="echo external ;:" \
+ git diff --no-index non/git/a non/git/b >actual &&
+ echo external >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
new file mode 100755
index 0000000..4831ad3
--- /dev/null
+++ b/t/t4067-diff-partial-clone.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+test_description='behavior of diff when reading objects in a partial clone'
+
+. ./test-lib.sh
+
+test_expect_success 'git show batches blobs' '
+ test_when_finished "rm -rf server client trace" &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ echo b >server/b &&
+ git -C server add a b &&
+ git -C server commit -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ # Ensure that there is exactly 1 negotiation by checking that there is
+ # only 1 "done" line sent. ("done" marks the end of negotiation.)
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
+ grep "git> done" trace >done_lines &&
+ test_line_count = 1 done_lines
+'
+
+test_expect_success 'diff batches blobs' '
+ test_when_finished "rm -rf server client trace" &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ echo b >server/b &&
+ git -C server add a b &&
+ git -C server commit -m x &&
+ echo c >server/c &&
+ echo d >server/d &&
+ git -C server add c d &&
+ git -C server commit -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ # Ensure that there is exactly 1 negotiation by checking that there is
+ # only 1 "done" line sent. ("done" marks the end of negotiation.)
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+ grep "git> done" trace >done_lines &&
+ test_line_count = 1 done_lines
+'
+
+test_expect_success 'diff skips same-OID blobs' '
+ test_when_finished "rm -rf server client trace" &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ echo b >server/b &&
+ git -C server add a b &&
+ git -C server commit -m x &&
+ echo another-a >server/a &&
+ git -C server add a &&
+ git -C server commit -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ echo a | git hash-object --stdin >hash-old-a &&
+ echo another-a | git hash-object --stdin >hash-new-a &&
+ echo b | git hash-object --stdin >hash-b &&
+
+ # Ensure that only a and another-a are fetched.
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+ grep "want $(cat hash-old-a)" trace &&
+ grep "want $(cat hash-new-a)" trace &&
+ ! grep "want $(cat hash-b)" trace
+'
+
+test_expect_success 'when fetching missing objects, diff skips GITLINKs' '
+ test_when_finished "rm -rf sub server client trace" &&
+
+ test_create_repo sub &&
+ test_commit -C sub first &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ git -C server add a &&
+ git -C server submodule add "file://$(pwd)/sub" &&
+ git -C server commit -m x &&
+
+ test_commit -C server/sub second &&
+ echo another-a >server/a &&
+ git -C server add a sub &&
+ git -C server commit -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ echo a | git hash-object --stdin >hash-old-a &&
+ echo another-a | git hash-object --stdin >hash-new-a &&
+
+ # Ensure that a and another-a are fetched, and check (by successful
+ # execution of the diff) that no invalid OIDs are sent.
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+ grep "want $(cat hash-old-a)" trace &&
+ grep "want $(cat hash-new-a)" trace
+'
+
+test_expect_success 'diff with rename detection batches blobs' '
+ test_when_finished "rm -rf server client trace" &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ printf "b\nb\nb\nb\nb\n" >server/b &&
+ git -C server add a b &&
+ git -C server commit -m x &&
+ rm server/b &&
+ printf "b\nb\nb\nb\nbX\n" >server/c &&
+ git -C server add c &&
+ git -C server commit -a -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ # Ensure that there is exactly 1 negotiation by checking that there is
+ # only 1 "done" line sent. ("done" marks the end of negotiation.)
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff -M HEAD^ HEAD >out &&
+ grep "similarity index" out &&
+ grep "git> done" trace >done_lines &&
+ test_line_count = 1 done_lines
+'
+
+test_done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 55b577d..4f1e24e 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -77,14 +77,12 @@
printf "Subject: " >subject-prefix &&
- cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF &&
+ cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF
This line should not be included in the commit message with --scissors enabled.
- - >8 - - remove everything above this line - - >8 - -
EOF
-
- signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
'
test_expect_success setup '
@@ -1063,4 +1061,56 @@
test_cmp expected actual
'
+test_expect_success 'am and .gitattibutes' '
+ test_create_repo attributes &&
+ (
+ cd attributes &&
+ test_commit init &&
+ git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+ git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+ test_commit second &&
+ git checkout -b test HEAD^ &&
+
+ echo "*.txt filter=test conflict-marker-size=10" >.gitattributes &&
+ git add .gitattributes &&
+ test_commit third &&
+
+ echo "This text is smudged." >a.txt &&
+ git add a.txt &&
+ test_commit fourth &&
+
+ git checkout -b removal HEAD^ &&
+ git rm .gitattributes &&
+ git add -u &&
+ test_commit fifth &&
+ git cherry-pick test &&
+
+ git checkout -b conflict third &&
+ echo "This text is different." >a.txt &&
+ git add a.txt &&
+ test_commit sixth &&
+
+ git checkout test &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard master &&
+ git am patches &&
+ grep "smudged" a.txt &&
+
+ git checkout removal &&
+ git reset --hard &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard master &&
+ git am patches &&
+ grep "clean" a.txt &&
+
+ git checkout conflict &&
+ git reset --hard &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard fourth &&
+ test_must_fail git am -3 patches &&
+ grep "<<<<<<<<<<" a.txt
+ )
+'
+
test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 819c24d..e803ba4 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -352,7 +352,7 @@
test_cmp expect actual
'
-test_expect_success 'log with various grep.patternType configurations & command-lines' '
+test_expect_success !FAIL_PREREQS 'log with various grep.patternType configurations & command-lines' '
git init pattern-type &&
(
cd pattern-type &&
@@ -837,6 +837,21 @@
test_cmp expect.decorate actual
'
+test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (HEAD -> master)
+ reach (tag: reach, reach)
+ seventh (tag: seventh)
+ Merge-branch-tangle
+ Merge-branch-side-early-part-into-tangle (tangle)
+ tangle-a (tag: tangle-a)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs-exclude="*octopus*" \
+ --simplify-by-decoration >actual &&
+ test_cmp expect.decorate actual
+'
+
test_expect_success 'log.decorate config parsing' '
git log --oneline --decorate=full >expect.full &&
git log --oneline --decorate=short >expect.short &&
@@ -1707,4 +1722,11 @@
test_must_fail git log --exclude-promisor-objects source-a
'
+test_expect_success 'log --end-of-options' '
+ git update-ref refs/heads/--source HEAD &&
+ git log --end-of-options --source >actual &&
+ git log >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 43b1522..918ada6 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -442,6 +442,34 @@
test_cmp expect actual
'
+test_expect_success 'log.mailmap=false disables mailmap' '
+ cat >expect <<-\EOF &&
+ Author: CTO <cto@coompany.xx>
+ Author: claus <me@company.xx>
+ Author: santa <me@company.xx>
+ Author: nick2 <nick2@company.xx>
+ Author: nick2 <bugs@company.xx>
+ Author: nick1 <bugs@company.xx>
+ Author: A U Thor <author@example.com>
+ EOF
+ git -c log.mailmap=False log | grep Author > actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--no-use-mailmap disables mailmap' '
+ cat >expect <<-\EOF &&
+ Author: CTO <cto@coompany.xx>
+ Author: claus <me@company.xx>
+ Author: santa <me@company.xx>
+ Author: nick2 <nick2@company.xx>
+ Author: nick2 <bugs@company.xx>
+ Author: nick1 <bugs@company.xx>
+ Author: A U Thor <author@example.com>
+ EOF
+ git log --no-use-mailmap | grep Author > actual &&
+ test_cmp expect actual
+'
+
cat >expect <<\EOF
Author: Santa Claus <santa.claus@northpole.xx>
Author: Santa Claus <santa.claus@northpole.xx>
@@ -461,6 +489,11 @@
test_cmp expect actual
'
+test_expect_success 'log.mailmap is true by default these days' '
+ git log --author Santa | grep Author >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'Only grep replaced author with --use-mailmap' '
git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
test_must_be_empty actual
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 7df8c3d..f42a69f 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -578,6 +578,24 @@
test_cmp expect actual
'
+test_expect_success '%(trailers:only=yes) shows only "key: value" trailers' '
+ git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
+ grep -v patch.description <trailers >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only=no) shows all trailers' '
+ git log --no-walk --pretty=format:"%(trailers:only=no)" >actual &&
+ cat trailers >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only=no,only=true) shows only "key: value" trailers' '
+ git log --no-walk --pretty=format:"%(trailers:only=yes)" >actual &&
+ grep -v patch.description <trailers >expect &&
+ test_cmp expect actual
+'
+
test_expect_success '%(trailers:unfold) unfolds trailers' '
git log --no-walk --pretty="%(trailers:unfold)" >actual &&
{
@@ -598,6 +616,105 @@
test_cmp expect actual
'
+test_expect_success 'pretty format %(trailers:key=foo) shows that trailer' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by)" >actual &&
+ echo "Acked-by: A U Thor <author@example.com>" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key=foo) is case insensitive' '
+ git log --no-walk --pretty="format:%(trailers:key=AcKed-bY)" >actual &&
+ echo "Acked-by: A U Thor <author@example.com>" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key=foo:) trailing colon also works' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by:)" >actual &&
+ echo "Acked-by: A U Thor <author@example.com>" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by:,key=Signed-off-By)" >actual &&
+ grep -v patch.description <trailers >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=nonexistant) becomes empty' '
+ git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
+ echo "xx" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo) handles multiple lines even if folded' '
+ git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by)" >actual &&
+ grep -v patch.description <trailers | grep -v Acked-by >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo,unfold) properly unfolds' '
+ git log --no-walk --pretty="format:%(trailers:key=Signed-Off-by,unfold)" >actual &&
+ unfold <trailers | grep Signed-off-by >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key=foo,only=no) also includes nontrailer lines' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by,only=no)" >actual &&
+ {
+ echo "Acked-by: A U Thor <author@example.com>" &&
+ grep patch.description <trailers
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key) without value is error' '
+ git log --no-walk --pretty="tformat:%(trailers:key)" >actual &&
+ echo "%(trailers:key)" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by,valueonly)" >actual &&
+ echo "A U Thor <author@example.com>" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator) changes separator' '
+ git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
+ printf "XSigned-off-by: A U Thor <author@example.com>\0Acked-by: A U Thor <author@example.com>\0[ v2 updated patch description ]\0Signed-off-by: A U Thor <author@example.com>X" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers) combining separator/key/valueonly' '
+ git commit --allow-empty -F - <<-\EOF &&
+ Important fix
+
+ The fix is explained here
+
+ Closes: #1234
+ EOF
+
+ git commit --allow-empty -F - <<-\EOF &&
+ Another fix
+
+ The fix is explained here
+
+ Closes: #567
+ Closes: #890
+ EOF
+
+ git commit --allow-empty -F - <<-\EOF &&
+ Does not close any tickets
+ EOF
+
+ git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,valueonly)" HEAD~3.. >actual &&
+ test_write_lines \
+ "Does not close any tickets" \
+ "Another fix #567, #890" \
+ "Important fix #1234" >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'trailer parsing not fooled by --- line' '
git commit --allow-empty -F - <<-\EOF &&
this is the subject
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index bd5fe4d..8319163 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -115,4 +115,103 @@
git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
'
+test_expect_success '-s shows only line-log commits' '
+ git log --format="commit %s" -L1,24:b.c >expect.raw &&
+ grep ^commit expect.raw >expect &&
+ git log --format="commit %s" -L1,24:b.c -s >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-p shows the default patch output' '
+ git log -L1,24:b.c >expect &&
+ git log -L1,24:b.c -p >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--raw is forbidden' '
+ test_must_fail git log -L1,24:b.c --raw
+'
+
+test_expect_success 'setup for checking fancy rename following' '
+ git checkout --orphan moves-start &&
+ git reset --hard &&
+
+ printf "%s\n" 12 13 14 15 b c d e >file-1 &&
+ printf "%s\n" 22 23 24 25 B C D E >file-2 &&
+ git add file-1 file-2 &&
+ test_tick &&
+ git commit -m "Add file-1 and file-2" &&
+ oid_add_f1_f2=$(git rev-parse --short HEAD) &&
+
+ git checkout -b moves-main &&
+ printf "%s\n" 11 12 13 14 15 b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on main" &&
+ oid_mod_f1_main=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 21 22 23 24 25 B C D E >file-2 &&
+ git commit -a -m "Modify file-2 on main #1" &&
+ oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
+
+ git mv file-1 renamed-1 &&
+ git commit -m "Rename file-1 to renamed-1 on main" &&
+
+ printf "%s\n" 11 12 13 14 15 b c d e f >renamed-1 &&
+ git commit -a -m "Modify renamed-1 on main" &&
+ oid_mod_r1_main=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 21 22 23 24 25 B C D E F >file-2 &&
+ git commit -a -m "Modify file-2 on main #2" &&
+ oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
+
+ git checkout -b moves-side moves-start &&
+ printf "%s\n" 12 13 14 15 16 b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on side #1" &&
+ oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 22 23 24 25 26 B C D E >file-2 &&
+ git commit -a -m "Modify file-2 on side" &&
+ oid_mod_f2_side=$(git rev-parse --short HEAD) &&
+
+ git mv file-2 renamed-2 &&
+ git commit -m "Rename file-2 to renamed-2 on side" &&
+
+ printf "%s\n" 12 13 14 15 16 a b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on side #2" &&
+ oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 22 23 24 25 26 A B C D E >renamed-2 &&
+ git commit -a -m "Modify renamed-2 on side" &&
+ oid_mod_r2_side=$(git rev-parse --short HEAD) &&
+
+ git checkout moves-main &&
+ git merge moves-side &&
+ oid_merge=$(git rev-parse --short HEAD)
+'
+
+test_expect_success 'fancy rename following #1' '
+ cat >expect <<-EOF &&
+ $oid_merge Merge branch '\''moves-side'\'' into moves-main
+ $oid_mod_f1_side_2 Modify file-1 on side #2
+ $oid_mod_f1_side_1 Modify file-1 on side #1
+ $oid_mod_r1_main Modify renamed-1 on main
+ $oid_mod_f1_main Modify file-1 on main
+ $oid_add_f1_f2 Add file-1 and file-2
+ EOF
+ git log -L1:renamed-1 --oneline --no-patch >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'fancy rename following #2' '
+ cat >expect <<-EOF &&
+ $oid_merge Merge branch '\''moves-side'\'' into moves-main
+ $oid_mod_r2_side Modify renamed-2 on side
+ $oid_mod_f2_side Modify file-2 on side
+ $oid_mod_f2_main_2 Modify file-2 on main #2
+ $oid_mod_f2_main_1 Modify file-2 on main #1
+ $oid_add_f1_f2 Add file-1 and file-2
+ EOF
+ git log -L1:renamed-2 --oneline --no-patch >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh
index 553fe3e..6e1b73e 100755
--- a/t/t4253-am-keep-cr-dos.sh
+++ b/t/t4253-am-keep-cr-dos.sh
@@ -51,14 +51,16 @@
test_expect_success 'am with dos files with --keep-cr' '
git checkout -b dosfiles-keep-cr initial &&
- git format-patch -k --stdout initial..master | git am --keep-cr -k -3 &&
+ git format-patch -k --stdout initial..master >output &&
+ git am --keep-cr -k -3 output &&
git diff --exit-code master
'
test_expect_success 'am with dos files config am.keepcr' '
git config am.keepcr 1 &&
git checkout -b dosfiles-conf-keepcr initial &&
- git format-patch -k --stdout initial..master | git am -k -3 &&
+ git format-patch -k --stdout initial..master >output &&
+ git am -k -3 output &&
git diff --exit-code master
'
diff --git a/t/t4257-am-interactive.sh b/t/t4257-am-interactive.sh
new file mode 100755
index 0000000..5344bd2
--- /dev/null
+++ b/t/t4257-am-interactive.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='am --interactive tests'
+. ./test-lib.sh
+
+test_expect_success 'set up patches to apply' '
+ test_commit unrelated &&
+ test_commit no-conflict &&
+ test_commit conflict-patch file patch &&
+ git format-patch --stdout -2 >mbox &&
+
+ git reset --hard unrelated &&
+ test_commit conflict-master file master base
+'
+
+# Sanity check our setup.
+test_expect_success 'applying all patches generates conflict' '
+ test_must_fail git am mbox &&
+ echo resolved >file &&
+ git add -u &&
+ git am --resolved
+'
+
+test_expect_success 'interactive am can apply a single patch' '
+ git reset --hard base &&
+ # apply the first, but not the second
+ test_write_lines y n | git am -i mbox &&
+
+ echo no-conflict >expect &&
+ git log -1 --format=%s >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'interactive am can resolve conflict' '
+ git reset --hard base &&
+ # apply both; the second one will conflict
+ test_write_lines y y | test_must_fail git am -i mbox &&
+ echo resolved >file &&
+ git add -u &&
+ # interactive "--resolved" will ask us if we want to apply the result
+ echo y | git am -i --resolved &&
+
+ echo conflict-patch >expect &&
+ git log -1 --format=%s >actual &&
+ test_cmp expect actual &&
+
+ echo resolved >expect &&
+ git cat-file blob HEAD:file >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 602bfd9..37655a2 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -94,6 +94,13 @@
'
}
+test_expect_success 'setup' '
+ test_oid_cache <<-EOF
+ obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
+ obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
+ EOF
+'
+
test_expect_success \
'populate workdir' \
'mkdir a &&
@@ -369,11 +376,10 @@
'
test_expect_success LONG_IS_64BIT 'set up repository with huge blob' '
- obj_d=19 &&
- obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
- obj=${obj_d}${obj_f} &&
- mkdir -p .git/objects/$obj_d &&
- cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
+ obj=$(test_oid obj) &&
+ path=$(test_oid_to_path $obj) &&
+ mkdir -p .git/objects/$(dirname $path) &&
+ cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
rm -f .git/index &&
git update-index --add --cacheinfo 100644,$obj,huge &&
git commit -m huge
diff --git a/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a b/t/t5000/huge-object
similarity index 100%
rename from t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
rename to t/t5000/huge-object
Binary files differ
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 271eb5a..3e7b23c 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -204,4 +204,23 @@
grep $size big.lst
'
+build_tree() {
+ perl -e '
+ my $hash = $ARGV[0];
+ foreach my $order (2..6) {
+ $first = 10 ** $order;
+ foreach my $i (-13..-9) {
+ my $name = "a" x ($first + $i);
+ print "100644 blob $hash\t$name\n"
+ }
+ }
+ ' "$1"
+}
+
+test_expect_success 'tar archive with long paths' '
+ blob=$(echo foo | git hash-object -w --stdin) &&
+ tree=$(build_tree $blob | git mktree) &&
+ git archive -o long_paths.tar $tree
+'
+
test_done
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index fca001e..852dcd9 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -246,4 +246,57 @@
'
+test_expect_success 'request-pull quotes regex metacharacters properly' '
+
+ rm -fr downstream.git &&
+ git init --bare downstream.git &&
+ (
+ cd local &&
+ git checkout initial &&
+ git merge --ff-only master &&
+ git tag -mrelease v2.0 &&
+ git push origin refs/tags/v2.0:refs/tags/v2-0 &&
+ test_must_fail git request-pull initial "$downstream_url" tags/v2.0 \
+ 2>../err
+ ) &&
+ grep "No match for commit .*" err &&
+ grep "Are you sure you pushed" err
+
+'
+
+test_expect_success 'pull request with mismatched object' '
+
+ rm -fr downstream.git &&
+ git init --bare downstream.git &&
+ (
+ cd local &&
+ git checkout initial &&
+ git merge --ff-only master &&
+ git push origin HEAD:refs/tags/full &&
+ test_must_fail git request-pull initial "$downstream_url" tags/full \
+ 2>../err
+ ) &&
+ grep "points to a different object" err &&
+ grep "Are you sure you pushed" err
+
+'
+
+test_expect_success 'pull request with stale object' '
+
+ rm -fr downstream.git &&
+ git init --bare downstream.git &&
+ (
+ cd local &&
+ git checkout initial &&
+ git merge --ff-only master &&
+ git push origin refs/tags/full &&
+ git tag -f -m"Thirty-one days" full &&
+ test_must_fail git request-pull initial "$downstream_url" tags/full \
+ 2>../err
+ ) &&
+ grep "points to a different object" err &&
+ grep "Are you sure you pushed" err
+
+'
+
test_done
diff --git a/t/t5200-update-server-info.sh b/t/t5200-update-server-info.sh
new file mode 100755
index 0000000..21a58ee
--- /dev/null
+++ b/t/t5200-update-server-info.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+test_description='Test git update-server-info'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' 'test_commit file'
+
+test_expect_success 'create info/refs' '
+ git update-server-info &&
+ test_path_is_file .git/info/refs
+'
+
+test_expect_success 'modify and store mtime' '
+ test-tool chmtime =0 .git/info/refs &&
+ test-tool chmtime --get .git/info/refs >a
+'
+
+test_expect_success 'info/refs is not needlessly overwritten' '
+ git update-server-info &&
+ test-tool chmtime --get .git/info/refs >b &&
+ test_cmp a b
+'
+
+test_expect_success 'info/refs can be forced to update' '
+ git update-server-info -f &&
+ test-tool chmtime --get .git/info/refs >b &&
+ ! test_cmp a b
+'
+
+test_expect_success 'info/refs updates when changes are made' '
+ test-tool chmtime =0 .git/info/refs &&
+ test-tool chmtime --get .git/info/refs >b &&
+ test_cmp a b &&
+ git update-ref refs/heads/foo HEAD &&
+ git update-server-info &&
+ test-tool chmtime --get .git/info/refs >b &&
+ ! test_cmp a b
+'
+
+test_done
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 270da21..df60f18 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -118,10 +118,10 @@
test_expect_success 'prune: prune former HEAD after checking out branch' '
- head_sha1=$(git rev-parse HEAD) &&
+ head_oid=$(git rev-parse HEAD) &&
git checkout --quiet master &&
git prune -v >prune_actual &&
- grep "$head_sha1" prune_actual
+ grep "$head_oid" prune_actual
'
@@ -265,15 +265,27 @@
'
test_expect_success 'prune .git/shallow' '
- SHA1=$(echo hi|git commit-tree HEAD^{tree}) &&
- echo $SHA1 >.git/shallow &&
+ oid=$(echo hi|git commit-tree HEAD^{tree}) &&
+ echo $oid >.git/shallow &&
git prune --dry-run >out &&
- grep $SHA1 .git/shallow &&
- grep $SHA1 out &&
+ grep $oid .git/shallow &&
+ grep $oid out &&
git prune &&
test_path_is_missing .git/shallow
'
+test_expect_success 'prune .git/shallow when there are no loose objects' '
+ oid=$(echo hi|git commit-tree HEAD^{tree}) &&
+ echo $oid >.git/shallow &&
+ git update-ref refs/heads/shallow-tip $oid &&
+ git repack -ad &&
+ # verify assumption that all loose objects are gone
+ git count-objects | grep ^0 &&
+ git prune &&
+ echo $oid >expect &&
+ test_cmp expect .git/shallow
+'
+
test_expect_success 'prune: handle alternate object database' '
test_create_repo A &&
git -C A commit --allow-empty -m "initial commit" &&
@@ -314,8 +326,8 @@
git reset --hard HEAD^
) &&
git prune --expire=now &&
- SHA1=`git hash-object expected` &&
- git -C third-worktree show "$SHA1" >actual &&
+ oid=`git hash-object expected` &&
+ git -C third-worktree show "$oid" >actual &&
test_cmp expected actual
'
@@ -329,4 +341,12 @@
git prune --no-expire
'
+test_expect_success 'trivial prune with bitmaps enabled' '
+ git repack -adb &&
+ blob=$(echo bitmap-unreachable-blob | git hash-object -w --stdin) &&
+ git prune --expire=now &&
+ git cat-file -e HEAD &&
+ test_must_fail git cat-file -e $blob
+'
+
test_done
diff --git a/t/t5307-pack-missing-commit.sh b/t/t5307-pack-missing-commit.sh
index dacb440..f4338ab 100755
--- a/t/t5307-pack-missing-commit.sh
+++ b/t/t5307-pack-missing-commit.sh
@@ -24,11 +24,11 @@
'
test_expect_success 'rev-list notices corruption (1)' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list HEAD
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
'
test_expect_success 'rev-list notices corruption (2)' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --objects HEAD
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
'
test_expect_success 'pack-objects notices corruption' '
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 82d7f7f..6640329 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -21,21 +21,14 @@
}
test_expect_success 'setup repo with moderate-sized history' '
- for i in $(test_seq 1 10)
- do
- test_commit $i
- done &&
+ test_commit_bulk --id=file 100 &&
git checkout -b other HEAD~5 &&
- for i in $(test_seq 1 10)
- do
- test_commit side-$i
- done &&
+ test_commit_bulk --id=side 10 &&
git checkout master &&
bitmaptip=$(git rev-parse master) &&
blob=$(echo tagged-blob | git hash-object -w --stdin) &&
git tag tagged-blob $blob &&
- git config repack.writebitmaps true &&
- git config pack.writebitmaphashcache true
+ git config repack.writebitmaps true
'
test_expect_success 'full repack creates bitmaps' '
@@ -107,10 +100,7 @@
'
test_expect_success 'setup further non-bitmapped commits' '
- for i in $(test_seq 1 10)
- do
- test_commit further-$i
- done
+ test_commit_bulk --id=further 10
'
rev_list_tests 'partial bitmap'
@@ -269,7 +259,7 @@
git clone --bare . compat-jgit.git &&
(
cd compat-jgit.git &&
- rm -f .git/objects/pack/*.bitmap &&
+ rm -f objects/pack/*.bitmap &&
jgit gc &&
git rev-list --test-bitmap HEAD
)
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 24541ea..2d2f5d0 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -25,7 +25,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
+ git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
HEAD
EOF
git -C r1 index-pack ../all.pack &&
@@ -39,7 +39,7 @@
'
test_expect_success 'verify blob:none packfile has no blobs' '
- git -C r1 pack-objects --rev --stdout --filter=blob:none >filter.pack <<-EOF &&
+ git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
HEAD
EOF
git -C r1 index-pack ../filter.pack &&
@@ -74,7 +74,7 @@
git -C r5 commit -m "foo" &&
del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") &&
rm r5/.git/objects/$del &&
- test_must_fail git -C r5 pack-objects --rev --stdout 2>bad_tree <<-EOF &&
+ test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
HEAD
EOF
grep "bad tree object" bad_tree
@@ -88,7 +88,7 @@
'
test_expect_success 'verify tree:0 packfile has no blobs or trees' '
- git -C r1 pack-objects --rev --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+ git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
HEAD
EOF
git -C r1 index-pack ../commitsonly.pack &&
@@ -98,7 +98,7 @@
test_expect_success 'grab tree directly when using tree:0' '
# We should get the tree specified directly but not its blobs or subtrees.
- git -C r1 pack-objects --rev --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+ git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
HEAD:
EOF
git -C r1 index-pack ../commitsonly.pack &&
@@ -128,7 +128,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../all.pack &&
@@ -142,7 +142,7 @@
'
test_expect_success 'verify blob:limit=500 omits all blobs' '
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -157,7 +157,7 @@
'
test_expect_success 'verify blob:limit=1000' '
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -176,7 +176,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -194,7 +194,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -212,7 +212,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -230,7 +230,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
HEAD
$(git -C r2 rev-parse HEAD:large.10000)
EOF
@@ -249,7 +249,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+ git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
HEAD
EOF
git -C r2 index-pack ../filter.pack &&
@@ -277,6 +277,10 @@
'
# Test sparse:path=<path> filter.
+# !!!!
+# NOTE: sparse:path filter support has been dropped for security reasons,
+# so the tests have been changed to make sure that using it fails.
+# !!!!
# Use a local file containing a sparse-checkout specification to filter
# out blobs not required for the corresponding sparse-checkout. We do not
# require sparse-checkout to actually be enabled.
@@ -302,7 +306,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
+ git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
HEAD
EOF
git -C r3 index-pack ../all.pack &&
@@ -315,73 +319,24 @@
test_cmp expected observed
'
-test_expect_success 'verify sparse:path=pattern1' '
- git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
- sort >expected &&
-
- git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
+test_expect_success 'verify sparse:path=pattern1 fails' '
+ test_must_fail git -C r3 pack-objects --revs --stdout \
+ --filter=sparse:path=../pattern1 <<-EOF
HEAD
EOF
- git -C r3 index-pack ../filter.pack &&
-
- git -C r3 verify-pack -v ../filter.pack >verify_result &&
- grep blob verify_result |
- awk -f print_1.awk |
- sort >observed &&
-
- test_cmp expected observed
'
-test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
- git -C r3 verify-pack -v ../all.pack >verify_result &&
- grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
- sort >expected &&
-
- git -C r3 verify-pack -v ../filter.pack >verify_result &&
- grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
- sort >observed &&
-
- test_cmp expected observed
-'
-
-test_expect_success 'verify sparse:path=pattern2' '
- git -C r3 ls-files -s sparse1 dir1/sparse1 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
- sort >expected &&
-
- git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
+test_expect_success 'verify sparse:path=pattern2 fails' '
+ test_must_fail git -C r3 pack-objects --revs --stdout \
+ --filter=sparse:path=../pattern2 <<-EOF
HEAD
EOF
- git -C r3 index-pack ../filter.pack &&
-
- git -C r3 verify-pack -v ../filter.pack >verify_result &&
- grep blob verify_result |
- awk -f print_1.awk |
- sort >observed &&
-
- test_cmp expected observed
-'
-
-test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
- git -C r3 verify-pack -v ../all.pack >verify_result &&
- grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
- sort >expected &&
-
- git -C r3 verify-pack -v ../filter.pack >verify_result &&
- grep -E "commit|tree" verify_result |
- awk -f print_1.awk |
- sort >observed &&
-
- test_cmp expected observed
'
# Test sparse:oid=<oid-ish> filter.
-# Like sparse:path, but we get the sparse-checkout specification from
-# a blob rather than a file on disk.
+# Use a blob containing a sparse-checkout specification to filter
+# out blobs not required for the corresponding sparse-checkout. We do not
+# require sparse-checkout to actually be enabled.
test_expect_success 'setup r4' '
git init r4 &&
@@ -404,7 +359,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
+ git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
HEAD
EOF
git -C r4 index-pack ../all.pack &&
@@ -423,7 +378,7 @@
sort >expected &&
oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
- git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
+ git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
HEAD
EOF
git -C r4 index-pack ../filter.pack &&
@@ -441,7 +396,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
+ git -C r4 pack-objects --revs --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
HEAD
EOF
git -C r4 index-pack ../filter.pack &&
@@ -470,19 +425,19 @@
'
test_expect_success 'verify pack-objects fails w/ missing objects' '
- test_must_fail git -C r1 pack-objects --rev --stdout >miss.pack <<-EOF
+ test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
HEAD
EOF
'
test_expect_success 'verify pack-objects fails w/ --missing=error' '
- test_must_fail git -C r1 pack-objects --rev --stdout --missing=error >miss.pack <<-EOF
+ test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
HEAD
EOF
'
test_expect_success 'verify pack-objects w/ --missing=allow-any' '
- git -C r1 pack-objects --rev --stdout --missing=allow-any >miss.pack <<-EOF
+ git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
HEAD
EOF
'
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 16d10eb..ab3eccf 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -20,7 +20,14 @@
test_expect_success 'write graph with no packs' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write --object-dir . &&
- test_path_is_file info/commit-graph
+ test_path_is_missing info/commit-graph
+'
+
+test_expect_success 'exit with correct error on bad input to --stdin-packs' '
+ cd "$TRASH_DIRECTORY/full" &&
+ echo doesnotexist >in &&
+ test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr &&
+ test_i18ngrep "error adding pack" stderr
'
test_expect_success 'create commits and repack' '
@@ -33,6 +40,15 @@
git repack
'
+test_expect_success 'exit with correct error on bad input to --stdin-commits' '
+ cd "$TRASH_DIRECTORY/full" &&
+ echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+ test_i18ngrep "invalid commit object id" stderr &&
+ # valid tree OID, but not a commit OID
+ git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+ test_i18ngrep "invalid commit object id" stderr
+'
+
graph_git_two_modes() {
git -c core.commitGraph=true $1 >output
git -c core.commitGraph=false $1 >expect
@@ -75,7 +91,7 @@
test_expect_success 'write graph' '
cd "$TRASH_DIRECTORY/full" &&
- graph1=$(git commit-graph write) &&
+ git commit-graph write &&
test_path_is_file $objdir/info/commit-graph &&
graph_read_expect "3"
'
@@ -366,6 +382,26 @@
GRAPH_BYTE_OCTOPUS=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4))
GRAPH_BYTE_FOOTER=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4 * $NUM_OCTOPUS_EDGES))
+corrupt_graph_setup() {
+ cd "$TRASH_DIRECTORY/full" &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ cp $objdir/info/commit-graph commit-graph-backup
+}
+
+corrupt_graph_verify() {
+ grepstr=$1
+ test_must_fail git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "$grepstr" err &&
+ if test "$2" != "no-copy"
+ then
+ cp $objdir/info/commit-graph commit-graph-pre-write-test
+ fi &&
+ git status --short &&
+ GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write &&
+ git commit-graph verify
+}
+
# usage: corrupt_graph_and_verify <position> <data> <string> [<zero_pos>]
# Manipulates the commit-graph file at the position
# by inserting the data, optionally zeroing the file
@@ -376,19 +412,28 @@
pos=$1
data="${2:-\0}"
grepstr=$3
- cd "$TRASH_DIRECTORY/full" &&
+ corrupt_graph_setup &&
orig_size=$(wc -c < $objdir/info/commit-graph) &&
zero_pos=${4:-${orig_size}} &&
- test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
- cp $objdir/info/commit-graph commit-graph-backup &&
printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc &&
- dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=0 &&
- dd if=/dev/zero of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=$(($orig_size - $zero_pos)) &&
- test_must_fail git commit-graph verify 2>test_err &&
- grep -v "^+" test_err >err &&
- test_i18ngrep "$grepstr" err
+ dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" if=/dev/null &&
+ generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
+ corrupt_graph_verify "$grepstr"
+
}
+test_expect_success POSIXPERM,SANITY 'detect permission problem' '
+ corrupt_graph_setup &&
+ chmod 000 $objdir/info/commit-graph &&
+ corrupt_graph_verify "Could not open" "no-copy"
+'
+
+test_expect_success 'detect too small' '
+ corrupt_graph_setup &&
+ echo "a small graph" >$objdir/info/commit-graph &&
+ corrupt_graph_verify "too small"
+'
+
test_expect_success 'detect bad signature' '
corrupt_graph_and_verify 0 "\0" \
"graph signature"
@@ -499,6 +544,7 @@
git fsck &&
corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
"incorrect checksum" &&
+ cp commit-graph-pre-write-test $objdir/info/commit-graph &&
test_must_fail git fsck
'
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 70926b5..c72ca04 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -86,13 +86,14 @@
'
midx_git_two_modes () {
+ git -c core.multiPackIndex=false $1 >expect &&
+ git -c core.multiPackIndex=true $1 >actual &&
if [ "$2" = "sorted" ]
then
- git -c core.multiPackIndex=false $1 | sort >expect &&
- git -c core.multiPackIndex=true $1 | sort >actual
- else
- git -c core.multiPackIndex=false $1 >expect &&
- git -c core.multiPackIndex=true $1 >actual
+ sort <expect >expect.sorted &&
+ mv expect.sorted expect &&
+ sort <actual >actual.sorted &&
+ mv actual.sorted actual
fi &&
test_cmp expect actual
}
@@ -103,8 +104,8 @@
midx_git_two_modes "rev-list --objects --all" &&
midx_git_two_modes "log --raw" &&
midx_git_two_modes "count-objects --verbose" &&
- midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
- midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+ midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
+ midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
'
}
@@ -116,6 +117,20 @@
compare_results_with_midx "one v2 pack"
+test_expect_success 'corrupt idx not opened' '
+ idx=$(test-tool read-midx $objdir | grep "\.idx\$") &&
+ mv $objdir/pack/$idx backup-$idx &&
+ test_when_finished "mv backup-\$idx \$objdir/pack/\$idx" &&
+
+ # This is the minimum size for a sha-1 based .idx; this lets
+ # us pass perfunctory tests, but anything that actually opens and reads
+ # the idx file will complain.
+ test_copy_bytes 1064 <backup-$idx >$objdir/pack/$idx &&
+
+ git -c core.multiPackIndex=true rev-list --objects --all 2>err &&
+ test_must_be_empty err
+'
+
test_expect_success 'add more objects' '
for i in $(test_seq 6 10)
do
@@ -348,4 +363,188 @@
"incorrect object offset"
'
+test_expect_success 'setup expire tests' '
+ mkdir dup &&
+ (
+ cd dup &&
+ git init &&
+ test-tool genrandom "data" 4096 >large_file.txt &&
+ git update-index --add large_file.txt &&
+ for i in $(test_seq 1 20)
+ do
+ test_commit $i
+ done &&
+ git branch A HEAD &&
+ git branch B HEAD~8 &&
+ git branch C HEAD~13 &&
+ git branch D HEAD~16 &&
+ git branch E HEAD~18 &&
+ git pack-objects --revs .git/objects/pack/pack-A <<-EOF &&
+ refs/heads/A
+ ^refs/heads/B
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-B <<-EOF &&
+ refs/heads/B
+ ^refs/heads/C
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-C <<-EOF &&
+ refs/heads/C
+ ^refs/heads/D
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-D <<-EOF &&
+ refs/heads/D
+ ^refs/heads/E
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-E <<-EOF &&
+ refs/heads/E
+ EOF
+ git multi-pack-index write &&
+ cp -r .git/objects/pack .git/objects/pack-backup
+ )
+'
+
+test_expect_success 'expire does not remove any packs' '
+ (
+ cd dup &&
+ ls .git/objects/pack >expect &&
+ git multi-pack-index expire &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'expire removes unreferenced packs' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/A
+ ^refs/heads/C
+ EOF
+ git multi-pack-index write &&
+ ls .git/objects/pack | grep -v -e pack-[AB] >expect &&
+ git multi-pack-index expire &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual &&
+ ls .git/objects/pack/ | grep idx >expect-idx &&
+ test-tool read-midx .git/objects | grep idx >actual-midx &&
+ test_cmp expect-idx actual-midx &&
+ git multi-pack-index verify &&
+ git fsck
+ )
+'
+
+test_expect_success 'repack with minimum size does not alter existing packs' '
+ (
+ cd dup &&
+ rm -rf .git/objects/pack &&
+ mv .git/objects/pack-backup .git/objects/pack &&
+ touch -m -t 201901010000 .git/objects/pack/pack-D* &&
+ touch -m -t 201901010001 .git/objects/pack/pack-C* &&
+ touch -m -t 201901010002 .git/objects/pack/pack-B* &&
+ touch -m -t 201901010003 .git/objects/pack/pack-A* &&
+ ls .git/objects/pack >expect &&
+ MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) &&
+ git multi-pack-index repack --batch-size=$MINSIZE &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'repack creates a new pack' '
+ (
+ cd dup &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 5 idx-list &&
+ THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 3 | tail -n 1) &&
+ BATCH_SIZE=$(($THIRD_SMALLEST_SIZE + 1)) &&
+ git multi-pack-index repack --batch-size=$BATCH_SIZE &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 6 idx-list &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 6 midx-list
+ )
+'
+
+test_expect_success 'expire removes repacked packs' '
+ (
+ cd dup &&
+ ls -al .git/objects/pack/*pack &&
+ ls -S .git/objects/pack/*pack | head -n 4 >expect &&
+ git multi-pack-index expire &&
+ ls -S .git/objects/pack/*pack >actual &&
+ test_cmp expect actual &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 4 midx-list
+ )
+'
+
+test_expect_success 'expire works when adding new packs' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/A
+ ^refs/heads/B
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/B
+ ^refs/heads/C
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/C
+ ^refs/heads/D
+ EOF
+ git multi-pack-index write &&
+ git pack-objects --revs .git/objects/pack/a-pack <<-EOF &&
+ refs/heads/D
+ ^refs/heads/E
+ EOF
+ git multi-pack-index write &&
+ git pack-objects --revs .git/objects/pack/z-pack <<-EOF &&
+ refs/heads/E
+ EOF
+ git multi-pack-index expire &&
+ ls .git/objects/pack/ | grep idx >expect &&
+ test-tool read-midx .git/objects | grep idx >actual &&
+ test_cmp expect actual &&
+ git multi-pack-index verify
+ )
+'
+
+test_expect_success 'expire respects .keep files' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-all <<-EOF &&
+ refs/heads/A
+ EOF
+ git multi-pack-index write &&
+ PACKA=$(ls .git/objects/pack/a-pack*\.pack | sed s/\.pack\$//) &&
+ touch $PACKA.keep &&
+ git multi-pack-index expire &&
+ ls -S .git/objects/pack/a-pack* | grep $PACKA >a-pack-files &&
+ test_line_count = 3 a-pack-files &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 2 midx-list
+ )
+'
+
+test_expect_success 'repack --batch-size=0 repacks everything' '
+ (
+ cd dup &&
+ rm .git/objects/pack/*.keep &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 2 idx-list &&
+ git multi-pack-index repack --batch-size=0 &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 3 idx-list &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 3 midx-list &&
+ git multi-pack-index expire &&
+ ls -al .git/objects/pack/*idx >idx-list &&
+ test_line_count = 1 idx-list &&
+ git multi-pack-index repack --batch-size=0 &&
+ ls -al .git/objects/pack/*idx >new-idx-list &&
+ test_cmp idx-list new-idx-list
+ )
+'
+
test_done
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
new file mode 100755
index 0000000..6b4d1ca
--- /dev/null
+++ b/t/t5323-pack-redundant.sh
@@ -0,0 +1,467 @@
+#!/bin/sh
+#
+# Copyright (c) 2018 Jiang Xin
+#
+
+test_description='Test git pack-redundant
+
+In order to test git-pack-redundant, we will create a number of objects and
+packs in the repository `master.git`. The relationship between packs (P1-P8)
+and objects (T, A-R) is showed in the following chart. Objects of a pack will
+be marked with letter x, while objects of redundant packs will be marked with
+exclamation point, and redundant pack itself will be marked with asterisk.
+
+ | T A B C D E F G H I J K L M N O P Q R
+ ----+--------------------------------------
+ P1 | x x x x x x x x
+ P2* | ! ! ! ! ! ! !
+ P3 | x x x x x x
+ P4* | ! ! ! ! !
+ P5 | x x x x
+ P6* | ! ! !
+ P7 | x x
+ P8* | !
+ ----+--------------------------------------
+ ALL | x x x x x x x x x x x x x x x x x x x
+
+Another repository `shared.git` has unique objects (X-Z), while other objects
+(marked with letter s) are shared through alt-odb (of `master.git`). The
+relationship between packs and objects is as follows:
+
+ | T A B C D E F G H I J K L M N O P Q R X Y Z
+ ----+----------------------------------------------
+ Px1 | s s s x x x
+ Px2 | s s s x x x
+'
+
+. ./test-lib.sh
+
+master_repo=master.git
+shared_repo=shared.git
+
+# Create commits in <repo> and assign each commit's oid to shell variables
+# given in the arguments (A, B, and C). E.g.:
+#
+# create_commits_in <repo> A B C
+#
+# NOTE: Avoid calling this function from a subshell since variable
+# assignments will disappear when subshell exits.
+create_commits_in () {
+ repo="$1" &&
+ if ! parent=$(git -C "$repo" rev-parse HEAD^{} 2>/dev/null)
+ then
+ parent=
+ fi &&
+ T=$(git -C "$repo" write-tree) &&
+ shift &&
+ while test $# -gt 0
+ do
+ name=$1 &&
+ test_tick &&
+ if test -z "$parent"
+ then
+ oid=$(echo $name | git -C "$repo" commit-tree $T)
+ else
+ oid=$(echo $name | git -C "$repo" commit-tree -p $parent $T)
+ fi &&
+ eval $name=$oid &&
+ parent=$oid &&
+ shift ||
+ return 1
+ done &&
+ git -C "$repo" update-ref refs/heads/master $oid
+}
+
+# Create pack in <repo> and assign pack id to variable given in the 2nd argument
+# (<name>). Commits in the pack will be read from stdin. E.g.:
+#
+# create_pack_in <repo> <name> <<-EOF
+# ...
+# EOF
+#
+# NOTE: commits from stdin should be given using heredoc, not using pipe, and
+# avoid calling this function from a subshell since variable assignments will
+# disappear when subshell exits.
+create_pack_in () {
+ repo="$1" &&
+ name="$2" &&
+ pack=$(git -C "$repo/objects/pack" pack-objects -q pack) &&
+ eval $name=$pack &&
+ eval P$pack=$name:$pack
+}
+
+format_packfiles () {
+ sed \
+ -e "s#.*/pack-\(.*\)\.idx#\1#" \
+ -e "s#.*/pack-\(.*\)\.pack#\1#" |
+ sort -u |
+ while read p
+ do
+ if test -z "$(eval echo \${P$p})"
+ then
+ echo $p
+ else
+ eval echo "\${P$p}"
+ fi
+ done |
+ sort
+}
+
+test_expect_success 'setup master repo' '
+ git init --bare "$master_repo" &&
+ create_commits_in "$master_repo" A B C D E F G H I J K L M N O P Q R
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# | T A B C D E F G H I J K L M N O P Q R
+# ----+--------------------------------------
+# P1 | x x x x x x x x
+# P2 | x x x x x x x
+# P3 | x x x x x x
+# ----+--------------------------------------
+# ALL | x x x x x x x x x x x x x x x
+#
+#############################################################################
+test_expect_success 'master: no redundant for pack 1, 2, 3' '
+ create_pack_in "$master_repo" P1 <<-EOF &&
+ $T
+ $A
+ $B
+ $C
+ $D
+ $E
+ $F
+ $R
+ EOF
+ create_pack_in "$master_repo" P2 <<-EOF &&
+ $B
+ $C
+ $D
+ $E
+ $G
+ $H
+ $I
+ EOF
+ create_pack_in "$master_repo" P3 <<-EOF &&
+ $F
+ $I
+ $J
+ $K
+ $L
+ $M
+ EOF
+ (
+ cd "$master_repo" &&
+ git pack-redundant --all >out &&
+ test_must_be_empty out
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# | T A B C D E F G H I J K L M N O P Q R
+# ----+--------------------------------------
+# P1 | x x x x x x x x
+# P2 | x x x x x x x
+# P3* | ! ! ! ! ! !
+# P4 | x x x x x
+# P5 | x x x x
+# ----+--------------------------------------
+# ALL | x x x x x x x x x x x x x x x x x x
+#
+#############################################################################
+test_expect_success 'master: one of pack-2/pack-3 is redundant' '
+ create_pack_in "$master_repo" P4 <<-EOF &&
+ $J
+ $K
+ $L
+ $M
+ $P
+ EOF
+ create_pack_in "$master_repo" P5 <<-EOF &&
+ $G
+ $H
+ $N
+ $O
+ EOF
+ (
+ cd "$master_repo" &&
+ cat >expect <<-EOF &&
+ P3:$P3
+ EOF
+ git pack-redundant --all >out &&
+ format_packfiles <out >actual &&
+ test_cmp expect actual
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# | T A B C D E F G H I J K L M N O P Q R
+# ----+--------------------------------------
+# P1 | x x x x x x x x
+# P2* | ! ! ! ! ! ! !
+# P3 | x x x x x x
+# P4* | ! ! ! ! !
+# P5 | x x x x
+# P6* | ! ! !
+# P7 | x x
+# ----+--------------------------------------
+# ALL | x x x x x x x x x x x x x x x x x x x
+#
+#############################################################################
+test_expect_success 'master: pack 2, 4, and 6 are redundant' '
+ create_pack_in "$master_repo" P6 <<-EOF &&
+ $N
+ $O
+ $Q
+ EOF
+ create_pack_in "$master_repo" P7 <<-EOF &&
+ $P
+ $Q
+ EOF
+ (
+ cd "$master_repo" &&
+ cat >expect <<-EOF &&
+ P2:$P2
+ P4:$P4
+ P6:$P6
+ EOF
+ git pack-redundant --all >out &&
+ format_packfiles <out >actual &&
+ test_cmp expect actual
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# | T A B C D E F G H I J K L M N O P Q R
+# ----+--------------------------------------
+# P1 | x x x x x x x x
+# P2* | ! ! ! ! ! ! !
+# P3 | x x x x x x
+# P4* | ! ! ! ! !
+# P5 | x x x x
+# P6* | ! ! !
+# P7 | x x
+# P8* | !
+# ----+--------------------------------------
+# ALL | x x x x x x x x x x x x x x x x x x x
+#
+#############################################################################
+test_expect_success 'master: pack-8 (subset of pack-1) is also redundant' '
+ create_pack_in "$master_repo" P8 <<-EOF &&
+ $A
+ EOF
+ (
+ cd "$master_repo" &&
+ cat >expect <<-EOF &&
+ P2:$P2
+ P4:$P4
+ P6:$P6
+ P8:$P8
+ EOF
+ git pack-redundant --all >out &&
+ format_packfiles <out >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'master: clean loose objects' '
+ (
+ cd "$master_repo" &&
+ git prune-packed &&
+ find objects -type f | sed -e "/objects\/pack\//d" >out &&
+ test_must_be_empty out
+ )
+'
+
+test_expect_success 'master: remove redundant packs and pass fsck' '
+ (
+ cd "$master_repo" &&
+ git pack-redundant --all | xargs rm &&
+ git fsck &&
+ git pack-redundant --all >out &&
+ test_must_be_empty out
+ )
+'
+
+# The following test cases will execute inside `shared.git`, instead of
+# inside `master.git`.
+test_expect_success 'setup shared.git' '
+ git clone --mirror "$master_repo" "$shared_repo" &&
+ (
+ cd "$shared_repo" &&
+ printf "../../$master_repo/objects\n" >objects/info/alternates
+ )
+'
+
+test_expect_success 'shared: all packs are redundant, but no output without --alt-odb' '
+ (
+ cd "$shared_repo" &&
+ git pack-redundant --all >out &&
+ test_must_be_empty out
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# ================ master.git ===============
+# | T A B C D E F G H I J K L M N O P Q R <----------+
+# ----+-------------------------------------- |
+# P1 | x x x x x x x x |
+# P3 | x x x x x x |
+# P5 | x x x x |
+# P7 | x x |
+# ----+-------------------------------------- |
+# ALL | x x x x x x x x x x x x x x x x x x x |
+# |
+# |
+# ================ shared.git =============== |
+# | T A B C D E F G H I J K L M N O P Q R <objects/info/alternates>
+# ----+--------------------------------------
+# P1* | s s s s s s s s
+# P3* | s s s s s s
+# P5* | s s s s
+# P7* | s s
+# ----+--------------------------------------
+# ALL | x x x x x x x x x x x x x x x x x x x
+#
+#############################################################################
+test_expect_success 'shared: show redundant packs in stderr for verbose mode' '
+ (
+ cd "$shared_repo" &&
+ cat >expect <<-EOF &&
+ P1:$P1
+ P3:$P3
+ P5:$P5
+ P7:$P7
+ EOF
+ git pack-redundant --all --verbose >out 2>out.err &&
+ test_must_be_empty out &&
+ grep "pack$" out.err | format_packfiles >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'shared: remove redundant packs, no packs left' '
+ (
+ cd "$shared_repo" &&
+ cat >expect <<-EOF &&
+ fatal: Zero packs found!
+ EOF
+ git pack-redundant --all --alt-odb | xargs rm &&
+ git fsck &&
+ test_must_fail git pack-redundant --all --alt-odb >actual 2>&1 &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'shared: create new objects and packs' '
+ create_commits_in "$shared_repo" X Y Z &&
+ create_pack_in "$shared_repo" Px1 <<-EOF &&
+ $X
+ $Y
+ $Z
+ $A
+ $B
+ $C
+ EOF
+ create_pack_in "$shared_repo" Px2 <<-EOF
+ $X
+ $Y
+ $Z
+ $D
+ $E
+ $F
+ EOF
+'
+
+test_expect_success 'shared: no redundant without --alt-odb' '
+ (
+ cd "$shared_repo" &&
+ git pack-redundant --all >out &&
+ test_must_be_empty out
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# ================ master.git ===============
+# | T A B C D E F G H I J K L M N O P Q R <----------------+
+# ----+-------------------------------------- |
+# P1 | x x x x x x x x |
+# P3 | x x x x x x |
+# P5 | x x x x |
+# P7 | x x |
+# ----+-------------------------------------- |
+# ALL | x x x x x x x x x x x x x x x x x x x |
+# |
+# |
+# ================ shared.git ======================= |
+# | T A B C D E F G H I J K L M N O P Q R X Y Z <objects/info/alternates>
+# ----+----------------------------------------------
+# Px1 | s s s x x x
+# Px2*| s s s ! ! !
+# ----+----------------------------------------------
+# ALL | s s s s s s s s s s s s s s s s s s s x x x
+#
+#############################################################################
+test_expect_success 'shared: one pack is redundant with --alt-odb' '
+ (
+ cd "$shared_repo" &&
+ git pack-redundant --all --alt-odb >out &&
+ format_packfiles <out >actual &&
+ test_line_count = 1 actual
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# ================ master.git ===============
+# | T A B C D E F G H I J K L M N O P Q R <----------------+
+# ----+-------------------------------------- |
+# P1 | x x x x x x x x |
+# P3 | x x x x x x |
+# P5 | x x x x |
+# P7 | x x |
+# ----+-------------------------------------- |
+# ALL | x x x x x x x x x x x x x x x x x x x |
+# |
+# |
+# ================ shared.git ======================= |
+# | T A B C D E F G H I J K L M N O P Q R X Y Z <objects/info/alternates>
+# ----+----------------------------------------------
+# Px1*| s s s i i i
+# Px2*| s s s i i i
+# ----+----------------------------------------------
+# ALL | s s s s s s s s s s s s s s s s s s s i i i
+# (ignored objects, marked with i)
+#
+#############################################################################
+test_expect_success 'shared: ignore unique objects and all two packs are redundant' '
+ (
+ cd "$shared_repo" &&
+ cat >expect <<-EOF &&
+ Px1:$Px1
+ Px2:$Px2
+ EOF
+ git pack-redundant --all --alt-odb >out <<-EOF &&
+ $X
+ $Y
+ $Z
+ EOF
+ format_packfiles <out >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_done
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
new file mode 100755
index 0000000..e2c3953
--- /dev/null
+++ b/t/t5324-split-commit-graph.sh
@@ -0,0 +1,347 @@
+#!/bin/sh
+
+test_description='split commit graph'
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+
+test_expect_success 'setup repo' '
+ git init &&
+ git config core.commitGraph true &&
+ git config gc.writeCommitGraph false &&
+ infodir=".git/objects/info" &&
+ graphdir="$infodir/commit-graphs" &&
+ test_oid_init
+'
+
+graph_read_expect() {
+ NUM_BASE=0
+ if test ! -z $2
+ then
+ NUM_BASE=$2
+ fi
+ cat >expect <<- EOF
+ header: 43475048 1 1 3 $NUM_BASE
+ num_commits: $1
+ chunks: oid_fanout oid_lookup commit_metadata
+ EOF
+ git commit-graph read >output &&
+ test_cmp expect output
+}
+
+test_expect_success 'create commits and write commit-graph' '
+ for i in $(test_seq 3)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable &&
+ test_path_is_file $infodir/commit-graph &&
+ graph_read_expect 3
+'
+
+graph_git_two_modes() {
+ git -c core.commitGraph=true $1 >output
+ git -c core.commitGraph=false $1 >expect
+ test_cmp expect output
+}
+
+graph_git_behavior() {
+ MSG=$1
+ BRANCH=$2
+ COMPARE=$3
+ test_expect_success "check normal git operations: $MSG" '
+ graph_git_two_modes "log --oneline $BRANCH" &&
+ graph_git_two_modes "log --topo-order $BRANCH" &&
+ graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
+ graph_git_two_modes "branch -vv" &&
+ graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+ '
+}
+
+graph_git_behavior 'graph exists' commits/3 commits/1
+
+verify_chain_files_exist() {
+ for hash in $(cat $1/commit-graph-chain)
+ do
+ test_path_is_file $1/graph-$hash.graph || return 1
+ done
+}
+
+test_expect_success 'add more commits, and write a new base graph' '
+ git reset --hard commits/1 &&
+ for i in $(test_seq 4 5)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git reset --hard commits/2 &&
+ for i in $(test_seq 6 10)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git reset --hard commits/2 &&
+ git merge commits/4 &&
+ git branch merge/1 &&
+ git reset --hard commits/4 &&
+ git merge commits/6 &&
+ git branch merge/2 &&
+ git commit-graph write --reachable &&
+ graph_read_expect 12
+'
+
+test_expect_success 'fork and fail to base a chain on a commit-graph file' '
+ test_when_finished rm -rf fork &&
+ git clone . fork &&
+ (
+ cd fork &&
+ rm .git/objects/info/commit-graph &&
+ echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+ test_commit new-commit &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ verify_chain_files_exist $graphdir
+ )
+'
+
+test_expect_success 'add three more commits, write a tip graph' '
+ git reset --hard commits/3 &&
+ git merge merge/1 &&
+ git merge commits/5 &&
+ git merge merge/2 &&
+ git branch merge/3 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_missing $infodir/commit-graph &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 2 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'split commit-graph: merge 3 vs 2' merge/3 merge/2
+
+test_expect_success 'add one commit, write a tip graph' '
+ test_commit 11 &&
+ git branch commits/11 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_missing $infodir/commit-graph &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 3 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'three-layer commit-graph: commit 11 vs 6' commits/11 commits/6
+
+test_expect_success 'add one commit, write a merged graph' '
+ test_commit 12 &&
+ git branch commits/12 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 2 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'merged commit-graph: commit 12 vs 6' commits/12 commits/6
+
+test_expect_success 'create fork and chain across alternate' '
+ git clone . fork &&
+ (
+ cd fork &&
+ git config core.commitGraph true &&
+ rm -rf $graphdir &&
+ echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+ test_commit 13 &&
+ git branch commits/13 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files &&
+ git -c core.commitGraph=true rev-list HEAD >expect &&
+ git -c core.commitGraph=false rev-list HEAD >actual &&
+ test_cmp expect actual &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --object-dir=.git/objects/ &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ )
+'
+
+graph_git_behavior 'alternate: commit 13 vs 6' commits/13 commits/6
+
+test_expect_success 'test merge stragety constants' '
+ git clone . merge-2 &&
+ (
+ cd merge-2 &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --size-multiple=2 &&
+ test_line_count = 3 $graphdir/commit-graph-chain
+
+ ) &&
+ git clone . merge-10 &&
+ (
+ cd merge-10 &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --size-multiple=10 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ ) &&
+ git clone . merge-10-expire &&
+ (
+ cd merge-10-expire &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 15 &&
+ git commit-graph write --reachable --split --size-multiple=10 --expire-time=1980-01-01 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 3 graph-files
+ ) &&
+ git clone --no-hardlinks . max-commits &&
+ (
+ cd max-commits &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 16 &&
+ test_commit 17 &&
+ git commit-graph write --reachable --split --max-commits=1 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ )
+'
+
+test_expect_success 'remove commit-graph-chain file after flattening' '
+ git clone . flatten &&
+ (
+ cd flatten &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ git commit-graph write --reachable &&
+ test_path_is_missing $graphdir/commit-graph-chain &&
+ ls $graphdir >graph-files &&
+ test_line_count = 0 graph-files
+ )
+'
+
+corrupt_file() {
+ file=$1
+ pos=$2
+ data="${3:-\0}"
+ chmod a+w "$file" &&
+ printf "$data" | dd of="$file" bs=1 seek="$pos" conv=notrunc
+}
+
+test_expect_success 'verify hashes along chain, even in shallow' '
+ git clone --no-hardlinks . verify &&
+ (
+ cd verify &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1760 "\01" &&
+ test_must_fail git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "incorrect checksum" err
+ )
+'
+
+test_expect_success 'verify --shallow does not check base contents' '
+ git clone --no-hardlinks . verify-shallow &&
+ (
+ cd verify-shallow &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1000 "\01" &&
+ git commit-graph verify --shallow &&
+ test_must_fail git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "incorrect checksum" err
+ )
+'
+
+test_expect_success 'warn on base graph chunk incorrect' '
+ git clone --no-hardlinks . base-chunk &&
+ (
+ cd base-chunk &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1376 "\01" &&
+ git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "commit-graph chain does not match" err
+ )
+'
+
+test_expect_success 'verify after commit-graph-chain corruption' '
+ git clone --no-hardlinks . verify-chain &&
+ (
+ cd verify-chain &&
+ corrupt_file "$graphdir/commit-graph-chain" 60 "G" &&
+ git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "invalid commit-graph chain" err &&
+ corrupt_file "$graphdir/commit-graph-chain" 60 "A" &&
+ git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "unable to find all commit-graph files" err
+ )
+'
+
+test_expect_success 'verify across alternates' '
+ git clone --no-hardlinks . verify-alt &&
+ (
+ cd verify-alt &&
+ rm -rf $graphdir &&
+ altdir="$(pwd)/../.git/objects" &&
+ echo "$altdir" >.git/objects/info/alternates &&
+ git commit-graph verify --object-dir="$altdir/" &&
+ test_commit extra &&
+ git commit-graph write --reachable --split &&
+ tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$tip_file" 100 "\01" &&
+ test_must_fail git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "commit-graph has incorrect fanout value" err
+ )
+'
+
+test_expect_success 'add octopus merge' '
+ git reset --hard commits/10 &&
+ git merge commits/3 commits/4 &&
+ git branch merge/octopus &&
+ git commit-graph write --reachable --split &&
+ git commit-graph verify 2>err &&
+ test_line_count = 3 err &&
+ test_i18ngrep ! warning err &&
+ test_line_count = 3 $graphdir/commit-graph-chain
+'
+
+graph_git_behavior 'graph exists' merge/octopus commits/12
+
+test_expect_success 'split across alternate where alternate is not split' '
+ git commit-graph write --reachable &&
+ test_path_is_file .git/objects/info/commit-graph &&
+ cp .git/objects/info/commit-graph . &&
+ git clone --no-hardlinks . alt-split &&
+ (
+ cd alt-split &&
+ rm -f .git/objects/info/commit-graph &&
+ echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
+ test_commit 18 &&
+ git commit-graph write --reachable --split &&
+ test_line_count = 1 $graphdir/commit-graph-chain
+ ) &&
+ test_cmp commit-graph .git/objects/info/commit-graph
+'
+
+test_done
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index f1932ea..571d620 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -288,7 +288,7 @@
$shared .have
EOF
- GIT_TRACE_PACKET=$(pwd)/trace \
+ GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION= \
git push \
--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
fork HEAD:foo &&
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index a539ffc..a39b3b5 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -67,7 +67,7 @@
test_expect_success 'post-checkout hook is triggered by clone' '
mkdir -p templates/hooks &&
write_script templates/hooks/post-checkout <<-\EOF &&
- echo "$@" >$GIT_DIR/post-checkout.args
+ echo "$@" >"$GIT_DIR/post-checkout.args"
EOF
git clone --template=templates . clone3 &&
test -f clone3/.git/post-checkout.args
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index a4a5903..7344253 100755
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -131,7 +131,7 @@
test_expect_success 'git rebase with implicit use of interactive backend' '
git reset --hard D &&
clear_hook_input &&
- test_must_fail git rebase --keep --onto A B &&
+ test_must_fail git rebase --keep-empty --onto A B &&
echo C > foo &&
git add foo &&
git rebase --continue &&
@@ -146,7 +146,7 @@
test_expect_success 'git rebase --skip with implicit use of interactive backend' '
git reset --hard D &&
clear_hook_input &&
- test_must_fail git rebase --keep --onto A B &&
+ test_must_fail git rebase --keep-empty --onto A B &&
test_must_fail git rebase --skip &&
echo D > foo &&
git add foo &&
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 49c540b..6b97923 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -636,7 +636,9 @@
test_commit -C server 6 &&
git init client &&
- test_must_fail git -C client fetch-pack ../server \
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= git -C client fetch-pack ../server \
$(git -C server rev-parse refs/heads/master^) 2>err &&
test_i18ngrep "Server does not allow request for unadvertised object" err
'
@@ -706,13 +708,22 @@
# file with scheme
for p in file
do
- test_expect_success "fetch-pack --diag-url $p://$h/$r" '
+ test_expect_success !MINGW "fetch-pack --diag-url $p://$h/$r" '
check_prot_path $p://$h/$r $p "/$r"
'
+ test_expect_success MINGW "fetch-pack --diag-url $p://$h/$r" '
+ check_prot_path $p://$h/$r $p "//$h/$r"
+ '
+ test_expect_success MINGW "fetch-pack --diag-url $p:///$r" '
+ check_prot_path $p:///$r $p "/$r"
+ '
# No "/~" -> "~" conversion for file
- test_expect_success "fetch-pack --diag-url $p://$h/~$r" '
+ test_expect_success !MINGW "fetch-pack --diag-url $p://$h/~$r" '
check_prot_path $p://$h/~$r $p "/~$r"
'
+ test_expect_success MINGW "fetch-pack --diag-url $p://$h/~$r" '
+ check_prot_path $p://$h/~$r $p "//$h/~$r"
+ '
done
# file without scheme
for h in nohost nohost:12 [::1] [::1]:23 [ [:aa
@@ -781,6 +792,44 @@
)
'
+# A few subtle things about the request in this test:
+#
+# - the server must have commit-graphs present and enabled
+#
+# - the history is such that our want/have share a common ancestor ("base"
+# here)
+#
+# - we send only a single have, which is fewer than a normal client would
+# send. This ensures that we don't parse "base" up front with
+# parse_object(), but rather traverse to it as a parent while deciding if we
+# can stop the "have" negotiation, and call parse_commit(). The former
+# sees the actual object data and so always loads the three oid, whereas the
+# latter will try to load it lazily.
+#
+# - we must use protocol v2, because it handles the "have" negotiation before
+# processing the shallow directives
+#
+test_expect_success 'shallow since with commit graph and already-seen commit' '
+ test_create_repo shallow-since-graph &&
+ (
+ cd shallow-since-graph &&
+ test_commit base &&
+ test_commit master &&
+ git checkout -b other HEAD^ &&
+ test_commit other &&
+ git commit-graph write --reachable &&
+ git config core.commitGraph true &&
+
+ GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
+ 0012command=fetch
+ 00010013deepen-since 1
+ 0032want $(git rev-parse other)
+ 0032have $(git rev-parse master)
+ 0000
+ EOF
+ )
+'
+
test_expect_success 'shallow clone exclude tag two' '
test_create_repo shallow-exclude &&
(
@@ -918,7 +967,7 @@
fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
'
-stop_httpd
-
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 4ca48f0..6041a4d 100755
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -47,7 +47,7 @@
test -s "$1" &&
perl -alne '
next unless $F[1] eq "upload-pack<";
- last if $F[2] eq "0000";
+ next unless $F[2] eq "want";
print $F[2], " ", $F[3];
' "$1"
}
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 7bc7068..fdfe179 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -164,9 +164,9 @@
test_expect_success 'fsck with invalid or bogus skipList input' '
git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err
+ test_i18ngrep "invalid object name: \[core\]" err
'
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
@@ -193,7 +193,7 @@
test_expect_success 'fsck with invalid abbreviated skipList input' '
echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
- test_i18ngrep "^fatal: Invalid SHA-1: " err-abbreviated
+ test_i18ngrep "^fatal: invalid object name: " err-abbreviated
'
test_expect_success 'fsck with exhaustive accepted skipList input (various types of comments etc.)' '
@@ -226,10 +226,10 @@
test_must_fail git push --porcelain dst bogus &&
git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config receive.fsck.skipList config &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+ test_i18ngrep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
git push --porcelain dst bogus
@@ -255,10 +255,10 @@
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+ test_i18ngrep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
diff --git a/t/t5509-fetch-push-namespaces.sh b/t/t5509-fetch-push-namespaces.sh
index c88df78..75cbfcc 100755
--- a/t/t5509-fetch-push-namespaces.sh
+++ b/t/t5509-fetch-push-namespaces.sh
@@ -124,4 +124,32 @@
test_must_fail git -C original push pushee-namespaced master
'
+test_expect_success 'set up ambiguous HEAD' '
+ git init ambiguous &&
+ (
+ cd ambiguous &&
+ git commit --allow-empty -m foo &&
+ git update-ref refs/namespaces/ns/refs/heads/one HEAD &&
+ git update-ref refs/namespaces/ns/refs/heads/two HEAD &&
+ git symbolic-ref refs/namespaces/ns/HEAD \
+ refs/namespaces/ns/refs/heads/two
+ )
+'
+
+test_expect_success 'clone chooses correct HEAD (v0)' '
+ GIT_NAMESPACE=ns git -c protocol.version=0 \
+ clone ambiguous ambiguous-v0 &&
+ echo refs/heads/two >expect &&
+ git -C ambiguous-v0 symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'clone chooses correct HEAD (v2)' '
+ GIT_NAMESPACE=ns git -c protocol.version=2 \
+ clone ambiguous ambiguous-v2 &&
+ echo refs/heads/two >expect &&
+ git -C ambiguous-v2 symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 3b7b305..ecabbe1 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -570,6 +570,19 @@
)
'
+test_expect_success 'fetch.writeCommitGraph' '
+ git clone three write &&
+ (
+ cd three &&
+ test_commit new
+ ) &&
+ (
+ cd write &&
+ git -c fetch.writeCommitGraph fetch origin &&
+ test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
+ )
+'
+
# configured prune tests
set_config_tristate () {
@@ -902,6 +915,29 @@
test_cmp expect actual
'
+test_expect_success '--no-show-forced-updates' '
+ mkdir forced-updates &&
+ (
+ cd forced-updates &&
+ git init &&
+ test_commit 1 &&
+ test_commit 2
+ ) &&
+ git clone forced-updates forced-update-clone &&
+ git clone forced-updates no-forced-update-clone &&
+ git -C forced-updates reset --hard HEAD~1 &&
+ (
+ cd forced-update-clone &&
+ git fetch --show-forced-updates origin 2>output &&
+ test_i18ngrep "(forced update)" output
+ ) &&
+ (
+ cd no-forced-update-clone &&
+ git fetch --no-show-forced-updates origin 2>output &&
+ test_i18ngrep ! "(forced update)" output
+ )
+'
+
setup_negotiation_tip () {
SERVER="$1"
URL="$2"
@@ -978,6 +1014,7 @@
check_negotiation_tip
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index ced15ae..43e1d8d 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -223,7 +223,9 @@
$(git rev-parse refs/tags/mark1.10) refs/tags/mark1.10
$(git rev-parse refs/tags/mark1.2) refs/tags/mark1.2
EOF
- git ls-remote --symref >actual &&
+ # Protocol v2 supports sending symrefs for refs other than HEAD, so use
+ # protocol v0 here.
+ GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref >actual &&
test_cmp expect actual
'
@@ -232,7 +234,9 @@
ref: refs/heads/master HEAD
1bd44cb9d13204b0fe1958db0082f5028a16eb3a HEAD
EOF
- git ls-remote --symref . HEAD >actual &&
+ # Protocol v2 supports sending symrefs for refs other than HEAD, so use
+ # protocol v0 here.
+ GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . HEAD >actual &&
test_cmp expect actual
'
@@ -243,7 +247,9 @@
1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo
1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master
EOF
- git ls-remote --symref --heads . >actual &&
+ # Protocol v2 supports sending symrefs for refs other than HEAD, so use
+ # protocol v0 here.
+ GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
test_cmp expect actual
'
@@ -252,15 +258,16 @@
1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo
1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master
EOF
- git ls-remote --symref --heads . >actual &&
+ # Protocol v2 supports sending symrefs for refs other than HEAD, so use
+ # protocol v0 here.
+ GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
test_cmp expect actual &&
- git ls-remote --symref . "refs/heads/*" >actual &&
+ GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . "refs/heads/*" >actual &&
test_cmp expect actual
'
test_lazy_prereq GIT_DAEMON '
- test_tristate GIT_TEST_GIT_DAEMON &&
- test "$GIT_TEST_GIT_DAEMON" != false
+ git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
'
# This test spawns a daemon, so run it only if the user would be OK with
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh
index 0030c92..5426d4b 100755
--- a/t/t5514-fetch-multiple.sh
+++ b/t/t5514-fetch-multiple.sh
@@ -105,9 +105,12 @@
git remote rm origin &&
git remote add one ../one &&
git remote add two ../two &&
- git fetch --multiple one two &&
+ GIT_TRACE=1 git fetch --multiple one two 2>trace &&
git branch -r > output &&
- test_cmp ../expect output)
+ test_cmp ../expect output &&
+ grep "built-in: git gc" trace >gc &&
+ test_line_count = 1 gc
+ )
'
test_expect_success 'git fetch --multiple (bad remote names)' '
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 36b0dbc..961eb35 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -6,10 +6,11 @@
test_description='Merge logic in fetch'
-. ./test-lib.sh
+# NEEDSWORK: If the overspecification of the expected result is reduced, we
+# might be able to run this test in all protocol versions.
+GIT_TEST_PROTOCOL_VERSION=
-LF='
-'
+. ./test-lib.sh
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 37e8e80..c81ca36 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1147,8 +1147,12 @@
git prune &&
test_must_fail git cat-file -t $the_commit &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+
# fetching the hidden object should fail by default
- test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
test_i18ngrep "Server does not allow request for unadvertised object" err &&
test_must_fail git rev-parse --verify refs/heads/copy &&
@@ -1204,7 +1208,10 @@
mk_empty shallow &&
(
cd shallow &&
- test_must_fail git fetch --depth=1 ../testrepo/.git $SHA1 &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch --depth=1 ../testrepo/.git $SHA1 &&
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
git fetch --depth=1 ../testrepo/.git $SHA1 &&
git cat-file commit $SHA1
@@ -1232,15 +1239,21 @@
mk_empty shallow &&
(
cd shallow &&
- test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&
- test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch ../testrepo/.git $SHA1_3 &&
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch ../testrepo/.git $SHA1_1 &&
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
git fetch ../testrepo/.git $SHA1_1 &&
git cat-file commit $SHA1_1 &&
test_must_fail git cat-file commit $SHA1_2 &&
git fetch ../testrepo/.git $SHA1_2 &&
git cat-file commit $SHA1_2 &&
- test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch ../testrepo/.git $SHA1_3 2>err &&
+ test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err
)
'
done
@@ -1272,6 +1285,17 @@
test_cmp expect actual
'
+test_expect_success 'peeled advertisements are not considered ref tips' '
+ mk_empty testrepo &&
+ git -C testrepo commit --allow-empty -m one &&
+ git -C testrepo commit --allow-empty -m two &&
+ git -C testrepo tag -m foo mytag HEAD^ &&
+ oid=$(git -C testrepo rev-parse mytag^{commit}) &&
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git fetch testrepo $oid 2>err &&
+ test_i18ngrep "Server does not allow request for unadvertised object" err
+'
+
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
mk_test testrepo heads/master &&
rm -fr src dst &&
@@ -1370,7 +1394,7 @@
test_cmp expect actual
'
-test_expect_success 'push --follow-tag only pushes relevant tags' '
+test_expect_success 'push --follow-tags only pushes relevant tags' '
mk_test testrepo heads/master &&
rm -fr src dst &&
git init src &&
@@ -1384,7 +1408,7 @@
git tag -m "future" future &&
git checkout master &&
git for-each-ref refs/heads/master refs/tags/tag >../expect &&
- git push --follow-tag ../dst master
+ git push --follow-tags ../dst master
) &&
(
cd dst &&
diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index c05a661..e4edd56 100755
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -265,4 +265,14 @@
'
+test_expect_success 'push to mirrored repository with refspec fails' '
+ mk_repo_pair &&
+ (
+ cd master &&
+ echo one >foo && git add foo && git commit -m one &&
+ git config --add remote.up.mirror true &&
+ test_must_fail git push up master
+ )
+'
+
test_done
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index c19d8db..ccde8ba 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -77,6 +77,14 @@
test_must_be_empty out &&
test -s err)
'
+test_expect_success 'git pull --cleanup errors early on invalid argument' '
+ mkdir clonedcleanup &&
+ (cd clonedcleanup && git init &&
+ test_must_fail git pull --cleanup invalid "../parent" >out 2>err &&
+ test_must_be_empty out &&
+ test -s err)
+'
+
test_expect_success 'git pull --force' '
mkdir clonedoldstyle &&
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 4f6e32b..a1d3031 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -57,13 +57,25 @@
grep "bad tree object" output.err
'
-test_expect_success 'upload-pack error message when bad ref requested' '
+test_expect_success 'upload-pack fails due to bad want (no object)' '
printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
test_must_fail git upload-pack . <input >output 2>output.err &&
- grep -q "not our ref" output.err &&
- ! grep -q multi_ack_detailed output.err
+ grep "not our ref" output.err &&
+ grep "ERR" output &&
+ ! grep multi_ack_detailed output.err
+'
+
+test_expect_success 'upload-pack fails due to bad want (not tip)' '
+
+ oid=$(echo an object we have | git hash-object -w --stdin) &&
+ printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
+ "$oid" >input &&
+ test_must_fail git upload-pack . <input >output 2>output.err &&
+ grep "not our ref" output.err &&
+ grep "ERR" output &&
+ ! grep multi_ack_detailed output.err
'
test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index e2c37fd..4ad059e 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -363,7 +363,7 @@
) &&
git add b &&
git commit -m "added submodule" &&
- git push --recurse-submodule=check origin master
+ git push --recurse-submodules=check origin master
)
'
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 6caf628..97a6772 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -255,6 +255,7 @@
git -C client fsck
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh
index 5fbf67c..b4ad81f 100755
--- a/t/t5539-fetch-http-shallow.sh
+++ b/t/t5539-fetch-http-shallow.sh
@@ -67,7 +67,10 @@
cd clone &&
git checkout --orphan newnew &&
test_commit new-too &&
- GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" git fetch --depth=2 &&
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION= \
+ git fetch --depth=2 &&
grep "fetch-pack< ACK .* ready" ../trace &&
! grep "fetch-pack> done" ../trace
)
@@ -146,5 +149,4 @@
)
'
-stop_httpd
test_done
diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh
index 88ff5a4..a094fd5 100755
--- a/t/t5540-http-push-webdav.sh
+++ b/t/t5540-http-push-webdav.sh
@@ -176,6 +176,4 @@
test_cmp expect actual
'
-stop_httpd
-
test_done
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 5475afc..b86ddb6 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -47,7 +47,12 @@
cd "$ROOT_PATH" &&
git clone $HTTPD_URL/smart/test_repo.git/ test_repo_clone &&
- check_access_log exp
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ if test -z "$GIT_TEST_PROTOCOL_VERSION"
+ then
+ check_access_log exp
+ fi
'
test_expect_success 'clone remote repository' '
@@ -128,7 +133,12 @@
POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
EOF
test_expect_success 'used receive-pack service' '
- check_access_log exp
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ if test -z "$GIT_TEST_PROTOCOL_VERSION"
+ then
+ check_access_log exp
+ fi
'
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
@@ -167,6 +177,55 @@
test $HEAD = $(git rev-parse --verify HEAD))
'
+test_expect_success 'push --atomic also prevents branch creation, reports collateral' '
+ # Setup upstream repo - empty for now
+ d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
+ git init --bare "$d" &&
+ test_config -C "$d" http.receivepack true &&
+ up="$HTTPD_URL"/smart/atomic-branches.git &&
+
+ # Tell "$up" about two branches for now
+ test_commit atomic1 &&
+ test_commit atomic2 &&
+ git branch collateral &&
+ git push "$up" master collateral &&
+
+ # collateral is a valid push, but should be failed by atomic push
+ git checkout collateral &&
+ test_commit collateral1 &&
+
+ # Make master incompatible with upstream to provoke atomic
+ git checkout master &&
+ git reset --hard HEAD^ &&
+
+ # Add a new branch which should be failed by atomic push. This is a
+ # regression case.
+ git branch atomic &&
+
+ # --atomic should cause entire push to be rejected
+ test_must_fail git push --atomic "$up" master atomic collateral 2>output &&
+
+ # the new branch should not have been created upstream
+ test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
+
+ # upstream should still reflect atomic2, the last thing we pushed
+ # successfully
+ git rev-parse atomic2 >expected &&
+ # on master...
+ git -C "$d" rev-parse refs/heads/master >actual &&
+ test_cmp expected actual &&
+ # ...and collateral.
+ git -C "$d" rev-parse refs/heads/collateral >actual &&
+ test_cmp expected actual &&
+
+ # the failed refs should be indicated to the user
+ grep "^ ! .*rejected.* master -> master" output &&
+
+ # the collateral failure refs should be indicated to the user
+ grep "^ ! .*rejected.* atomic -> atomic .*atomic push failed" output &&
+ grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output
+'
+
test_expect_success 'push --all can push to empty repo' '
d=$HTTPD_DOCUMENT_ROOT_PATH/empty-all.git &&
git init --bare "$d" &&
@@ -203,7 +262,7 @@
cd "$ROOT_PATH"/test_repo_clone &&
test_commit noisy &&
test_terminal git push >output 2>&1 &&
- test_i18ngrep "^Writing objects" output
+ test_i18ngrep "Writing objects" output
'
test_expect_success TTY 'push --quiet silences status and progress' '
@@ -218,7 +277,7 @@
test_commit no-progress &&
test_terminal git push --no-progress >output 2>&1 &&
test_i18ngrep "^To http" output &&
- test_i18ngrep ! "^Writing objects" output
+ test_i18ngrep ! "Writing objects" output
'
test_expect_success 'push --progress shows progress to non-tty' '
@@ -226,7 +285,7 @@
test_commit progress &&
git push --progress >output 2>&1 &&
test_i18ngrep "^To http" output &&
- test_i18ngrep "^Writing objects" output
+ test_i18ngrep "Writing objects" output
'
test_expect_success 'http push gives sane defaults to reflog' '
@@ -373,5 +432,4 @@
test_i18ngrep ! "^hint: " decoded
'
-stop_httpd
test_done
diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh
index 5165833..ddc1db7 100755
--- a/t/t5542-push-http-shallow.sh
+++ b/t/t5542-push-http-shallow.sh
@@ -90,5 +90,4 @@
)
'
-stop_httpd
test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index b47a958..04b34c4 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -278,6 +278,7 @@
test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 6d7d88c..b811d89 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -408,5 +408,20 @@
test_i18ngrep "unable to access.*/redir-to/502" stderr
'
-stop_httpd
+test_expect_success 'fetching via http alternates works' '
+ parent=$HTTPD_DOCUMENT_ROOT_PATH/alt-parent.git &&
+ git init --bare "$parent" &&
+ git -C "$parent" --work-tree=. commit --allow-empty -m foo &&
+ git -C "$parent" update-server-info &&
+ commit=$(git -C "$parent" rev-parse HEAD) &&
+
+ child=$HTTPD_DOCUMENT_ROOT_PATH/alt-child.git &&
+ git init --bare "$child" &&
+ echo "../../alt-parent.git/objects" >"$child/objects/info/alternates" &&
+ git -C "$child" update-ref HEAD $commit &&
+ git -C "$child" update-server-info &&
+
+ git -c http.followredirects=true clone "$HTTPD_URL/dumb/alt-child.git"
+'
+
test_done
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 8630b0c..e38e543 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -43,7 +43,8 @@
< Cache-Control: no-cache, max-age=0, must-revalidate
< Content-Type: application/x-git-upload-pack-result
EOF
- GIT_TRACE_CURL=true git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
+ GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION= \
+ git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
test_cmp file clone/file &&
tr '\''\015'\'' Q <err |
sed -e "
@@ -80,12 +81,18 @@
/^< Content-Length: /d
/^< Transfer-Encoding: /d
" >actual &&
- sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \
- actual >actual.smudged &&
- test_cmp exp actual.smudged &&
- grep "Accept-Encoding:.*gzip" actual >actual.gzip &&
- test_line_count = 2 actual.gzip
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ if test -z "$GIT_TEST_PROTOCOL_VERSION"
+ then
+ sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \
+ actual >actual.smudged &&
+ test_cmp exp actual.smudged &&
+
+ grep "Accept-Encoding:.*gzip" actual >actual.gzip &&
+ test_line_count = 2 actual.gzip
+ fi
'
test_expect_success 'fetch changes via http' '
@@ -103,7 +110,13 @@
GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
POST /smart/repo.git/git-upload-pack HTTP/1.1 200
EOF
- check_access_log exp
+
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ if test -z "$GIT_TEST_PROTOCOL_VERSION"
+ then
+ check_access_log exp
+ fi
'
test_expect_success 'follow redirects (301)' '
@@ -151,7 +164,17 @@
test_expect_success 'no-op half-auth fetch does not require a password' '
set_askpass wrong &&
- git --git-dir=half-auth fetch &&
+
+ # NEEDSWORK: When using HTTP(S), protocol v0 supports a "half-auth"
+ # configuration with authentication required only when downloading
+ # objects and not refs, by having the HTTP server only require
+ # authentication for the "git-upload-pack" path and not "info/refs".
+ # This is not possible with protocol v2, since both objects and refs
+ # are obtained from the "git-upload-pack" path. A solution to this is
+ # to teach the server and client to be able to inline ls-refs requests
+ # as an Extra Parameter (see pack-protocol.txt), so that "info/refs"
+ # can serve refs, just like it does in protocol v0.
+ GIT_TEST_PROTOCOL_VERSION=0 git --git-dir=half-auth fetch &&
expect_askpass none
'
@@ -176,7 +199,7 @@
test_expect_success 'invalid Content-Type rejected' '
test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual &&
- grep "not valid:" actual
+ test_i18ngrep "not valid:" actual
'
test_expect_success 'create namespaced refs' '
@@ -215,8 +238,14 @@
git config http.cookiefile cookies.txt &&
git config http.savecookies true &&
git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
- tail -3 cookies.txt | sort >cookies_tail.txt &&
- test_cmp expect_cookies.txt cookies_tail.txt
+
+ # NEEDSWORK: If the overspecification of the expected result is reduced, we
+ # might be able to run this test in all protocol versions.
+ if test -z "$GIT_TEST_PROTOCOL_VERSION"
+ then
+ tail -3 cookies.txt | sort >cookies_tail.txt &&
+ test_cmp expect_cookies.txt cookies_tail.txt
+ fi
'
test_expect_success 'transfer.hiderefs works over smart-http' '
@@ -272,11 +301,10 @@
)
'
-test_expect_success 'large fetch-pack requests can be split across POSTs' '
+test_expect_success 'large fetch-pack requests can be sent using chunked encoding' '
GIT_TRACE_CURL=true git -c http.postbuffer=65536 \
clone --bare "$HTTPD_URL/smart/repo.git" split.git 2>err &&
- grep "^=> Send header: POST" err >posts &&
- test_line_count = 2 posts
+ grep "^=> Send header: Transfer-Encoding: chunked" err
'
test_expect_success 'test allowreachablesha1inwant' '
@@ -306,7 +334,10 @@
git init --bare test_reachable.git &&
git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
- test_must_fail git -C test_reachable.git fetch origin "$(git rev-parse HEAD)"
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)"
'
test_expect_success 'test allowanysha1inwant with unreachable' '
@@ -325,7 +356,10 @@
git init --bare test_reachable.git &&
git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
- test_must_fail git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" &&
git -C "$server" config uploadpack.allowanysha1inwant 1 &&
git -C test_reachable.git fetch origin "$(git rev-parse HEAD)"
@@ -429,5 +463,9 @@
! grep "=> Send data" err
'
-stop_httpd
+test_expect_success 'server-side error detected' '
+ test_must_fail git clone $HTTPD_URL/error_smart/repo.git 2>actual &&
+ test_i18ngrep "server-side error" actual
+'
+
test_done
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 30857b8..f70cbcc 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -60,29 +60,6 @@
have_not_sent c6 c4 c3
'
-test_expect_success 'unknown fetch.negotiationAlgorithm values error out' '
- rm -rf server client trace &&
- git init server &&
- test_commit -C server to_fetch &&
-
- git init client &&
- test_commit -C client on_client &&
- git -C client checkout on_client &&
-
- test_config -C client fetch.negotiationAlgorithm invalid &&
- test_must_fail git -C client fetch "$(pwd)/server" 2>err &&
- test_i18ngrep "unknown fetch negotiation algorithm" err &&
-
- # Explicit "default" value
- test_config -C client fetch.negotiationAlgorithm default &&
- git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" &&
-
- # Implementation detail: If there is nothing to fetch, we will not error out
- test_config -C client fetch.negotiationAlgorithm invalid &&
- git -C client fetch "$(pwd)/server" 2>err &&
- test_i18ngrep ! "unknown fetch negotiation algorithm" err
-'
-
test_expect_success 'when two skips collide, favor the larger one' '
rm -rf server client trace &&
git init server &&
@@ -127,7 +104,10 @@
# not need to send any ancestors of "c3", but we still need to send "c3"
# itself.
test_config -C client fetch.negotiationalgorithm skipping &&
- trace_fetch client origin to_fetch &&
+
+ # The ref advertisement itself is filtered when protocol v2 is used, so
+ # use v0.
+ GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch &&
have_sent c5 c4^ c2side &&
have_not_sent c4 c4^^ c4^^^
'
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
new file mode 100755
index 0000000..81975ad
--- /dev/null
+++ b/t/t5553-set-upstream.sh
@@ -0,0 +1,178 @@
+#!/bin/sh
+
+test_description='"git fetch/pull --set-upstream" basic tests.'
+. ./test-lib.sh
+
+check_config () {
+ printf "%s\n" "$2" "$3" >"expect.$1" &&
+ {
+ git config "branch.$1.remote" && git config "branch.$1.merge"
+ } >"actual.$1" &&
+ test_cmp "expect.$1" "actual.$1"
+}
+
+check_config_missing () {
+ test_expect_code 1 git config "branch.$1.remote" &&
+ test_expect_code 1 git config "branch.$1.merge"
+}
+
+clear_config () {
+ for branch in "$@"; do
+ test_might_fail git config --unset-all "branch.$branch.remote"
+ test_might_fail git config --unset-all "branch.$branch.merge"
+ done
+}
+
+ensure_fresh_upstream () {
+ rm -rf parent && git init --bare parent
+}
+
+test_expect_success 'setup bare parent fetch' '
+ ensure_fresh_upstream &&
+ git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other fetch' '
+ test_commit one &&
+ git push upstream master &&
+ git checkout -b other &&
+ test_commit two &&
+ git push upstream other
+'
+
+# tests for fetch --set-upstream
+
+test_expect_success 'fetch --set-upstream does not set upstream w/o branch' '
+ clear_config master other &&
+ git checkout master &&
+ git fetch --set-upstream upstream &&
+ check_config_missing master &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' '
+ clear_config master other &&
+ git fetch --set-upstream upstream master &&
+ check_config master upstream refs/heads/master &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream other sets branch other' '
+ clear_config master other &&
+ git fetch --set-upstream upstream other &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream master:other does not set the branch other2' '
+ clear_config other2 &&
+ git fetch --set-upstream upstream master:other2 &&
+ check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+ # master explicitly not cleared, we check that it is not touched from previous value
+ clear_config other other2 &&
+ test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
+ clear_config other other2 &&
+ url="file://'"$PWD"'" &&
+ git fetch --set-upstream "$url" &&
+ check_config master "$url" HEAD &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+# tests for pull --set-upstream
+
+test_expect_success 'setup bare parent pull' '
+ git remote rm upstream &&
+ ensure_fresh_upstream &&
+ git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other pull' '
+ test_commit three &&
+ git push --tags upstream master &&
+ test_commit four &&
+ git push upstream other
+'
+
+test_expect_success 'pull --set-upstream upstream master sets branch master but not other' '
+ clear_config master other &&
+ git pull --set-upstream upstream master &&
+ check_config master upstream refs/heads/master &&
+ check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' '
+ clear_config other2 &&
+ git pull --set-upstream upstream master:other2 &&
+ check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream upstream other sets branch master' '
+ clear_config master other &&
+ git pull --set-upstream upstream other &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream upstream tag does not set the tag' '
+ clear_config three &&
+ git pull --tags --set-upstream upstream three &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+ # master explicitly not cleared, we check that it is not touched from previous value
+ clear_config other other2 three &&
+ test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other &&
+ check_config_missing other2 &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
+ clear_config master other &&
+ git pull --set-upstream upstream HEAD &&
+ check_config master upstream HEAD &&
+ git checkout other &&
+ git pull --set-upstream upstream HEAD &&
+ check_config other upstream HEAD
+'
+
+test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' '
+ clear_config master three &&
+ git pull --set-upstream upstream master three &&
+ check_config_missing master &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
+ clear_config master other other2 &&
+ git checkout master &&
+ url="file://'"$PWD"'" &&
+ git pull --set-upstream "$url" &&
+ check_config master "$url" HEAD &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
+ clear_config master other other2 &&
+ git checkout master &&
+ url="file://'"$PWD"'" &&
+ git pull --set-upstream "$url" master &&
+ check_config master "$url" refs/heads/master &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_done
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh
index 1c49054..6eb0294 100755
--- a/t/t5561-http-backend.sh
+++ b/t/t5561-http-backend.sh
@@ -132,5 +132,4 @@
check_access_log exp
'
-stop_httpd
test_done
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index 90d890d..f0f425b 100755
--- a/t/t5562-http-backend-content-length.sh
+++ b/t/t5562-http-backend-content-length.sh
@@ -8,12 +8,12 @@
verify_http_result() {
# some fatal errors still produce status 200
# so check if there is the error message
- if grep 'fatal:' act.err
+ if grep 'fatal:' act.err.$test_count
then
return 1
fi
- if ! grep "Status" act.out >act
+ if ! grep "Status" act.out.$test_count >act
then
printf "Status: 200 OK\r\n" >act
fi
@@ -33,7 +33,7 @@
REQUEST_METHOD=POST \
"$PERL_PATH" \
"$TEST_DIRECTORY"/t5562/invoke-with-content-length.pl \
- "$request_body" git http-backend >act.out 2>act.err
+ "$request_body" git http-backend >act.out.$test_count 2>act.err.$test_count
}
ssize_b100dots() {
@@ -150,7 +150,7 @@
GIT_HTTP_EXPORT_ALL=TRUE \
REQUEST_METHOD=POST \
CONTENT_LENGTH="$NOT_FIT_IN_SSIZE" \
- git http-backend </dev/zero >/dev/null 2>err &&
+ git http-backend </dev/null >/dev/null 2>err &&
grep "fatal:.*CONTENT_LENGTH" err
'
@@ -161,7 +161,7 @@
GIT_HTTP_EXPORT_ALL=TRUE \
REQUEST_METHOD=GET \
CONTENT_LENGTH="" \
- git http-backend <empty_body >act.out 2>act.err &&
+ git http-backend <empty_body >act.out.$test_count 2>act.err.$test_count &&
verify_http_result "200 OK"
'
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 58ee787..34487bb 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -90,6 +90,7 @@
test_expect_success 'fetch notices corrupt idx' '
cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+ rm -f objects/pack/multi-pack-index &&
p=$(ls objects/pack/pack-*.idx) &&
chmod u+w $p &&
printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
@@ -198,5 +199,4 @@
test_cmp expect actual
'
-stop_git_daemon
test_done
diff --git a/t/t5580-clone-push-unc.sh b/t/t5580-clone-push-unc.sh
index 217adf3..b3c8a92 100755
--- a/t/t5580-clone-push-unc.sh
+++ b/t/t5580-clone-push-unc.sh
@@ -62,4 +62,16 @@
test_i18ngrep ! "unable to access" err
'
+test_expect_success 'unc alternates' '
+ tree="$(git rev-parse HEAD:)" &&
+ mkdir test-unc-alternate &&
+ (
+ cd test-unc-alternate &&
+ git init &&
+ test_must_fail git show $tree &&
+ echo "$UNCPATH/.git/objects" >.git/objects/info/alternates &&
+ git show $tree
+ )
+'
+
test_done
diff --git a/t/t5581-http-curl-verbose.sh b/t/t5581-http-curl-verbose.sh
index cd9283e..5129b07 100755
--- a/t/t5581-http-curl-verbose.sh
+++ b/t/t5581-http-curl-verbose.sh
@@ -23,6 +23,4 @@
grep "< HTTP/1.1 500 Intentional Breakage" curl_log
'
-stop_httpd
-
test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index d6948cb..ad8c411 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -345,7 +345,7 @@
}
test_expect_success 'clone myhost:src uses ssh' '
- git clone myhost:src ssh-clone &&
+ GIT_TEST_PROTOCOL_VERSION=0 git clone myhost:src ssh-clone &&
expect_ssh myhost src
'
@@ -356,12 +356,12 @@
'
test_expect_success 'bracketed hostnames are still ssh' '
- git clone "[myhost:123]:src" ssh-bracket-clone &&
+ GIT_TEST_PROTOCOL_VERSION=0 git clone "[myhost:123]:src" ssh-bracket-clone &&
expect_ssh "-p 123" myhost src
'
test_expect_success 'OpenSSH variant passes -4' '
- git clone -4 "[myhost:123]:src" ssh-ipv4-clone &&
+ GIT_TEST_PROTOCOL_VERSION=0 git clone -4 "[myhost:123]:src" ssh-ipv4-clone &&
expect_ssh "-4 -p 123" myhost src
'
@@ -405,7 +405,7 @@
test_when_finished "rm -f \"\$TRASH_DIRECTORY/uplink\"" &&
GIT_SSH="$TRASH_DIRECTORY/uplink" &&
test_when_finished "GIT_SSH=\"\$TRASH_DIRECTORY/ssh\$X\"" &&
- git clone "[myhost:123]:src" ssh-bracket-clone-sshlike-uplink &&
+ GIT_TEST_PROTOCOL_VERSION=0 git clone "[myhost:123]:src" ssh-bracket-clone-sshlike-uplink &&
expect_ssh "-p 123" myhost src
'
@@ -434,7 +434,6 @@
expect_ssh "-v -P 123" myhost src
'
-SQ="'"
test_expect_success 'single quoted plink.exe in GIT_SSH_COMMAND' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" &&
GIT_SSH_COMMAND="$SQ$TRASH_DIRECTORY/plink.exe$SQ -v" \
@@ -444,14 +443,14 @@
test_expect_success 'GIT_SSH_VARIANT overrides plink detection' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" &&
- GIT_SSH_VARIANT=ssh \
- git clone "[myhost:123]:src" ssh-bracket-clone-variant-1 &&
+ GIT_TEST_PROTOCOL_VERSION=0 GIT_SSH_VARIANT=ssh \
+ git clone "[myhost:123]:src" ssh-bracket-clone-variant-1 &&
expect_ssh "-p 123" myhost src
'
test_expect_success 'ssh.variant overrides plink detection' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" &&
- git -c ssh.variant=ssh \
+ GIT_TEST_PROTOCOL_VERSION=0 git -c ssh.variant=ssh \
clone "[myhost:123]:src" ssh-bracket-clone-variant-2 &&
expect_ssh "-p 123" myhost src
'
@@ -482,7 +481,7 @@
# $3 path
test_clone_url () {
counter=$(($counter + 1))
- test_might_fail git clone "$1" tmp$counter &&
+ test_might_fail env GIT_TEST_PROTOCOL_VERSION=0 git clone "$1" tmp$counter &&
shift &&
expect_ssh "$@"
}
@@ -611,10 +610,6 @@
git -C replay.git index-pack -v --stdin <tmp.pack
'
-hex2oct () {
- perl -ne 'printf "\\%03o", hex for /../g'
-}
-
test_expect_success 'clone on case-insensitive fs' '
git init icasefs &&
(
@@ -634,9 +629,8 @@
test_i18ngrep "the following paths have collided" icasefs/warning
'
-partial_clone () {
+partial_clone_server () {
SERVER="$1" &&
- URL="$2" &&
rm -rf "$SERVER" client &&
test_create_repo "$SERVER" &&
@@ -646,14 +640,21 @@
test_commit -C "$SERVER" two &&
HASH2=$(git hash-object "$SERVER/two.t") &&
test_config -C "$SERVER" uploadpack.allowfilter 1 &&
- test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 &&
+ test_config -C "$SERVER" uploadpack.allowanysha1inwant 1
+}
+partial_clone () {
+ SERVER="$1" &&
+ URL="$2" &&
+
+ partial_clone_server "${SERVER}" &&
git clone --filter=blob:limit=0 "$URL" client &&
git -C client fsck &&
# Ensure that unneeded blobs are not inadvertently fetched.
- test_config -C client extensions.partialclone "not a remote" &&
+ test_config -C client remote.origin.promisor "false" &&
+ git -C client config --unset remote.origin.partialclonefilter &&
test_must_fail git -C client cat-file -e "$HASH1" &&
# But this blob was fetched, because clone performs an initial checkout
@@ -664,6 +665,11 @@
partial_clone server "file://$(pwd)/server"
'
+test_expect_success 'partial clone with -o' '
+ partial_clone_server server &&
+ git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client
+'
+
test_expect_success 'partial clone: warn if server does not support object filtering' '
rm -rf server client &&
test_create_repo server &&
@@ -733,6 +739,7 @@
partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 4320082..4894237 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -221,4 +221,137 @@
( cd C && git fsck )
'
+test_expect_success 'setup repo with garbage in objects/*' '
+ git init S &&
+ (
+ cd S &&
+ test_commit A &&
+
+ cd .git/objects &&
+ >.some-hidden-file &&
+ >some-file &&
+ mkdir .some-hidden-dir &&
+ >.some-hidden-dir/some-file &&
+ >.some-hidden-dir/.some-dot-file &&
+ mkdir some-dir &&
+ >some-dir/some-file &&
+ >some-dir/.some-dot-file
+ )
+'
+
+test_expect_success 'clone a repo with garbage in objects/*' '
+ for option in --local --no-hardlinks --shared --dissociate
+ do
+ git clone $option S S$option || return 1 &&
+ git -C S$option fsck || return 1
+ done &&
+ find S-* -name "*some*" | sort >actual &&
+ cat >expected <<-EOF &&
+ S--dissociate/.git/objects/.some-hidden-dir
+ S--dissociate/.git/objects/.some-hidden-dir/.some-dot-file
+ S--dissociate/.git/objects/.some-hidden-dir/some-file
+ S--dissociate/.git/objects/.some-hidden-file
+ S--dissociate/.git/objects/some-dir
+ S--dissociate/.git/objects/some-dir/.some-dot-file
+ S--dissociate/.git/objects/some-dir/some-file
+ S--dissociate/.git/objects/some-file
+ S--local/.git/objects/.some-hidden-dir
+ S--local/.git/objects/.some-hidden-dir/.some-dot-file
+ S--local/.git/objects/.some-hidden-dir/some-file
+ S--local/.git/objects/.some-hidden-file
+ S--local/.git/objects/some-dir
+ S--local/.git/objects/some-dir/.some-dot-file
+ S--local/.git/objects/some-dir/some-file
+ S--local/.git/objects/some-file
+ S--no-hardlinks/.git/objects/.some-hidden-dir
+ S--no-hardlinks/.git/objects/.some-hidden-dir/.some-dot-file
+ S--no-hardlinks/.git/objects/.some-hidden-dir/some-file
+ S--no-hardlinks/.git/objects/.some-hidden-file
+ S--no-hardlinks/.git/objects/some-dir
+ S--no-hardlinks/.git/objects/some-dir/.some-dot-file
+ S--no-hardlinks/.git/objects/some-dir/some-file
+ S--no-hardlinks/.git/objects/some-file
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success SYMLINKS 'setup repo with manually symlinked or unknown files at objects/' '
+ git init T &&
+ (
+ cd T &&
+ git config gc.auto 0 &&
+ test_commit A &&
+ git gc &&
+ test_commit B &&
+
+ cd .git/objects &&
+ mv pack packs &&
+ ln -s packs pack &&
+ find ?? -type d >loose-dirs &&
+ last_loose=$(tail -n 1 loose-dirs) &&
+ mv $last_loose a-loose-dir &&
+ ln -s a-loose-dir $last_loose &&
+ first_loose=$(head -n 1 loose-dirs) &&
+ rm -f loose-dirs &&
+
+ cd $first_loose &&
+ obj=$(ls *) &&
+ mv $obj ../an-object &&
+ ln -s ../an-object $obj &&
+
+ cd ../ &&
+ find . -type f | sort >../../../T.objects-files.raw &&
+ find . -type l | sort >../../../T.objects-symlinks.raw &&
+ echo unknown_content >unknown_file
+ ) &&
+ git -C T fsck &&
+ git -C T rev-list --all --objects >T.objects
+'
+
+
+test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at objects/' '
+ for option in --local --no-hardlinks --shared --dissociate
+ do
+ git clone $option T T$option || return 1 &&
+ git -C T$option fsck || return 1 &&
+ git -C T$option rev-list --all --objects >T$option.objects &&
+ test_cmp T.objects T$option.objects &&
+ (
+ cd T$option/.git/objects &&
+ find . -type f | sort >../../../T$option.objects-files.raw &&
+ find . -type l | sort >../../../T$option.objects-symlinks.raw
+ )
+ done &&
+
+ for raw in $(ls T*.raw)
+ do
+ sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
+ -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1
+ done &&
+
+ cat >expected-files <<-EOF &&
+ ./Y/Z
+ ./Y/Z
+ ./a-loose-dir/Z
+ ./an-object
+ ./Y/Z
+ ./info/packs
+ ./pack/pack-Z.idx
+ ./pack/pack-Z.pack
+ ./packs/pack-Z.idx
+ ./packs/pack-Z.pack
+ ./unknown_file
+ EOF
+
+ for option in --local --no-hardlinks --dissociate
+ do
+ test_cmp expected-files T$option.objects-files.raw.de-sha || return 1 &&
+ test_must_be_empty T$option.objects-symlinks.raw.de-sha || return 1
+ done &&
+
+ echo ./info/alternates >expected-files &&
+ test_cmp expected-files T--shared.objects-files.raw &&
+ test_must_be_empty T--shared.objects-symlinks.raw
+'
+
test_done
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index cf39e9e..b7a3fdf 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -14,6 +14,12 @@
git tag -d third
'
+test_expect_success '"verify" needs a worktree' '
+ git bundle create tip.bundle -1 master &&
+ test_must_fail nongit git bundle verify ../tip.bundle 2>err &&
+ test_i18ngrep "need a repository" err
+'
+
test_expect_success 'annotated tags can be excluded by rev-list options' '
git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
git ls-remote bundle > output &&
@@ -77,4 +83,15 @@
test_path_is_missing fail.bundle.lock
'
+test_expect_success 'fetch SHA-1 from bundle' '
+ test_create_repo foo &&
+ test_commit -C foo x &&
+ git -C foo bundle create tip.bundle -1 master &&
+ git -C foo rev-parse HEAD >hash &&
+
+ # Exercise to ensure that fetching a SHA-1 from a bundle works with no
+ # errors
+ git fetch --no-tags foo/tip.bundle "$(cat hash)"
+'
+
test_done
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 9643acb..79f7b65 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -42,8 +42,8 @@
test_cmp expect_1.oids observed.oids &&
test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
- test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
- test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none"
+ test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
+ test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
'
# checkout master to force dynamic object fetch of blobs at HEAD.
@@ -208,6 +208,25 @@
test_cmp unique_types.expected unique_types.observed
'
+test_expect_success 'implicitly construct combine: filter with repeated flags' '
+ GIT_TRACE=$(pwd)/trace git clone --bare \
+ --filter=blob:none --filter=tree:1 \
+ "file://$(pwd)/srv.bare" pc2 &&
+ grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
+ trace &&
+ git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
+
+ # We should have gotten some root trees.
+ grep " $" objects &&
+ # Should not have gotten any non-root trees or blobs.
+ ! grep " ." objects &&
+
+ xargs -n 1 git -C pc2 cat-file -t <objects >types &&
+ sort -u types >unique_types.actual &&
+ test_write_lines commit tree >unique_types.expected &&
+ test_cmp unique_types.expected unique_types.actual
+'
+
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
rm -rf src dst &&
git init src &&
@@ -241,14 +260,64 @@
! grep "?$(cat blob)" missing_after
'
+test_expect_success 'setup src repo for sparse filter' '
+ git init sparse-src &&
+ git -C sparse-src config --local uploadpack.allowfilter 1 &&
+ git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
+ test_commit -C sparse-src one &&
+ test_commit -C sparse-src two &&
+ echo /one.t >sparse-src/only-one &&
+ git -C sparse-src add . &&
+ git -C sparse-src commit -m "add sparse checkout files"
+'
+
+test_expect_success 'partial clone with sparse filter succeeds' '
+ rm -rf dst.git &&
+ git clone --no-local --bare \
+ --filter=sparse:oid=master:only-one \
+ sparse-src dst.git &&
+ (
+ cd dst.git &&
+ git rev-list --objects --missing=print HEAD >out &&
+ grep "^$(git rev-parse HEAD:one.t)" out &&
+ grep "^?$(git rev-parse HEAD:two.t)" out
+ )
+'
+
+test_expect_success 'partial clone with unresolvable sparse filter fails cleanly' '
+ rm -rf dst.git &&
+ test_must_fail git clone --no-local --bare \
+ --filter=sparse:oid=master:no-such-name \
+ sparse-src dst.git 2>err &&
+ test_i18ngrep "unable to access sparse blob in .master:no-such-name" err &&
+ test_must_fail git clone --no-local --bare \
+ --filter=sparse:oid=master \
+ sparse-src dst.git 2>err &&
+ test_i18ngrep "unable to parse sparse filter data in" err
+'
+
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
-# Converts bytes into a form suitable for inclusion in a sed command. For
-# example, "printf 'ab\r\n' | hex_unpack" results in '\x61\x62\x0d\x0a'.
-sed_escape () {
- perl -e '$/ = undef; $input = <>; print unpack("H2" x length($input), $input)' |
- sed 's/\(..\)/\\x\1/g'
+# Converts bytes into their hexadecimal representation. For example,
+# "printf 'ab\r\n' | hex_unpack" results in '61620d0a'.
+hex_unpack () {
+ perl -e '$/ = undef; $input = <>; print unpack("H2" x length($input), $input)'
+}
+
+# Inserts $1 at the start of the string and every 2 characters thereafter.
+intersperse () {
+ sed 's/\(..\)/'$1'\1/g'
+}
+
+# Create a one-time-sed command to replace the existing packfile with $1.
+replace_packfile () {
+ # The protocol requires that the packfile be sent in sideband 1, hence
+ # the extra \x01 byte at the beginning.
+ printf "1,/packfile/!c %04x\\\\x01%s0000" \
+ "$(($(wc -c <$1) + 5))" \
+ "$(hex_unpack <$1 | intersperse '\\x')" \
+ >"$HTTPD_ROOT_PATH/one-time-sed"
}
test_expect_success 'upon cloning, check that all refs point to objects' '
@@ -270,10 +339,7 @@
# Replace the existing packfile with the crafted one. The protocol
# requires that the packfile be sent in sideband 1, hence the extra
# \x01 byte at the beginning.
- printf "1,/packfile/!c %04x\\\\x01%s0000" \
- "$(($(wc -c <incomplete.pack) + 5))" \
- "$(sed_escape <incomplete.pack)" \
- >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ replace_packfile incomplete.pack &&
# Use protocol v2 because the sed command looks for the "packfile"
# section header.
@@ -313,10 +379,7 @@
# Replace the existing packfile with the crafted one. The protocol
# requires that the packfile be sent in sideband 1, hence the extra
# \x01 byte at the beginning.
- printf "1,/packfile/!c %04x\\\\x01%s0000" \
- "$(($(wc -c <incomplete.pack) + 5))" \
- "$(sed_escape <incomplete.pack)" \
- >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ replace_packfile incomplete.pack &&
# Use protocol v2 because the sed command looks for the "packfile"
# section header.
@@ -331,6 +394,85 @@
! test -e "$HTTPD_ROOT_PATH/one-time-sed"
'
-stop_httpd
+test_expect_success 'tolerate server sending REF_DELTA against missing promisor objects' '
+ SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server" &&
+ rm -rf "$SERVER" repo &&
+ test_create_repo "$SERVER" &&
+ test_config -C "$SERVER" uploadpack.allowfilter 1 &&
+ test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 &&
+
+ # Create a commit with 2 blobs to be used as delta bases.
+ for i in $(test_seq 10)
+ do
+ echo "this is a line" >>"$SERVER/foo.txt" &&
+ echo "this is another line" >>"$SERVER/have.txt"
+ done &&
+ git -C "$SERVER" add foo.txt have.txt &&
+ git -C "$SERVER" commit -m bar &&
+ git -C "$SERVER" rev-parse HEAD:foo.txt >deltabase_missing &&
+ git -C "$SERVER" rev-parse HEAD:have.txt >deltabase_have &&
+
+ # Clone. The client has deltabase_have but not deltabase_missing.
+ git -c protocol.version=2 clone --no-checkout \
+ --filter=blob:none $HTTPD_URL/one_time_sed/server repo &&
+ git -C repo hash-object -w -- "$SERVER/have.txt" &&
+
+ # Sanity check to ensure that the client does not have
+ # deltabase_missing.
+ git -C repo rev-list --objects --ignore-missing \
+ -- $(cat deltabase_missing) >objlist &&
+ test_line_count = 0 objlist &&
+
+ # Another commit. This commit will be fetched by the client.
+ echo "abcdefghijklmnopqrstuvwxyz" >>"$SERVER/foo.txt" &&
+ echo "abcdefghijklmnopqrstuvwxyz" >>"$SERVER/have.txt" &&
+ git -C "$SERVER" add foo.txt have.txt &&
+ git -C "$SERVER" commit -m baz &&
+
+ # Pack a thin pack containing, among other things, HEAD:foo.txt
+ # delta-ed against HEAD^:foo.txt and HEAD:have.txt delta-ed against
+ # HEAD^:have.txt.
+ printf "%s\n--not\n%s\n" \
+ $(git -C "$SERVER" rev-parse HEAD) \
+ $(git -C "$SERVER" rev-parse HEAD^) |
+ git -C "$SERVER" pack-objects --thin --stdout >thin.pack &&
+
+ # Ensure that the pack contains one delta against HEAD^:foo.txt. Since
+ # the delta contains at least 26 novel characters, the size cannot be
+ # contained in 4 bits, so the object header will take up 2 bytes. The
+ # most significant nybble of the first byte is 0b1111 (0b1 to indicate
+ # that the header continues, and 0b111 to indicate REF_DELTA), followed
+ # by any 3 nybbles, then the OID of the delta base.
+ printf "f.,..%s" $(intersperse "," <deltabase_missing) >want &&
+ hex_unpack <thin.pack | intersperse "," >have &&
+ grep $(cat want) have &&
+
+ # Ensure that the pack contains one delta against HEAD^:have.txt,
+ # similar to the above.
+ printf "f.,..%s" $(intersperse "," <deltabase_have) >want &&
+ hex_unpack <thin.pack | intersperse "," >have &&
+ grep $(cat want) have &&
+
+ replace_packfile thin.pack &&
+
+ # Use protocol v2 because the sed command looks for the "packfile"
+ # section header.
+ test_config -C "$SERVER" protocol.version 2 &&
+
+ # Fetch the thin pack and ensure that index-pack is able to handle the
+ # REF_DELTA object with a missing promisor delta base.
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C repo -c protocol.version=2 fetch &&
+
+ # Ensure that the missing delta base was directly fetched, but not the
+ # one that the client has.
+ grep "want $(cat deltabase_missing)" trace &&
+ ! grep "want $(cat deltabase_have)" trace &&
+
+ # Ensure that the one-time-sed script was used.
+ ! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+'
+
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh
new file mode 100755
index 0000000..37fcce9
--- /dev/null
+++ b/t/t5617-clone-submodules-remote.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+test_description='Test cloning repos with submodules using remote-tracking branches'
+
+. ./test-lib.sh
+
+pwd=$(pwd)
+
+test_expect_success 'setup' '
+ git checkout -b master &&
+ test_commit commit1 &&
+ mkdir sub &&
+ (
+ cd sub &&
+ git init &&
+ test_commit subcommit1 &&
+ git tag sub_when_added_to_super
+ ) &&
+ git submodule add "file://$pwd/sub" sub &&
+ git commit -m "add submodule" &&
+ (
+ cd sub &&
+ test_commit subcommit2
+ )
+'
+
+test_expect_success 'clone with --no-remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code sub_when_added_to_super
+ )
+'
+
+test_expect_success 'clone with --remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code remotes/origin/master
+ )
+'
+
+test_expect_success 'check the default is --no-remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code sub_when_added_to_super
+ )
+'
+
+test_done
diff --git a/t/t5618-alternate-refs.sh b/t/t5618-alternate-refs.sh
new file mode 100755
index 0000000..3353216
--- /dev/null
+++ b/t/t5618-alternate-refs.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+test_description='test handling of --alternate-refs traversal'
+. ./test-lib.sh
+
+# Avoid test_commit because we want a specific and known set of refs:
+#
+# base -- one
+# \ \
+# two -- merged
+#
+# where "one" and "two" are on separate refs, and "merged" is available only in
+# the dependent child repository.
+test_expect_success 'set up local refs' '
+ git checkout -b one &&
+ test_tick &&
+ git commit --allow-empty -m base &&
+ test_tick &&
+ git commit --allow-empty -m one &&
+ git checkout -b two HEAD^ &&
+ test_tick &&
+ git commit --allow-empty -m two
+'
+
+# We'll enter the child repository after it's set up since that's where
+# all of the subsequent tests will want to run (and it's easy to forget a
+# "-C child" and get nonsense results).
+test_expect_success 'set up shared clone' '
+ git clone -s . child &&
+ cd child &&
+ git merge origin/one
+'
+
+test_expect_success 'rev-list --alternate-refs' '
+ git rev-list --remotes=origin >expect &&
+ git rev-list --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rev-list --not --alternate-refs' '
+ git rev-parse HEAD >expect &&
+ git rev-list HEAD --not --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'limiting with alternateRefsPrefixes' '
+ test_config core.alternateRefsPrefixes refs/heads/one &&
+ git rev-list origin/one >expect &&
+ git rev-list --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --source shows .alternate marker' '
+ git log --oneline --source --remotes=origin >expect.orig &&
+ sed "s/origin.* /.alternate /" <expect.orig >expect &&
+ git log --oneline --source --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index ba86a44..2571eb9 100755
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -4,6 +4,9 @@
TEST_NO_CREATE_REPO=1
+# This is a protocol-specific test.
+GIT_TEST_PROTOCOL_VERSION=
+
. ./test-lib.sh
# Test protocol v1 with 'git://' transport
@@ -289,6 +292,7 @@
grep "git< version 1" log
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index fe45bf8..ffb9613 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='test git-serve and server commands'
+test_description='test protocol v2 server commands'
. ./test-lib.sh
@@ -14,7 +14,8 @@
0000
EOF
- GIT_TEST_SIDEBAND_ALL=0 git serve --advertise-capabilities >out &&
+ GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+ --advertise-capabilities >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -24,11 +25,11 @@
test-tool pkt-line pack >in <<-EOF &&
0000
EOF
- git serve --stateless-rpc >out <in &&
+ test-tool serve-v2 --stateless-rpc >out <in &&
test_must_be_empty out &&
# EOF
- git serve --stateless-rpc >out &&
+ test-tool serve-v2 --stateless-rpc >out &&
test_must_be_empty out
'
@@ -37,7 +38,7 @@
foobar
0000
EOF
- test_must_fail git serve --stateless-rpc 2>err <in &&
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
test_i18ngrep "unknown capability" err
'
@@ -46,7 +47,7 @@
agent=git/test
0000
EOF
- test_must_fail git serve --stateless-rpc 2>err <in &&
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
test_i18ngrep "no command requested" err
'
@@ -56,7 +57,7 @@
agent=git/test
0000
EOF
- test_must_fail git serve --stateless-rpc 2>err <in &&
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
test_i18ngrep "invalid command" err
'
@@ -87,7 +88,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -107,7 +108,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -127,7 +128,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -148,7 +149,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -169,7 +170,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -189,7 +190,7 @@
0000
EOF
- git serve --stateless-rpc <in >out &&
+ test-tool serve-v2 --stateless-rpc <in >out &&
test-tool pkt-line unpack <out >actual &&
test_cmp expect actual
'
@@ -204,7 +205,10 @@
0000
EOF
- test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err &&
+ (
+ cd server &&
+ test_must_fail test-tool serve-v2 --stateless-rpc
+ ) <in >/dev/null 2>err &&
grep "unexpected line: .this-is-not-a-command." err
'
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index db4ae09..ae9175c 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -182,6 +182,13 @@
grep "server-option=world" log
'
+test_expect_success 'warn if using server-option with ls-remote with legacy protocol' '
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
+ ls-remote -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+
+ test_i18ngrep "see protocol.version in" err &&
+ test_i18ngrep "server options require protocol version 2 or later" err
+'
test_expect_success 'clone with file:// using protocol v2' '
test_when_finished "rm -f log" &&
@@ -251,6 +258,40 @@
grep "server-option=world" log
'
+test_expect_success 'warn if using server-option with fetch with legacy protocol' '
+ test_when_finished "rm -rf temp_child" &&
+
+ git init temp_child &&
+
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
+ fetch -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+
+ test_i18ngrep "see protocol.version in" err &&
+ test_i18ngrep "server options require protocol version 2 or later" err
+'
+
+test_expect_success 'server-options are sent when cloning' '
+ test_when_finished "rm -rf log myclone" &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+ clone --server-option=hello --server-option=world \
+ "file://$(pwd)/file_parent" myclone &&
+
+ grep "server-option=hello" log &&
+ grep "server-option=world" log
+'
+
+test_expect_success 'warn if using server-option with clone with legacy protocol' '
+ test_when_finished "rm -rf myclone" &&
+
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
+ clone --server-option=hello --server-option=world \
+ "file://$(pwd)/file_parent" myclone 2>err &&
+
+ test_i18ngrep "see protocol.version in" err &&
+ test_i18ngrep "server options require protocol version 2 or later" err
+'
+
test_expect_success 'upload-pack respects config using protocol v2' '
git init server &&
write_script server/.git/hook <<-\EOF &&
@@ -359,12 +400,13 @@
0000
EOF
- test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err &&
+ test_must_fail test-tool -C server serve-v2 --stateless-rpc \
+ <in >/dev/null 2>err &&
grep "unexpected line: .filter blob:none." err &&
# Exercise to ensure that if advertised, filter works
git -C server config uploadpack.allowfilter 1 &&
- git -C server serve --stateless-rpc <in >/dev/null
+ test-tool -C server serve-v2 --stateless-rpc <in >/dev/null
'
test_expect_success 'default refspec is used to filter ref when fetchcing' '
@@ -457,10 +499,7 @@
# Add extra commits to the client so that the whole fetch takes more
# than 1 request (due to negotiation)
- for i in $(test_seq 1 32)
- do
- test_commit -C client c$i
- done &&
+ test_commit_bulk -C client --id=c 32 &&
git -C server checkout -b newbranch base &&
test_commit -C server client_wants &&
@@ -542,7 +581,38 @@
# Client requested to use protocol v2
grep "Git-Protocol: version=2" log &&
# Server responded using protocol v2
- grep "git< version 2" log
+ grep "git< version 2" log &&
+ # Verify that the chunked encoding sending codepath is NOT exercised
+ ! grep "Send header: Transfer-Encoding: chunked" log
+'
+
+test_expect_success 'clone big repository with http:// using protocol v2' '
+ test_when_finished "rm -f log" &&
+
+ git init "$HTTPD_DOCUMENT_ROOT_PATH/big" &&
+ # Ensure that the list of wants is greater than http.postbuffer below
+ for i in $(test_seq 1 1500)
+ do
+ # do not use here-doc, because it requires a process
+ # per loop iteration
+ echo "commit refs/heads/too-many-refs-$i" &&
+ echo "committer git <git@example.com> $i +0000" &&
+ echo "data 0" &&
+ echo "M 644 inline bla.txt" &&
+ echo "data 4" &&
+ echo "bla"
+ done | git -C "$HTTPD_DOCUMENT_ROOT_PATH/big" fast-import &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git \
+ -c protocol.version=2 -c http.postbuffer=65536 \
+ clone "$HTTPD_URL/smart/big" big_child &&
+
+ # Client requested to use protocol v2
+ grep "Git-Protocol: version=2" log &&
+ # Server responded using protocol v2
+ grep "git< version 2" log &&
+ # Verify that the chunked encoding sending codepath is exercised
+ grep "Send header: Transfer-Encoding: chunked" log
'
test_expect_success 'fetch with http:// using protocol v2' '
@@ -561,6 +631,19 @@
grep "git< version 2" log
'
+test_expect_success 'fetch with http:// by hash without tag following with protocol v2 does not list refs' '
+ test_when_finished "rm -f log" &&
+
+ test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two_a &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" rev-parse two_a >two_a_hash &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
+ fetch --no-tags origin $(cat two_a_hash) &&
+
+ grep "fetch< version 2" log &&
+ ! grep "fetch> command=ls-refs" log
+'
+
test_expect_success 'fetch from namespaced repo respects namespaces' '
test_when_finished "rm -f log" &&
@@ -638,10 +721,7 @@
# Create many commits to extend the negotiation phase across multiple
# requests, so that the server does not send "ready" in the first
# request.
- for i in $(test_seq 1 32)
- do
- test_commit -C http_child c$i
- done &&
+ test_commit_bulk -C http_child --id=c 32 &&
# After the acknowledgments section, pretend that a DELIM
# (0001) was sent instead of a FLUSH (0000).
@@ -656,6 +736,7 @@
test_i18ngrep "expected no other sections to be sent after no .ready." err
'
-stop_httpd
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
test_done
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index f87b2f6..3a2c143 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -48,15 +48,15 @@
'
test_expect_success 'config controls ref-in-want advertisement' '
- git serve --advertise-capabilities >out &&
+ test-tool serve-v2 --advertise-capabilities >out &&
! grep -a ref-in-want out &&
git config uploadpack.allowRefInWant false &&
- git serve --advertise-capabilities >out &&
+ test-tool serve-v2 --advertise-capabilities >out &&
! grep -a ref-in-want out &&
git config uploadpack.allowRefInWant true &&
- git serve --advertise-capabilities >out &&
+ test-tool serve-v2 --advertise-capabilities >out &&
grep -a ref-in-want out
'
@@ -70,7 +70,7 @@
0000
EOF
- test_must_fail git serve --stateless-rpc 2>out <in &&
+ test_must_fail test-tool serve-v2 --stateless-rpc 2>out <in &&
grep "unknown ref" out
'
@@ -90,7 +90,7 @@
0000
EOF
- git serve --stateless-rpc >out <in &&
+ test-tool serve-v2 --stateless-rpc >out <in &&
check_output
'
@@ -112,7 +112,7 @@
0000
EOF
- git serve --stateless-rpc >out <in &&
+ test-tool serve-v2 --stateless-rpc >out <in &&
check_output
'
@@ -133,7 +133,7 @@
0000
EOF
- git serve --stateless-rpc >out <in &&
+ test-tool serve-v2 --stateless-rpc >out <in &&
check_output
'
@@ -153,112 +153,10 @@
0000
EOF
- git serve --stateless-rpc >out <in &&
+ test-tool serve-v2 --stateless-rpc >out <in &&
check_output
'
-. "$TEST_DIRECTORY"/lib-httpd.sh
-start_httpd
-
-REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
-LOCAL_PRISTINE="$(pwd)/local_pristine"
-
-test_expect_success 'setup repos for change-while-negotiating test' '
- (
- git init "$REPO" &&
- cd "$REPO" &&
- >.git/git-daemon-export-ok &&
- test_commit m1 &&
- git tag -d m1 &&
-
- # Local repo with many commits (so that negotiation will take
- # more than 1 request/response pair)
- git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
- cd "$LOCAL_PRISTINE" &&
- git checkout -b side &&
- for i in $(test_seq 1 33); do test_commit s$i; done &&
-
- # Add novel commits to upstream
- git checkout master &&
- cd "$REPO" &&
- test_commit m2 &&
- test_commit m3 &&
- git tag -d m2 m3
- ) &&
- git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
- git -C "$LOCAL_PRISTINE" config protocol.version 2
-'
-
-inconsistency () {
- # Simulate that the server initially reports $2 as the ref
- # corresponding to $1, and after that, $1 as the ref corresponding to
- # $1. This corresponds to the real-life situation where the server's
- # repository appears to change during negotiation, for example, when
- # different servers in a load-balancing arrangement serve (stateless)
- # RPCs during a single negotiation.
- printf "s/%s/%s/" \
- $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
- $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
- >"$HTTPD_ROOT_PATH/one-time-sed"
-}
-
-test_expect_success 'server is initially ahead - no ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant false &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master 1234567890123456789012345678901234567890 &&
- test_must_fail git -C local fetch 2>err &&
- test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
-'
-
-test_expect_success 'server is initially ahead - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master 1234567890123456789012345678901234567890 &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify master >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - no ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant false &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify "master^" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify "master" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server loses a ref - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
- test_must_fail git -C local fetch 2>err &&
-
- test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
-'
-
-stop_httpd
-
REPO="$(pwd)/repo"
LOCAL_PRISTINE="$(pwd)/local_pristine"
@@ -289,7 +187,7 @@
git clone "file://$REPO" "$LOCAL_PRISTINE" &&
cd "$LOCAL_PRISTINE" &&
git checkout -b side &&
- for i in $(test_seq 1 33); do test_commit s$i; done &&
+ test_commit_bulk --id=s 33 &&
# Add novel commits to upstream
git checkout master &&
@@ -374,4 +272,108 @@
grep "want-ref refs/heads/o/bar" log
'
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
+LOCAL_PRISTINE="$(pwd)/local_pristine"
+
+test_expect_success 'setup repos for change-while-negotiating test' '
+ (
+ git init "$REPO" &&
+ cd "$REPO" &&
+ >.git/git-daemon-export-ok &&
+ test_commit m1 &&
+ git tag -d m1 &&
+
+ # Local repo with many commits (so that negotiation will take
+ # more than 1 request/response pair)
+ rm -rf "$LOCAL_PRISTINE" &&
+ git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
+ cd "$LOCAL_PRISTINE" &&
+ git checkout -b side &&
+ test_commit_bulk --id=s 33 &&
+
+ # Add novel commits to upstream
+ git checkout master &&
+ cd "$REPO" &&
+ test_commit m2 &&
+ test_commit m3 &&
+ git tag -d m2 m3
+ ) &&
+ git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
+ git -C "$LOCAL_PRISTINE" config protocol.version 2
+'
+
+inconsistency () {
+ # Simulate that the server initially reports $2 as the ref
+ # corresponding to $1, and after that, $1 as the ref corresponding to
+ # $1. This corresponds to the real-life situation where the server's
+ # repository appears to change during negotiation, for example, when
+ # different servers in a load-balancing arrangement serve (stateless)
+ # RPCs during a single negotiation.
+ printf "s/%s/%s/" \
+ $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
+ $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
+ >"$HTTPD_ROOT_PATH/one-time-sed"
+}
+
+test_expect_success 'server is initially ahead - no ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant false &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master 1234567890123456789012345678901234567890 &&
+ test_must_fail git -C local fetch 2>err &&
+ test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
+'
+
+test_expect_success 'server is initially ahead - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master 1234567890123456789012345678901234567890 &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify master >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - no ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant false &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master "master^" &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify "master^" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master "master^" &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify "master" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server loses a ref - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ test_must_fail git -C local fetch 2>err &&
+
+ test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
+'
+
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index aaaa722..2d6c4a2 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -8,6 +8,8 @@
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
+PATH="$TEST_DIRECTORY/t5801:$PATH"
+
compare_refs() {
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
@@ -124,7 +126,7 @@
'
test_expect_success 'cloning without refspec' '
- GIT_REMOTE_TESTGIT_REFSPEC="" \
+ GIT_REMOTE_TESTGIT_NOREFSPEC=1 \
git clone "testgit::${PWD}/server" local2 2>error &&
test_i18ngrep "this remote helper should implement refspec capability" error &&
compare_refs local2 HEAD server HEAD
@@ -133,7 +135,7 @@
test_expect_success 'pulling without refspecs' '
(cd local2 &&
git reset --hard &&
- GIT_REMOTE_TESTGIT_REFSPEC="" git pull 2>../error) &&
+ GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&
test_i18ngrep "this remote helper should implement refspec capability" error &&
compare_refs local2 HEAD server HEAD
'
@@ -143,8 +145,8 @@
(cd local2 &&
echo content >>file &&
git commit -a -m ten &&
- GIT_REMOTE_TESTGIT_REFSPEC="" &&
- export GIT_REMOTE_TESTGIT_REFSPEC &&
+ GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
+ export GIT_REMOTE_TESTGIT_NOREFSPEC &&
test_must_fail git push 2>../error) &&
test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
'
@@ -301,4 +303,14 @@
compare_refs server HEAD local FETCH_HEAD
'
+test_expect_success 'fetch tag' '
+ (cd server &&
+ git tag v1.0
+ ) &&
+ (cd local &&
+ git fetch
+ ) &&
+ compare_refs local v1.0 server v1.0
+'
+
test_done
diff --git a/git-remote-testgit.sh b/t/t5801/git-remote-testgit
similarity index 84%
rename from git-remote-testgit.sh
rename to t/t5801/git-remote-testgit
index 752c763..6b9f0b5 100755
--- a/git-remote-testgit.sh
+++ b/t/t5801/git-remote-testgit
@@ -11,13 +11,15 @@
url=$2
dir="$GIT_DIR/testgit/$alias"
-prefix="refs/testgit/$alias"
-default_refspec="refs/heads/*:${prefix}/heads/*"
+h_refspec="refs/heads/*:refs/testgit/$alias/heads/*"
+t_refspec="refs/tags/*:refs/testgit/$alias/tags/*"
-refspec="${GIT_REMOTE_TESTGIT_REFSPEC-$default_refspec}"
-
-test -z "$refspec" && prefix="refs"
+if test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC"
+then
+ h_refspec=""
+ t_refspec=""
+fi
GIT_DIR="$url/.git"
export GIT_DIR
@@ -40,7 +42,8 @@
capabilities)
echo 'import'
echo 'export'
- test -n "$refspec" && echo "refspec $refspec"
+ test -n "$h_refspec" && echo "refspec $h_refspec"
+ test -n "$t_refspec" && echo "refspec $t_refspec"
if test -n "$gitmarks"
then
echo "*import-marks $gitmarks"
@@ -52,7 +55,7 @@
echo
;;
list)
- git for-each-ref --format='? %(refname)' 'refs/heads/'
+ git for-each-ref --format='? %(refname)' 'refs/heads/' 'refs/tags/'
head=$(git symbolic-ref HEAD)
echo "@$head HEAD"
echo
@@ -81,10 +84,11 @@
echo "feature done"
git fast-export \
+ ${h_refspec:+"--refspec=$h_refspec"} \
+ ${t_refspec:+"--refspec=$t_refspec"} \
${testgitmarks:+"--import-marks=$testgitmarks"} \
${testgitmarks:+"--export-marks=$testgitmarks"} \
- $refs |
- sed -e "s#refs/heads/#${prefix}/heads/#g"
+ $refs
echo "done"
;;
export)
diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
index 872788a..af8772f 100755
--- a/t/t5812-proto-disable-http.sh
+++ b/t/t5812-proto-disable-http.sh
@@ -34,5 +34,4 @@
clone "$HTTPD_URL/smart-redir-perm/repo.git" redir.git
'
-stop_httpd
test_done
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 0507999..b8cf823 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -48,6 +48,26 @@
! grep one output
'
+test_expect_success 'rev-list --objects --no-object-names has no space/names' '
+ git rev-list --objects --no-object-names HEAD >output &&
+ ! grep wanted_file output &&
+ ! grep unwanted_file output &&
+ ! grep " " output
+'
+
+test_expect_success 'rev-list --objects --no-object-names works with cat-file' '
+ git rev-list --objects --no-object-names --all >list-output &&
+ git cat-file --batch-check <list-output >cat-output &&
+ ! grep missing cat-output
+'
+
+test_expect_success '--no-object-names and --object-names are last-one-wins' '
+ git rev-list --objects --no-object-names --object-names --all >output &&
+ grep wanted_file output &&
+ git rev-list --objects --object-names --no-object-names --all >output &&
+ ! grep wanted_file output
+'
+
test_expect_success 'rev-list A..B and rev-list ^A B are the same' '
git commit --allow-empty -m another &&
git tag -a -m "annotated" v1.0 &&
@@ -120,4 +140,12 @@
test_cmp expect actual
'
+test_expect_success 'rev-list --end-of-options' '
+ git update-ref refs/heads/--output=yikes HEAD &&
+ git rev-list --end-of-options --output=yikes >actual &&
+ test_path_is_missing yikes &&
+ git rev-list HEAD >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index da113d9..cfb74d0 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -501,9 +501,8 @@
'
test_expect_success 'oneline with empty message' '
- git commit -m "dummy" --allow-empty &&
- git commit -m "dummy" --allow-empty &&
- git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
+ git commit --allow-empty --cleanup=verbatim -m "$LF" &&
+ git commit --allow-empty --allow-empty-message &&
git rev-list --oneline HEAD >test.txt &&
test_line_count = 5 test.txt &&
git rev-list --oneline --graph HEAD >testg.txt &&
diff --git a/t/t6011-rev-list-with-bad-commit.sh b/t/t6011-rev-list-with-bad-commit.sh
index 545b461..bad02cf 100755
--- a/t/t6011-rev-list-with-bad-commit.sh
+++ b/t/t6011-rev-list-with-bad-commit.sh
@@ -42,7 +42,7 @@
'
test_expect_success 'rev-list should fail' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all > /dev/null
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
'
test_expect_success 'git repack _MUST_ fail' \
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 55835ee..bdc42e9 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -615,6 +615,7 @@
git add missing/MISSING &&
git commit -m "6(broken): Added file that will be deleted" &&
git tag BROKEN_HASH6 &&
+ deleted=$(git rev-parse --verify HEAD:missing) &&
add_line_into_file "7(broken): second line on a broken branch" hello2 &&
git tag BROKEN_HASH7 &&
add_line_into_file "8(broken): third line on a broken branch" hello2 &&
@@ -622,12 +623,12 @@
git rm missing/MISSING &&
git commit -m "9(broken): Remove missing file" &&
git tag BROKEN_HASH9 &&
- rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d
+ rm .git/objects/$(test_oid_to_path $deleted)
'
echo "" > expected.ok
cat > expected.missing-tree.default <<EOF
-fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
+fatal: unable to read tree $deleted
EOF
test_expect_success 'bisect fails if tree is broken on start commit' '
@@ -681,7 +682,7 @@
check_same BROKEN_HASH6 BISECT_HEAD &&
git bisect bad BISECT_HEAD &&
check_same BROKEN_HASH5 BISECT_HEAD &&
- git bisect good BISECT_HEAD &&
+ test_must_fail git bisect good BISECT_HEAD &&
check_same BROKEN_HASH6 bisect/bad &&
git bisect reset
'
@@ -692,7 +693,7 @@
check_same BROKEN_HASH6 BISECT_HEAD &&
git bisect good BISECT_HEAD &&
check_same BROKEN_HASH8 BISECT_HEAD &&
- git bisect good BISECT_HEAD &&
+ test_must_fail git bisect good BISECT_HEAD &&
check_same BROKEN_HASH9 bisect/bad &&
git bisect reset
'
@@ -701,7 +702,7 @@
git bisect reset &&
git checkout broken &&
git bisect start broken master --no-checkout &&
- git bisect run \"\$SHELL_PATH\" -c '
+ test_must_fail git bisect run \"\$SHELL_PATH\" -c '
GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
git pack-objects --stdout >/dev/null < tmp.\$\$
@@ -713,12 +714,12 @@
"
cat > expected.bisect-log <<EOF
-# bad: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# good: [7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-git bisect start '32a594a3fdac2d57cf6d02987e30eec68511498c' '7b7f204a749c3125d5224ed61ea2ae1187ad046f'
-# good: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-git bisect good 3de952f2416b6084f557ec417709eac740c6818c
-# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
+# good: [$HASH2] Add <2: A new day for git> into <hello>.
+git bisect start '$HASH4' '$HASH2'
+# good: [$HASH3] Add <3: Another new day for git> into <hello>.
+git bisect good $HASH3
+# first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
EOF
test_expect_success 'bisect log: successful result' '
@@ -731,14 +732,14 @@
'
cat > expected.bisect-skip-log <<EOF
-# bad: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# good: [7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-git bisect start '32a594a3fdac2d57cf6d02987e30eec68511498c' '7b7f204a749c3125d5224ed61ea2ae1187ad046f'
-# skip: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-git bisect skip 3de952f2416b6084f557ec417709eac740c6818c
+# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
+# good: [$HASH2] Add <2: A new day for git> into <hello>.
+git bisect start '$HASH4' '$HASH2'
+# skip: [$HASH3] Add <3: Another new day for git> into <hello>.
+git bisect skip $HASH3
# only skipped commits left to test
-# possible first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# possible first bad commit: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+# possible first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
+# possible first bad commit: [$HASH3] Add <3: Another new day for git> into <hello>.
EOF
test_expect_success 'bisect log: only skip commits left' '
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 716283b..ad1922b 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -38,7 +38,7 @@
advance h
'
-script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
+t6040_script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
cat >expect <<\EOF
b1 [ahead 1, behind 1] d
b2 [ahead 1, behind 1] d
@@ -53,7 +53,7 @@
cd test &&
git branch -v
) |
- sed -n -e "$script" >actual &&
+ sed -n -e "$t6040_script" >actual &&
test_i18ncmp expect actual
'
@@ -71,7 +71,7 @@
cd test &&
git branch -vv
) |
- sed -n -e "$script" >actual &&
+ sed -n -e "$t6040_script" >actual &&
test_i18ncmp expect actual
'
@@ -160,6 +160,19 @@
'
cat >expect <<\EOF
+## b1...origin/master [different]
+EOF
+
+test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstream)' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=false status -s -b | head -1
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
+cat >expect <<\EOF
On branch b1
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
@@ -174,6 +187,15 @@
test_i18ncmp expect actual
'
+test_expect_success 'status --long --branch' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=true status --long -b | head -3
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
cat >expect <<\EOF
On branch b1
Your branch and 'origin/master' refer to different commits.
@@ -188,6 +210,15 @@
test_i18ncmp expect actual
'
+test_expect_success 'status.aheadbehind=false status --long --branch' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=false status --long -b | head -2
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
cat >expect <<\EOF
## b5...brokenbase [gone]
EOF
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 09dfa8b..c5b57f4 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -411,6 +411,122 @@
)
'
+# Test for basic rename/add-dest conflict, with rename needing content merge:
+# Commit O: a
+# Commit A: rename a->b, modifying b too
+# Commit B: modify a, add different b
+
+test_expect_success 'setup rename-with-content-merge vs. add' '
+ test_create_repo rename-with-content-merge-and-add &&
+ (
+ cd rename-with-content-merge-and-add &&
+
+ test_seq 1 5 >a &&
+ git add a &&
+ git commit -m O &&
+ git tag O &&
+
+ git checkout -b A O &&
+ git mv a b &&
+ test_seq 0 5 >b &&
+ git add b &&
+ git commit -m A &&
+
+ git checkout -b B O &&
+ echo 6 >>a &&
+ echo hello world >b &&
+ git add a b &&
+ git commit -m B
+ )
+'
+
+test_expect_success 'handle rename-with-content-merge vs. add' '
+ (
+ cd rename-with-content-merge-and-add &&
+
+ git checkout A^0 &&
+
+ test_must_fail git merge -s recursive B^0 >out &&
+ test_i18ngrep "CONFLICT (rename/add)" out &&
+
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ # Also, make sure both unmerged entries are for "b"
+ git ls-files -u b >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ test_path_is_missing a &&
+ test_path_is_file b &&
+
+ test_seq 0 6 >tmp &&
+ git hash-object tmp >expect &&
+ git rev-parse B:b >>expect &&
+ git rev-parse >actual \
+ :2:b :3:b &&
+ test_cmp expect actual &&
+
+ # Test that the two-way merge in b is as expected
+ git cat-file -p :2:b >>ours &&
+ git cat-file -p :3:b >>theirs &&
+ >empty &&
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ ours empty theirs &&
+ test_cmp ours b
+ )
+'
+
+test_expect_success 'handle rename-with-content-merge vs. add, merge other way' '
+ (
+ cd rename-with-content-merge-and-add &&
+
+ git reset --hard &&
+ git clean -fdx &&
+
+ git checkout B^0 &&
+
+ test_must_fail git merge -s recursive A^0 >out &&
+ test_i18ngrep "CONFLICT (rename/add)" out &&
+
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ # Also, make sure both unmerged entries are for "b"
+ git ls-files -u b >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ test_path_is_missing a &&
+ test_path_is_file b &&
+
+ test_seq 0 6 >tmp &&
+ git rev-parse B:b >expect &&
+ git hash-object tmp >>expect &&
+ git rev-parse >actual \
+ :2:b :3:b &&
+ test_cmp expect actual &&
+
+ # Test that the two-way merge in b is as expected
+ git cat-file -p :2:b >>ours &&
+ git cat-file -p :3:b >>theirs &&
+ >empty &&
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "A^0" \
+ ours empty theirs &&
+ test_cmp ours b
+ )
+'
+
# Test for all kinds of things that can go wrong with rename/rename (2to1):
# Commit A: new files: a & b
# Commit B: rename a->c, modify b
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
index 62c5647..c966147 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6043-merge-rename-directories.sh
@@ -75,7 +75,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -142,7 +142,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -201,7 +201,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -270,7 +270,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
git ls-files -s >out &&
@@ -350,7 +350,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -416,7 +416,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -497,7 +497,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT.*directory rename split" out &&
git ls-files -s >out &&
@@ -559,7 +559,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 >out &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -640,7 +640,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -705,7 +705,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
test_i18ngrep ! CONFLICT.*rename/rename.*y/d out &&
@@ -826,7 +826,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -915,7 +915,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT.*implicit dir rename" out &&
git ls-files -s >out &&
@@ -989,7 +989,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (add/add).* y/d" out &&
git ls-files -s >out &&
@@ -1069,7 +1069,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
test_i18ngrep "CONFLICT (add/add).* y/d" out &&
@@ -1153,7 +1153,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (file/directory).*y/d" out &&
git ls-files -s >out &&
@@ -1243,7 +1243,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
git ls-files -s >out &&
@@ -1308,7 +1308,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -1370,7 +1370,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -1432,7 +1432,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -1495,7 +1495,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -1591,7 +1591,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
test_i18ngrep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
@@ -1663,7 +1663,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
git ls-files -s >out &&
@@ -1740,7 +1740,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
git ls-files -s >out &&
@@ -1804,7 +1804,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
git ls-files -s >out &&
@@ -1894,7 +1894,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
git ls-files -s >out &&
@@ -1985,7 +1985,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -2063,7 +2063,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -2135,7 +2135,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (modify/delete).* z/d" out &&
git ls-files -s >out &&
@@ -2212,7 +2212,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -2287,7 +2287,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
test_i18ngrep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
@@ -2374,7 +2374,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 7 out &&
@@ -2444,7 +2444,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -2534,7 +2534,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 >out &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "WARNING: Avoiding applying x -> z rename to x/f" out &&
git ls-files -s >out &&
@@ -2622,7 +2622,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 >out &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "WARNING: Avoiding applying z -> y rename to z/t" out &&
test_i18ngrep "WARNING: Avoiding applying y -> x rename to y/a" out &&
test_i18ngrep "WARNING: Avoiding applying x -> w rename to x/b" out &&
@@ -2704,7 +2704,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 >out &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
grep -q dir1/yo error_line &&
grep -q dir2/yo error_line &&
@@ -2782,7 +2782,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -2849,7 +2849,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -2918,7 +2918,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -2993,7 +2993,7 @@
echo very >z/c &&
echo important >z/d &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
@@ -3061,7 +3061,7 @@
echo important >y/d &&
echo contents >y/e &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
@@ -3137,7 +3137,7 @@
git checkout A^0 &&
echo important >y/c &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
@@ -3174,7 +3174,7 @@
mkdir y &&
echo important >y/c &&
- test_must_fail git merge -s recursive A^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
@@ -3249,7 +3249,7 @@
git checkout A^0 &&
echo important >y/wham &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
@@ -3327,7 +3327,7 @@
mkdir z &&
echo random >z/c &&
- git merge -s recursive B^0 >out 2>err &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
@@ -3407,7 +3407,7 @@
git checkout A^0 &&
echo stuff >>z/c &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "Refusing to lose dirty file at z/c" out &&
test_seq 1 10 >expected &&
@@ -3479,7 +3479,7 @@
git checkout A^0 &&
echo stuff >>z/c &&
- git merge -s recursive B^0 >out 2>err &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "Refusing to lose dirty file at z/c" out &&
grep -q stuff z/c &&
@@ -3554,7 +3554,7 @@
git checkout A^0 &&
echo stuff >>y/c &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "following files would be overwritten by merge" err &&
grep -q stuff y/c &&
@@ -3621,7 +3621,7 @@
git checkout A^0 &&
echo stuff >>z/c &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "Refusing to lose dirty file at z/c" out &&
grep -q stuff z/c &&
@@ -3700,7 +3700,7 @@
git checkout A^0 &&
echo mods >>y/c &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
test_i18ngrep "Refusing to lose dirty file at y/c" out &&
@@ -3782,7 +3782,7 @@
git checkout A^0 &&
echo important >>y/wham &&
- test_must_fail git merge -s recursive B^0 >out 2>err &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep "CONFLICT (rename/rename)" out &&
test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
@@ -3870,7 +3870,7 @@
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -3910,7 +3910,7 @@
# To which, I can do no more than shrug my shoulders and say that
# even simple rules give weird results when given weird inputs.
-test_expect_success '12b-setup: Moving one directory hierarchy into another' '
+test_expect_success '12b-setup: Moving two directory hierarchies into each other' '
test_create_repo 12b &&
(
cd 12b &&
@@ -3940,13 +3940,13 @@
)
'
-test_expect_success '12b-check: Moving one directory hierarchy into another' '
+test_expect_success '12b-check: Moving two directory hierarchies into each other' '
(
cd 12b &&
git checkout A^0 &&
- git merge -s recursive B^0 &&
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -4016,7 +4016,7 @@
git checkout A^0 &&
- test_must_fail git merge -s recursive B^0 &&
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
git ls-files -u >out &&
test_line_count = 12 out &&
@@ -4051,4 +4051,467 @@
)
'
+###########################################################################
+# SECTION 13: Checking informational and conflict messages
+#
+# A year after directory rename detection became the default, it was
+# instead decided to report conflicts on the pathname on the basis that
+# some users may expect the new files added or moved into a directory to
+# be unrelated to all the other files in that directory, and thus that
+# directory rename detection is unexpected. Test that the messages printed
+# match our expectation.
+###########################################################################
+
+# Testcase 13a, Basic directory rename with newly added files
+# Commit O: z/{b,c}
+# Commit A: y/{b,c}
+# Commit B: z/{b,c,d,e/f}
+# Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f
+
+test_expect_success '13a-setup: messages for newly added files' '
+ test_create_repo 13a &&
+ (
+ cd 13a &&
+
+ mkdir z &&
+ echo b >z/b &&
+ echo c >z/c &&
+ git add z &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv z y &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ echo d >z/d &&
+ mkdir z/e &&
+ echo f >z/e/f &&
+ git add z/d z/e/f &&
+ test_tick &&
+ git commit -m "B"
+ )
+'
+
+test_expect_success '13a-check(conflict): messages for newly added files' '
+ (
+ cd 13a &&
+
+ git checkout A^0 &&
+
+ test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
+ test_i18ngrep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/[de]" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d &&
+ test_path_is_missing z/e/f &&
+ test_path_is_file y/e/f
+ )
+'
+
+test_expect_success '13a-check(info): messages for newly added files' '
+ (
+ cd 13a &&
+
+ git reset --hard &&
+ git checkout A^0 &&
+
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
+ test_i18ngrep Path.updated:.*z/d.added.in.B^0.*y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/[de]" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d &&
+ test_path_is_missing z/e/f &&
+ test_path_is_file y/e/f
+ )
+'
+
+# Testcase 13b, Transitive rename with conflicted content merge and default
+# "conflict" setting
+# (Related to testcase 1c, 9b)
+# Commit O: z/{b,c}, x/d_1
+# Commit A: y/{b,c}, x/d_2
+# Commit B: z/{b,c,d_3}
+# Expected: y/{b,c,d_merged}, with two conflict messages for y/d,
+# one about content, and one about file location
+
+test_expect_success '13b-setup: messages for transitive rename with conflicted content' '
+ test_create_repo 13b &&
+ (
+ cd 13b &&
+
+ mkdir x &&
+ mkdir z &&
+ test_seq 1 10 >x/d &&
+ echo b >z/b &&
+ echo c >z/c &&
+ git add x z &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv z y &&
+ echo 11 >>x/d &&
+ git add x/d &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ echo eleven >>x/d &&
+ git mv x/d z/d &&
+ git add z/d &&
+ test_tick &&
+ git commit -m "B"
+ )
+'
+
+test_expect_success '13b-check(conflict): messages for transitive rename with conflicted content' '
+ (
+ cd 13b &&
+
+ git checkout A^0 &&
+
+ test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+ test_i18ngrep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/d" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d
+ )
+'
+
+test_expect_success '13b-check(info): messages for transitive rename with conflicted content' '
+ (
+ cd 13b &&
+
+ git reset --hard &&
+ git checkout A^0 &&
+
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+ test_i18ngrep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/d" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d
+ )
+'
+
+# Testcase 13c, Rename/rename(1to1) due to directory rename
+# Commit O: z/{b,c}, x/{d,e}
+# Commit A: y/{b,c,d}, x/e
+# Commit B: z/{b,c,d}, x/e
+# Expected: y/{b,c,d}, with info or conflict messages for d (
+# A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d
+# One could argue A had partial knowledge of what was done with
+# d and B had full knowledge, but that's a slippery slope as
+# shown in testcase 13d.
+
+test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive rename' '
+ test_create_repo 13c &&
+ (
+ cd 13c &&
+
+ mkdir x &&
+ mkdir z &&
+ test_seq 1 10 >x/d &&
+ echo e >x/e &&
+ echo b >z/b &&
+ echo c >z/c &&
+ git add x z &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv z y &&
+ git mv x/d y/ &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ git mv x/d z/d &&
+ git add z/d &&
+ test_tick &&
+ git commit -m "B"
+ )
+'
+
+test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via transitive rename' '
+ (
+ cd 13c &&
+
+ git checkout A^0 &&
+
+ test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/d" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d
+ )
+'
+
+test_expect_success '13c-check(info): messages for rename/rename(1to1) via transitive rename' '
+ (
+ cd 13c &&
+
+ git reset --hard &&
+ git checkout A^0 &&
+
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+
+ git ls-files >paths &&
+ ! grep z/ paths &&
+ grep "y/d" paths &&
+
+ test_path_is_missing z/d &&
+ test_path_is_file y/d
+ )
+'
+
+# Testcase 13d, Rename/rename(1to1) due to directory rename on both sides
+# Commit O: a/{z,y}, b/x, c/w
+# Commit A: a/z, b/{y,x}, d/w
+# Commit B: a/z, d/x, c/{y,w}
+# Expected: a/z, d/{y,x,w} with no file location conflict for x
+# Easy cases:
+# * z is always in a; so it stays in a.
+# * x starts in b, only modified on one side to move into d/
+# * w starts in c, only modified on one side to move into d/
+# Hard case:
+# * A renames a/y to b/y, and B renames b/->d/ => a/y -> d/y
+# * B renames a/y to c/y, and A renames c/->d/ => a/y -> d/y
+# No conflict in where a/y ends up, so put it in d/y.
+
+test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transitive rename' '
+ test_create_repo 13d &&
+ (
+ cd 13d &&
+
+ mkdir a &&
+ mkdir b &&
+ mkdir c &&
+ echo z >a/z &&
+ echo y >a/y &&
+ echo x >b/x &&
+ echo w >c/w &&
+ git add a b c &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv a/y b/ &&
+ git mv c/ d/ &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ git mv a/y c/ &&
+ git mv b/ d/ &&
+ test_tick &&
+ git commit -m "B"
+ )
+'
+
+test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via dual transitive rename' '
+ (
+ cd 13d &&
+
+ git checkout A^0 &&
+
+ test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
+ test_i18ngrep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
+
+ git ls-files >paths &&
+ ! grep b/ paths &&
+ ! grep c/ paths &&
+ grep "d/y" paths &&
+
+ test_path_is_missing b/y &&
+ test_path_is_missing c/y &&
+ test_path_is_file d/y
+ )
+'
+
+test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual transitive rename' '
+ (
+ cd 13d &&
+
+ git reset --hard &&
+ git checkout A^0 &&
+
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+ test_i18ngrep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
+ test_i18ngrep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
+
+ git ls-files >paths &&
+ ! grep b/ paths &&
+ ! grep c/ paths &&
+ grep "d/y" paths &&
+
+ test_path_is_missing b/y &&
+ test_path_is_missing c/y &&
+ test_path_is_file d/y
+ )
+'
+
+# Testcase 13e, directory rename in virtual merge base
+#
+# This testcase has a slightly different setup than all the above cases, in
+# order to include a recursive case:
+#
+# A C
+# o - o
+# / \ / \
+# O o X ?
+# \ / \ /
+# o o
+# B D
+#
+# Commit O: a/{z,y}
+# Commit A: b/{z,y}
+# Commit B: a/{z,y,x}
+# Commit C: b/{z,y,x}
+# Commit D: b/{z,y}, a/x
+# Expected: b/{z,y,x} (sort of; see below for why this might not be expected)
+#
+# NOTES: 'X' represents a virtual merge base. With the default of
+# directory rename detection yielding conflicts, merging A and B
+# results in a conflict complaining about whether 'x' should be
+# under 'a/' or 'b/'. However, when creating the virtual merge
+# base 'X', since virtual merge bases need to be written out as a
+# tree, we cannot have a conflict, so some resolution has to be
+# picked.
+#
+# In choosing the right resolution, it's worth noting here that
+# commits C & D are merges of A & B that choose different
+# locations for 'x' (i.e. they resolve the conflict differently),
+# and so it would be nice when merging C & D if git could detect
+# this difference of opinion and report a conflict. But the only
+# way to do so that I can think of would be to have the virtual
+# merge base place 'x' in some directory other than either 'a/' or
+# 'b/', which seems a little weird -- especially since it'd result
+# in a rename/rename(1to2) conflict with a source path that never
+# existed in any version.
+#
+# So, for now, when directory rename detection is set to
+# 'conflict' just avoid doing directory rename detection at all in
+# the recursive case. This will not allow us to detect a conflict
+# in the outer merge for this special kind of setup, but it at
+# least avoids hitting a BUG().
+#
+test_expect_success '13e-setup: directory rename detection in recursive case' '
+ test_create_repo 13e &&
+ (
+ cd 13e &&
+
+ mkdir a &&
+ echo z >a/z &&
+ echo y >a/y &&
+ git add a &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv a/ b/ &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ echo x >a/x &&
+ git add a &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git branch C A &&
+ git branch D B &&
+
+ git checkout C &&
+ test_must_fail git -c merge.directoryRenames=conflict merge B &&
+ git add b/x &&
+ test_tick &&
+ git commit -m "C" &&
+
+
+ git checkout D &&
+ test_must_fail git -c merge.directoryRenames=conflict merge A &&
+ git add b/x &&
+ mkdir a &&
+ git mv b/x a/x &&
+ test_tick &&
+ git commit -m "D"
+ )
+'
+
+test_expect_success '13e-check: directory rename detection in recursive case' '
+ (
+ cd 13e &&
+
+ git checkout --quiet D^0 &&
+
+ git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
+
+ test_i18ngrep ! CONFLICT out &&
+ test_i18ngrep ! BUG: err &&
+ test_i18ngrep ! core.dumped err &&
+ test_must_be_empty err &&
+
+ git ls-files >paths &&
+ ! grep a/x paths &&
+ grep b/x paths
+ )
+'
+
test_done
diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
index 38e24f7..3a47623 100755
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6046-merge-skip-unneeded-updates.sh
@@ -466,7 +466,7 @@
git checkout A^0 &&
- GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+ GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep ! "Skipped bar/bq" out &&
test_must_be_empty err &&
@@ -495,7 +495,7 @@
git checkout B^0 &&
- GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+ GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
test_i18ngrep ! "Skipped bar/bq" out &&
test_must_be_empty err &&
@@ -560,7 +560,7 @@
git checkout A^0 &&
- GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+ GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_i18ngrep ! "Skipped bar/bq" out &&
test_must_be_empty err &&
@@ -589,7 +589,7 @@
git checkout B^0 &&
- GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+ GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
test_i18ngrep ! "Skipped bar/bq" out &&
test_must_be_empty err &&
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index d638119..e7e64e0 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -40,7 +40,8 @@
test "$_found" = "$_parent" || return 1
_parent_number=$(( $_parent_number + 1 ))
done &&
- test_must_fail git rev-parse --verify $_commit^$_parent_number
+ test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&
+ test_i18ngrep "Needed a single revision" err
}
commit_has_parents ()
@@ -393,9 +394,11 @@
'
test_expect_success '--graft with and without already replaced object' '
- test $(git log --oneline | wc -l) = 7 &&
+ git log --oneline >log &&
+ test_line_count = 7 log &&
git replace --graft $HASH5 &&
- test $(git log --oneline | wc -l) = 3 &&
+ git log --oneline >log &&
+ test_line_count = 3 log &&
commit_has_parents $HASH5 &&
test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
git replace --force -g $HASH5 $HASH4 $HASH3 &&
@@ -403,6 +406,28 @@
git replace -d $HASH5
'
+test_expect_success '--graft using a tag as the new parent' '
+ git tag new_parent $HASH5 &&
+ git replace --graft $HASH7 new_parent &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7 &&
+ git tag -a -m "annotated new parent tag" annotated_new_parent $HASH5 &&
+ git replace --graft $HASH7 annotated_new_parent &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7
+'
+
+test_expect_success '--graft using a tag as the replaced object' '
+ git tag replaced_object $HASH7 &&
+ git replace --graft replaced_object $HASH5 &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7 &&
+ git tag -a -m "annotated replaced object tag" annotated_replaced_object $HASH7 &&
+ git replace --graft annotated_replaced_object $HASH5 &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7
+'
+
test_expect_success GPG 'set up a signed commit' '
echo "line 17" >>hello &&
echo "line 18" >>hello &&
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
new file mode 100755
index 0000000..28611c9
--- /dev/null
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+test_description='git rev-list should handle unexpected object types'
+
+. ./test-lib.sh
+
+test_expect_success 'setup well-formed objects' '
+ blob="$(printf "foo" | git hash-object -w --stdin)" &&
+ tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
+ commit="$(git commit-tree $tree -m "first commit")" &&
+ git cat-file commit $commit >good-commit
+'
+
+test_expect_success 'setup unexpected non-blob entry' '
+ printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
+ broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+'
+
+test_expect_failure 'traverse unexpected non-blob entry (lone)' '
+ test_must_fail git rev-list --objects $broken_tree
+'
+
+test_expect_success 'traverse unexpected non-blob entry (seen)' '
+ test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
+ test_i18ngrep "is not a blob" output
+'
+
+test_expect_success 'setup unexpected non-tree entry' '
+ printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
+ broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+'
+
+test_expect_success 'traverse unexpected non-tree entry (lone)' '
+ test_must_fail git rev-list --objects $broken_tree
+'
+
+test_expect_success 'traverse unexpected non-tree entry (seen)' '
+ test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
+ test_i18ngrep "is not a tree" output
+'
+
+test_expect_success 'setup unexpected non-commit parent' '
+ sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
+ >broken-commit &&
+ broken_commit="$(git hash-object -w --literally -t commit \
+ broken-commit)"
+'
+
+test_expect_success 'traverse unexpected non-commit parent (lone)' '
+ test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
+ test_i18ngrep "not a commit" output
+'
+
+test_expect_success 'traverse unexpected non-commit parent (seen)' '
+ test_must_fail git rev-list --objects $commit $broken_commit \
+ >output 2>&1 &&
+ test_i18ngrep "not a commit" output
+'
+
+test_expect_success 'setup unexpected non-tree root' '
+ sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
+ broken_commit="$(git hash-object -w --literally -t commit \
+ broken-commit)"
+'
+
+test_expect_success 'traverse unexpected non-tree root (lone)' '
+ test_must_fail git rev-list --objects $broken_commit
+'
+
+test_expect_success 'traverse unexpected non-tree root (seen)' '
+ test_must_fail git rev-list --objects $blob $broken_commit \
+ >output 2>&1 &&
+ test_i18ngrep "not a tree" output
+'
+
+test_expect_success 'setup unexpected non-commit tag' '
+ git tag -a -m "tagged commit" tag $commit &&
+ git cat-file tag tag >good-tag &&
+ test_when_finished "git tag -d tag" &&
+ sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
+ tag=$(git hash-object -w --literally -t tag broken-tag)
+'
+
+test_expect_success 'traverse unexpected non-commit tag (lone)' '
+ test_must_fail git rev-list --objects $tag
+'
+
+test_expect_success 'traverse unexpected non-commit tag (seen)' '
+ test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+ test_i18ngrep "not a commit" output
+'
+
+test_expect_success 'setup unexpected non-tree tag' '
+ git tag -a -m "tagged tree" tag $tree &&
+ git cat-file tag tag >good-tag &&
+ test_when_finished "git tag -d tag" &&
+ sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
+ tag=$(git hash-object -w --literally -t tag broken-tag)
+'
+
+test_expect_success 'traverse unexpected non-tree tag (lone)' '
+ test_must_fail git rev-list --objects $tag
+'
+
+test_expect_success 'traverse unexpected non-tree tag (seen)' '
+ test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+ test_i18ngrep "not a tree" output
+'
+
+test_expect_success 'setup unexpected non-blob tag' '
+ git tag -a -m "tagged blob" tag $blob &&
+ git cat-file tag tag >good-tag &&
+ test_when_finished "git tag -d tag" &&
+ sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
+ tag=$(git hash-object -w --literally -t tag broken-tag)
+'
+
+test_expect_failure 'traverse unexpected non-blob tag (lone)' '
+ test_must_fail git rev-list --objects $tag
+'
+
+test_expect_success 'traverse unexpected non-blob tag (seen)' '
+ test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
+ test_i18ngrep "not a blob" output
+'
+
+test_done
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index 9c11427..de0e5a5 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -157,6 +157,10 @@
'
# Test sparse:path=<path> filter.
+# !!!!
+# NOTE: sparse:path filter support has been dropped for security reasons,
+# so the tests have been changed to make sure that using it fails.
+# !!!!
# Use a local file containing a sparse-checkout specification to filter
# out blobs not required for the corresponding sparse-checkout. We do not
# require sparse-checkout to actually be enabled.
@@ -176,37 +180,20 @@
echo sparse1 >pattern2
'
-test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
- git -C r3 ls-files -s sparse1 sparse2 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
- sort >expected &&
-
- git -C r3 rev-list --quiet --objects --filter-print-omitted \
- --filter=sparse:path=../pattern1 HEAD >revs &&
- awk -f print_1.awk revs |
- sed "s/~//" |
- sort >observed &&
-
- test_cmp expected observed
+test_expect_success 'verify sparse:path=pattern1 fails' '
+ test_must_fail git -C r3 rev-list --quiet --objects \
+ --filter-print-omitted --filter=sparse:path=../pattern1 HEAD
'
-test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
- git -C r3 ls-files -s sparse2 dir1/sparse2 >ls_files_result &&
- awk -f print_2.awk ls_files_result |
- sort >expected &&
-
- git -C r3 rev-list --quiet --objects --filter-print-omitted \
- --filter=sparse:path=../pattern2 HEAD >revs &&
- awk -f print_1.awk revs |
- sed "s/~//" |
- sort >observed &&
-
- test_cmp expected observed
+test_expect_success 'verify sparse:path=pattern2 fails' '
+ test_must_fail git -C r3 rev-list --quiet --objects \
+ --filter-print-omitted --filter=sparse:path=../pattern2 HEAD
'
# Test sparse:oid=<oid-ish> filter.
-# Like sparse:path, but we get the sparse-checkout specification from
-# a blob rather than a file on disk.
+# Use a blob containing a sparse-checkout specification to filter
+# out blobs not required for the corresponding sparse-checkout. We do not
+# require sparse-checkout to actually be enabled.
test_expect_success 'setup r3 part 2' '
echo dir1/ >r3/pattern &&
@@ -291,7 +278,19 @@
test_line_count = 2 actual &&
# Make sure no other trees were considered besides the root.
- ! grep "Skipping contents of tree [^.]" filter_trace
+ ! grep "Skipping contents of tree [^.]" filter_trace &&
+
+ # Try this again with "combine:". If both sub-filters are skipping
+ # trees, the composite filter should also skip trees. This is not
+ # important unless the user does combine:tree:X+tree:Y or another filter
+ # besides "tree:" is implemented in the future which can skip trees.
+ GIT_TRACE=1 git -C r3 rev-list \
+ --objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace &&
+
+ # Only skip the dir1/ tree, which is shared between the two commits.
+ grep "Skipping contents of tree " filter_trace >actual &&
+ test_write_lines "Skipping contents of tree dir1/..." >expected &&
+ test_cmp expected actual
'
# Test tree:# filters.
@@ -343,6 +342,148 @@
test_line_count = 10 actual
'
+test_expect_success 'combine:... for a simple combination' '
+ git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \
+ >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD dir1 &&
+
+ # There are also 2 commit objects
+ test_line_count = 5 actual &&
+
+ cp actual expected &&
+
+ # Try again using repeated --filter - this is equivalent to a manual
+ # combine with "combine:...+..."
+ git -C r3 rev-list --objects --filter=combine:tree:2 \
+ --filter=blob:none HEAD >actual &&
+
+ test_cmp expected actual
+'
+
+test_expect_success 'combine:... with URL encoding' '
+ git -C r3 rev-list --objects \
+ --filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD dir1 &&
+
+ # There are also 2 commit objects
+ test_line_count = 5 actual
+'
+
+expect_invalid_filter_spec () {
+ spec="$1" &&
+ err="$2" &&
+
+ test_must_fail git -C r3 rev-list --objects --filter="$spec" HEAD \
+ >actual 2>actual_stderr &&
+ test_must_be_empty actual &&
+ test_i18ngrep "$err" actual_stderr
+}
+
+test_expect_success 'combine:... while URL-encoding things that should not be' '
+ expect_invalid_filter_spec combine%3Atree:2+blob:none \
+ "invalid filter-spec"
+'
+
+test_expect_success 'combine: with nothing after the :' '
+ expect_invalid_filter_spec combine: "expected something after combine:"
+'
+
+test_expect_success 'parse error in first sub-filter in combine:' '
+ expect_invalid_filter_spec combine:tree:asdf+blob:none \
+ "expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with non-encoded reserved chars' '
+ expect_invalid_filter_spec combine:tree:2+sparse:@xyz \
+ "must escape char in sub-filter-spec: .@." &&
+ expect_invalid_filter_spec combine:tree:2+sparse:\` \
+ "must escape char in sub-filter-spec: .\`." &&
+ expect_invalid_filter_spec combine:tree:2+sparse:~abc \
+ "must escape char in sub-filter-spec: .\~."
+'
+
+test_expect_success 'validate err msg for "combine:<valid-filter>+"' '
+ expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with edge-case hex digits: Ff Aa 0 9' '
+ git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \
+ HEAD >actual &&
+ test_line_count = 5 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \
+ HEAD >actual &&
+ test_line_count = 5 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual &&
+ test_line_count = 2 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \
+ HEAD >actual &&
+ test_line_count = 5 actual
+'
+
+test_expect_success 'add sparse pattern blobs whose paths have reserved chars' '
+ cp r3/pattern r3/pattern1+renamed% &&
+ cp r3/pattern "r3/p;at%ter+n" &&
+ cp r3/pattern r3/^~pattern &&
+ git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern &&
+ git -C r3 commit -m "add sparse pattern files with reserved chars"
+'
+
+test_expect_success 'combine:... with more than two sub-filters' '
+ git -C r3 rev-list --objects \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern \
+ HEAD >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD~2 "" &&
+ expect_has HEAD dir1 &&
+ expect_has HEAD dir1/sparse1 &&
+ expect_has HEAD dir1/sparse2 &&
+
+ # Should also have 3 commits
+ test_line_count = 9 actual &&
+
+ # Try again, this time making sure the last sub-filter is only
+ # URL-decoded once.
+ cp actual expect &&
+
+ git -C r3 rev-list --objects \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \
+ HEAD >actual &&
+ test_cmp expect actual &&
+
+ # Use the same composite filter again, but with a pattern file name that
+ # requires encoding multiple characters, and use implicit filter
+ # combining.
+ test_when_finished "rm -f trace1" &&
+ GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
+ --filter=tree:3 --filter=blob:limit=40 \
+ --filter=sparse:oid="master:p;at%ter+n" \
+ HEAD >actual &&
+
+ test_cmp expect actual &&
+ grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \
+ trace1 &&
+
+ # Repeat the above test, but this time, the characters to encode are in
+ # the LHS of the combined filter.
+ test_when_finished "rm -f trace2" &&
+ GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
+ --filter=sparse:oid=master:^~pattern \
+ --filter=tree:3 --filter=blob:limit=40 \
+ HEAD >actual &&
+
+ test_cmp expect actual &&
+ grep "Add to combine filter-spec: sparse:oid=master:%5e%7epattern" \
+ trace2
+'
+
# Test provisional omit collection logic with a repo that has objects appearing
# at multiple depths - first deeper than the filter's threshold, then shallow.
@@ -386,6 +527,37 @@
test_cmp expect actual
'
+test_expect_success 'setup r5' '
+ git init r5 &&
+ mkdir -p r5/subdir &&
+
+ echo 1 >r5/short-root &&
+ echo 12345 >r5/long-root &&
+ echo a >r5/subdir/short-subdir &&
+ echo abcde >r5/subdir/long-subdir &&
+
+ git -C r5 add short-root long-root subdir &&
+ git -C r5 commit -m "commit msg"
+'
+
+test_expect_success 'verify collecting omits in combined: filter' '
+ # Note that this test guards against the naive implementation of simply
+ # giving both filters the same "omits" set and expecting it to
+ # automatically merge them.
+ git -C r5 rev-list --objects --quiet --filter-print-omitted \
+ --filter=combine:tree:2+blob:limit=3 HEAD >actual &&
+
+ # Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root)
+ omitted_1=$(echo 12345 | git hash-object --stdin) &&
+ omitted_2=$(echo a | git hash-object --stdin) &&
+ omitted_3=$(echo abcde | git hash-object --stdin) &&
+
+ grep ~$omitted_1 actual &&
+ grep ~$omitted_2 actual &&
+ grep ~$omitted_3 actual &&
+ test_line_count = 3 actual
+'
+
# Test tree:<depth> where a tree is iterated to twice - once where a subentry is
# too deep to be included, and again where the blob inside it is shallow enough
# to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we
@@ -454,11 +626,4 @@
grep "blob:limit=1024" trace
'
-test_expect_success 'expand tree depth limit in protocol' '
- GIT_TRACE_PACKET="$(pwd)/tree_trace" git -c protocol.version=2 clone \
- --filter=tree:0k "file://$(pwd)/r2" tree &&
- ! grep "tree:0k" tree_trace &&
- grep "tree:0" tree_trace
-'
-
test_done
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index ee5b03e..2b883d8 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -146,7 +146,7 @@
test_expect_success 'describe works from outside repo using --git-dir' '
git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
- grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out
+ grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
'
check_describe "A-*[0-9a-f]" --dirty
@@ -156,7 +156,7 @@
cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) &&
- grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out
+ grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
'
test_expect_success 'set-up dirty work tree' '
@@ -170,7 +170,7 @@
cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) &&
- grep "^A-[1-9][0-9]\?-g[0-9a-f]\+-dirty$" out
+ grep -E "^A-[1-9][0-9]?-g[0-9a-f]+-dirty$" out
'
check_describe "A-*[0-9a-f].mod" --dirty=.mod
@@ -180,7 +180,7 @@
cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
) &&
- grep "^A-[1-9][0-9]\?-g[0-9a-f]\+.mod$" out
+ grep -E "^A-[1-9][0-9]?-g[0-9a-f]+.mod$" out
'
test_expect_success 'describe --dirty HEAD' '
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 93f23cf..8a72b4c 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -66,12 +66,7 @@
git commit -a -m "Right #5" &&
git checkout -b long &&
- i=0 &&
- while test $i -lt 30
- do
- test_commit $i one &&
- i=$(($i+1))
- done &&
+ test_commit_bulk --start=0 --message=%s --filename=one 30 &&
git show-branch &&
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 0ffd630..9c910ce 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -346,6 +346,32 @@
'
cat >expected <<\EOF
+refs/tags/testtag
+refs/tags/testtag-2
+EOF
+
+test_expect_success 'exercise patterns with prefixes' '
+ git tag testtag-2 &&
+ test_when_finished "git tag -d testtag-2" &&
+ git for-each-ref --format="%(refname)" \
+ refs/tags/testtag refs/tags/testtag-2 >actual &&
+ test_cmp expected actual
+'
+
+cat >expected <<\EOF
+refs/tags/testtag
+refs/tags/testtag-2
+EOF
+
+test_expect_success 'exercise glob patterns with prefixes' '
+ git tag testtag-2 &&
+ test_when_finished "git tag -d testtag-2" &&
+ git for-each-ref --format="%(refname)" \
+ refs/tags/testtag "refs/tags/testtag-*" >actual &&
+ test_cmp expected actual
+'
+
+cat >expected <<\EOF
'refs/heads/master'
'refs/remotes/origin/master'
'refs/tags/testtag'
@@ -392,8 +418,15 @@
test_atom head upstream:trackshort '>'
test_atom head upstream:track,nobracket 'ahead 1'
test_atom head upstream:nobracket,track 'ahead 1'
-test_atom head push:track '[ahead 1]'
-test_atom head push:trackshort '>'
+
+test_expect_success 'setup for push:track[short]' '
+ test_commit third &&
+ git update-ref refs/remotes/myfork/master master &&
+ git reset master~1
+'
+
+test_atom head push:track '[behind 1]'
+test_atom head push:trackshort '<'
test_expect_success 'Check that :track[short] cannot be used with other atoms' '
test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
@@ -420,8 +453,10 @@
test_expect_success 'set up color tests' '
cat >expected.color <<-EOF &&
$(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
+ $(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET>
$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
+ $(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
EOF
sed "s/<[^>]*>//g" <expected.color >expected.bare &&
@@ -491,6 +526,25 @@
test_cmp expected actual
'
+test_expect_success 'create tag without tagger' '
+ git tag -a -m "Broken tag" taggerless &&
+ git tag -f taggerless $(git cat-file tag taggerless |
+ sed -e "/^tagger /d" |
+ git hash-object --stdin -w -t tag)
+'
+
+test_atom refs/tags/taggerless type 'commit'
+test_atom refs/tags/taggerless tag 'taggerless'
+test_atom refs/tags/taggerless tagger ''
+test_atom refs/tags/taggerless taggername ''
+test_atom refs/tags/taggerless taggeremail ''
+test_atom refs/tags/taggerless taggerdate ''
+test_atom refs/tags/taggerless committer ''
+test_atom refs/tags/taggerless committername ''
+test_atom refs/tags/taggerless committeremail ''
+test_atom refs/tags/taggerless committerdate ''
+test_atom refs/tags/taggerless subject 'Broken tag'
+
test_expect_success 'an unusual tag with an incomplete line' '
git tag -m "bogo" bogo &&
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index fc067ed..35408d5 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -441,4 +441,17 @@
test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
'
+test_expect_success 'validate worktree atom' '
+ cat >expect <<-EOF &&
+ master: $(pwd)
+ master_worktree: $(pwd)/worktree_dir
+ side: not checked out
+ EOF
+ git worktree add -b master_worktree worktree_dir master &&
+ git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 4684d06..c0f04dc 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -71,6 +71,8 @@
git gc --keep-largest-pack &&
( cd .git/objects/pack && ls *.pack ) >pack-list &&
test_line_count = 2 pack-list &&
+ awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
+ test_line_count = 2 pack-info &&
test_path_is_file $BASE_PACK &&
git fsck
)
@@ -120,6 +122,25 @@
test_must_be_empty stderr
'
+test_expect_success 'gc.reflogExpire{Unreachable,}=never skips "expire" via "gc"' '
+ test_config gc.reflogExpire never &&
+ test_config gc.reflogExpireUnreachable never &&
+
+ GIT_TRACE=$(pwd)/trace.out git gc &&
+
+ # Check that git-pack-refs is run as a sanity check (done via
+ # gc_before_repack()) but that git-expire is not.
+ grep -E "^trace: (built-in|exec|run_command): git pack-refs --" trace.out &&
+ ! grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
+'
+
+test_expect_success 'one of gc.reflogExpire{Unreachable,}=never does not skip "expire" via "gc"' '
+ >trace.out &&
+ test_config gc.reflogExpire never &&
+ GIT_TRACE=$(pwd)/trace.out git gc &&
+ grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
+'
+
run_and_wait_for_auto_gc () {
# We read stdout from gc for the side effect of waiting until the
# background gc process exits, closing its fd 9. Furthermore, the
@@ -162,7 +183,15 @@
# now fake a concurrent gc that holds the lock; we can use our
# shell pid so that it looks valid.
hostname=$(hostname || echo unknown) &&
- printf "$$ %s" "$hostname" >.git/gc.pid &&
+ shell_pid=$$ &&
+ if test_have_prereq MINGW && test -f /proc/$shell_pid/winpid
+ then
+ # In Git for Windows, Bash (actually, the MSYS2 runtime) has a
+ # different idea of PIDs than git.exe (actually Windows). Use
+ # the Windows PID in this case.
+ shell_pid=$(cat /proc/$shell_pid/winpid)
+ fi &&
+ printf "%d %s" "$shell_pid" "$hostname" >.git/gc.pid &&
# our gc should exit zero without doing anything
run_and_wait_for_auto_gc &&
diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index 033871e..f30b484 100755
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -137,7 +137,7 @@
some message
EOF
commit=$(git hash-object -t commit -w broken-commit) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
verbose git cat-file -e $commit &&
test_must_be_empty stderr
'
@@ -147,7 +147,7 @@
100644 blob 0000000000000000000000000000000000000003 foo
EOF
tree=$(git mktree --missing <broken-tree) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
git cat-file -e $tree &&
test_must_be_empty stderr
'
@@ -162,7 +162,7 @@
this is a broken tag
EOF
tag=$(git hash-object -t tag -w broken-tag) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
git cat-file -e $tag &&
test_must_be_empty stderr
'
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 0b01862..80eb13d 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -932,6 +932,27 @@
test_cmp expect actual
'
+get_tag_header gpgsign-enabled $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+ 'git tag configured tag.gpgsign enables GPG sign' \
+ 'test_config tag.gpgsign true &&
+ git tag -m "A message" gpgsign-enabled &&
+ get_tag_msg gpgsign-enabled>actual &&
+ test_cmp expect actual
+'
+
+get_tag_header no-sign $commit commit $time >expect
+echo "A message" >>expect
+test_expect_success GPG \
+ 'git tag --no-sign configured tag.gpgsign skip GPG sign' \
+ 'test_config tag.gpgsign true &&
+ git tag -a --no-sign -m "A message" no-sign &&
+ get_tag_msg no-sign>actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG \
'trying to create a signed tag with non-existing -F file should fail' '
! test -f nonexistingfile &&
@@ -1700,6 +1721,17 @@
test_cmp expect actual
'
+test_expect_success 'recursive tagging should give advice' '
+ sed -e "s/|$//" <<-EOF >expect &&
+ hint: You have created a nested tag. The object referred to by your new tag is
+ hint: already a tag. If you meant to tag the object that it points to, use:
+ hint: |
+ hint: git tag -f nested annotated-v4.0^{}
+ EOF
+ git tag -m nested nested annotated-v4.0 2>actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success 'multiple --points-at are OR-ed together' '
cat >expect <<-\EOF &&
v2.0
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 53cf42f..d521874 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -38,7 +38,6 @@
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
deleted by us: foo
no changes added to commit (use "git add" and/or "git commit -a")
@@ -143,7 +142,6 @@
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
both added: conflict.txt
deleted by them: main.txt
@@ -177,7 +175,6 @@
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
both deleted: main.txt
added by them: sub_master.txt
added by us: sub_second.txt
@@ -201,12 +198,10 @@
(use "git merge --abort" to abort the merge)
Changes to be committed:
-
new file: sub_master.txt
Unmerged paths:
(use "git rm <file>..." to mark resolution)
-
both deleted: main.txt
Untracked files not listed (use -u option to show untracked files)
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 11eccc2..537787e 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -445,6 +445,14 @@
EOF
git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+ test_cmp expect actual &&
+
+ # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+ git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
+ test_cmp expect actual &&
+
+ # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+ git -c status.aheadbehind=true status --porcelain=v2 --branch --untracked-files=all >actual &&
test_cmp expect actual
)
'
diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
new file mode 100755
index 0000000..f011ad7
--- /dev/null
+++ b/t/t7113-post-index-change-hook.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+test_description='post index change hook'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ mkdir -p dir1 &&
+ touch dir1/file1.txt &&
+ echo testing >dir1/file2.txt &&
+ git add . &&
+ git commit -m "initial"
+'
+
+test_expect_success 'test status, add, commit, others trigger hook without flags set' '
+ mkdir -p .git/hooks &&
+ write_script .git/hooks/post-index-change <<-\EOF &&
+ if test "$1" -eq 1; then
+ echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
+ exit 1
+ fi
+ if test "$2" -eq 1; then
+ echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
+ exit 1
+ fi
+ if test -f ".git/index.lock"; then
+ echo ".git/index.lock exists" >testfailure
+ exit 3
+ fi
+ if ! test -f ".git/index"; then
+ echo ".git/index does not exist" >testfailure
+ exit 3
+ fi
+ echo "success" >testsuccess
+ EOF
+ mkdir -p dir2 &&
+ touch dir2/file1.txt &&
+ touch dir2/file2.txt &&
+ : force index to be dirty &&
+ test-tool chmtime +60 dir1/file1.txt &&
+ git status &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git add . &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git commit -m "second" &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git checkout -- dir1/file1.txt &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git update-index &&
+ test_path_is_missing testsuccess &&
+ test_path_is_missing testfailure &&
+ git reset --soft &&
+ test_path_is_missing testsuccess &&
+ test_path_is_missing testfailure
+'
+
+test_expect_success 'test checkout and reset trigger the hook' '
+ write_script .git/hooks/post-index-change <<-\EOF &&
+ if test "$1" -eq 1 && test "$2" -eq 1; then
+ echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+ exit 1
+ fi
+ if test "$1" -eq 0 && test "$2" -eq 0; then
+ echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+ exit 2
+ fi
+ if test "$1" -eq 1; then
+ if test -f ".git/index.lock"; then
+ echo "updated_workdir set but .git/index.lock exists" >testfailure
+ exit 3
+ fi
+ if ! test -f ".git/index"; then
+ echo "updated_workdir set but .git/index does not exist" >testfailure
+ exit 3
+ fi
+ else
+ echo "update_workdir should be set for checkout" >testfailure
+ exit 4
+ fi
+ echo "success" >testsuccess
+ EOF
+ : force index to be dirty &&
+ test-tool chmtime +60 dir1/file1.txt &&
+ git checkout master &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ test-tool chmtime +60 dir1/file1.txt &&
+ git checkout HEAD &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ test-tool chmtime +60 dir1/file1.txt &&
+ git reset --hard &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git checkout -B test &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure
+'
+
+test_expect_success 'test reset --mixed and update-index triggers the hook' '
+ write_script .git/hooks/post-index-change <<-\EOF &&
+ if test "$1" -eq 1 && test "$2" -eq 1; then
+ echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+ exit 1
+ fi
+ if test "$1" -eq 0 && test "$2" -eq 0; then
+ echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+ exit 2
+ fi
+ if test "$2" -eq 1; then
+ if test -f ".git/index.lock"; then
+ echo "updated_skipworktree set but .git/index.lock exists" >testfailure
+ exit 3
+ fi
+ if ! test -f ".git/index"; then
+ echo "updated_skipworktree set but .git/index does not exist" >testfailure
+ exit 3
+ fi
+ else
+ echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
+ exit 4
+ fi
+ echo "success" >testsuccess
+ EOF
+ : force index to be dirty &&
+ test-tool chmtime +60 dir1/file1.txt &&
+ git reset --mixed --quiet HEAD~1 &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git hash-object -w --stdin <dir1/file2.txt >expect &&
+ git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure &&
+ git update-index --skip-worktree dir1/file2.txt &&
+ git update-index --remove dir1/file2.txt &&
+ test_path_is_file testsuccess && rm -f testsuccess &&
+ test_path_is_missing testfailure
+'
+
+test_done
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 72b9b37..b696bae 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -223,13 +223,8 @@
test_must_fail git checkout simple 2>errs &&
test_i18ngrep overwritten errs &&
- git checkout --merge simple 2>errs &&
- test_i18ngrep ! overwritten errs &&
- git ls-files -u &&
- test_must_fail git cat-file -t :0:two &&
- test "$(git cat-file -t :1:two)" = blob &&
- test "$(git cat-file -t :2:two)" = blob &&
- test_must_fail git cat-file -t :3:two
+ test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
+ test_must_be_empty errs
'
test_expect_success 'checkout to detach HEAD (with advice declined)' '
@@ -254,7 +249,7 @@
test_expect_success 'checkout to detach HEAD' '
git config advice.detachedHead true &&
git checkout -f renamer && git clean -f &&
- GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
+ GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
grep "HEAD is now at 7329388" messages &&
test_line_count -gt 1 messages &&
H=$(git rev-parse --verify HEAD) &&
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 7b36954..d01fd12 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -669,4 +669,38 @@
test_path_is_missing foo/b/bb
'
+test_expect_failure 'git clean -d skips nested repo containing ignored files' '
+ test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+
+ git init nested-repo-with-ignored-file &&
+ (
+ cd nested-repo-with-ignored-file &&
+ >file &&
+ git add file &&
+ git commit -m Initial &&
+
+ # This file is ignored by a .gitignore rule in the outer repo
+ # added in the previous test.
+ >ignoreme
+ ) &&
+
+ git clean -fd &&
+
+ test_path_is_file nested-repo-with-ignored-file/.git/index &&
+ test_path_is_file nested-repo-with-ignored-file/ignoreme &&
+ test_path_is_file nested-repo-with-ignored-file/file
+'
+
+test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
+ test_config core.longpaths false &&
+ a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+ mkdir -p $a50$a50/$a50$a50/$a50$a50 &&
+ : >"$a50$a50/test.txt" 2>"$a50$a50/$a50$a50/$a50$a50/test.txt" &&
+ # create a temporary outside the working tree to hide from "git clean"
+ test_must_fail git clean -xdf 2>.git/err &&
+ # grepping for a strerror string is unportable but it is OK here with
+ # MINGW prereq
+ test_i18ngrep "too long" .git/err
+'
+
test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index aba2d4d..a208cb2 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -46,6 +46,15 @@
test_must_fail git submodule init
'
+test_expect_success 'add aborts on repository with no commits' '
+ cat >expect <<-\EOF &&
+ '"'repo-no-commits'"' does not have a commit checked out
+ EOF
+ git init repo-no-commits &&
+ test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success 'setup - repository in init subdirectory' '
mkdir init &&
(
@@ -809,7 +818,7 @@
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
mkdir -p a/b/c &&
- (cd a/b/c && git init) &&
+ (cd a/b/c && git init && test_commit msg) &&
git config remote.origin.url ../foo/bar.git &&
git submodule add ../bar/a/b/c ./a/b/c &&
git submodule init &&
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 7855bd8..aa33978 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -417,7 +417,7 @@
)
'
-test_expect_failure 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
+test_expect_failure !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
test_when_finished "git -C directory-submodule/path reset --hard" &&
test_when_finished "git -C directory-submodule reset --hard" &&
(
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index e87164a..df34c99 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -158,7 +158,6 @@
test_i18ncmp expect2 actual2
'
-apos="'";
test_expect_success 'submodule update does not fetch already present commits' '
(cd submodule &&
echo line3 >> file &&
@@ -168,7 +167,7 @@
) &&
(cd super/submodule &&
head=$(git rev-parse --verify HEAD) &&
- echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
+ echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
git reset --hard HEAD~1
) &&
(cd super &&
@@ -943,7 +942,10 @@
cd super3 &&
sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
mv -f .gitmodules.tmp .gitmodules &&
- test_must_fail git submodule update --init --depth=1 2>actual &&
+ # Some protocol versions (e.g. 2) support fetching
+ # unadvertised objects, so restrict this test to v0.
+ test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+ git submodule update --init --depth=1 2>actual &&
test_i18ngrep "Direct fetching of that commit failed." actual &&
git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
git submodule update --init --depth=1 >actual &&
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 77729ac..6b2aa91 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -411,4 +411,21 @@
test_cmp expected actual
'
+test_expect_success 'option-like arguments passed to foreach commands are not lost' '
+ (
+ cd super &&
+ git submodule foreach "echo be --quiet" > ../expected &&
+ git submodule foreach echo be --quiet > ../actual
+ ) &&
+ grep -sq -e "--quiet" expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'option-like arguments passed to foreach recurse correctly' '
+ git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
+ git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
+ grep -e "--an-option" expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index fcc0fb8..ad28e93 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -243,18 +243,14 @@
)
'
-# When this test eventually passes, before turning it into
-# test_expect_success, remember to replace the test_i18ngrep below with
-# a "test_must_be_empty warning" to be sure that the warning is actually
-# removed from the code.
-test_expect_failure 'reading nested submodules config when .gitmodules is not in the working tree' '
+test_expect_success 'reading nested submodules config when .gitmodules is not in the working tree' '
test_when_finished "git -C super/submodule checkout .gitmodules" &&
(cd super &&
echo "./nested_submodule" >expect &&
rm submodule/.gitmodules &&
test-tool submodule-nested-repo-config \
submodule submodule.nested_submodule.url >actual 2>warning &&
- test_i18ngrep "nested submodules without %s in the working tree are not supported yet" warning &&
+ test_must_be_empty warning &&
test_cmp expect actual
)
'
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index ca4a740..14c92e4 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -16,7 +16,8 @@
# Arguments: [<prefix] [<commit message>] [<commit options>]
check_summary_oneline() {
test_tick &&
- git commit ${3+"$3"} -m "$2" | head -1 > act &&
+ git commit ${3+"$3"} -m "$2" >raw &&
+ head -n 1 raw >act &&
# branch name
SUMMARY_PREFIX="$(git name-rev --name-only HEAD)" &&
@@ -68,7 +69,7 @@
git checkout recursive-a &&
test_must_fail git merge recursive-b &&
# resolve the conflict
- echo commit-a > file1 &&
+ echo commit-a >file1 &&
git add file1 &&
check_summary_oneline "" "Merge"
'
@@ -142,9 +143,11 @@
>positive &&
git add positive &&
git commit -s -m "thank you" &&
- actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
- expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
- test "z$actual" = "z$expected"
+ git cat-file commit HEAD >commit.msg &&
+ sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
+ git var GIT_COMMITTER_IDENT >ident &&
+ sed -e "s/>.*/>/" ident >expected &&
+ test_cmp expected actual
'
@@ -153,8 +156,8 @@
>negative &&
git add negative &&
git commit -m "one" -m "two" -m "three" &&
- actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
- expected=$(echo one; echo; echo two; echo; echo three) &&
+ actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
+ expected=$(test_write_lines "one" "" "two" "" "three") &&
test "z$actual" = "z$expected"
'
@@ -163,7 +166,8 @@
echo minus >negative &&
git add negative &&
- git status -v | sed -ne "/^diff --git /p" >actual &&
+ git status -v >raw &&
+ sed -ne "/^diff --git /p" raw >actual &&
echo "diff --git a/negative b/negative" >expect &&
test_cmp expect actual
@@ -189,7 +193,8 @@
echo >>negative &&
git commit --cleanup=verbatim --no-status -t expect -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d" >actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
@@ -198,7 +203,8 @@
echo >>negative &&
git commit --cleanup=verbatim -F expect -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
@@ -207,7 +213,8 @@
echo >>negative &&
git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
@@ -215,10 +222,11 @@
test_expect_success 'cleanup commit messages (whitespace option,-F)' '
echo >>negative &&
- { echo;echo "# text";echo; } >text &&
+ test_write_lines "" "# text" "" >text &&
echo "# text" >expect &&
git commit --cleanup=whitespace -F text -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
@@ -226,48 +234,51 @@
test_expect_success 'cleanup commit messages (scissors option,-F,-e)' '
echo >>negative &&
- cat >text <<EOF &&
+ cat >text <<-\EOF &&
-# to be kept
+ # to be kept
- # ------------------------ >8 ------------------------
-# to be kept, too
-# ------------------------ >8 ------------------------
-to be removed
-# ------------------------ >8 ------------------------
-to be removed, too
-EOF
+ # ------------------------ >8 ------------------------
+ # to be kept, too
+ # ------------------------ >8 ------------------------
+ to be removed
+ # ------------------------ >8 ------------------------
+ to be removed, too
+ EOF
- cat >expect <<EOF &&
-# to be kept
+ cat >expect <<-\EOF &&
+ # to be kept
- # ------------------------ >8 ------------------------
-# to be kept, too
-EOF
+ # ------------------------ >8 ------------------------
+ # to be kept, too
+ EOF
git commit --cleanup=scissors -e -F text -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line)' '
echo >>negative &&
- cat >text <<EOF &&
-# ------------------------ >8 ------------------------
-to be removed
-EOF
+ cat >text <<-\EOF &&
+ # ------------------------ >8 ------------------------
+ to be removed
+ EOF
git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_must_be_empty actual
'
test_expect_success 'cleanup commit messages (strip option,-F)' '
echo >>negative &&
- { echo;echo "# text";echo sample;echo; } >text &&
+ test_write_lines "" "# text" "sample" "" >text &&
echo sample >expect &&
git commit --cleanup=strip -F text -a &&
- git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+ git cat-file -p HEAD >raw &&
+ sed -e "1,/^\$/d" raw >actual &&
test_cmp expect actual
'
@@ -275,7 +286,7 @@
test_expect_success 'cleanup commit messages (strip option,-F,-e)' '
echo >>negative &&
- { echo;echo sample;echo; } >text &&
+ test_write_lines "" "sample" "" >text &&
git commit -e -F text -a &&
head -n 4 .git/COMMIT_EDITMSG >actual
'
@@ -387,11 +398,11 @@
'
write_script .git/FAKE_EDITOR <<EOF
-echo editor started > "$(pwd)/.git/result"
+echo editor started >"$(pwd)/.git/result"
exit 0
EOF
-test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
+test_expect_success !FAIL_PREREQS,!AUTOIDENT 'do not fire editor when committer is bogus' '
>.git/result &&
echo >>negative &&
@@ -455,7 +466,7 @@
test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
echo >>negative &&
! "$SHELL_PATH" -c '\''
- echo kill -TERM $$ >> .git/FAKE_EDITOR
+ echo kill -TERM $$ >>.git/FAKE_EDITOR
GIT_EDITOR=.git/FAKE_EDITOR
export GIT_EDITOR
exec git commit -a'\'' &&
@@ -471,7 +482,8 @@
test_must_fail git merge second master &&
git checkout master g &&
EDITOR=: git commit -a &&
- git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
+ git cat-file commit HEAD >raw &&
+ sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
test_cmp expect actual
'
@@ -480,7 +492,8 @@
git reset --hard &&
git commit -s -m "hello: kitty" --allow-empty &&
- git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
test_line_count = 3 actual
'
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
new file mode 100755
index 0000000..b348545
--- /dev/null
+++ b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -0,0 +1,281 @@
+#!/bin/sh
+
+test_description='pre-commit and pre-merge-commit hooks'
+
+. ./test-lib.sh
+
+HOOKDIR="$(git rev-parse --git-dir)/hooks"
+PRECOMMIT="$HOOKDIR/pre-commit"
+PREMERGE="$HOOKDIR/pre-merge-commit"
+
+# Prepare sample scripts that write their $0 to actual_hooks
+test_expect_success 'sample script setup' '
+ mkdir -p "$HOOKDIR" &&
+ write_script "$HOOKDIR/success.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 0
+ EOF
+ write_script "$HOOKDIR/fail.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 1
+ EOF
+ write_script "$HOOKDIR/non-exec.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 1
+ EOF
+ chmod -x "$HOOKDIR/non-exec.sample" &&
+ write_script "$HOOKDIR/require-prefix.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ test $GIT_PREFIX = "success/"
+ EOF
+ write_script "$HOOKDIR/check-author.sample" <<-\EOF
+ echo $0 >>actual_hooks
+ test "$GIT_AUTHOR_NAME" = "New Author" &&
+ test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
+ EOF
+'
+
+test_expect_success 'root commit' '
+ echo "root" >file &&
+ git add file &&
+ git commit -m "zeroth" &&
+ git checkout -b side &&
+ echo "foo" >foo &&
+ git add foo &&
+ git commit -m "make it non-ff" &&
+ git branch side-orig side &&
+ git checkout master
+'
+
+test_expect_success 'setup conflicting branches' '
+ test_when_finished "git checkout master" &&
+ git checkout -b conflicting-a master &&
+ echo a >conflicting &&
+ git add conflicting &&
+ git commit -m conflicting-a &&
+ git checkout -b conflicting-b master &&
+ echo b >conflicting &&
+ git add conflicting &&
+ git commit -m conflicting-b
+'
+
+test_expect_success 'with no hook' '
+ test_when_finished "rm -f actual_hooks" &&
+ echo "foo" >file &&
+ git add file &&
+ git commit -m "first" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with no hook (merge)' '
+ test_when_finished "rm -f actual_hooks" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook' '
+ test_when_finished "rm -f actual_hooks" &&
+ echo "bar" >file &&
+ git add file &&
+ git commit --no-verify -m "bar" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook (merge)' '
+ test_when_finished "rm -f actual_hooks" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with succeeding hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more" >>file &&
+ git add file &&
+ git commit -m "more" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with succeeding hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ echo "$PREMERGE" >expected_hooks &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'automatic merge fails; both hooks are available' '
+ test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" &&
+ test_when_finished "rm -f expected_hooks actual_hooks" &&
+ test_when_finished "git checkout master" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+
+ git checkout conflicting-a &&
+ test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+ test_path_is_missing actual_hooks &&
+
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo a+b >conflicting &&
+ git add conflicting &&
+ git commit -m "resolve conflict" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ echo "even more" >>file &&
+ git add file &&
+ git commit --no-verify -m "even more" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "another" >>file &&
+ git add file &&
+ test_must_fail git commit -m "another" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+ echo "stuff" >>file &&
+ git add file &&
+ git commit --no-verify -m "stuff" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+ echo "$PREMERGE" >expected_hooks &&
+ git checkout side &&
+ test_must_fail git merge -m "merge master" master &&
+ git checkout master &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ echo "content" >>file &&
+ git add file &&
+ git commit -m "content" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ echo "more content" >>file &&
+ git add file &&
+ git commit --no-verify -m "more content" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with hook requiring GIT_PREFIX' '
+ test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" &&
+ cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more content" >>file &&
+ git add file &&
+ mkdir success &&
+ (
+ cd success &&
+ git commit -m "hook requires GIT_PREFIX = success/"
+ ) &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with failing hook requiring GIT_PREFIX' '
+ test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" &&
+ cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more content" >>file &&
+ git add file &&
+ mkdir fail &&
+ (
+ cd fail &&
+ test_must_fail git commit -m "hook must fail"
+ ) &&
+ git checkout -- file &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'check the author in hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/check-author.sample" "$PRECOMMIT" &&
+ cat >expected_hooks <<-EOF &&
+ $PRECOMMIT
+ $PRECOMMIT
+ $PRECOMMIT
+ EOF
+ test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+ (
+ GIT_AUTHOR_NAME="New Author" &&
+ GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+ export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+ git commit --allow-empty -m "by new.author via env" &&
+ git show -s
+ ) &&
+ git commit --author="New Author <newauthor@example.com>" \
+ --allow-empty -m "by new.author via command line" &&
+ git show -s &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_done
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh
deleted file mode 100755
index 984889b..0000000
--- a/t/t7503-pre-commit-hook.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-
-test_description='pre-commit hook'
-
-. ./test-lib.sh
-
-test_expect_success 'with no hook' '
-
- echo "foo" > file &&
- git add file &&
- git commit -m "first"
-
-'
-
-test_expect_success '--no-verify with no hook' '
-
- echo "bar" > file &&
- git add file &&
- git commit --no-verify -m "bar"
-
-'
-
-# now install hook that always succeeds
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/pre-commit"
-mkdir -p "$HOOKDIR"
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 0
-EOF
-chmod +x "$HOOK"
-
-test_expect_success 'with succeeding hook' '
-
- echo "more" >> file &&
- git add file &&
- git commit -m "more"
-
-'
-
-test_expect_success '--no-verify with succeeding hook' '
-
- echo "even more" >> file &&
- git add file &&
- git commit --no-verify -m "even more"
-
-'
-
-# now a hook that fails
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 1
-EOF
-
-test_expect_success 'with failing hook' '
-
- echo "another" >> file &&
- git add file &&
- test_must_fail git commit -m "another"
-
-'
-
-test_expect_success '--no-verify with failing hook' '
-
- echo "stuff" >> file &&
- git add file &&
- git commit --no-verify -m "stuff"
-
-'
-
-chmod -x "$HOOK"
-test_expect_success POSIXPERM 'with non-executable hook' '
-
- echo "content" >> file &&
- git add file &&
- git commit -m "content"
-
-'
-
-test_expect_success POSIXPERM '--no-verify with non-executable hook' '
-
- echo "more content" >> file &&
- git add file &&
- git commit --no-verify -m "more content"
-
-'
-chmod +x "$HOOK"
-
-# a hook that checks $GIT_PREFIX and succeeds inside the
-# success/ subdirectory only
-cat > "$HOOK" <<EOF
-#!/bin/sh
-test \$GIT_PREFIX = success/
-EOF
-
-test_expect_success 'with hook requiring GIT_PREFIX' '
-
- echo "more content" >> file &&
- git add file &&
- mkdir success &&
- (
- cd success &&
- git commit -m "hook requires GIT_PREFIX = success/"
- ) &&
- rmdir success
-'
-
-test_expect_success 'with failing hook requiring GIT_PREFIX' '
-
- echo "more content" >> file &&
- git add file &&
- mkdir fail &&
- (
- cd fail &&
- test_must_fail git commit -m "hook must fail"
- ) &&
- rmdir fail &&
- git checkout -- file
-'
-
-test_expect_success 'check the author in hook' '
- write_script "$HOOK" <<-\EOF &&
- test "$GIT_AUTHOR_NAME" = "New Author" &&
- test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
- EOF
- test_must_fail git commit --allow-empty -m "by a.u.thor" &&
- (
- GIT_AUTHOR_NAME="New Author" &&
- GIT_AUTHOR_EMAIL="newauthor@example.com" &&
- export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
- git commit --allow-empty -m "by new.author via env" &&
- git show -s
- ) &&
- git commit --author="New Author <newauthor@example.com>" \
- --allow-empty -m "by new.author via command line" &&
- git show -s
-'
-
-test_done
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index e1f1129..4e676cd 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -94,19 +94,16 @@
# (use "git pull" to merge the remote branch into yours)
#
# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
+# (use "git restore --staged <file>..." to unstage)
# new file: dir2/added
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
-# (use "git checkout -- <file>..." to discard changes in working directory)
-#
+# (use "git restore <file>..." to discard changes in working directory)
# modified: dir1/modified
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
-#
# dir1/untracked dir2/untracked
# dir2/modified untracked
#
@@ -128,19 +125,16 @@
# (use "git pull" to merge the remote branch into yours)
#
# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
+# (use "git restore --staged <file>..." to unstage)
# new file: dir2/added
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
-# (use "git checkout -- <file>..." to discard changes in working directory)
-#
+# (use "git restore <file>..." to discard changes in working directory)
# modified: dir1/modified
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
-#
# dir1/untracked
# dir2/modified
# dir2/untracked
@@ -278,24 +272,20 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir2/modified
Ignored files:
(use "git add -f <file>..." to include in what will be committed)
-
.gitignore
dir1/untracked
dir2/untracked
@@ -347,19 +337,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Ignored files:
(use "git add -f <file>..." to include in what will be committed)
-
.gitignore
dir1/untracked
dir2/modified
@@ -420,14 +407,12 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files not listed (use -u option to show untracked files)
@@ -484,19 +469,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -542,19 +524,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -605,19 +584,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: ../dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
untracked
../dir2/modified
../dir2/untracked
@@ -676,19 +652,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
<GREEN>new file: dir2/added<RESET>
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
<RED>modified: dir1/modified<RESET>
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
<BLUE>dir1/untracked<RESET>
<BLUE>dir2/modified<RESET>
<BLUE>dir2/untracked<RESET>
@@ -802,19 +775,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -852,13 +822,11 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/
untracked
@@ -896,20 +864,17 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -956,15 +921,13 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
@@ -974,7 +937,6 @@
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -1019,13 +981,11 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -1068,15 +1028,13 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD^1 <file>..." to unstage)
-
+ (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
@@ -1086,7 +1044,6 @@
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
@@ -1123,14 +1080,12 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
@@ -1140,7 +1095,6 @@
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
@@ -1235,15 +1189,13 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
+ (use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
-
modified: dir1/modified
modified: sm (modified content)
@@ -1254,7 +1206,6 @@
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
@@ -1295,14 +1246,12 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
modified: sm (new commits)
@@ -1318,7 +1267,6 @@
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
@@ -1379,14 +1327,12 @@
; (use "git pull" to merge the remote branch into yours)
;
; Changes to be committed:
-; (use "git reset HEAD <file>..." to unstage)
-;
+; (use "git restore --staged <file>..." to unstage)
; modified: sm
;
; Changes not staged for commit:
; (use "git add <file>..." to update what will be committed)
-; (use "git checkout -- <file>..." to discard changes in working directory)
-;
+; (use "git restore <file>..." to discard changes in working directory)
; modified: dir1/modified
; modified: sm (new commits)
;
@@ -1402,7 +1348,6 @@
;
; Untracked files:
; (use "git add <file>..." to include in what will be committed)
-;
; .gitmodules
; dir1/untracked
; dir2/modified
@@ -1431,13 +1376,11 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
@@ -1458,19 +1401,16 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
@@ -1581,14 +1521,12 @@
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files not listed (use -u option to show untracked files)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 458608c..66d7a62 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -33,7 +33,6 @@
Unmerged paths:
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -54,7 +53,6 @@
(use "git commit" to conclude merge)
Changes to be committed:
-
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
@@ -85,9 +83,8 @@
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -110,8 +107,7 @@
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
@@ -148,9 +144,8 @@
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -176,8 +171,7 @@
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
@@ -246,8 +240,7 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -354,8 +347,7 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -453,8 +445,7 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -557,8 +548,7 @@
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -743,11 +733,11 @@
On branch cherry_branch
You are currently cherry-picking commit $TO_CHERRY_PICK.
(fix conflicts and run "git cherry-pick --continue")
+ (use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -768,10 +758,10 @@
On branch cherry_branch
You are currently cherry-picking commit $TO_CHERRY_PICK.
(all conflicts fixed: run "git cherry-pick --continue")
+ (use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
-
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
@@ -780,6 +770,41 @@
test_i18ncmp expected actual
'
+test_expect_success 'status when cherry-picking after committing conflict resolution' '
+ git reset --hard cherry_branch &&
+ test_when_finished "git cherry-pick --abort" &&
+ test_must_fail git cherry-pick cherry_branch_second one_cherry &&
+ echo end >main.txt &&
+ git commit -a &&
+ cat >expected <<EOF &&
+On branch cherry_branch
+Cherry-pick currently in progress.
+ (run "git cherry-pick --continue" to continue)
+ (use "git cherry-pick --skip" to skip this patch)
+ (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit (use -u to show untracked files)
+EOF
+ git status --untracked-files=no >actual &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success 'status shows cherry-pick with invalid oid' '
+ mkdir .git/sequencer &&
+ test_write_lines "pick invalid-oid" >.git/sequencer/todo &&
+ git status --untracked-files=no >actual 2>err &&
+ git cherry-pick --quit &&
+ test_must_be_empty err &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success 'status does not show error if .git/sequencer is a file' '
+ test_when_finished "rm .git/sequencer" &&
+ test_write_lines hello >.git/sequencer &&
+ git status --untracked-files=no 2>err &&
+ test_must_be_empty err
+'
+
test_expect_success 'status showing detached at and from a tag' '
test_commit atag tagging &&
git checkout atag &&
@@ -813,12 +838,12 @@
On branch master
You are currently reverting commit $TO_REVERT.
(fix conflicts and run "git revert --continue")
+ (use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: to-revert.txt
no changes added to commit (use "git add" and/or "git commit -a")
@@ -834,11 +859,11 @@
On branch master
You are currently reverting commit $TO_REVERT.
(all conflicts fixed: run "git revert --continue")
+ (use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: to-revert.txt
Untracked files not listed (use -u option to show untracked files)
@@ -857,6 +882,25 @@
test_i18ncmp expected actual
'
+test_expect_success 'status while reverting after committing conflict resolution' '
+ test_when_finished "git revert --abort" &&
+ git reset --hard new &&
+ test_must_fail git revert old new &&
+ echo reverted >to-revert.txt &&
+ git commit -a &&
+ cat >expected <<EOF &&
+On branch master
+Revert currently in progress.
+ (run "git revert --continue" to continue)
+ (use "git revert --skip" to skip this patch)
+ (use "git revert --abort" to cancel the revert operation)
+
+nothing to commit (use -u to show untracked files)
+EOF
+ git status --untracked-files=no >actual &&
+ test_i18ncmp expected actual
+'
+
test_expect_success 'prepare for different number of commits rebased' '
git reset --hard master &&
git checkout -b several_commits &&
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index c441861..f19202b 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -538,33 +538,50 @@
test_cmp expected actual
'
-test_expect_success 'with message that has comments' '
- cat basic_message >message_with_comments &&
- sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
- # comment
+# Cover multiple comment characters with the same test input.
+for char in "#" ";"
+do
+ case "$char" in
+ "#")
+ # This is the default, so let's explicitly _not_
+ # set any config to make sure it behaves as we expect.
+ ;;
+ *)
+ config="-c core.commentChar=$char"
+ ;;
+ esac
- # other comment
- Cc: Z
- # yet another comment
- Reviewed-by: Johan
- Reviewed-by: Z
- # last comment
+ test_expect_success "with message that has comments ($char)" '
+ cat basic_message >message_with_comments &&
+ sed -e "s/ Z\$/ /" \
+ -e "s/#/$char/g" >>message_with_comments <<-EOF &&
+ # comment
- EOF
- cat basic_patch >>message_with_comments &&
- cat basic_message >expected &&
- cat >>expected <<-\EOF &&
- # comment
+ # other comment
+ Cc: Z
+ # yet another comment
+ Reviewed-by: Johan
+ Reviewed-by: Z
+ # last comment
- Reviewed-by: Johan
- Cc: Peff
- # last comment
+ EOF
+ cat basic_patch >>message_with_comments &&
+ cat basic_message >expected &&
+ sed -e "s/#/$char/g" >>expected <<-\EOF &&
+ # comment
- EOF
- cat basic_patch >>expected &&
- git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
- test_cmp expected actual
-'
+ Reviewed-by: Johan
+ Cc: Peff
+ # last comment
+
+ EOF
+ cat basic_patch >>expected &&
+ git $config interpret-trailers \
+ --trim-empty --trailer "Cc: Peff" \
+ message_with_comments >actual &&
+ test_cmp expected actual
+ '
+done
test_expect_success 'with message that has an old style conflict block' '
cat basic_message >message_with_comments &&
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 231b8cc..b2401ce 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -85,4 +85,78 @@
test_must_fail git rebase -p master
'
+test_expect_success 'author.name overrides user.name' '
+ test_config user.name user &&
+ test_config user.email user@example.com &&
+ test_config author.name author &&
+ test_commit author-name-override-user &&
+ echo author user@example.com > expected-author &&
+ echo user user@example.com > expected-committer &&
+ git log --format="%an %ae" -1 > actual-author &&
+ git log --format="%cn %ce" -1 > actual-committer &&
+ test_cmp expected-author actual-author &&
+ test_cmp expected-committer actual-committer
+'
+
+test_expect_success 'author.email overrides user.email' '
+ test_config user.name user &&
+ test_config user.email user@example.com &&
+ test_config author.email author@example.com &&
+ test_commit author-email-override-user &&
+ echo user author@example.com > expected-author &&
+ echo user user@example.com > expected-committer &&
+ git log --format="%an %ae" -1 > actual-author &&
+ git log --format="%cn %ce" -1 > actual-committer &&
+ test_cmp expected-author actual-author &&
+ test_cmp expected-committer actual-committer
+'
+
+test_expect_success 'committer.name overrides user.name' '
+ test_config user.name user &&
+ test_config user.email user@example.com &&
+ test_config committer.name committer &&
+ test_commit committer-name-override-user &&
+ echo user user@example.com > expected-author &&
+ echo committer user@example.com > expected-committer &&
+ git log --format="%an %ae" -1 > actual-author &&
+ git log --format="%cn %ce" -1 > actual-committer &&
+ test_cmp expected-author actual-author &&
+ test_cmp expected-committer actual-committer
+'
+
+test_expect_success 'committer.email overrides user.email' '
+ test_config user.name user &&
+ test_config user.email user@example.com &&
+ test_config committer.email committer@example.com &&
+ test_commit committer-email-override-user &&
+ echo user user@example.com > expected-author &&
+ echo user committer@example.com > expected-committer &&
+ git log --format="%an %ae" -1 > actual-author &&
+ git log --format="%cn %ce" -1 > actual-committer &&
+ test_cmp expected-author actual-author &&
+ test_cmp expected-committer actual-committer
+'
+
+test_expect_success 'author and committer environment variables override config settings' '
+ test_config user.name user &&
+ test_config user.email user@example.com &&
+ test_config author.name author &&
+ test_config author.email author@example.com &&
+ test_config committer.name committer &&
+ test_config committer.email committer@example.com &&
+ GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
+ GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
+ GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
+ GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
+ test_commit env-override-conf &&
+ echo env_author env_author@example.com > expected-author &&
+ echo env_commit env_commit@example.com > expected-committer &&
+ git log --format="%an %ae" -1 > actual-author &&
+ git log --format="%cn %ce" -1 > actual-committer &&
+ sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+ sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+ test_cmp expected-author actual-author &&
+ test_cmp expected-committer actual-committer
+'
+
test_done
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 3e0a61d..81a375f 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -346,4 +346,12 @@
test_cmp before after
'
+test_expect_success 'discard_index() also discards fsmonitor info' '
+ test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
+ test_might_fail git update-index --refresh &&
+ test-tool read-cache --print-and-refresh=tracked 2 >actual &&
+ printf "tracked is%s up to date\n" "" " not" >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t7525-status-rename.sh b/t/t7525-status-rename.sh
index ef8b1b3..a62736d 100755
--- a/t/t7525-status-rename.sh
+++ b/t/t7525-status-rename.sh
@@ -84,7 +84,7 @@
test_i18ngrep "deleted:" actual &&
test_i18ngrep "new file:" actual &&
- git status --find-rename=100% >actual &&
+ git status --find-renames=100% >actual &&
test_i18ngrep "deleted:" actual &&
test_i18ngrep "new file:" actual
'
@@ -93,11 +93,11 @@
git status -M=01% >actual &&
test_i18ngrep "renamed:" actual &&
- git status --find-rename=01% >actual &&
+ git status --find-renames=01% >actual &&
test_i18ngrep "renamed:" actual
'
-test_expect_success 'copies not overridden by find-rename' '
+test_expect_success 'copies not overridden by find-renames' '
cp renamed copy &&
git add copy &&
@@ -105,7 +105,7 @@
test_i18ngrep "copied:" actual &&
test_i18ngrep "renamed:" actual &&
- git -c status.renames=copies status --find-rename=01% >actual &&
+ git -c status.renames=copies status --find-renames=01% >actual &&
test_i18ngrep "copied:" actual &&
test_i18ngrep "renamed:" actual
'
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1061482..1326088 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -233,20 +233,65 @@
cat result.9z >file &&
git commit --no-edit -a &&
- {
- cat <<-EOF
- Squashed commit of the following:
+ cat >expect <<-EOF &&
+ Squashed commit of the following:
- $(git show -s c7)
+ $(git show -s c7)
- # Conflicts:
- # file
- EOF
- } >expect &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ # Conflicts:
+ # file
+ EOF
+ git cat-file commit HEAD >raw &&
+ sed -e '1,/^$/d' raw >actual &&
test_cmp expect actual
'
+test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
+ git config commit.cleanup scissors &&
+ git reset --hard c3 &&
+ test_must_fail git merge c7 &&
+ cat result.9z >file &&
+ git commit --no-edit -a &&
+
+ cat >expect <<-\EOF &&
+ Merge tag '"'"'c7'"'"'
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # file
+ EOF
+ git cat-file commit HEAD >raw &&
+ sed -e '1,/^$/d' raw >actual &&
+ test_i18ncmp expect actual
+'
+
+test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
+ git config commit.cleanup scissors &&
+ git reset --hard c3 &&
+ test_must_fail git merge --squash c7 &&
+ cat result.9z >file &&
+ git commit --no-edit -a &&
+
+ cat >expect <<-EOF &&
+ Squashed commit of the following:
+
+ $(git show -s c7)
+
+ # ------------------------ >8 ------------------------
+ # Do not modify or remove the line above.
+ # Everything below it will be ignored.
+ #
+ # Conflicts:
+ # file
+ EOF
+ git cat-file commit HEAD >raw &&
+ sed -e '1,/^$/d' raw >actual &&
+ test_i18ncmp expect actual
+'
+
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge c1 with c2 and c3' '
@@ -525,6 +570,12 @@
test_must_fail git merge --no-ff --squash c1
'
+test_expect_success 'combining --squash and --commit is refused' '
+ git reset --hard c0 &&
+ test_must_fail git merge --squash --commit c1 &&
+ test_must_fail git merge --commit --squash c1
+'
+
test_expect_success 'option --ff-only overwrites --no-ff' '
git merge --no-ff --ff-only c1 &&
test_must_fail git merge --no-ff --ff-only c2
@@ -680,10 +731,10 @@
(
echo "Merge work done on the side branch c1"
echo
- cat <"$1"
+ cat "$1"
) >"$1.tmp" && mv "$1.tmp" "$1"
# strip comments and blank lines from end of message
-sed -e '/^#/d' < "$1" | sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' > expected
+sed -e '/^#/d' "$1" | sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' >expected
EOF
chmod 755 editor
@@ -768,14 +819,14 @@
git commit -m base &&
# one side changes the first line of each to "master"
- sed s/-1/-master/ <file >tmp &&
+ sed s/-1/-master/ file >tmp &&
mv tmp file &&
git commit -am master &&
# and the other to "side"; merging the two will
# yield 256 separate conflicts
git checkout -b side HEAD^ &&
- sed s/-1/-side/ <file >tmp &&
+ sed s/-1/-side/ file >tmp &&
mv tmp file &&
git commit -am side
'
@@ -814,7 +865,7 @@
test_expect_success EXECKEEPSPID 'killed merge can be completed with --continue' '
git reset --hard c0 &&
! "$SHELL_PATH" -c '\''
- echo kill -TERM $$ >> .git/FAKE_EDITOR
+ echo kill -TERM $$ >>.git/FAKE_EDITOR
GIT_EDITOR=.git/FAKE_EDITOR
export GIT_EDITOR
exec git merge --no-ff --edit c1'\'' &&
@@ -822,4 +873,50 @@
verify_parents $c0 $c1
'
+test_expect_success 'merge --quit' '
+ git init merge-quit &&
+ (
+ cd merge-quit &&
+ test_commit base &&
+ echo one >>base.t &&
+ git commit -am one &&
+ git branch one &&
+ git checkout base &&
+ echo two >>base.t &&
+ git commit -am two &&
+ test_must_fail git -c rerere.enabled=true merge one &&
+ test_path_is_file .git/MERGE_HEAD &&
+ test_path_is_file .git/MERGE_MODE &&
+ test_path_is_file .git/MERGE_MSG &&
+ git rerere status >rerere.before &&
+ git merge --quit &&
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_path_is_missing .git/MERGE_MODE &&
+ test_path_is_missing .git/MERGE_MSG &&
+ git rerere status >rerere.after &&
+ test_must_be_empty rerere.after &&
+ ! test_cmp rerere.after rerere.before
+ )
+'
+
+test_expect_success 'merge suggests matching remote refname' '
+ git commit --allow-empty -m not-local &&
+ git update-ref refs/remotes/origin/not-local HEAD &&
+ git reset --hard HEAD^ &&
+
+ # This is white-box testing hackery; we happen to know
+ # that reading packed refs is more picky about the memory
+ # ownership of strings we pass to for_each_ref() callbacks.
+ git pack-refs --all --prune &&
+
+ test_must_fail git merge not-local 2>stderr &&
+ grep origin/not-local stderr
+'
+
+test_expect_success 'suggested names are not ambiguous' '
+ git update-ref refs/heads/origin/not-local HEAD &&
+ test_must_fail git merge not-local 2>stderr &&
+ grep remotes/origin/not-local stderr
+'
+
test_done
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index 89619cf..cd4f960 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -16,16 +16,16 @@
}
test_expect_success 'setup' '
- echo c0 > c0.c &&
+ echo c0 >c0.c &&
git add c0.c &&
git commit -m c0 &&
git tag c0 &&
- echo c1 > c1.c &&
+ echo c1 >c1.c &&
git add c1.c &&
git commit -m c1 &&
git tag c1 &&
git reset --hard c0 &&
- echo c2 > c2.c &&
+ echo c2 >c2.c &&
git add c2.c &&
git commit -m c2 &&
git tag c2 &&
@@ -36,15 +36,80 @@
test_expect_success 'merge c2 with a custom message' '
git reset --hard c1 &&
git merge -m "$(cat exp.subject)" c2 &&
- git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
test_cmp exp.subject actual
'
test_expect_success 'merge --log appends to custom message' '
git reset --hard c1 &&
git merge --log -m "$(cat exp.subject)" c2 &&
- git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
test_cmp exp.log actual
'
+mesg_with_comment_and_newlines='
+# text
+
+'
+
+test_expect_success 'prepare file with comment line and trailing newlines' '
+ printf "%s" "$mesg_with_comment_and_newlines" >expect
+'
+
+test_expect_success 'cleanup commit messages (verbatim option)' '
+ git reset --hard c1 &&
+ git merge --cleanup=verbatim -F expect c2 &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cleanup commit messages (whitespace option)' '
+ git reset --hard c1 &&
+ test_write_lines "" "# text" "" >text &&
+ echo "# text" >expect &&
+ git merge --cleanup=whitespace -F text c2 &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cleanup merge messages (scissors option)' '
+ git reset --hard c1 &&
+ cat >text <<-\EOF &&
+
+ # to be kept
+
+ # ------------------------ >8 ------------------------
+ # to be kept, too
+ # ------------------------ >8 ------------------------
+ to be removed
+ # ------------------------ >8 ------------------------
+ to be removed, too
+ EOF
+
+ cat >expect <<-\EOF &&
+ # to be kept
+
+ # ------------------------ >8 ------------------------
+ # to be kept, too
+ EOF
+ git merge --cleanup=scissors -e -F text c2 &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cleanup commit messages (strip option)' '
+ git reset --hard c1 &&
+ test_write_lines "" "# text" "sample" "" >text &&
+ echo sample >expect &&
+ git merge --cleanup=strip -F text c2 &&
+ git cat-file commit HEAD >raw &&
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index a9fb971..ad288dd 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -130,18 +130,71 @@
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master >/dev/null 2>&1 &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool file1 file1 ) &&
- ( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
- test "$(cat file1)" = "master updated" &&
- test "$(cat file2)" = "master new" &&
- test "$(cat subdir/file3)" = "master new sub" &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ test_must_fail git merge master &&
+ yes "" | git mergetool both &&
+ yes "" | git mergetool file1 file1 &&
+ yes "" | git mergetool file2 "spaced name" &&
+ yes "" | git mergetool subdir/file3 &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "master new" >expect &&
+ test_cmp expect file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
+ git commit -m "branch1 resolved with mergetool"
+'
+
+test_expect_success 'gui mergetool' '
+ test_config merge.guitool myguitool &&
+ test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
+ test_config mergetool.myguitool.trustExitCode true &&
+ test_when_finished "git reset --hard" &&
+ git checkout -b test$test_count branch1 &&
+ git submodule update -N &&
+ test_must_fail git merge master &&
+ yes "" | git mergetool --gui both &&
+ yes "" | git mergetool -g file1 file1 &&
+ yes "" | git mergetool --gui file2 "spaced name" &&
+ yes "" | git mergetool --gui subdir/file3 &&
+ yes "d" | git mergetool --gui file11 &&
+ yes "d" | git mergetool --gui file12 &&
+ yes "l" | git mergetool --gui submod &&
+ echo "gui master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "gui master new" >expect &&
+ test_cmp expect file2 &&
+ echo "gui master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
+ git commit -m "branch1 resolved with mergetool"
+'
+
+test_expect_success 'gui mergetool without merge.guitool set falls back to merge.tool' '
+ test_when_finished "git reset --hard" &&
+ git checkout -b test$test_count branch1 &&
+ git submodule update -N &&
+ test_must_fail git merge master &&
+ yes "" | git mergetool --gui both &&
+ yes "" | git mergetool -g file1 file1 &&
+ yes "" | git mergetool --gui file2 "spaced name" &&
+ yes "" | git mergetool --gui subdir/file3 &&
+ yes "d" | git mergetool --gui file11 &&
+ yes "d" | git mergetool --gui file12 &&
+ yes "l" | git mergetool --gui submod &&
+ echo "master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "master new" >expect &&
+ test_cmp expect file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool"
'
@@ -153,20 +206,21 @@
# test_when_finished is LIFO.)
test_config core.autocrlf true &&
git checkout -b test$test_count branch1 &&
- test_must_fail git merge master >/dev/null 2>&1 &&
- ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool "spaced name" >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
- ( yes "r" | git mergetool submod >/dev/null 2>&1 ) &&
+ test_must_fail git merge master &&
+ yes "" | git mergetool file1 &&
+ yes "" | git mergetool file2 &&
+ yes "" | git mergetool "spaced name" &&
+ yes "" | git mergetool both &&
+ yes "" | git mergetool subdir/file3 &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "r" | git mergetool submod &&
test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool - autocrlf"
'
@@ -176,9 +230,10 @@
git submodule update -N &&
(
cd subdir &&
- test_must_fail git merge master >/dev/null 2>&1 &&
- ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
- test "$(cat file3)" = "master new sub"
+ test_must_fail git merge master &&
+ yes "" | git mergetool file3 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3
)
'
@@ -188,17 +243,20 @@
git submodule update -N &&
(
cd subdir &&
- test_must_fail git merge master >/dev/null 2>&1 &&
- ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool ../file2 ../spaced\ name >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool ../both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool ../submod >/dev/null 2>&1 ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat ../submod/bar)" = "branch1 submodule" &&
+ test_must_fail git merge master &&
+ yes "" | git mergetool file3 &&
+ yes "" | git mergetool ../file1 &&
+ yes "" | git mergetool ../file2 ../spaced\ name &&
+ yes "" | git mergetool ../both &&
+ yes "d" | git mergetool ../file11 &&
+ yes "d" | git mergetool ../file12 &&
+ yes "l" | git mergetool ../submod &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch1 resolved with mergetool - subdir"
)
'
@@ -209,9 +267,9 @@
git submodule update -N &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "l" | git mergetool submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging"
'
@@ -223,13 +281,17 @@
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "r" | git mergetool ../submod ) &&
- ( yes "d" "d" | git mergetool --no-prompt ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat file3)" = "master new sub" &&
+ yes "r" | git mergetool ../submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- test "$(cat ../submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
'
@@ -242,13 +304,17 @@
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "r" | git mergetool ../submod ) &&
- ( yes "d" "d" | git mergetool --no-prompt ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat file3)" = "master new sub" &&
+ yes "r" | git mergetool ../submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- test "$(cat ../submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
'
@@ -259,9 +325,9 @@
rm -rf .git/rr-cache &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master >/dev/null 2>&1 &&
- ( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
- ( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
+ test_must_fail git merge master &&
+ yes "l" | git mergetool --no-prompt submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
git submodule update -N &&
output="$(yes "n" | git mergetool --no-prompt)" &&
test "$output" = "No files need merging"
@@ -302,9 +368,10 @@
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "" | git mergetool subdir ) &&
+ yes "" | git mergetool subdir &&
- test "$(cat subdir/file3)" = "master new sub"
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3
'
test_expect_success 'mergetool delete/delete conflict' '
@@ -369,14 +436,16 @@
git checkout -b test$test_count.a test$test_count &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
rmdir submod && mv submod-movedaside submod &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module" &&
@@ -386,10 +455,10 @@
git submodule update -N &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
test ! -e submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
@@ -400,10 +469,10 @@
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
test ! -e submod &&
test -d submod.orig &&
git submodule update -N &&
@@ -416,13 +485,15 @@
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/bar)" = "master submodule" &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module"
@@ -440,14 +511,16 @@
git checkout -b test$test_count.a branch1 &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
rmdir submod && mv submod-movedaside submod &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module" &&
@@ -456,12 +529,13 @@
git checkout -b test$test_count.b test$test_count &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
git submodule update -N &&
- test "$(cat submod)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
@@ -472,13 +546,14 @@
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
test -d submod.orig &&
git submodule update -N &&
- test "$(cat submod)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
@@ -488,13 +563,15 @@
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
- ( yes "" | git mergetool both>/dev/null 2>&1 ) &&
- ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/bar)" = "master submodule" &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module"
@@ -543,22 +620,26 @@
git add subdir/subdir_module &&
git commit -m "change submodule in subdirectory on test$test_count.b" &&
- test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
+ test_must_fail git merge test$test_count.a &&
(
cd subdir &&
- ( yes "l" | git mergetool subdir_module )
+ yes "l" | git mergetool subdir_module
) &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git submodule update -N &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git reset --hard &&
git submodule update -N &&
- test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
- ( yes "r" | git mergetool subdir/subdir_module ) &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ test_must_fail git merge test$test_count.a &&
+ yes "r" | git mergetool subdir/subdir_module &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git submodule update -N &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.a" &&
+ echo "test$test_count.a" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git commit -m "branch1 resolved with mergetool"
'
@@ -574,22 +655,25 @@
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/file16)" = "not a submodule" &&
+ yes "l" | git mergetool submod &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod/file16 &&
rm -rf submod.orig &&
git reset --hard &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
test ! -e submod.orig &&
- ( yes "r" | git mergetool submod ) &&
+ yes "r" | git mergetool submod &&
test -d submod.orig &&
- test "$(cat submod.orig/file16)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod.orig/file16 &&
rm -r submod.orig &&
mv submod-movedaside/.git submod &&
( cd submod && git clean -f && git reset --hard ) &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git reset --hard &&
rm -rf submod-movedaside &&
@@ -597,17 +681,19 @@
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "l" | git mergetool submod ) &&
+ yes "l" | git mergetool submod &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git reset --hard &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
test ! -e submod.orig &&
- ( yes "r" | git mergetool submod ) &&
- test "$(cat submod/file16)" = "not a submodule" &&
+ yes "r" | git mergetool submod &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod/file16 &&
git reset --hard master &&
( cd submod && git clean -f && git reset --hard ) &&
@@ -641,7 +727,7 @@
test_config mergetool.myecho.trustExitCode true &&
test_must_fail git merge master &&
git mergetool --no-prompt --tool myecho -- both >actual &&
- grep ^\./both_LOCAL_ actual >/dev/null
+ grep ^\./both_LOCAL_ actual
'
test_lazy_prereq MKTEMP '
@@ -658,8 +744,8 @@
test_config mergetool.myecho.trustExitCode true &&
test_must_fail git merge master &&
git mergetool --no-prompt --tool myecho -- both >actual &&
- ! grep ^\./both_LOCAL_ actual >/dev/null &&
- grep /both_LOCAL_ actual >/dev/null
+ ! grep ^\./both_LOCAL_ actual &&
+ grep /both_LOCAL_ actual
'
test_expect_success 'diff.orderFile configuration is honored' '
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 6162e2a..4e855bc2 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -221,5 +221,45 @@
)
'
-test_done
+test_expect_success 'bitmaps are created by default in bare repos' '
+ git clone --bare .git bare.git &&
+ git -C bare.git repack -ad &&
+ bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
+ test_path_is_file "$bitmap"
+'
+test_expect_success 'incremental repack does not complain' '
+ git -C bare.git repack -q 2>repack.err &&
+ test_must_be_empty repack.err
+'
+
+test_expect_success 'bitmaps can be disabled on bare repos' '
+ git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+ bitmap=$(ls bare.git/objects/pack/*.bitmap 2>/dev/null || :) &&
+ test -z "$bitmap"
+'
+
+test_expect_success 'no bitmaps created if .keep files present' '
+ pack=$(ls bare.git/objects/pack/*.pack) &&
+ test_path_is_file "$pack" &&
+ keep=${pack%.pack}.keep &&
+ test_when_finished "rm -f \"\$keep\"" &&
+ >"$keep" &&
+ git -C bare.git repack -ad 2>stderr &&
+ test_must_be_empty stderr &&
+ find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'auto-bitmaps do not complain if unavailable' '
+ test_config -C bare.git pack.packSizeLimit 1M &&
+ blob=$(test-tool genrandom big $((1024*1024)) |
+ git -C bare.git hash-object -w --stdin) &&
+ git -C bare.git update-ref refs/tags/big $blob &&
+ git -C bare.git repack -ad 2>stderr &&
+ test_must_be_empty stderr &&
+ find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
+ test_must_be_empty actual
+'
+
+test_done
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 22b9199..6bac9ed 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -279,11 +279,27 @@
echo branch >expect &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual &&
+ git difftool --gui --no-prompt branch >actual &&
+ test_cmp expect actual &&
# set merge.tool to something bogus, diff.tool to test-tool
test_config merge.tool bogus-tool &&
test_config diff.tool test-tool &&
git difftool --no-prompt branch >actual &&
+ test_cmp expect actual &&
+ git difftool --gui --no-prompt branch >actual &&
+ test_cmp expect actual &&
+
+ # set merge.tool, diff.tool to something bogus, merge.guitool to test-tool
+ test_config diff.tool bogus-tool &&
+ test_config merge.guitool test-tool &&
+ git difftool --gui --no-prompt branch >actual &&
+ test_cmp expect actual &&
+
+ # set merge.tool, diff.tool, merge.guitool to something bogus, diff.guitool to test-tool
+ test_config merge.guitool bogus-tool &&
+ test_config diff.guitool test-tool &&
+ git difftool --gui --no-prompt branch >actual &&
test_cmp expect actual
'
@@ -546,7 +562,7 @@
done >actual
EOF
-test_expect_success SYMLINKS 'difftool --dir-diff --symlink without unstaged changes' '
+test_expect_success SYMLINKS 'difftool --dir-diff --symlinks without unstaged changes' '
cat >expect <<-EOF &&
file
$PWD/file
@@ -555,7 +571,7 @@
sub/sub
$PWD/sub/sub
EOF
- git difftool --dir-diff --symlink \
+ git difftool --dir-diff --symlinks \
--extcmd "./.git/CHECK_SYMLINKS" branch HEAD &&
test_cmp expect actual
'
@@ -705,4 +721,22 @@
test_cmp expect actual
'
+test_expect_success 'outside worktree' '
+ echo 1 >1 &&
+ echo 2 >2 &&
+ test_expect_code 1 nongit git \
+ -c diff.tool=echo -c difftool.echo.cmd="echo \$LOCAL \$REMOTE" \
+ difftool --no-prompt --no-index ../1 ../2 >actual &&
+ echo "../1 ../2" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'difftool --gui, --tool and --extcmd are mutually exclusive' '
+ difftool_test_setup &&
+ test_must_fail git difftool --gui --tool=test-tool &&
+ test_must_fail git difftool --gui --extcmd=cat &&
+ test_must_fail git difftool --tool=test-tool --extcmd=cat &&
+ test_must_fail git difftool --gui --tool=test-tool --extcmd=cat
+'
+
test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 43aa416..7d7b396 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -119,33 +119,33 @@
test_cmp expected actual
'
- test_expect_success "grep -w $L (with --column, --invert)" '
+ test_expect_success "grep -w $L (with --column, --invert-match)" '
{
echo ${HC}file:1:foo mmap bar
echo ${HC}file:1:foo_mmap bar
echo ${HC}file:1:foo_mmap bar mmap
echo ${HC}file:1:foo mmap bar_mmap
} >expected &&
- git grep --column --invert -w -e baz $H -- file >actual &&
+ git grep --column --invert-match -w -e baz $H -- file >actual &&
test_cmp expected actual
'
- test_expect_success "grep $L (with --column, --invert, extended OR)" '
+ test_expect_success "grep $L (with --column, --invert-match, extended OR)" '
{
echo ${HC}hello_world:6:HeLLo_world
} >expected &&
- git grep --column --invert -e ll --or --not -e _ $H -- hello_world \
+ git grep --column --invert-match -e ll --or --not -e _ $H -- hello_world \
>actual &&
test_cmp expected actual
'
- test_expect_success "grep $L (with --column, --invert, extended AND)" '
+ test_expect_success "grep $L (with --column, --invert-match, extended AND)" '
{
echo ${HC}hello_world:3:Hello world
echo ${HC}hello_world:3:Hello_world
echo ${HC}hello_world:6:HeLLo_world
} >expected &&
- git grep --column --invert --not -e _ --and --not -e ll $H -- hello_world \
+ git grep --column --invert-match --not -e _ --and --not -e ll $H -- hello_world \
>actual &&
test_cmp expected actual
'
@@ -412,7 +412,7 @@
test_cmp expected actual
'
- test_expect_success !PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
+ test_expect_success !FAIL_PREREQS,!PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
test_must_fail git -c grep.patterntype=perl grep "foo.*bar"
'
@@ -1010,7 +1010,7 @@
echo ".gitignore:.*o*" &&
cat ../expect.full
} >../expect.with.ignored &&
- git grep --no-index --no-exclude o >../actual.full &&
+ git grep --no-index --no-exclude-standard o >../actual.full &&
test_cmp ../expect.with.ignored ../actual.full
)
'
@@ -1051,7 +1051,7 @@
echo ".gitignore:.*o*" &&
cat ../expect.full
} >../expect.with.ignored &&
- git -c grep.fallbackToNoIndex grep --no-exclude o >../actual.full &&
+ git -c grep.fallbackToNoIndex grep --no-exclude-standard o >../actual.full &&
test_cmp ../expect.with.ignored ../actual.full
)
'
@@ -1234,7 +1234,7 @@
test_cmp expected actual
'
-test_expect_success !PCRE 'grep --perl-regexp pattern errors without PCRE' '
+test_expect_success !FAIL_PREREQS,!PCRE 'grep --perl-regexp pattern errors without PCRE' '
test_must_fail git grep --perl-regexp "foo.*bar"
'
@@ -1249,7 +1249,7 @@
'
-test_expect_success !PCRE 'grep -P pattern errors without PCRE' '
+test_expect_success !FAIL_PREREQS,!PCRE 'grep -P pattern errors without PCRE' '
test_must_fail git grep -P "foo.*bar"
'
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index fa475d5..946f91f 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -14,12 +14,14 @@
echo "(3|4)" >b/b &&
git add a b &&
git commit -m "add a and b" &&
+ test_tick &&
git init submodule &&
echo "(1|2)d(3|4)" >submodule/a &&
git -C submodule add a &&
git -C submodule commit -m "add a" &&
git submodule add ./submodule &&
- git commit -m "added submodule"
+ git commit -m "added submodule" &&
+ test_tick
'
test_expect_success 'grep correctly finds patterns in a submodule' '
@@ -65,11 +67,14 @@
echo "(1|2)d(3|4)" >submodule/sub/a &&
git -C submodule/sub add a &&
git -C submodule/sub commit -m "add a" &&
+ test_tick &&
git -C submodule submodule add ./sub &&
git -C submodule add sub &&
git -C submodule commit -m "added sub" &&
+ test_tick &&
git add submodule &&
git commit -m "updated submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
a:(1|2)d(3|4)
@@ -179,15 +184,18 @@
echo "(1|2)d(3|4)" >"parent/fi:le" &&
git -C parent add "fi:le" &&
git -C parent commit -m "add fi:le" &&
+ test_tick &&
git init "su:b" &&
test_when_finished "rm -rf su:b" &&
echo "(1|2)d(3|4)" >"su:b/fi:le" &&
git -C "su:b" add "fi:le" &&
git -C "su:b" commit -m "add fi:le" &&
+ test_tick &&
git -C parent submodule add "../su:b" "su:b" &&
git -C parent commit -m "add submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
fi:le:(1|2)d(3|4)
@@ -210,15 +218,18 @@
echo "(1|2)d(3|4)" >parent/file &&
git -C parent add file &&
git -C parent commit -m "add file" &&
+ test_tick &&
git init sub &&
test_when_finished "rm -rf sub" &&
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git -C parent submodule add ../sub dir/sub &&
git -C parent commit -m "add submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
dir/sub/file:(1|2)d(3|4)
@@ -229,6 +240,7 @@
git -C parent mv dir/sub sub-moved &&
git -C parent commit -m "moved submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
file:(1|2)d(3|4)
@@ -251,6 +263,7 @@
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git init parent &&
echo "(1|2)d(3|4)" >parent/file &&
@@ -260,6 +273,7 @@
git -C parent add src/file2 &&
git -C parent submodule add ../sub &&
git -C parent commit -m "add files and submodule" &&
+ test_tick &&
# From top works
cat >expect <<-\EOF &&
@@ -293,6 +307,7 @@
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git init parent &&
mkdir parent/src &&
@@ -301,6 +316,7 @@
git -C parent submodule add ../sub src/sub &&
git -C parent submodule add ../sub sub &&
git -C parent commit -m "add files and submodules" &&
+ test_tick &&
# Verify grep from root works
cat >expect <<-\EOF &&
@@ -380,11 +396,7 @@
fi
'
-# Recursing down into nested submodules which do not have .gitmodules in their
-# working tree does not work yet. This is because config_from_gitmodules()
-# uses get_oid() and the latter is still not able to get objects from an
-# arbitrary repository (the nested submodule, in this case).
-test_expect_failure 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
+test_expect_success 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
test_when_finished "git -C submodule checkout .gitmodules" &&
rm submodule/.gitmodules &&
git grep --recurse-submodules -e "(.|.)[\d]" >actual &&
@@ -396,4 +408,25 @@
test_cmp expect actual
'
+reset_and_clean () {
+ git reset --hard &&
+ git clean -fd &&
+ git submodule foreach --recursive 'git reset --hard' &&
+ git submodule foreach --recursive 'git clean -fd'
+}
+
+test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
+ reset_and_clean &&
+ echo "A modified line in submodule" >>submodule/a &&
+ echo "submodule/a:A modified line in submodule" >expect &&
+ git grep --recurse-submodules "A modified line in submodule" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
+ reset_and_clean &&
+ echo "A modified line in submodule" >>submodule/a &&
+ test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
+ test_must_be_empty actual
+'
test_done
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index c92a47b..1c5fb1d 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -275,4 +275,40 @@
grep "A U Thor" actual
'
+# Tests the splitting and merging of blame entries in blame_coalesce().
+# The output of blame is the same, regardless of whether blame_coalesce() runs
+# or not, so we'd likely only notice a problem if blame crashes or assigned
+# blame to the "splitting" commit ('SPLIT' below).
+test_expect_success 'blame coalesce' '
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "original file" &&
+ oid=$(git rev-parse HEAD) &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ SPLIT
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "interior SPLIT line" &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "same contents as original" &&
+
+ cat >expect <<-EOF &&
+ $oid 1) ABC
+ $oid 2) DEF
+ EOF
+ git -c core.abbrev=40 blame -s giraffe >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
new file mode 100755
index 0000000..36dc31e
--- /dev/null
+++ b/t/t8013-blame-ignore-revs.sh
@@ -0,0 +1,274 @@
+#!/bin/sh
+
+test_description='ignore revisions when blaming'
+. ./test-lib.sh
+
+# Creates:
+# A--B--X
+# A added line 1 and B added line 2. X makes changes to those lines. Sanity
+# check that X is blamed for both lines.
+test_expect_success setup '
+ test_commit A file line1 &&
+
+ echo line2 >>file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ test_write_lines line-one line-two >file &&
+ git add file &&
+ test_tick &&
+ git commit -m X &&
+ git tag X &&
+
+ git blame --line-porcelain file >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse X >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse X >expect &&
+ test_cmp expect actual
+ '
+
+# Ignore X, make sure A is blamed for line 1 and B for line 2.
+test_expect_success ignore_rev_changing_lines '
+ git blame --line-porcelain --ignore-rev X file >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# For ignored revs that have added 'unblamable' lines, attribute those to the
+# ignored commit.
+# A--B--X--Y
+# Where Y changes lines 1 and 2, and adds lines 3 and 4. The added lines ought
+# to have nothing in common with "line-one" or "line-two", to keep any
+# heuristics from matching them with any lines in the parent.
+test_expect_success ignore_rev_adding_unblamable_lines '
+ test_write_lines line-one-change line-two-changed y3 y4 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m Y &&
+ git tag Y &&
+
+ git rev-parse Y >expect &&
+ git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 3" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual
+ '
+
+# Ignore X and Y, both in separate files. Lines 1 == A, 2 == B.
+test_expect_success ignore_revs_from_files '
+ git rev-parse X >ignore_x &&
+ git rev-parse Y >ignore_y &&
+ git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# Ignore X from the config option, Y from a file.
+test_expect_success ignore_revs_from_configs_and_files '
+ git config --add blame.ignoreRevsFile ignore_x &&
+ git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# Override blame.ignoreRevsFile (ignore_x) with an empty string. X should be
+# blamed now for lines 1 and 2, since we are no longer ignoring X.
+test_expect_success override_ignore_revs_file '
+ git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
+ git rev-parse X >expect &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual
+ '
+test_expect_success bad_files_and_revs '
+ test_must_fail git blame file --ignore-rev NOREV 2>err &&
+ test_i18ngrep "cannot find revision NOREV to ignore" err &&
+
+ test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
+ test_i18ngrep "could not open.*: NOFILE" err &&
+
+ echo NOREV >ignore_norev &&
+ test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
+ test_i18ngrep "invalid object name: NOREV" err
+ '
+
+# For ignored revs that have added 'unblamable' lines, mark those lines with a
+# '*'
+# A--B--X--Y
+# Lines 3 and 4 are from Y and unblamable. This was set up in
+# ignore_rev_adding_unblamable_lines.
+test_expect_success mark_unblamable_lines '
+ git config --add blame.markUnblamableLines true &&
+
+ git blame --ignore-rev Y file >blame_raw &&
+ echo "*" >expect &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual
+ '
+
+# Commit Z will touch the first two lines. Y touched all four.
+# A--B--X--Y--Z
+# The blame output when ignoring Z should be:
+# ?Y ... 1)
+# ?Y ... 2)
+# Y ... 3)
+# Y ... 4)
+# We're checking only the first character
+test_expect_success mark_ignored_lines '
+ git config --add blame.markIgnoredLines true &&
+
+ test_write_lines line-one-Z line-two-Z y3 y4 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m Z &&
+ git tag Z &&
+
+ git blame --ignore-rev Z file >blame_raw &&
+ echo "?" >expect &&
+
+ sed -n "1p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "2p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual
+ '
+
+# For ignored revs that added 'unblamable' lines and more recent commits changed
+# the blamable lines, mark the unblamable lines with a
+# '*'
+# A--B--X--Y--Z
+# Lines 3 and 4 are from Y and unblamable, as set up in
+# ignore_rev_adding_unblamable_lines. Z changed lines 1 and 2.
+test_expect_success mark_unblamable_lines_intermediate '
+ git config --add blame.markUnblamableLines true &&
+
+ git blame --ignore-rev Y file >blame_raw 2>stderr &&
+ echo "*" >expect &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual
+ '
+
+# The heuristic called by guess_line_blames() tries to find the size of a
+# blame_entry 'e' in the parent's address space. Those calculations need to
+# check for negative or zero values for when a blame entry is completely outside
+# the window of the parent's version of a file.
+#
+# This happens when one commit adds several lines (commit B below). A later
+# commit (C) changes one line in the middle of B's change. Commit C gets blamed
+# for its change, and that breaks up B's change into multiple blame entries.
+# When processing B, one of the blame_entries is outside A's window (which was
+# zero - it had no lines added on its side of the diff).
+#
+# A--B--C, ignore B to test the ignore heuristic's boundary checks.
+test_expect_success ignored_chunk_negative_parent_size '
+ rm -rf .git/ &&
+ git init &&
+
+ test_write_lines L1 L2 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m A &&
+ git tag A &&
+
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m C &&
+ git tag C &&
+
+ git blame file --ignore-rev B >blame_raw
+ '
+
+# Resetting the repo and creating:
+#
+# A--B--M
+# \ /
+# C-+
+#
+# 'A' creates a file. B changes line 1, and C changes line 9. M merges.
+test_expect_success ignore_merge '
+ rm -rf .git/ &&
+ git init &&
+
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m A &&
+ git tag A &&
+
+ test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ git reset --hard A &&
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
+ git add file &&
+ test_tick &&
+ git commit -m C &&
+ git tag C &&
+
+ test_merge M B &&
+ git blame --line-porcelain file --ignore-rev M >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse C >expect &&
+ test_cmp expect actual
+ '
+
+test_done
diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
new file mode 100755
index 0000000..6e61882
--- /dev/null
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -0,0 +1,437 @@
+#!/bin/sh
+
+test_description='git blame ignore fuzzy heuristic'
+. ./test-lib.sh
+
+pick_author='s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/'
+
+# Each test is composed of 4 variables:
+# titleN - the test name
+# aN - the initial content
+# bN - the final content
+# expectedN - the line numbers from aN that we expect git blame
+# on bN to identify, or "Final" if bN itself should
+# be identified as the origin of that line.
+
+# We start at test 2 because setup will show as test 1
+title2="Regression test for partially overlapping search ranges"
+cat <<EOF >a2
+1
+2
+3
+abcdef
+5
+6
+7
+ijkl
+9
+10
+11
+pqrs
+13
+14
+15
+wxyz
+17
+18
+19
+EOF
+cat <<EOF >b2
+abcde
+ijk
+pqr
+wxy
+EOF
+cat <<EOF >expected2
+4
+8
+12
+16
+EOF
+
+title3="Combine 3 lines into 2"
+cat <<EOF >a3
+if ((maxgrow==0) ||
+ ( single_line_field && (field->dcols < maxgrow)) ||
+ (!single_line_field && (field->drows < maxgrow)))
+EOF
+cat <<EOF >b3
+if ((maxgrow == 0) || (single_line_field && (field->dcols < maxgrow)) ||
+ (!single_line_field && (field->drows < maxgrow))) {
+EOF
+cat <<EOF >expected3
+2
+3
+EOF
+
+title4="Add curly brackets"
+cat <<EOF >a4
+ if (rows) *rows = field->rows;
+ if (cols) *cols = field->cols;
+ if (frow) *frow = field->frow;
+ if (fcol) *fcol = field->fcol;
+EOF
+cat <<EOF >b4
+ if (rows) {
+ *rows = field->rows;
+ }
+ if (cols) {
+ *cols = field->cols;
+ }
+ if (frow) {
+ *frow = field->frow;
+ }
+ if (fcol) {
+ *fcol = field->fcol;
+ }
+EOF
+cat <<EOF >expected4
+1
+1
+Final
+2
+2
+Final
+3
+3
+Final
+4
+4
+Final
+EOF
+
+
+title5="Combine many lines and change case"
+cat <<EOF >a5
+for(row=0,pBuffer=field->buf;
+ row<height;
+ row++,pBuffer+=width )
+{
+ if ((len = (int)( After_End_Of_Data( pBuffer, width ) - pBuffer )) > 0)
+ {
+ wmove( win, row, 0 );
+ waddnstr( win, pBuffer, len );
+EOF
+cat <<EOF >b5
+for (Row = 0, PBuffer = field->buf; Row < Height; Row++, PBuffer += Width) {
+ if ((Len = (int)(afterEndOfData(PBuffer, Width) - PBuffer)) > 0) {
+ wmove(win, Row, 0);
+ waddnstr(win, PBuffer, Len);
+EOF
+cat <<EOF >expected5
+1
+5
+7
+8
+EOF
+
+title6="Rename and combine lines"
+cat <<EOF >a6
+bool need_visual_update = ((form != (FORM *)0) &&
+ (form->status & _POSTED) &&
+ (form->current==field));
+
+if (need_visual_update)
+ Synchronize_Buffer(form);
+
+if (single_line_field)
+{
+ growth = field->cols * amount;
+ if (field->maxgrow)
+ growth = Minimum(field->maxgrow - field->dcols,growth);
+ field->dcols += growth;
+ if (field->dcols == field->maxgrow)
+EOF
+cat <<EOF >b6
+bool NeedVisualUpdate = ((Form != (FORM *)0) && (Form->status & _POSTED) &&
+ (Form->current == field));
+
+if (NeedVisualUpdate) {
+ synchronizeBuffer(Form);
+}
+
+if (SingleLineField) {
+ Growth = field->cols * amount;
+ if (field->maxgrow) {
+ Growth = Minimum(field->maxgrow - field->dcols, Growth);
+ }
+ field->dcols += Growth;
+ if (field->dcols == field->maxgrow) {
+EOF
+cat <<EOF >expected6
+1
+3
+4
+5
+6
+Final
+7
+8
+10
+11
+12
+Final
+13
+14
+EOF
+
+# Both lines match identically so position must be used to tie-break.
+title7="Same line twice"
+cat <<EOF >a7
+abc
+abc
+EOF
+cat <<EOF >b7
+abcd
+abcd
+EOF
+cat <<EOF >expected7
+1
+2
+EOF
+
+title8="Enforce line order"
+cat <<EOF >a8
+abcdef
+ghijkl
+ab
+EOF
+cat <<EOF >b8
+ghijk
+abcd
+EOF
+cat <<EOF >expected8
+2
+3
+EOF
+
+title9="Expand lines and rename variables"
+cat <<EOF >a9
+int myFunction(int ArgumentOne, Thing *ArgTwo, Blah XuglyBug) {
+ Squiggle FabulousResult = squargle(ArgumentOne, *ArgTwo,
+ XuglyBug) + EwwwGlobalWithAReallyLongNameYepTooLong;
+ return FabulousResult * 42;
+}
+EOF
+cat <<EOF >b9
+int myFunction(int argument_one, Thing *arg_asdfgh,
+ Blah xugly_bug) {
+ Squiggle fabulous_result = squargle(argument_one,
+ *arg_asdfgh, xugly_bug)
+ + g_ewww_global_with_a_really_long_name_yep_too_long;
+ return fabulous_result * 42;
+}
+EOF
+cat <<EOF >expected9
+1
+1
+2
+3
+3
+4
+5
+EOF
+
+title10="Two close matches versus one less close match"
+cat <<EOF >a10
+abcdef
+abcdef
+ghijkl
+EOF
+cat <<EOF >b10
+gh
+abcdefx
+EOF
+cat <<EOF >expected10
+Final
+2
+EOF
+
+# The first line of b matches best with the last line of a, but the overall
+# match is better if we match it with the the first line of a.
+title11="Piggy in the middle"
+cat <<EOF >a11
+abcdefg
+ijklmn
+abcdefgh
+EOF
+cat <<EOF >b11
+abcdefghx
+ijklm
+EOF
+cat <<EOF >expected11
+1
+2
+EOF
+
+title12="No trailing newline"
+printf "abc\ndef" >a12
+printf "abx\nstu" >b12
+cat <<EOF >expected12
+1
+Final
+EOF
+
+title13="Reorder includes"
+cat <<EOF >a13
+#include "c.h"
+#include "b.h"
+#include "a.h"
+#include "e.h"
+#include "d.h"
+EOF
+cat <<EOF >b13
+#include "a.h"
+#include "b.h"
+#include "c.h"
+#include "d.h"
+#include "e.h"
+EOF
+cat <<EOF >expected13
+3
+2
+1
+5
+4
+EOF
+
+last_test=13
+
+test_expect_success setup '
+ for i in $(test_seq 2 $last_test)
+ do
+ # Append each line in a separate commit to make it easy to
+ # check which original line the blame output relates to.
+
+ line_count=0 &&
+ while IFS= read line
+ do
+ line_count=$((line_count+1)) &&
+ echo "$line" >>"$i" &&
+ git add "$i" &&
+ test_tick &&
+ GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count"
+ done <"a$i"
+ done &&
+
+ for i in $(test_seq 2 $last_test)
+ do
+ # Overwrite the files with the final content.
+ cp b$i $i &&
+ git add $i
+ done &&
+ test_tick &&
+
+ # Commit the final content all at once so it can all be
+ # referred to with the same commit ID.
+ GIT_AUTHOR_NAME=Final git commit -m Final &&
+
+ IGNOREME=$(git rev-parse HEAD)
+'
+
+for i in $(test_seq 2 $last_test); do
+ eval title="\$title$i"
+ test_expect_success "$title" \
+ "git blame -M9 --ignore-rev $IGNOREME $i >output &&
+ sed -e \"$pick_author\" output >actual &&
+ test_cmp expected$i actual"
+done
+
+# This invoked a null pointer dereference when the chunk callback was called
+# with a zero length parent chunk and there were no more suspects.
+test_expect_success 'Diff chunks with no suspects' '
+ test_write_lines xy1 A B C xy1 >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines xy2 A B xy2 C xy2 >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+ REV_2=$(git rev-parse HEAD) &&
+
+ test_write_lines xy3 A >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+ REV_3=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 1 >expected &&
+
+ git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+test_expect_success 'position matching' '
+ test_write_lines abc def >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines abc def abc def >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+ test_write_lines abcx defx abcx defx >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+ REV_3=$(git rev-parse HEAD) &&
+
+ test_write_lines abcy defy abcx defx >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=4 git commit -m 4 &&
+ REV_4=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 1 2 2 >expected &&
+
+ git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+# This fails if each blame entry is processed independently instead of
+# processing each diff change in full.
+test_expect_success 'preserve order' '
+ test_write_lines bcde >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines bcde fghij >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+ test_write_lines bcde fghij abcd >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+
+ test_write_lines abcdx fghijx bcdex >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=4 git commit -m 4 &&
+ REV_4=$(git rev-parse HEAD) &&
+
+ test_write_lines abcdx fghijy bcdex >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=5 git commit -m 5 &&
+ REV_5=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 2 3 >expected &&
+
+ git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+test_done
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index ee1efcc..997f90b 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -481,6 +481,20 @@
grep "Content-Transfer-Encoding: quoted-printable" msgtxt1
'
+test_expect_success $PREREQ 'carriage returns with auto encoding are quoted-printable' '
+ clean_fake_sendmail &&
+ cp $patches cr.patch &&
+ printf "this is a line\r\n" >>cr.patch &&
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ --transfer-encoding=auto \
+ --no-validate \
+ cr.patch &&
+ grep "Content-Transfer-Encoding: quoted-printable" msgtxt1
+'
+
for enc in auto quoted-printable base64
do
test_expect_success $PREREQ "--validate passes with encoding $enc" '
@@ -1190,7 +1204,7 @@
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--no-thread \
- $patches $patches >stdout &&
+ $patches >stdout &&
! grep "In-Reply-To: " stdout
'
@@ -1210,17 +1224,72 @@
git send-email \
--dry-run \
--from="Example <nobody@example.com>" \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "To: Somebody <somebody@ex.com>" stdout
'
+test_expect_success $PREREQ 'setup sendemail.identity' '
+ git config --replace-all sendemail.to "default@example.com" &&
+ git config --replace-all sendemail.isp.to "isp@example.com" &&
+ git config --replace-all sendemail.cloud.to "cloud@example.com"
+'
+
+test_expect_success $PREREQ 'sendemail.identity: reads the correct identity config' '
+ git -c sendemail.identity=cloud send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: identity overrides sendemail.identity' '
+ git -c sendemail.identity=cloud send-email \
+ --identity=isp \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: isp@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: --no-identity clears previous identity' '
+ git -c sendemail.identity=cloud send-email \
+ --no-identity \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: default@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: bool identity variable existance overrides' '
+ git -c sendemail.identity=cloud \
+ -c sendemail.xmailer=true \
+ -c sendemail.cloud.xmailer=false \
+ send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout &&
+ ! grep "X-Mailer" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: bool variable fallback' '
+ git -c sendemail.identity=cloud \
+ -c sendemail.xmailer=false \
+ send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout &&
+ ! grep "X-Mailer" stdout
+'
+
test_expect_success $PREREQ '--no-to overrides sendemail.to' '
git send-email \
--dry-run \
--from="Example <nobody@example.com>" \
--no-to \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "To: nobody@example.com" stdout &&
! grep "To: Somebody <somebody@ex.com>" stdout
'
@@ -1231,7 +1300,7 @@
--dry-run \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "Cc: Somebody <somebody@ex.com>" stdout
'
@@ -1242,7 +1311,7 @@
--no-cc \
--cc=bodies@example.com \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "Cc: bodies@example.com" stdout &&
! grep "Cc: Somebody <somebody@ex.com>" stdout
'
@@ -1254,7 +1323,7 @@
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server relay.example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "RCPT TO:<other@ex.com>" stdout
'
@@ -1266,7 +1335,7 @@
--bcc=bodies@example.com \
--to=nobody@example.com \
--smtp-server relay.example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "RCPT TO:<bodies@example.com>" stdout &&
! grep "RCPT TO:<other@ex.com>" stdout
'
@@ -1423,22 +1492,10 @@
EOF
'
-test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
- clean_fake_sendmail &&
- git config sendemail.transferEncoding 7bit &&
- test_must_fail git send-email \
- --transfer-encoding=7bit \
- --smtp-server="$(pwd)/fake.sendmail" \
- email-using-8bit \
- 2>errors >out &&
- grep "cannot send message as 7bit" errors &&
- test -z "$(ls msgtxt*)"
-'
-
test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
clean_fake_sendmail &&
- git config sendemail.transferEncoding 8bit &&
- test_must_fail git send-email \
+ test_must_fail git -c sendemail.transferEncoding=8bit \
+ send-email \
--transfer-encoding=7bit \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
@@ -1447,16 +1504,26 @@
test -z "$(ls msgtxt*)"
'
-test_expect_success $PREREQ 'sendemail.transferencoding=8bit' '
+test_expect_success $PREREQ 'sendemail.transferEncoding via config' '
clean_fake_sendmail &&
- git send-email \
- --transfer-encoding=8bit \
+ test_must_fail git -c sendemail.transferEncoding=7bit \
+ send-email \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
- sed '1,/^$/d' email-using-8bit >expected &&
- test_cmp expected actual
+ grep "cannot send message as 7bit" errors &&
+ test -z "$(ls msgtxt*)"
+'
+
+test_expect_success $PREREQ 'sendemail.transferEncoding via cli' '
+ clean_fake_sendmail &&
+ test_must_fail git send-email \
+ --transfer-encoding=7bit \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ email-using-8bit \
+ 2>errors >out &&
+ grep "cannot send message as 7bit" errors &&
+ test -z "$(ls msgtxt*)"
'
test_expect_success $PREREQ 'setup expect' '
@@ -1773,6 +1840,15 @@
test_must_fail git send-email --dump-aliases --to=janice@example.com -1 refs/heads/accounting
'
+test_expect_success $PREREQ 'aliases and sendemail.identity' '
+ test_must_fail git \
+ -c sendemail.identity=cloud \
+ -c sendemail.aliasesfile=default-aliases \
+ -c sendemail.cloud.aliasesfile=cloud-aliases \
+ send-email -1 2>stderr &&
+ test_i18ngrep "cloud-aliases" stderr
+'
+
test_sendmail_aliases () {
msg="$1" && shift &&
expect="$@" &&
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 64bb495..9b44a44 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -120,6 +120,4 @@
git svn dcommit
'
-stop_httpd
-
test_done
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index 41a0266..a159ff9 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -87,6 +87,4 @@
)
'
-stop_httpd
-
test_done
diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index b28a174..40b714d 100755
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -74,6 +74,4 @@
)
'
-stop_httpd
-
test_done
diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index 9ee23be..a307305 100755
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -26,6 +26,4 @@
( cd g && git rev-parse --symbolic --verify HEAD )
'
-stop_httpd
-
test_done
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 59a13b6..141b7fa 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -3262,4 +3262,61 @@
background_import_still_running
'
+###
+### series W (get-mark and empty orphan commits)
+###
+
+cat >>W-input <<-W_INPUT_END
+ commit refs/heads/W-branch
+ mark :1
+ author Full Name <user@company.tld> 1000000000 +0100
+ committer Full Name <user@company.tld> 1000000000 +0100
+ data 27
+ Intentionally empty commit
+ LFsget-mark :1
+ W_INPUT_END
+
+test_expect_success !MINGW 'W: get-mark & empty orphan commit with no newlines' '
+ sed -e s/LFs// W-input | tr L "\n" | git fast-import
+'
+
+test_expect_success !MINGW 'W: get-mark & empty orphan commit with one newline' '
+ sed -e s/LFs/L/ W-input | tr L "\n" | git fast-import
+'
+
+test_expect_success !MINGW 'W: get-mark & empty orphan commit with ugly second newline' '
+ # Technically, this should fail as it has too many linefeeds
+ # according to the grammar in fast-import.txt. But, for whatever
+ # reason, it works. Since using the correct number of newlines
+ # does not work with older (pre-2.22) versions of git, allow apps
+ # that used this second-newline workaround to keep working by
+ # checking it with this test...
+ sed -e s/LFs/LL/ W-input | tr L "\n" | git fast-import
+'
+
+test_expect_success !MINGW 'W: get-mark & empty orphan commit with erroneous third newline' '
+ # ...but do NOT allow more empty lines than that (see previous test).
+ sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import
+'
+
+###
+### series X (other new features)
+###
+
+test_expect_success 'X: handling encoding' '
+ test_tick &&
+ cat >input <<-INPUT_END &&
+ commit refs/heads/encoding
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ encoding iso-8859-7
+ data <<COMMIT
+ INPUT_END
+
+ printf "Pi: \360\nCOMMIT\n" >>input &&
+
+ git fast-import <input &&
+ git cat-file -p encoding | grep $(printf "\360") &&
+ git log -1 --format=%B encoding | grep $(printf "\317\200")
+'
+
test_done
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 5690fe2..b4004e0 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -94,22 +94,83 @@
test $MUSS = $(git rev-parse --verify refs/tags/muss)
'
-test_expect_success 'iso-8859-1' '
+test_expect_success 'reencoding iso-8859-7' '
- git config i18n.commitencoding ISO8859-1 &&
- # use author and committer name in ISO-8859-1 to match it.
- . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
test_tick &&
echo rosten >file &&
- git commit -s -m den file &&
- git fast-export wer^..wer >iso8859-1.fi &&
- sed "s/wer/i18n/" iso8859-1.fi |
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n/" iso-8859-7.fi |
(cd new &&
git fast-import &&
+ # The commit object, if not re-encoded, would be 240 bytes.
+ # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
+ # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
+ # to \xCF\x80 (\317\200) in UTF-8 adds a byte. Check for
+ # the expected size.
+ test 221 -eq "$(git cat-file -s i18n)" &&
+ # ...and for the expected translation of bytes.
git cat-file commit i18n >actual &&
- grep "Áéí óú" actual)
-
+ grep $(printf "\317\200") actual &&
+ # Also make sure the commit does not have the "encoding" header
+ ! grep ^encoding actual)
'
+
+test_expect_success 'aborting on iso-8859-7' '
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
+'
+
+test_expect_success 'preserving iso-8859-7' '
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
+ (cd new &&
+ git fast-import &&
+ # The commit object, if not re-encoded, is 240 bytes.
+ # Removing the "encoding iso-8859-7\n" header would drops 20
+ # bytes. Re-encoding the Pi character from \xF0 (\360) in
+ # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
+ # Check for the expected size...
+ test 240 -eq "$(git cat-file -s i18n-no-recoding)" &&
+ # ...as well as the expected byte.
+ git cat-file commit i18n-no-recoding >actual &&
+ grep $(printf "\360") actual &&
+ # Also make sure the commit has the "encoding" header
+ grep ^encoding actual)
+'
+
+test_expect_success 'encoding preserved if reencoding fails' '
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n-invalid/" iso-8859-7.fi |
+ (cd new &&
+ git fast-import &&
+ git cat-file commit i18n-invalid >actual &&
+ # Make sure the commit still has the encoding header
+ grep ^encoding actual &&
+ # Verify that the commit has the expected size; i.e.
+ # that no bytes were re-encoded to a different encoding.
+ test 252 -eq "$(git cat-file -s i18n-invalid)" &&
+ # ...and check for the original special bytes
+ grep $(printf "\360") actual &&
+ grep $(printf "\377") actual)
+'
+
test_expect_success 'import/export-marks' '
git checkout -b marks master &&
@@ -224,7 +285,6 @@
test_expect_success 'setup copies' '
- git config --unset i18n.commitencoding &&
git checkout -b copy rein &&
git mv file file3 &&
git commit -m move1 &&
diff --git a/t/t9350/broken-iso-8859-7-commit-message.txt b/t/t9350/broken-iso-8859-7-commit-message.txt
new file mode 100644
index 0000000..d06ad75
--- /dev/null
+++ b/t/t9350/broken-iso-8859-7-commit-message.txt
@@ -0,0 +1 @@
+Pi: ð; Invalid: ÿ
\ No newline at end of file
diff --git a/t/t9350/simple-iso-8859-7-commit-message.txt b/t/t9350/simple-iso-8859-7-commit-message.txt
new file mode 100644
index 0000000..8b3f0c3
--- /dev/null
+++ b/t/t9350/simple-iso-8859-7-commit-message.txt
@@ -0,0 +1 @@
+Pi: ð
\ No newline at end of file
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 729cd25..5856563 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -326,8 +326,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 6a86d69..67ff271 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -151,7 +151,7 @@
'
test_expect_success 'restart p4d' '
- kill_p4d &&
+ stop_and_cleanup_p4d &&
start_p4d
'
@@ -411,6 +411,46 @@
)
'
+# Check that excluded files are omitted during import
+test_expect_success 'git p4 clone complex branches with excluded files' '
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList branch1:branch2 &&
+ git config --add git-p4.branchList branch1:branch3 &&
+ git config --add git-p4.branchList branch1:branch4 &&
+ git config --add git-p4.branchList branch1:branch5 &&
+ git config --add git-p4.branchList branch1:branch6 &&
+ git p4 clone --dest=. --detect-branches -//depot/branch1/file2 -//depot/branch2/file2 -//depot/branch3/file2 -//depot/branch4/file2 -//depot/branch5/file2 -//depot/branch6/file2 //depot@all &&
+ git log --all --graph --decorate --stat &&
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch2 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3 &&
+ git reset --hard p4/depot/branch3 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3 &&
+ git reset --hard p4/depot/branch4 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch5 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch6 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3
+ )
+'
+
# From a report in http://stackoverflow.com/questions/11893688
# where --use-client-spec caused branch prefixes not to be removed;
# every file in git appeared into a subdirectory of the branch name.
@@ -505,7 +545,7 @@
'
test_expect_success 'restart p4d' '
- kill_p4d &&
+ stop_and_cleanup_p4d &&
start_p4d
'
@@ -610,8 +650,96 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
+test_expect_success 'restart p4d (case folding enabled)' '
+ stop_and_cleanup_p4d &&
+ start_p4d -C1
+'
+
+#
+# 1: //depot/main/mf1
+# 2: integrate //depot/main/... -> //depot/branch1/...
+# 3: //depot/main/mf2
+# 4: //depot/BRANCH1/B1f3
+# 5: //depot/branch1/b1f4
+#
+test_expect_success !CASE_INSENSITIVE_FS 'basic p4 branches for case folding' '
+ (
+ cd "$cli" &&
+ mkdir -p main &&
+
+ echo mf1 >main/mf1 &&
+ p4 add main/mf1 &&
+ p4 submit -d "main/mf1" &&
+
+ p4 integrate //depot/main/... //depot/branch1/... &&
+ p4 submit -d "integrate main to branch1" &&
+
+ echo mf2 >main/mf2 &&
+ p4 add main/mf2 &&
+ p4 submit -d "main/mf2" &&
+
+ mkdir BRANCH1 &&
+ echo B1f3 >BRANCH1/B1f3 &&
+ p4 add BRANCH1/B1f3 &&
+ p4 submit -d "BRANCH1/B1f3" &&
+
+ echo b1f4 >branch1/b1f4 &&
+ p4 add branch1/b1f4 &&
+ p4 submit -d "branch1/b1f4"
+ )
+'
+
+# Check that files are properly split across branches when ignorecase is set
+test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone, branchList branch definition, ignorecase' '
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList main:branch1 &&
+ git config --type=bool core.ignoreCase true &&
+ git p4 clone --dest=. --detect-branches //depot@all &&
+
+ git log --all --graph --decorate --stat &&
+
+ git reset --hard p4/master &&
+ test_path_is_file mf1 &&
+ test_path_is_file mf2 &&
+ test_path_is_missing B1f3 &&
+ test_path_is_missing b1f4 &&
+
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file mf1 &&
+ test_path_is_missing mf2 &&
+ test_path_is_file B1f3 &&
+ test_path_is_file b1f4
+ )
+'
+
+# Check that files are properly split across branches when ignorecase is set, use-client-spec case
+test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone with client-spec, branchList branch definition, ignorecase' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList main:branch1 &&
+ git config --type=bool core.ignoreCase true &&
+ git p4 clone --dest=. --use-client-spec --detect-branches //depot@all &&
+
+ git log --all --graph --decorate --stat &&
+
+ git reset --hard p4/master &&
+ test_path_is_file mf1 &&
+ test_path_is_file mf2 &&
+ test_path_is_missing B1f3 &&
+ test_path_is_missing b1f4 &&
+
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file mf1 &&
+ test_path_is_missing mf2 &&
+ test_path_is_file B1f3 &&
+ test_path_is_file b1f4
+ )
'
test_done
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 9978352..94edebe2 100755
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -333,8 +333,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9803-git-p4-shell-metachars.sh b/t/t9803-git-p4-shell-metachars.sh
index d5c3675..2913277 100755
--- a/t/t9803-git-p4-shell-metachars.sh
+++ b/t/t9803-git-p4-shell-metachars.sh
@@ -105,8 +105,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9804-git-p4-label.sh b/t/t9804-git-p4-label.sh
index e30f80e..3236457 100755
--- a/t/t9804-git-p4-label.sh
+++ b/t/t9804-git-p4-label.sh
@@ -108,8 +108,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 5fbf904..90ef647 100755
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -98,8 +98,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 3f5291b..4e794a0 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -300,9 +300,4 @@
test_path_is_file "$git"/cli_file2.t
'
-
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 850d979..eaaae41 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -593,8 +593,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index 11d2b51..58a9b3b 100755
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -83,8 +83,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 897b3c3..3cff1fc 100755
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -836,8 +836,4 @@
git_verify "cdir 1/file11" "cdir 1/file12"
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index cc53deb..57b533d 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -360,8 +360,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index 602b0a5..c1446f2 100755
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -191,7 +191,7 @@
(
cd "$cli" &&
p4 sync ... &&
- !(p4 labels | grep GIT_TAG_ON_A_BRANCH)
+ ! p4 labels | grep GIT_TAG_ON_A_BRANCH
)
'
@@ -259,9 +259,4 @@
)
'
-
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh
index 0206771..254a7c2 100755
--- a/t/t9812-git-p4-wildcards.sh
+++ b/t/t9812-git-p4-wildcards.sh
@@ -211,8 +211,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh
index 783c6ad..fd018c8 100755
--- a/t/t9813-git-p4-preserve-users.sh
+++ b/t/t9813-git-p4-preserve-users.sh
@@ -138,8 +138,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 60baa06..468767c 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -242,8 +242,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index eaf03a6..9779dc0 100755
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -422,8 +422,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
index d048bd3..9328410 100755
--- a/t/t9816-git-p4-locked.sh
+++ b/t/t9816-git-p4-locked.sh
@@ -138,8 +138,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9817-git-p4-exclude.sh b/t/t9817-git-p4-exclude.sh
index aac568e..ec3d937 100755
--- a/t/t9817-git-p4-exclude.sh
+++ b/t/t9817-git-p4-exclude.sh
@@ -22,7 +22,9 @@
mkdir -p wanted discard &&
echo wanted >wanted/foo &&
echo discard >discard/foo &&
- p4 add wanted/foo discard/foo &&
+ echo discard_file >discard_file &&
+ echo discard_file_not >discard_file_not &&
+ p4 add wanted/foo discard/foo discard_file discard_file_not &&
p4 submit -d "initial revision"
)
'
@@ -33,7 +35,9 @@
(
cd "$git" &&
test_path_is_file wanted/foo &&
- test_path_is_file discard/foo
+ test_path_is_file discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
)
'
@@ -43,7 +47,21 @@
(
cd "$git" &&
test_path_is_file wanted/foo &&
- test_path_is_missing discard/foo
+ test_path_is_missing discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
+ )
+'
+
+test_expect_success 'clone, excluding single file, no trailing /' '
+ test_when_finished cleanup_git &&
+ git p4 clone -//depot/discard_file --dest="$git" //depot/...@all &&
+ (
+ cd "$git" &&
+ test_path_is_file wanted/foo &&
+ test_path_is_file discard/foo &&
+ test_path_is_missing discard_file &&
+ test_path_is_file discard_file_not
)
'
@@ -52,20 +70,39 @@
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
(
cd "$cli" &&
- p4 edit wanted/foo discard/foo &&
+ p4 edit wanted/foo discard/foo discard_file_not &&
date >>wanted/foo &&
date >>discard/foo &&
+ date >>discard_file_not &&
p4 submit -d "updating" &&
cd "$git" &&
git p4 sync -//depot/discard/... &&
test_path_is_file wanted/foo &&
- test_path_is_missing discard/foo
+ test_path_is_missing discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
+test_expect_success 'clone, then sync with exclude, no trailing /' '
+ test_when_finished cleanup_git &&
+ git p4 clone -//depot/discard/... -//depot/discard_file --dest="$git" //depot/...@all &&
+ (
+ cd "$cli" &&
+ p4 edit wanted/foo discard/foo discard_file_not &&
+ date >>wanted/foo &&
+ date >>discard/foo &&
+ date >>discard_file_not &&
+ p4 submit -d "updating" &&
+
+ cd "$git" &&
+ git p4 sync -//depot/discard/... -//depot/discard_file &&
+ test_path_is_file wanted/foo &&
+ test_path_is_missing discard/foo &&
+ test_path_is_missing discard_file &&
+ test_path_is_file discard_file_not
+ )
'
test_done
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index ce7cb22..0db7ab9 100755
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -146,8 +146,4 @@
test_line_count \> 10 log
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index d808c00..600ce1e 100755
--- a/t/t9819-git-p4-case-folding.sh
+++ b/t/t9819-git-p4-case-folding.sh
@@ -53,8 +53,4 @@
test_must_fail git p4 clone //depot/uc/...
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh
index 3c22f74..fa1bba1 100755
--- a/t/t9820-git-p4-editor-handling.sh
+++ b/t/t9820-git-p4-editor-handling.sh
@@ -31,8 +31,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9821-git-p4-path-variations.sh b/t/t9821-git-p4-path-variations.sh
index 81e46ac..ef80f16 100755
--- a/t/t9821-git-p4-path-variations.sh
+++ b/t/t9821-git-p4-path-variations.sh
@@ -193,8 +193,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
index c78477c..572d395 100755
--- a/t/t9822-git-p4-path-encoding.sh
+++ b/t/t9822-git-p4-path-encoding.sh
@@ -7,6 +7,13 @@
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
+ISO8859="$(printf "$ISO8859_ESCAPED")" &&
+echo content123 >"$ISO8859" &&
+rm "$ISO8859" || {
+ skip_all="fs does not accept ISO-8859-1 filenames"
+ test_done
+}
+
test_expect_success 'start p4d' '
start_p4d
'
@@ -67,8 +74,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9823-git-p4-mock-lfs.sh b/t/t9823-git-p4-mock-lfs.sh
index 1f2dc36..88b76dc 100755
--- a/t/t9823-git-p4-mock-lfs.sh
+++ b/t/t9823-git-p4-mock-lfs.sh
@@ -185,8 +185,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh
index ed80ca8..a28dbbd 100755
--- a/t/t9824-git-p4-git-lfs.sh
+++ b/t/t9824-git-p4-git-lfs.sh
@@ -287,8 +287,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh b/t/t9825-git-p4-handle-utf16-without-bom.sh
index 1551845..f049ff8 100755
--- a/t/t9825-git-p4-handle-utf16-without-bom.sh
+++ b/t/t9825-git-p4-handle-utf16-without-bom.sh
@@ -43,8 +43,4 @@
git p4 clone --dest="$git" //depot
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh
index fa8b9da..fd64afe 100755
--- a/t/t9826-git-p4-keep-empty-commits.sh
+++ b/t/t9826-git-p4-keep-empty-commits.sh
@@ -127,8 +127,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh
index 7433998..d3670bd 100755
--- a/t/t9827-git-p4-change-filetype.sh
+++ b/t/t9827-git-p4-change-filetype.sh
@@ -59,8 +59,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh
index e20395c..ca6c294 100755
--- a/t/t9828-git-p4-map-user.sh
+++ b/t/t9828-git-p4-map-user.sh
@@ -54,8 +54,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh
index 971aeee..88cfb1f 100755
--- a/t/t9829-git-p4-jobs.sh
+++ b/t/t9829-git-p4-jobs.sh
@@ -92,8 +92,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9830-git-p4-symlink-dir.sh b/t/t9830-git-p4-symlink-dir.sh
index 2ad1b08..3fb6960 100755
--- a/t/t9830-git-p4-symlink-dir.sh
+++ b/t/t9830-git-p4-symlink-dir.sh
@@ -36,8 +36,4 @@
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index be44c97..d743ca3 100755
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -96,8 +96,4 @@
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index 41c09f1..e9276c4 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -22,7 +22,10 @@
: >file_to_move &&
p4 add file_to_delete &&
p4 add file_to_move &&
- p4 submit -d "add files to delete"
+ p4 submit -d "add files to delete" &&
+ echo file_to_integrate >file_to_integrate &&
+ p4 add file_to_integrate &&
+ p4 submit -d "add file to integrate"
)
'
@@ -40,6 +43,7 @@
p4 delete file_to_delete &&
p4 edit file_to_move &&
p4 move file_to_move moved_file &&
+ p4 integrate file_to_integrate integrated_file &&
p4 opened &&
p4 shelve -i <<EOF
Change: new
@@ -53,6 +57,7 @@
//depot/file_to_delete
//depot/file_to_move
//depot/moved_file
+ //depot/integrated_file
EOF
) &&
@@ -65,6 +70,7 @@
test_path_is_file file2 &&
test_cmp file1 "$cli"/file1 &&
test_cmp file2 "$cli"/file2 &&
+ test_cmp file_to_integrate "$cli"/integrated_file &&
test_path_is_missing file_to_delete &&
test_path_is_missing file_to_move &&
test_path_is_file moved_file
@@ -174,8 +180,5 @@
test_path_is_file file_to_shelve
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
test_done
diff --git a/t/t9833-errors.sh b/t/t9833-errors.sh
index 277d347..e22369c 100755
--- a/t/t9833-errors.sh
+++ b/t/t9833-errors.sh
@@ -45,36 +45,4 @@
)
'
-test_expect_success 'create group with short ticket expiry' '
- P4TICKETS="$cli/tickets" &&
- echo "newpassword" | p4 login &&
- p4_add_user short_expiry_user &&
- p4 -u short_expiry_user passwd -P password &&
- p4 group -i <<-EOF &&
- Group: testgroup
- Timeout: 3
- Users: short_expiry_user
- EOF
-
- p4 users | grep short_expiry_user
-'
-
-test_expect_success 'git operation with expired ticket' '
- P4TICKETS="$cli/tickets" &&
- P4USER=short_expiry_user &&
- echo "password" | p4 login &&
- (
- cd "$git" &&
- git p4 sync &&
- sleep 5 &&
- test_must_fail git p4 sync 2>errmsg &&
- grep "failure accessing depot" errmsg
- )
-'
-
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
-
test_done
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 3a2c632..54f8ce1 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -28,10 +28,10 @@
#
# (2) A test makes sure that common subcommands are included in the
# completion for "git <TAB>", and a plumbing is excluded. "add",
-# "filter-branch" and "ls-files" are listed for this.
+# "rebase" and "ls-files" are listed for this.
-GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr filter-branch ls-files'
-GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch'
+GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files'
+GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase'
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
@@ -1392,12 +1392,12 @@
# built-in
grep -q "^add \$" out &&
# script
- grep -q "^filter-branch \$" out &&
+ grep -q "^rebase \$" out &&
# plumbing
! grep -q "^ls-files \$" out &&
- run_completion "git f" &&
- ! grep -q -v "^f" out
+ run_completion "git r" &&
+ ! grep -q -v "^r" out
'
test_expect_success 'double dash "git" itself' '
@@ -1437,6 +1437,7 @@
--guess Z
--no-guess Z
--no-... Z
+ --overlay Z
EOF
'
@@ -1483,6 +1484,12 @@
test_completion "git --help core" "core-tutorial "
'
+test_expect_success 'completion.commands removes multiple commands' '
+ test_config completion.commands "-cherry -mergetool" &&
+ git --list-cmds=list-mainporcelain,list-complete,config >out &&
+ ! grep -E "^(cherry|mergetool)$" out
+'
+
test_expect_success 'setup for integration tests' '
echo content >file1 &&
echo more >file2 &&
@@ -1691,6 +1698,69 @@
'
done
+test_expect_success 'git config - section' '
+ test_completion "git config br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git config - variable name' '
+ test_completion "git config log.d" <<-\EOF
+ log.date Z
+ log.decorate Z
+ EOF
+'
+
+test_expect_success 'git config - value' '
+ test_completion "git config color.pager " <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
+test_expect_success 'git -c - section' '
+ test_completion "git -c br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git -c - variable name' '
+ test_completion "git -c log.d" <<-\EOF
+ log.date=Z
+ log.decorate=Z
+ EOF
+'
+
+test_expect_success 'git -c - value' '
+ test_completion "git -c color.pager=" <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - section' '
+ test_completion "git clone --config=br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - variable name' '
+ test_completion "git clone --config=log.d" <<-\EOF
+ log.date=Z
+ log.decorate=Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - value' '
+ test_completion "git clone --config=color.pager=" <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
test_expect_success 'sourcing the completion script clears cached commands' '
__git_compute_all_commands &&
verbose test -n "$__git_all_commands" &&
@@ -1699,7 +1769,7 @@
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
- GIT_TEST_GETTEXT_POISON= &&
+ GIT_TEST_GETTEXT_POISON=false &&
__git_compute_merge_strategies &&
verbose test -n "$__git_merge_strategies" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 5cadedb..88bc733 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -211,8 +211,24 @@
test_expect_success 'prompt - cherry-pick' '
printf " (master|CHERRY-PICKING)" >expected &&
- test_must_fail git cherry-pick b1 &&
- test_when_finished "git reset --hard" &&
+ test_must_fail git cherry-pick b1 b1^ &&
+ test_when_finished "git cherry-pick --abort" &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual" &&
+ git reset --merge &&
+ test_must_fail git rev-parse CHERRY_PICK_HEAD &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - revert' '
+ printf " (master|REVERTING)" >expected &&
+ test_must_fail git revert b1^ b1 &&
+ test_when_finished "git revert --abort" &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual" &&
+ git reset --merge &&
+ test_must_fail git rev-parse REVERT_HEAD &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 92cf8f8..87bf3a2 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -116,6 +116,13 @@
tr '\015' Q | sed -e 's/Q$//'
}
+# Generate an output of $1 bytes of all zeroes (NULs, not ASCII zeroes).
+# If $1 is 'infinity', output forever or until the receiving pipe stops reading,
+# whichever comes first.
+generate_zero_bytes () {
+ test-tool genzeros "$@"
+}
+
# In some bourne shell implementations, the "unset" builtin returns
# nonzero status when a variable to be unset was not set in the first
# place.
@@ -226,6 +233,129 @@
git tag "$1"
}
+# Efficiently create <nr> commits, each with a unique number (from 1 to <nr>
+# by default) in the commit message.
+#
+# Usage: test_commit_bulk [options] <nr>
+# -C <dir>:
+# Run all git commands in directory <dir>
+# --ref=<n>:
+# ref on which to create commits (default: HEAD)
+# --start=<n>:
+# number commit messages from <n> (default: 1)
+# --message=<msg>:
+# use <msg> as the commit mesasge (default: "commit %s")
+# --filename=<fn>:
+# modify <fn> in each commit (default: %s.t)
+# --contents=<string>:
+# place <string> in each file (default: "content %s")
+# --id=<string>:
+# shorthand to use <string> and %s in message, filename, and contents
+#
+# The message, filename, and contents strings are evaluated by printf, with the
+# first "%s" replaced by the current commit number. So you can do:
+#
+# test_commit_bulk --filename=file --contents="modification %s"
+#
+# to have every commit touch the same file, but with unique content.
+#
+test_commit_bulk () {
+ tmpfile=.bulk-commit.input
+ indir=.
+ ref=HEAD
+ n=1
+ message='commit %s'
+ filename='%s.t'
+ contents='content %s'
+ while test $# -gt 0
+ do
+ case "$1" in
+ -C)
+ indir=$2
+ shift
+ ;;
+ --ref=*)
+ ref=${1#--*=}
+ ;;
+ --start=*)
+ n=${1#--*=}
+ ;;
+ --message=*)
+ message=${1#--*=}
+ ;;
+ --filename=*)
+ filename=${1#--*=}
+ ;;
+ --contents=*)
+ contents=${1#--*=}
+ ;;
+ --id=*)
+ message="${1#--*=} %s"
+ filename="${1#--*=}-%s.t"
+ contents="${1#--*=} %s"
+ ;;
+ -*)
+ BUG "invalid test_commit_bulk option: $1"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done
+ total=$1
+
+ add_from=
+ if git -C "$indir" rev-parse --verify "$ref"
+ then
+ add_from=t
+ fi
+
+ while test "$total" -gt 0
+ do
+ test_tick &&
+ echo "commit $ref"
+ printf 'author %s <%s> %s\n' \
+ "$GIT_AUTHOR_NAME" \
+ "$GIT_AUTHOR_EMAIL" \
+ "$GIT_AUTHOR_DATE"
+ printf 'committer %s <%s> %s\n' \
+ "$GIT_COMMITTER_NAME" \
+ "$GIT_COMMITTER_EMAIL" \
+ "$GIT_COMMITTER_DATE"
+ echo "data <<EOF"
+ printf "$message\n" $n
+ echo "EOF"
+ if test -n "$add_from"
+ then
+ echo "from $ref^0"
+ add_from=
+ fi
+ printf "M 644 inline $filename\n" $n
+ echo "data <<EOF"
+ printf "$contents\n" $n
+ echo "EOF"
+ echo
+ n=$((n + 1))
+ total=$((total - 1))
+ done >"$tmpfile"
+
+ git -C "$indir" \
+ -c fastimport.unpacklimit=0 \
+ fast-import <"$tmpfile" || return 1
+
+ # This will be left in place on failure, which may aid debugging.
+ rm -f "$tmpfile"
+
+ # If we updated HEAD, then be nice and update the index and working
+ # tree, too.
+ if test "$ref" = "HEAD"
+ then
+ git -C "$indir" checkout -f HEAD || return 1
+ fi
+
+}
+
# This function helps systems where core.filemode=false is set.
# Use it instead of plain 'chmod +x' to set or unset the executable bit
# of a file in the working directory and add it to the index.
@@ -302,6 +432,26 @@
}
test_set_prereq () {
+ if test -n "$GIT_TEST_FAIL_PREREQS_INTERNAL"
+ then
+ case "$1" in
+ # The "!" case is handled below with
+ # test_unset_prereq()
+ !*)
+ ;;
+ # (Temporary?) whitelist of things we can't easily
+ # pretend not to support
+ SYMLINKS)
+ ;;
+ # Inspecting whether GIT_TEST_FAIL_PREREQS is on
+ # should be unaffected.
+ FAIL_PREREQS)
+ ;;
+ *)
+ return
+ esac
+ fi
+
case "$1" in
!*)
test_unset_prereq "${1#!}"
@@ -430,7 +580,7 @@
export test_prereq
if ! test_skip "$@"
then
- say >&3 "checking known breakage: $2"
+ say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2" expecting_failure
then
test_known_broken_ok_ "$1"
@@ -450,7 +600,7 @@
export test_prereq
if ! test_skip "$@"
then
- say >&3 "expecting success: $2"
+ say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2"
then
test_ok_ "$1"
@@ -586,6 +736,15 @@
fi
}
+# Check if the file exists and has a size greater than zero
+test_file_not_empty () {
+ if ! test -s "$1"
+ then
+ echo "'$1' is not a non-empty file."
+ false
+ fi
+}
+
test_path_is_missing () {
if test -e "$1"
then
@@ -872,6 +1031,21 @@
fi
}
+# Compare paths respecting core.ignoreCase
+test_cmp_fspath () {
+ if test "x$1" = "x$2"
+ then
+ return 0
+ fi
+
+ if test true != "$(git config --get --type=bool core.ignorecase)"
+ then
+ return 1
+ fi
+
+ test "x$(echo "$1" | tr A-Z a-z)" = "x$(echo "$2" | tr A-Z a-z)"
+}
+
# Print a sequence of integers in increasing order, either with
# two arguments (start and end):
#
@@ -927,6 +1101,34 @@
} && (exit \"\$eval_ret\"); eval_ret=\$?; $test_cleanup"
}
+# This function can be used to schedule some commands to be run
+# unconditionally at the end of the test script, e.g. to stop a daemon:
+#
+# test_expect_success 'test git daemon' '
+# git daemon &
+# daemon_pid=$! &&
+# test_atexit 'kill $daemon_pid' &&
+# hello world
+# '
+#
+# The commands will be executed before the trash directory is removed,
+# i.e. the atexit commands will still be able to access any pidfiles or
+# socket files.
+#
+# Note that these commands will be run even when a test script run
+# with '--immediate' fails. Be careful with your atexit commands to
+# minimize any changes to the failed state.
+
+test_atexit () {
+ # We cannot detect when we are in a subshell in general, but by
+ # doing so on Bash is better than nothing (the test will
+ # silently pass on other shells).
+ test "${BASH_SUBSHELL-0}" = 0 ||
+ error "bug in test script: test_atexit does nothing in a subshell"
+ test_atexit_cleanup="{ $*
+ } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup"
+}
+
# Most tests can use the created repository, but some may need to create more.
# Usage: test_create_repo <directory>
test_create_repo () {
@@ -971,62 +1173,20 @@
command "$PERL_PATH" "$@" 2>&7
} 7>&2 2>&4
-# Is the value one of the various ways to spell a boolean true/false?
-test_normalize_bool () {
- git -c magic.variable="$1" config --bool magic.variable 2>/dev/null
-}
-
-# Given a variable $1, normalize the value of it to one of "true",
-# "false", or "auto" and store the result to it.
-#
-# test_tristate GIT_TEST_HTTPD
-#
-# A variable set to an empty string is set to 'false'.
-# A variable set to 'false' or 'auto' keeps its value.
-# Anything else is set to 'true'.
-# An unset variable defaults to 'auto'.
-#
-# The last rule is to allow people to set the variable to an empty
-# string and export it to decline testing the particular feature
-# for versions both before and after this change. We used to treat
-# both unset and empty variable as a signal for "do not test" and
-# took any non-empty string as "please test".
-
-test_tristate () {
- if eval "test x\"\${$1+isset}\" = xisset"
- then
- # explicitly set
- eval "
- case \"\$$1\" in
- '') $1=false ;;
- auto) ;;
- *) $1=\$(test_normalize_bool \$$1 || echo true) ;;
- esac
- "
- else
- eval "$1=auto"
- fi
-}
-
# Exit the test suite, either by skipping all remaining tests or by
-# exiting with an error. If "$1" is "auto", we then we assume we were
-# opportunistically trying to set up some tests and we skip. If it is
-# "true", then we report a failure.
+# exiting with an error. If our prerequisite variable $1 falls back
+# on a default assume we were opportunistically trying to set up some
+# tests and we skip. If it is explicitly "true", then we report a failure.
#
# The error/skip message should be given by $2.
#
test_skip_or_die () {
- case "$1" in
- auto)
+ if ! git env--helper --type=bool --default=false --exit-code $1
+ then
skip_all=$2
test_done
- ;;
- true)
- error "$2"
- ;;
- *)
- error "BUG: test tristate is '$1' (real error: $2)"
- esac
+ fi
+ error "$2"
}
# The following mingw_* functions obey POSIX shell syntax, but are actually
@@ -1195,6 +1355,12 @@
'
}
+# Converts base-16 data into base-8. The output is given as a sequence of
+# escaped octals, suitable for consumption by 'printf'.
+hex2oct () {
+ perl -ne 'printf "\\%03o", hex for /../g'
+}
+
# Set the hash algorithm in use to $1. Only useful when testing the testsuite.
test_set_hash () {
test_hash_algo="$1"
@@ -1264,6 +1430,13 @@
eval "printf '%s' \"\${$var}\""
}
+# Insert a slash into an object ID so it can be used to reference a location
+# under ".git/objects". For example, "deadbeef..." becomes "de/adbeef..".
+test_oid_to_path () {
+ local basename=${1#??}
+ echo "${1%$basename}/$basename"
+}
+
# Choose a port number based on the test script's number and store it in
# the given variable name, unless that variable already contains a number.
test_set_port () {
@@ -1289,7 +1462,7 @@
port=$(($port + 10000))
fi
;;
- *[^0-9]*|0*)
+ *[!0-9]*|0*)
error >&7 "invalid port number: $port"
;;
*)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 42b1a0a..ee602c4 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -57,6 +57,13 @@
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
+# Disallow the use of abbreviated options in the test suite by default
+if test -z "${GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS}"
+then
+ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true
+ export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
+fi
+
################################################################
# It appears that people try to run tests without building...
"${GIT_TEST_INSTALLED:-$GIT_BUILD_DIR}/git$X" >/dev/null
@@ -147,10 +154,28 @@
--stress)
stress=t ;;
--stress=*)
+ echo "error: --stress does not accept an argument: '$opt'" >&2
+ echo "did you mean --stress-jobs=${opt#*=} or --stress-limit=${opt#*=}?" >&2
+ exit 1
+ ;;
+ --stress-jobs=*)
+ stress=t;
stress=${opt#--*=}
case "$stress" in
- *[^0-9]*|0*|"")
- echo "error: --stress=<N> requires the number of jobs to run" >&2
+ *[!0-9]*|0*|"")
+ echo "error: --stress-jobs=<N> requires the number of jobs to run" >&2
+ exit 1
+ ;;
+ *) # Good.
+ ;;
+ esac
+ ;;
+ --stress-limit=*)
+ stress=t;
+ stress_limit=${opt#--*=}
+ case "$stress_limit" in
+ *[!0-9]*|0*|"")
+ echo "error: --stress-limit=<N> requires the number of repetitions" >&2
exit 1
;;
*) # Good.
@@ -187,6 +212,8 @@
TEST_STRESS_JOB_SFX="${GIT_TEST_STRESS_JOB_NR:+.stress-$GIT_TEST_STRESS_JOB_NR}"
TEST_NAME="$(basename "$0" .sh)"
+TEST_NUMBER="${TEST_NAME%%-*}"
+TEST_NUMBER="${TEST_NUMBER#t}"
TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results"
TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX"
TRASH_DIRECTORY="trash directory.$TEST_NAME$TEST_STRESS_JOB_SFX"
@@ -242,8 +269,10 @@
exit 1
' TERM INT
- cnt=0
- while ! test -e "$stressfail"
+ cnt=1
+ while ! test -e "$stressfail" &&
+ { test -z "$stress_limit" ||
+ test $cnt -le $stress_limit ; }
do
$TEST_SHELL_PATH "$0" "$@" >"$TEST_RESULTS_BASE.stress-$job_nr.out" 2>&1 &
test_pid=$!
@@ -266,6 +295,7 @@
if test -f "$stressfail"
then
+ stress_exit=1
echo "Log(s) of failed test run(s):"
for failed_job_nr in $(sort -n "$stressfail")
do
@@ -479,6 +509,9 @@
LF='
'
+# Single quote
+SQ=\'
+
# UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores
# when case-folding filenames
u200c=$(printf '\342\200\214')
@@ -606,6 +639,10 @@
die () {
code=$?
+ # This is responsible for running the atexit commands even when a
+ # test script run with '--immediate' fails, or when the user hits
+ # ctrl-C, i.e. when 'test_done' is not invoked at all.
+ test_atexit_handler || code=$?
if test -n "$GIT_EXIT_OK"
then
exit $code
@@ -617,7 +654,10 @@
GIT_EXIT_OK=
trap 'die' EXIT
-trap 'exit $?' INT TERM HUP
+# Disable '-x' tracing, because with some shells, notably dash, it
+# prevents running the cleanup commands when a test script run with
+# '--verbose-log -x' is interrupted.
+trap '{ code=$?; set +x; } 2>/dev/null; exit $code' INT TERM HUP
# The user-facing functions are loaded from a separate file so that
# test_perf subshells can have them too
@@ -1028,9 +1068,28 @@
junit_have_testcase=t
}
+test_atexit_cleanup=:
+test_atexit_handler () {
+ # In a succeeding test script 'test_atexit_handler' is invoked
+ # twice: first from 'test_done', then from 'die' in the trap on
+ # EXIT.
+ # This condition and resetting 'test_atexit_cleanup' below makes
+ # sure that the registered cleanup commands are run only once.
+ test : != "$test_atexit_cleanup" || return 0
+
+ setup_malloc_check
+ test_eval_ "$test_atexit_cleanup"
+ test_atexit_cleanup=:
+ teardown_malloc_check
+}
+
test_done () {
GIT_EXIT_OK=t
+ # Run the atexit commands _before_ the trash directory is
+ # removed, so the commands can access pidfiles and socket files.
+ test_atexit_handler
+
if test -n "$write_junit_xml" && test -n "$junit_xml_path"
then
test -n "$junit_have_testcase" || {
@@ -1313,7 +1372,11 @@
fi
fi
-# Provide an implementation of the 'yes' utility
+# Provide an implementation of the 'yes' utility; the upper bound
+# limit is there to help Windows that cannot stop this loop from
+# wasting cycles when the downstream stops reading, so do not be
+# tempted to turn it into an infinite loop. cf. 6129c930 ("test-lib:
+# limit the output of the yes utility", 2016-02-02)
yes () {
if test $# = 0
then
@@ -1330,6 +1393,25 @@
done
}
+# The GIT_TEST_FAIL_PREREQS code hooks into test_set_prereq(), and
+# thus needs to be set up really early, and set an internal variable
+# for convenience so the hot test_set_prereq() codepath doesn't need
+# to call "git env--helper". Only do that work if needed by seeing if
+# GIT_TEST_FAIL_PREREQS is set at all.
+GIT_TEST_FAIL_PREREQS_INTERNAL=
+if test -n "$GIT_TEST_FAIL_PREREQS"
+then
+ if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+ then
+ GIT_TEST_FAIL_PREREQS_INTERNAL=true
+ test_set_prereq FAIL_PREREQS
+ fi
+else
+ test_lazy_prereq FAIL_PREREQS '
+ git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+ '
+fi
+
# Fix some commands on Windows
uname_s=$(uname -s)
case $uname_s in
@@ -1380,14 +1462,13 @@
if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
then
GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
+ export GIT_TEST_GETTEXT_POISON
unset GIT_TEST_GETTEXT_POISON_ORIG
fi
-# Can we rely on git's output in the C locale?
-if test -z "$GIT_TEST_GETTEXT_POISON"
-then
- test_set_prereq C_LOCALE_OUTPUT
-fi
+test_lazy_prereq C_LOCALE_OUTPUT '
+ ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON
+'
if test -z "$GIT_TEST_CHECK_CACHE_TREE"
then
@@ -1462,7 +1543,7 @@
'
test_lazy_prereq JGIT '
- type jgit
+ jgit --version
'
# SANITY is about "can you correctly predict what the filesystem would
diff --git a/tag.c b/tag.c
index 7445b8f..bfa0e31 100644
--- a/tag.c
+++ b/tag.c
@@ -100,10 +100,9 @@
struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_tag_node(r));
+ return create_object(r, oid, alloc_tag_node(r));
return object_as_type(r, obj, OBJ_TAG, 0);
}
@@ -213,3 +212,10 @@
free(data);
return ret;
}
+
+struct object_id *get_tagged_oid(struct tag *tag)
+{
+ if (!tag->tagged)
+ die("bad tag");
+ return &tag->tagged->oid;
+}
diff --git a/tag.h b/tag.h
index e669c3e..3ce8e72 100644
--- a/tag.h
+++ b/tag.h
@@ -11,13 +11,14 @@
char *tag;
timestamp_t date;
};
-extern struct tag *lookup_tag(struct repository *r, const struct object_id *oid);
-extern int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size);
-extern int parse_tag(struct tag *item);
-extern void release_tag_memory(struct tag *t);
-extern struct object *deref_tag(struct repository *r, struct object *, const char *, int);
-extern struct object *deref_tag_noverify(struct object *);
-extern int gpg_verify_tag(const struct object_id *oid,
- const char *name_to_report, unsigned flags);
+struct tag *lookup_tag(struct repository *r, const struct object_id *oid);
+int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size);
+int parse_tag(struct tag *item);
+void release_tag_memory(struct tag *t);
+struct object *deref_tag(struct repository *r, struct object *, const char *, int);
+struct object *deref_tag_noverify(struct object *);
+int gpg_verify_tag(const struct object_id *oid,
+ const char *name_to_report, unsigned flags);
+struct object_id *get_tagged_oid(struct tag *tag);
#endif /* TAG_H */
diff --git a/tempfile.h b/tempfile.h
index 61d8dc4..cddda0a 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -89,7 +89,7 @@
* a tempfile (whose "fd" member can be used for writing to it), or
* NULL on error. It is an error if a file already exists at that path.
*/
-extern struct tempfile *create_tempfile(const char *path);
+struct tempfile *create_tempfile(const char *path);
/*
* Register an existing file as a tempfile, meaning that it will be
@@ -97,7 +97,7 @@
* but it can be worked with like any other closed tempfile (for
* example, it can be opened using reopen_tempfile()).
*/
-extern struct tempfile *register_tempfile(const char *path);
+struct tempfile *register_tempfile(const char *path);
/*
@@ -136,8 +136,8 @@
*/
/* See "mks_tempfile functions" above. */
-extern struct tempfile *mks_tempfile_sm(const char *filename_template,
- int suffixlen, int mode);
+struct tempfile *mks_tempfile_sm(const char *filename_template,
+ int suffixlen, int mode);
/* See "mks_tempfile functions" above. */
static inline struct tempfile *mks_tempfile_s(const char *filename_template,
@@ -159,8 +159,8 @@
}
/* See "mks_tempfile functions" above. */
-extern struct tempfile *mks_tempfile_tsm(const char *filename_template,
- int suffixlen, int mode);
+struct tempfile *mks_tempfile_tsm(const char *filename_template,
+ int suffixlen, int mode);
/* See "mks_tempfile functions" above. */
static inline struct tempfile *mks_tempfile_ts(const char *filename_template,
@@ -182,7 +182,7 @@
}
/* See "mks_tempfile functions" above. */
-extern struct tempfile *xmks_tempfile_m(const char *filename_template, int mode);
+struct tempfile *xmks_tempfile_m(const char *filename_template, int mode);
/* See "mks_tempfile functions" above. */
static inline struct tempfile *xmks_tempfile(const char *filename_template)
@@ -196,7 +196,7 @@
* stream is closed automatically when `close_tempfile_gently()` is called or
* when the file is deleted or renamed.
*/
-extern FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode);
+FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode);
static inline int is_tempfile_active(struct tempfile *tempfile)
{
@@ -207,10 +207,10 @@
* Return the path of the lockfile. The return value is a pointer to a
* field within the lock_file object and should not be freed.
*/
-extern const char *get_tempfile_path(struct tempfile *tempfile);
+const char *get_tempfile_path(struct tempfile *tempfile);
-extern int get_tempfile_fd(struct tempfile *tempfile);
-extern FILE *get_tempfile_fp(struct tempfile *tempfile);
+int get_tempfile_fd(struct tempfile *tempfile);
+FILE *get_tempfile_fp(struct tempfile *tempfile);
/*
* If the temporary file is still open, close it (and the file pointer
@@ -220,7 +220,7 @@
* should eventually be called regardless of whether `close_tempfile_gently()`
* succeeds.
*/
-extern int close_tempfile_gently(struct tempfile *tempfile);
+int close_tempfile_gently(struct tempfile *tempfile);
/*
* Re-open a temporary file that has been closed using
@@ -241,7 +241,7 @@
*
* * `rename_tempfile()` to move the file to its permanent location.
*/
-extern int reopen_tempfile(struct tempfile *tempfile);
+int reopen_tempfile(struct tempfile *tempfile);
/*
* Close the file descriptor and/or file pointer and remove the
@@ -249,7 +249,7 @@
* `delete_tempfile()` for a `tempfile` object that has already been
* deleted or renamed.
*/
-extern void delete_tempfile(struct tempfile **tempfile_p);
+void delete_tempfile(struct tempfile **tempfile_p);
/*
* Close the file descriptor and/or file pointer if they are still
@@ -260,6 +260,6 @@
* `rename(2)`. It is a bug to call `rename_tempfile()` for a
* `tempfile` object that is not currently active.
*/
-extern int rename_tempfile(struct tempfile **tempfile_p, const char *path);
+int rename_tempfile(struct tempfile **tempfile_p, const char *path);
#endif /* TEMPFILE_H */
diff --git a/templates/hooks--pre-merge-commit.sample b/templates/hooks--pre-merge-commit.sample
new file mode 100755
index 0000000..399eab1
--- /dev/null
+++ b/templates/hooks--pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/trace.c b/trace.c
index fa4a2e7..b3ef0e6 100644
--- a/trace.c
+++ b/trace.c
@@ -88,8 +88,6 @@
if (!trace_want(key))
return 0;
- set_try_to_free_routine(NULL); /* is never reset */
-
/* unit tests may want to disable additional trace output */
if (trace_want(&trace_bare))
return 1;
diff --git a/trace.h b/trace.h
index 171b256..9fa3e7a 100644
--- a/trace.h
+++ b/trace.h
@@ -17,34 +17,34 @@
extern struct trace_key trace_perf_key;
extern struct trace_key trace_setup_key;
-extern void trace_repo_setup(const char *prefix);
-extern int trace_want(struct trace_key *key);
-extern void trace_disable(struct trace_key *key);
-extern uint64_t getnanotime(void);
-extern void trace_command_performance(const char **argv);
-extern void trace_verbatim(struct trace_key *key, const void *buf, unsigned len);
+void trace_repo_setup(const char *prefix);
+int trace_want(struct trace_key *key);
+void trace_disable(struct trace_key *key);
+uint64_t getnanotime(void);
+void trace_command_performance(const char **argv);
+void trace_verbatim(struct trace_key *key, const void *buf, unsigned len);
uint64_t trace_performance_enter(void);
#ifndef HAVE_VARIADIC_MACROS
__attribute__((format (printf, 1, 2)))
-extern void trace_printf(const char *format, ...);
+void trace_printf(const char *format, ...);
__attribute__((format (printf, 2, 3)))
-extern void trace_printf_key(struct trace_key *key, const char *format, ...);
+void trace_printf_key(struct trace_key *key, const char *format, ...);
__attribute__((format (printf, 2, 3)))
-extern void trace_argv_printf(const char **argv, const char *format, ...);
+void trace_argv_printf(const char **argv, const char *format, ...);
-extern void trace_strbuf(struct trace_key *key, const struct strbuf *data);
+void trace_strbuf(struct trace_key *key, const struct strbuf *data);
/* Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. */
__attribute__((format (printf, 2, 3)))
-extern void trace_performance(uint64_t nanos, const char *format, ...);
+void trace_performance(uint64_t nanos, const char *format, ...);
/* Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. */
__attribute__((format (printf, 2, 3)))
-extern void trace_performance_since(uint64_t start, const char *format, ...);
+void trace_performance_since(uint64_t start, const char *format, ...);
__attribute__((format (printf, 1, 2)))
void trace_performance_leave(const char *format, ...);
@@ -132,19 +132,19 @@
/* backend functions, use non-*fl macros instead */
__attribute__((format (printf, 4, 5)))
-extern void trace_printf_key_fl(const char *file, int line, struct trace_key *key,
- const char *format, ...);
+void trace_printf_key_fl(const char *file, int line, struct trace_key *key,
+ const char *format, ...);
__attribute__((format (printf, 4, 5)))
-extern void trace_argv_printf_fl(const char *file, int line, const char **argv,
- const char *format, ...);
-extern void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
- const struct strbuf *data);
+void trace_argv_printf_fl(const char *file, int line, const char **argv,
+ const char *format, ...);
+void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
+ const struct strbuf *data);
__attribute__((format (printf, 4, 5)))
-extern void trace_performance_fl(const char *file, int line,
- uint64_t nanos, const char *fmt, ...);
+void trace_performance_fl(const char *file, int line,
+ uint64_t nanos, const char *fmt, ...);
__attribute__((format (printf, 4, 5)))
-extern void trace_performance_leave_fl(const char *file, int line,
- uint64_t nanos, const char *fmt, ...);
+void trace_performance_leave_fl(const char *file, int line,
+ uint64_t nanos, const char *fmt, ...);
static inline int trace_pass_fl(struct trace_key *key)
{
return key->fd || !key->initialized;
diff --git a/trace2.c b/trace2.c
new file mode 100644
index 0000000..c7b4f14
--- /dev/null
+++ b/trace2.c
@@ -0,0 +1,785 @@
+#include "cache.h"
+#include "config.h"
+#include "json-writer.h"
+#include "quote.h"
+#include "run-command.h"
+#include "sigchain.h"
+#include "thread-utils.h"
+#include "version.h"
+#include "trace2/tr2_cfg.h"
+#include "trace2/tr2_cmd_name.h"
+#include "trace2/tr2_dst.h"
+#include "trace2/tr2_sid.h"
+#include "trace2/tr2_sysenv.h"
+#include "trace2/tr2_tgt.h"
+#include "trace2/tr2_tls.h"
+
+static int trace2_enabled;
+
+static int tr2_next_child_id; /* modify under lock */
+static int tr2_next_exec_id; /* modify under lock */
+static int tr2_next_repo_id = 1; /* modify under lock. zero is reserved */
+
+/*
+ * A table of the builtin TRACE2 targets. Each of these may be independently
+ * enabled or disabled. Each TRACE2 API method will try to write an event to
+ * *each* of the enabled targets.
+ */
+/* clang-format off */
+static struct tr2_tgt *tr2_tgt_builtins[] =
+{
+ &tr2_tgt_normal,
+ &tr2_tgt_perf,
+ &tr2_tgt_event,
+ NULL
+};
+/* clang-format on */
+
+/* clang-format off */
+#define for_each_builtin(j, tgt_j) \
+ for (j = 0, tgt_j = tr2_tgt_builtins[j]; \
+ tgt_j; \
+ j++, tgt_j = tr2_tgt_builtins[j])
+/* clang-format on */
+
+/* clang-format off */
+#define for_each_wanted_builtin(j, tgt_j) \
+ for_each_builtin(j, tgt_j) \
+ if (tr2_dst_trace_want(tgt_j->pdst))
+/* clang-format on */
+
+/*
+ * Force (rather than lazily) initialize any of the requested
+ * builtin TRACE2 targets at startup (and before we've seen an
+ * actual TRACE2 event call) so we can see if we need to setup
+ * the TR2 and TLS machinery.
+ *
+ * Return the number of builtin targets enabled.
+ */
+static int tr2_tgt_want_builtins(void)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ int sum = 0;
+
+ for_each_builtin (j, tgt_j)
+ if (tgt_j->pfn_init())
+ sum++;
+
+ return sum;
+}
+
+/*
+ * Properly terminate each builtin target. Give each target
+ * a chance to write a summary event and/or flush if necessary
+ * and then close the fd.
+ */
+static void tr2_tgt_disable_builtins(void)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ for_each_builtin (j, tgt_j)
+ tgt_j->pfn_term();
+}
+
+static int tr2main_exit_code;
+
+/*
+ * Our atexit routine should run after everything has finished.
+ *
+ * Note that events generated here might not actually appear if
+ * we are writing to fd 1 or 2 and our atexit routine runs after
+ * the pager's atexit routine (since it closes them to shutdown
+ * the pipes).
+ */
+static void tr2main_atexit_handler(void)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ /*
+ * Clear any unbalanced regions so that our atexit message
+ * does not appear nested. This improves the appearance of
+ * the trace output if someone calls die(), for example.
+ */
+ tr2tls_pop_unwind_self();
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_atexit)
+ tgt_j->pfn_atexit(us_elapsed_absolute,
+ tr2main_exit_code);
+
+ tr2_tgt_disable_builtins();
+
+ tr2tls_release();
+ tr2_sid_release();
+ tr2_cmd_name_release();
+ tr2_cfg_free_patterns();
+ tr2_sysenv_release();
+
+ trace2_enabled = 0;
+}
+
+static void tr2main_signal_handler(int signo)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_signal)
+ tgt_j->pfn_signal(us_elapsed_absolute, signo);
+
+ sigchain_pop(signo);
+ raise(signo);
+}
+
+void trace2_initialize_clock(void)
+{
+ tr2tls_start_process_clock();
+}
+
+void trace2_initialize_fl(const char *file, int line)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (trace2_enabled)
+ return;
+
+ tr2_sysenv_load();
+
+ if (!tr2_tgt_want_builtins())
+ return;
+ trace2_enabled = 1;
+
+ tr2_sid_get();
+
+ atexit(tr2main_atexit_handler);
+ sigchain_push(SIGPIPE, tr2main_signal_handler);
+ tr2tls_init();
+
+ /*
+ * Emit 'version' message on each active builtin target.
+ */
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_version_fl)
+ tgt_j->pfn_version_fl(file, line);
+}
+
+int trace2_is_enabled(void)
+{
+ return trace2_enabled;
+}
+
+void trace2_cmd_start_fl(const char *file, int line, const char **argv)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_start_fl)
+ tgt_j->pfn_start_fl(file, line, us_elapsed_absolute,
+ argv);
+}
+
+int trace2_cmd_exit_fl(const char *file, int line, int code)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ code &= 0xff;
+
+ if (!trace2_enabled)
+ return code;
+
+ trace2_collect_process_info(TRACE2_PROCESS_INFO_EXIT);
+
+ tr2main_exit_code = code;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_exit_fl)
+ tgt_j->pfn_exit_fl(file, line, us_elapsed_absolute,
+ code);
+
+ return code;
+}
+
+void trace2_cmd_error_va_fl(const char *file, int line, const char *fmt,
+ va_list ap)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ /*
+ * We expect each target function to treat 'ap' as constant
+ * and use va_copy (because an 'ap' can only be walked once).
+ */
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_error_va_fl)
+ tgt_j->pfn_error_va_fl(file, line, fmt, ap);
+}
+
+void trace2_cmd_path_fl(const char *file, int line, const char *pathname)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_command_path_fl)
+ tgt_j->pfn_command_path_fl(file, line, pathname);
+}
+
+void trace2_cmd_name_fl(const char *file, int line, const char *name)
+{
+ struct tr2_tgt *tgt_j;
+ const char *hierarchy;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ tr2_cmd_name_append_hierarchy(name);
+ hierarchy = tr2_cmd_name_get_hierarchy();
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_command_name_fl)
+ tgt_j->pfn_command_name_fl(file, line, name, hierarchy);
+}
+
+void trace2_cmd_mode_fl(const char *file, int line, const char *mode)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_command_mode_fl)
+ tgt_j->pfn_command_mode_fl(file, line, mode);
+}
+
+void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
+ const char **argv)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_alias_fl)
+ tgt_j->pfn_alias_fl(file, line, alias, argv);
+}
+
+void trace2_cmd_list_config_fl(const char *file, int line)
+{
+ if (!trace2_enabled)
+ return;
+
+ tr2_cfg_list_config_fl(file, line);
+}
+
+void trace2_cmd_set_config_fl(const char *file, int line, const char *key,
+ const char *value)
+{
+ if (!trace2_enabled)
+ return;
+
+ tr2_cfg_set_fl(file, line, key, value);
+}
+
+void trace2_child_start_fl(const char *file, int line,
+ struct child_process *cmd)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ cmd->trace2_child_id = tr2tls_locked_increment(&tr2_next_child_id);
+ cmd->trace2_child_us_start = us_now;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_child_start_fl)
+ tgt_j->pfn_child_start_fl(file, line,
+ us_elapsed_absolute, cmd);
+}
+
+void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
+ int child_exit_code)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_child;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ if (cmd->trace2_child_us_start)
+ us_elapsed_child = us_now - cmd->trace2_child_us_start;
+ else
+ us_elapsed_child = 0;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_child_exit_fl)
+ tgt_j->pfn_child_exit_fl(file, line,
+ us_elapsed_absolute,
+ cmd->trace2_child_id, cmd->pid,
+ child_exit_code,
+ us_elapsed_child);
+}
+
+int trace2_exec_fl(const char *file, int line, const char *exe,
+ const char **argv)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ int exec_id;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return -1;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ exec_id = tr2tls_locked_increment(&tr2_next_exec_id);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_exec_fl)
+ tgt_j->pfn_exec_fl(file, line, us_elapsed_absolute,
+ exec_id, exe, argv);
+
+ return exec_id;
+}
+
+void trace2_exec_result_fl(const char *file, int line, int exec_id, int code)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_exec_result_fl)
+ tgt_j->pfn_exec_result_fl(
+ file, line, us_elapsed_absolute, exec_id, code);
+}
+
+void trace2_thread_start_fl(const char *file, int line, const char *thread_name)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ if (tr2tls_is_main_thread()) {
+ /*
+ * We should only be called from the new thread's thread-proc,
+ * so this is technically a bug. But in those cases where the
+ * main thread also runs the thread-proc function (or when we
+ * are built with threading disabled), we need to allow it.
+ *
+ * Convert this call to a region-enter so the nesting looks
+ * correct.
+ */
+ trace2_region_enter_printf_fl(file, line, NULL, NULL, NULL,
+ "thread-proc on main: %s",
+ thread_name);
+ return;
+ }
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ tr2tls_create_self(thread_name, us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_thread_start_fl)
+ tgt_j->pfn_thread_start_fl(file, line,
+ us_elapsed_absolute);
+}
+
+void trace2_thread_exit_fl(const char *file, int line)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_thread;
+
+ if (!trace2_enabled)
+ return;
+
+ if (tr2tls_is_main_thread()) {
+ /*
+ * We should only be called from the exiting thread's
+ * thread-proc, so this is technically a bug. But in
+ * those cases where the main thread also runs the
+ * thread-proc function (or when we are built with
+ * threading disabled), we need to allow it.
+ *
+ * Convert this call to a region-leave so the nesting
+ * looks correct.
+ */
+ trace2_region_leave_printf_fl(file, line, NULL, NULL, NULL,
+ "thread-proc on main");
+ return;
+ }
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ /*
+ * Clear any unbalanced regions and then get the relative time
+ * for the outer-most region (which we pushed when the thread
+ * started). This gives us the run time of the thread.
+ */
+ tr2tls_pop_unwind_self();
+ us_elapsed_thread = tr2tls_region_elasped_self(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_thread_exit_fl)
+ tgt_j->pfn_thread_exit_fl(file, line,
+ us_elapsed_absolute,
+ us_elapsed_thread);
+
+ tr2tls_unset_self();
+}
+
+void trace2_def_param_fl(const char *file, int line, const char *param,
+ const char *value)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_param_fl)
+ tgt_j->pfn_param_fl(file, line, param, value);
+}
+
+void trace2_def_repo_fl(const char *file, int line, struct repository *repo)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+
+ if (!trace2_enabled)
+ return;
+
+ if (repo->trace2_repo_id)
+ return;
+
+ repo->trace2_repo_id = tr2tls_locked_increment(&tr2_next_repo_id);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_repo_fl)
+ tgt_j->pfn_repo_fl(file, line, repo);
+}
+
+void trace2_region_enter_printf_va_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ /*
+ * Print the region-enter message at the current nesting
+ * (indentation) level and then push a new level.
+ *
+ * We expect each target function to treat 'ap' as constant
+ * and use va_copy.
+ */
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_region_enter_printf_va_fl)
+ tgt_j->pfn_region_enter_printf_va_fl(
+ file, line, us_elapsed_absolute, category,
+ label, repo, fmt, ap);
+
+ tr2tls_push_self(us_now);
+}
+
+void trace2_region_enter_fl(const char *file, int line, const char *category,
+ const char *label, const struct repository *repo, ...)
+{
+ va_list ap;
+ va_start(ap, repo);
+ trace2_region_enter_printf_va_fl(file, line, category, label, repo,
+ NULL, ap);
+ va_end(ap);
+
+}
+
+void trace2_region_enter_printf_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_region_enter_printf_va_fl(file, line, category, label, repo, fmt,
+ ap);
+ va_end(ap);
+}
+
+#ifndef HAVE_VARIADIC_MACROS
+void trace2_region_enter_printf(const char *category, const char *label,
+ const struct repository *repo, const char *fmt,
+ ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_region_enter_printf_va_fl(NULL, 0, category, label, repo, fmt,
+ ap);
+ va_end(ap);
+}
+#endif
+
+void trace2_region_leave_printf_va_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_region;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ /*
+ * Get the elapsed time in the current region before we
+ * pop it off the stack. Pop the stack. And then print
+ * the perf message at the new (shallower) level so that
+ * it lines up with the corresponding push/enter.
+ */
+ us_elapsed_region = tr2tls_region_elasped_self(us_now);
+
+ tr2tls_pop_self();
+
+ /*
+ * We expect each target function to treat 'ap' as constant
+ * and use va_copy.
+ */
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_region_leave_printf_va_fl)
+ tgt_j->pfn_region_leave_printf_va_fl(
+ file, line, us_elapsed_absolute,
+ us_elapsed_region, category, label, repo, fmt,
+ ap);
+}
+
+void trace2_region_leave_fl(const char *file, int line, const char *category,
+ const char *label, const struct repository *repo, ...)
+{
+ va_list ap;
+ va_start(ap, repo);
+ trace2_region_leave_printf_va_fl(file, line, category, label, repo,
+ NULL, ap);
+ va_end(ap);
+}
+
+void trace2_region_leave_printf_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_region_leave_printf_va_fl(file, line, category, label, repo, fmt,
+ ap);
+ va_end(ap);
+}
+
+#ifndef HAVE_VARIADIC_MACROS
+void trace2_region_leave_printf(const char *category, const char *label,
+ const struct repository *repo, const char *fmt,
+ ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_region_leave_printf_va_fl(NULL, 0, category, label, repo, fmt,
+ ap);
+ va_end(ap);
+}
+#endif
+
+void trace2_data_string_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ const char *value)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_region;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+ us_elapsed_region = tr2tls_region_elasped_self(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_data_fl)
+ tgt_j->pfn_data_fl(file, line, us_elapsed_absolute,
+ us_elapsed_region, category, repo,
+ key, value);
+}
+
+void trace2_data_intmax_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ intmax_t value)
+{
+ struct strbuf buf_string = STRBUF_INIT;
+
+ if (!trace2_enabled)
+ return;
+
+ strbuf_addf(&buf_string, "%" PRIdMAX, value);
+ trace2_data_string_fl(file, line, category, repo, key, buf_string.buf);
+ strbuf_release(&buf_string);
+}
+
+void trace2_data_json_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ const struct json_writer *value)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+ uint64_t us_elapsed_region;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+ us_elapsed_region = tr2tls_region_elasped_self(us_now);
+
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_data_json_fl)
+ tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute,
+ us_elapsed_region, category,
+ repo, key, value);
+}
+
+void trace2_printf_va_fl(const char *file, int line, const char *fmt,
+ va_list ap)
+{
+ struct tr2_tgt *tgt_j;
+ int j;
+ uint64_t us_now;
+ uint64_t us_elapsed_absolute;
+
+ if (!trace2_enabled)
+ return;
+
+ us_now = getnanotime() / 1000;
+ us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+ /*
+ * We expect each target function to treat 'ap' as constant
+ * and use va_copy.
+ */
+ for_each_wanted_builtin (j, tgt_j)
+ if (tgt_j->pfn_printf_va_fl)
+ tgt_j->pfn_printf_va_fl(file, line, us_elapsed_absolute,
+ fmt, ap);
+}
+
+void trace2_printf_fl(const char *file, int line, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_printf_va_fl(file, line, fmt, ap);
+ va_end(ap);
+}
+
+#ifndef HAVE_VARIADIC_MACROS
+void trace2_printf(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ trace2_printf_va_fl(NULL, 0, fmt, ap);
+ va_end(ap);
+}
+#endif
diff --git a/trace2.h b/trace2.h
new file mode 100644
index 0000000..050bf3c
--- /dev/null
+++ b/trace2.h
@@ -0,0 +1,410 @@
+#ifndef TRACE2_H
+#define TRACE2_H
+
+struct child_process;
+struct repository;
+struct json_writer;
+
+/*
+ * The public TRACE2 routines are grouped into the following groups:
+ *
+ * [] trace2_initialize -- initialization.
+ * [] trace2_cmd_* -- emit command/control messages.
+ * [] trace2_child* -- emit child start/stop messages.
+ * [] trace2_exec* -- emit exec start/stop messages.
+ * [] trace2_thread* -- emit thread start/stop messages.
+ * [] trace2_def* -- emit definition/parameter mesasges.
+ * [] trace2_region* -- emit region nesting messages.
+ * [] trace2_data* -- emit region/thread/repo data messages.
+ * [] trace2_printf* -- legacy trace[1] messages.
+ */
+
+/*
+ * Initialize the TRACE2 clock and do nothing else, in particular
+ * no mallocs, no system inspection, and no environment inspection.
+ *
+ * This should be called at the very top of main() to capture the
+ * process start time. This is intended to reduce chicken-n-egg
+ * bootstrap pressure.
+ *
+ * It is safe to call this more than once. This allows capturing
+ * absolute startup costs on Windows which uses a little trickery
+ * to do setup work before common-main.c:main() is called.
+ *
+ * The main trace2_initialize_fl() may be called a little later
+ * after more infrastructure is established.
+ */
+void trace2_initialize_clock(void);
+
+/*
+ * Initialize TRACE2 tracing facility if any of the builtin TRACE2
+ * targets are enabled in the system config or the environment.
+ * Emits a 'version' event.
+ *
+ * Cleanup/Termination is handled automatically by a registered
+ * atexit() routine.
+ */
+void trace2_initialize_fl(const char *file, int line);
+
+#define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__)
+
+/*
+ * Return true if trace2 is enabled.
+ */
+int trace2_is_enabled(void);
+
+/*
+ * Emit a 'start' event with the original (unmodified) argv.
+ */
+void trace2_cmd_start_fl(const char *file, int line, const char **argv);
+
+#define trace2_cmd_start(argv) trace2_cmd_start_fl(__FILE__, __LINE__, (argv))
+
+/*
+ * Emit an 'exit' event.
+ *
+ * Write the exit-code that will be passed to exit() or returned
+ * from main().
+ *
+ * Use this prior to actually calling exit().
+ * See "#define exit()" in git-compat-util.h
+ */
+int trace2_cmd_exit_fl(const char *file, int line, int code);
+
+#define trace2_cmd_exit(code) (trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
+
+/*
+ * Emit an 'error' event.
+ *
+ * Write an error message to the TRACE2 targets.
+ */
+void trace2_cmd_error_va_fl(const char *file, int line, const char *fmt,
+ va_list ap);
+
+#define trace2_cmd_error_va(fmt, ap) \
+ trace2_cmd_error_va_fl(__FILE__, __LINE__, (fmt), (ap))
+
+/*
+ * Emit a 'pathname' event with the canonical pathname of the current process
+ * This gives post-processors a simple field to identify the command without
+ * having to parse the argv. For example, to distinguish invocations from
+ * installed versus debug executables.
+ */
+void trace2_cmd_path_fl(const char *file, int line, const char *pathname);
+
+#define trace2_cmd_path(p) trace2_cmd_path_fl(__FILE__, __LINE__, (p))
+
+/*
+ * Emit a 'cmd_name' event with the canonical name of the command.
+ * This gives post-processors a simple field to identify the command
+ * without having to parse the argv.
+ */
+void trace2_cmd_name_fl(const char *file, int line, const char *name);
+
+#define trace2_cmd_name(v) trace2_cmd_name_fl(__FILE__, __LINE__, (v))
+
+/*
+ * Emit a 'cmd_mode' event to further describe the command being run.
+ * For example, "checkout" can checkout a single file or can checkout a
+ * different branch. This gives post-processors a simple field to compare
+ * equivalent commands without having to parse the argv.
+ */
+void trace2_cmd_mode_fl(const char *file, int line, const char *mode);
+
+#define trace2_cmd_mode(sv) trace2_cmd_mode_fl(__FILE__, __LINE__, (sv))
+
+/*
+ * Emit an 'alias' expansion event.
+ */
+void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
+ const char **argv);
+
+#define trace2_cmd_alias(alias, argv) \
+ trace2_cmd_alias_fl(__FILE__, __LINE__, (alias), (argv))
+
+/*
+ * Emit one or more 'def_param' events for "interesting" configuration
+ * settings.
+ *
+ * Use the TR2_SYSENV_CFG_PARAM setting to register a comma-separated
+ * list of patterns configured important. For example:
+ * git config --system trace2.configParams 'core.*,remote.*.url'
+ * or:
+ * GIT_TRACE2_CONFIG_PARAMS=core.*,remote.*.url"
+ *
+ * Note: this routine does a read-only iteration on the config data
+ * (using read_early_config()), so it must not be called until enough
+ * of the process environment has been established. This includes the
+ * location of the git and worktree directories, expansion of any "-c"
+ * and "-C" command line options, and etc.
+ */
+void trace2_cmd_list_config_fl(const char *file, int line);
+
+#define trace2_cmd_list_config() trace2_cmd_list_config_fl(__FILE__, __LINE__)
+
+/*
+ * Emit a "def_param" event for the given config key/value pair IF
+ * we consider the key to be "interesting".
+ *
+ * Use this for new/updated config settings created/updated after
+ * trace2_cmd_list_config() is called.
+ */
+void trace2_cmd_set_config_fl(const char *file, int line, const char *key,
+ const char *value);
+
+#define trace2_cmd_set_config(k, v) \
+ trace2_cmd_set_config_fl(__FILE__, __LINE__, (k), (v))
+
+/*
+ * Emit a 'child_start' event prior to spawning a child process.
+ *
+ * Before calling optionally set "cmd->trace2_child_class" to a string
+ * describing the type of the child process. For example, "editor" or
+ * "pager".
+ */
+void trace2_child_start_fl(const char *file, int line,
+ struct child_process *cmd);
+
+#define trace2_child_start(cmd) trace2_child_start_fl(__FILE__, __LINE__, (cmd))
+
+/*
+ * Emit a 'child_exit' event after the child process completes.
+ */
+void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
+ int child_exit_code);
+
+#define trace2_child_exit(cmd, code) \
+ trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
+
+/*
+ * Emit an 'exec' event prior to calling one of exec(), execv(),
+ * execvp(), and etc. On Unix-derived systems, this will be the
+ * last event emitted for the current process, unless the exec
+ * fails. On Windows, exec() behaves like 'child_start' and a
+ * waitpid(), so additional events may be emitted.
+ *
+ * Returns the "exec_id".
+ */
+int trace2_exec_fl(const char *file, int line, const char *exe,
+ const char **argv);
+
+#define trace2_exec(exe, argv) trace2_exec_fl(__FILE__, __LINE__, (exe), (argv))
+
+/*
+ * Emit an 'exec_result' when possible. On Unix-derived systems,
+ * this should be called after exec() returns (which only happens
+ * when there is an error starting the new process). On Windows,
+ * this should be called after the waitpid().
+ *
+ * The "exec_id" should be the value returned from trace2_exec().
+ */
+void trace2_exec_result_fl(const char *file, int line, int exec_id, int code);
+
+#define trace2_exec_result(id, code) \
+ trace2_exec_result_fl(__FILE__, __LINE__, (id), (code))
+
+/*
+ * Emit a 'thread_start' event. This must be called from inside the
+ * thread-proc to set up the trace2 TLS data for the thread.
+ *
+ * Thread names should be descriptive, like "preload_index".
+ * Thread names will be decorated with an instance number automatically.
+ */
+void trace2_thread_start_fl(const char *file, int line,
+ const char *thread_name);
+
+#define trace2_thread_start(thread_name) \
+ trace2_thread_start_fl(__FILE__, __LINE__, (thread_name))
+
+/*
+ * Emit a 'thread_exit' event. This must be called from inside the
+ * thread-proc to report thread-specific data and cleanup TLS data
+ * for the thread.
+ */
+void trace2_thread_exit_fl(const char *file, int line);
+
+#define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__)
+
+/*
+ * Emit a 'param' event.
+ *
+ * Write a "<param> = <value>" pair describing some aspect of the
+ * run such as an important configuration setting or command line
+ * option that significantly changes command behavior.
+ */
+void trace2_def_param_fl(const char *file, int line, const char *param,
+ const char *value);
+
+#define trace2_def_param(param, value) \
+ trace2_def_param_fl(__FILE__, __LINE__, (param), (value))
+
+/*
+ * Tell trace2 about a newly instantiated repo object and assign
+ * a trace2-repo-id to be used in subsequent activity events.
+ *
+ * Emits a 'worktree' event for this repo instance.
+ */
+void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
+
+#define trace2_def_repo(repo) trace2_def_repo_fl(__FILE__, __LINE__, repo)
+
+/*
+ * Emit a 'region_enter' event for <category>.<label> with optional
+ * repo-id and printf message.
+ *
+ * Enter a new nesting level on the current thread and remember the
+ * current time. This controls the indenting of all subsequent events
+ * on this thread.
+ */
+void trace2_region_enter_fl(const char *file, int line, const char *category,
+ const char *label, const struct repository *repo, ...);
+
+#define trace2_region_enter(category, label, repo) \
+ trace2_region_enter_fl(__FILE__, __LINE__, (category), (label), (repo))
+
+void trace2_region_enter_printf_va_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap);
+
+#define trace2_region_enter_printf_va(category, label, repo, fmt, ap) \
+ trace2_region_enter_printf_va_fl(__FILE__, __LINE__, (category), \
+ (label), (repo), (fmt), (ap))
+
+void trace2_region_enter_printf_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, ...);
+
+#ifdef HAVE_VARIADIC_MACROS
+#define trace2_region_enter_printf(category, label, repo, ...) \
+ trace2_region_enter_printf_fl(__FILE__, __LINE__, (category), (label), \
+ (repo), __VA_ARGS__)
+#else
+/* clang-format off */
+__attribute__((format (region_enter_printf, 4, 5)))
+void trace2_region_enter_printf(const char *category, const char *label,
+ const struct repository *repo, const char *fmt,
+ ...);
+/* clang-format on */
+#endif
+
+/*
+ * Emit a 'region_leave' event for <category>.<label> with optional
+ * repo-id and printf message.
+ *
+ * Leave current nesting level and report the elapsed time spent
+ * in this nesting level.
+ */
+void trace2_region_leave_fl(const char *file, int line, const char *category,
+ const char *label, const struct repository *repo, ...);
+
+#define trace2_region_leave(category, label, repo) \
+ trace2_region_leave_fl(__FILE__, __LINE__, (category), (label), (repo))
+
+void trace2_region_leave_printf_va_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap);
+
+#define trace2_region_leave_printf_va(category, label, repo, fmt, ap) \
+ trace2_region_leave_printf_va_fl(__FILE__, __LINE__, (category), \
+ (label), (repo), (fmt), (ap))
+
+void trace2_region_leave_printf_fl(const char *file, int line,
+ const char *category, const char *label,
+ const struct repository *repo,
+ const char *fmt, ...);
+
+#ifdef HAVE_VARIADIC_MACROS
+#define trace2_region_leave_printf(category, label, repo, ...) \
+ trace2_region_leave_printf_fl(__FILE__, __LINE__, (category), (label), \
+ (repo), __VA_ARGS__)
+#else
+/* clang-format off */
+__attribute__((format (region_leave_printf, 4, 5)))
+void trace2_region_leave_printf(const char *category, const char *label,
+ const struct repository *repo, const char *fmt,
+ ...);
+/* clang-format on */
+#endif
+
+/*
+ * Emit a key-value pair 'data' event of the form <category>.<key> = <value>.
+ * This event implicitly contains information about thread, nesting region,
+ * and optional repo-id.
+ *
+ * On event-based TRACE2 targets, this generates a 'data' event suitable
+ * for post-processing. On printf-based TRACE2 targets, this is converted
+ * into a fixed-format printf message.
+ */
+void trace2_data_string_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ const char *value);
+
+#define trace2_data_string(category, repo, key, value) \
+ trace2_data_string_fl(__FILE__, __LINE__, (category), (repo), (key), \
+ (value))
+
+void trace2_data_intmax_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ intmax_t value);
+
+#define trace2_data_intmax(category, repo, key, value) \
+ trace2_data_intmax_fl(__FILE__, __LINE__, (category), (repo), (key), \
+ (value))
+
+void trace2_data_json_fl(const char *file, int line, const char *category,
+ const struct repository *repo, const char *key,
+ const struct json_writer *jw);
+
+#define trace2_data_json(category, repo, key, value) \
+ trace2_data_json_fl(__FILE__, __LINE__, (category), (repo), (key), \
+ (value))
+
+/*
+ * Emit a 'printf' event.
+ *
+ * Write an arbitrary formatted message to the TRACE2 targets. These
+ * text messages should be considered as human-readable strings without
+ * any formatting guidelines. Post-processors may choose to ignore
+ * them.
+ */
+void trace2_printf_va_fl(const char *file, int line, const char *fmt,
+ va_list ap);
+
+#define trace2_printf_va(fmt, ap) \
+ trace2_printf_va_fl(__FILE__, __LINE__, (fmt), (ap))
+
+void trace2_printf_fl(const char *file, int line, const char *fmt, ...);
+
+#ifdef HAVE_VARIADIC_MACROS
+#define trace2_printf(...) trace2_printf_fl(__FILE__, __LINE__, __VA_ARGS__)
+#else
+/* clang-format off */
+__attribute__((format (printf, 1, 2)))
+void trace2_printf(const char *fmt, ...);
+/* clang-format on */
+#endif
+
+/*
+ * Optional platform-specific code to dump information about the
+ * current and any parent process(es). This is intended to allow
+ * post-processors to know who spawned this git instance and anything
+ * else that the platform may be able to tell us about the current process.
+ */
+
+enum trace2_process_info_reason {
+ TRACE2_PROCESS_INFO_STARTUP,
+ TRACE2_PROCESS_INFO_EXIT,
+};
+
+#if defined(GIT_WINDOWS_NATIVE)
+void trace2_collect_process_info(enum trace2_process_info_reason reason);
+#else
+#define trace2_collect_process_info(reason) \
+ do { \
+ } while (0)
+#endif
+
+#endif /* TRACE2_H */
diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c
new file mode 100644
index 0000000..caa7f06
--- /dev/null
+++ b/trace2/tr2_cfg.c
@@ -0,0 +1,89 @@
+#include "cache.h"
+#include "config.h"
+#include "trace2/tr2_cfg.h"
+#include "trace2/tr2_sysenv.h"
+
+static struct strbuf **tr2_cfg_patterns;
+static int tr2_cfg_count_patterns;
+static int tr2_cfg_loaded;
+
+/*
+ * Parse a string containing a comma-delimited list of config keys
+ * or wildcard patterns into a list of strbufs.
+ */
+static int tr2_cfg_load_patterns(void)
+{
+ struct strbuf **s;
+ const char *envvar;
+
+ if (tr2_cfg_loaded)
+ return tr2_cfg_count_patterns;
+ tr2_cfg_loaded = 1;
+
+ envvar = tr2_sysenv_get(TR2_SYSENV_CFG_PARAM);
+ if (!envvar || !*envvar)
+ return tr2_cfg_count_patterns;
+
+ tr2_cfg_patterns = strbuf_split_buf(envvar, strlen(envvar), ',', -1);
+ for (s = tr2_cfg_patterns; *s; s++) {
+ struct strbuf *buf = *s;
+
+ if (buf->len && buf->buf[buf->len - 1] == ',')
+ strbuf_setlen(buf, buf->len - 1);
+ strbuf_trim_trailing_newline(*s);
+ strbuf_trim(*s);
+ }
+
+ tr2_cfg_count_patterns = s - tr2_cfg_patterns;
+ return tr2_cfg_count_patterns;
+}
+
+void tr2_cfg_free_patterns(void)
+{
+ if (tr2_cfg_patterns)
+ strbuf_list_free(tr2_cfg_patterns);
+ tr2_cfg_count_patterns = 0;
+ tr2_cfg_loaded = 0;
+}
+
+struct tr2_cfg_data {
+ const char *file;
+ int line;
+};
+
+/*
+ * See if the given config key matches any of our patterns of interest.
+ */
+static int tr2_cfg_cb(const char *key, const char *value, void *d)
+{
+ struct strbuf **s;
+ struct tr2_cfg_data *data = (struct tr2_cfg_data *)d;
+
+ for (s = tr2_cfg_patterns; *s; s++) {
+ struct strbuf *buf = *s;
+ int wm = wildmatch(buf->buf, key, WM_CASEFOLD);
+ if (wm == WM_MATCH) {
+ trace2_def_param_fl(data->file, data->line, key, value);
+ return 0;
+ }
+ }
+
+ return 0;
+}
+
+void tr2_cfg_list_config_fl(const char *file, int line)
+{
+ struct tr2_cfg_data data = { file, line };
+
+ if (tr2_cfg_load_patterns() > 0)
+ read_early_config(tr2_cfg_cb, &data);
+}
+
+void tr2_cfg_set_fl(const char *file, int line, const char *key,
+ const char *value)
+{
+ struct tr2_cfg_data data = { file, line };
+
+ if (tr2_cfg_load_patterns() > 0)
+ tr2_cfg_cb(key, value, &data);
+}
diff --git a/trace2/tr2_cfg.h b/trace2/tr2_cfg.h
new file mode 100644
index 0000000..d9c98f6
--- /dev/null
+++ b/trace2/tr2_cfg.h
@@ -0,0 +1,19 @@
+#ifndef TR2_CFG_H
+#define TR2_CFG_H
+
+/*
+ * Iterate over all config settings and emit 'def_param' events for the
+ * "interesting" ones to TRACE2.
+ */
+void tr2_cfg_list_config_fl(const char *file, int line);
+
+/*
+ * Emit a "def_param" event for the given key/value pair IF we consider
+ * the key to be "interesting".
+ */
+void tr2_cfg_set_fl(const char *file, int line, const char *key,
+ const char *value);
+
+void tr2_cfg_free_patterns(void);
+
+#endif /* TR2_CFG_H */
diff --git a/trace2/tr2_cmd_name.c b/trace2/tr2_cmd_name.c
new file mode 100644
index 0000000..dd31320
--- /dev/null
+++ b/trace2/tr2_cmd_name.c
@@ -0,0 +1,30 @@
+#include "cache.h"
+#include "trace2/tr2_cmd_name.h"
+
+#define TR2_ENVVAR_PARENT_NAME "GIT_TRACE2_PARENT_NAME"
+
+static struct strbuf tr2cmdname_hierarchy = STRBUF_INIT;
+
+void tr2_cmd_name_append_hierarchy(const char *name)
+{
+ const char *parent_name = getenv(TR2_ENVVAR_PARENT_NAME);
+
+ strbuf_reset(&tr2cmdname_hierarchy);
+ if (parent_name && *parent_name) {
+ strbuf_addstr(&tr2cmdname_hierarchy, parent_name);
+ strbuf_addch(&tr2cmdname_hierarchy, '/');
+ }
+ strbuf_addstr(&tr2cmdname_hierarchy, name);
+
+ setenv(TR2_ENVVAR_PARENT_NAME, tr2cmdname_hierarchy.buf, 1);
+}
+
+const char *tr2_cmd_name_get_hierarchy(void)
+{
+ return tr2cmdname_hierarchy.buf;
+}
+
+void tr2_cmd_name_release(void)
+{
+ strbuf_release(&tr2cmdname_hierarchy);
+}
diff --git a/trace2/tr2_cmd_name.h b/trace2/tr2_cmd_name.h
new file mode 100644
index 0000000..ab70b67
--- /dev/null
+++ b/trace2/tr2_cmd_name.h
@@ -0,0 +1,24 @@
+#ifndef TR2_CMD_NAME_H
+#define TR2_CMD_NAME_H
+
+/*
+ * Append the current command name to the list being maintained
+ * in the environment.
+ *
+ * The hierarchy for a top-level git command is just the current
+ * command name. For a child git process, the hierarchy includes the
+ * names of the parent processes.
+ *
+ * The hierarchy for the current process will be exported to the
+ * environment and inherited by child processes.
+ */
+void tr2_cmd_name_append_hierarchy(const char *name);
+
+/*
+ * Get the command name hierarchy for the current process.
+ */
+const char *tr2_cmd_name_get_hierarchy(void);
+
+void tr2_cmd_name_release(void);
+
+#endif /* TR2_CMD_NAME_H */
diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
new file mode 100644
index 0000000..c698575
--- /dev/null
+++ b/trace2/tr2_dst.c
@@ -0,0 +1,302 @@
+#include "cache.h"
+#include "trace2/tr2_dst.h"
+#include "trace2/tr2_sid.h"
+#include "trace2/tr2_sysenv.h"
+
+/*
+ * How many attempts we will make at creating an automatically-named trace file.
+ */
+#define MAX_AUTO_ATTEMPTS 10
+
+static int tr2_dst_want_warning(void)
+{
+ static int tr2env_dst_debug = -1;
+
+ if (tr2env_dst_debug == -1) {
+ const char *env_value = tr2_sysenv_get(TR2_SYSENV_DST_DEBUG);
+ if (!env_value || !*env_value)
+ tr2env_dst_debug = 0;
+ else
+ tr2env_dst_debug = atoi(env_value) > 0;
+ }
+
+ return tr2env_dst_debug;
+}
+
+void tr2_dst_trace_disable(struct tr2_dst *dst)
+{
+ if (dst->need_close)
+ close(dst->fd);
+ dst->fd = 0;
+ dst->initialized = 1;
+ dst->need_close = 0;
+}
+
+static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix)
+{
+ int fd;
+ const char *last_slash, *sid = tr2_sid_get();
+ struct strbuf path = STRBUF_INIT;
+ size_t base_path_len;
+ unsigned attempt_count;
+
+ last_slash = strrchr(sid, '/');
+ if (last_slash)
+ sid = last_slash + 1;
+
+ strbuf_addstr(&path, tgt_prefix);
+ if (!is_dir_sep(path.buf[path.len - 1]))
+ strbuf_addch(&path, '/');
+ strbuf_addstr(&path, sid);
+ base_path_len = path.len;
+
+ for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) {
+ if (attempt_count > 0) {
+ strbuf_setlen(&path, base_path_len);
+ strbuf_addf(&path, ".%d", attempt_count);
+ }
+
+ fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666);
+ if (fd != -1)
+ break;
+ }
+
+ if (fd == -1) {
+ if (tr2_dst_want_warning())
+ warning("trace2: could not open '%.*s' for '%s' tracing: %s",
+ (int) base_path_len, path.buf,
+ tr2_sysenv_display_name(dst->sysenv_var),
+ strerror(errno));
+
+ tr2_dst_trace_disable(dst);
+ strbuf_release(&path);
+ return 0;
+ }
+
+ strbuf_release(&path);
+
+ dst->fd = fd;
+ dst->need_close = 1;
+ dst->initialized = 1;
+
+ return dst->fd;
+}
+
+static int tr2_dst_try_path(struct tr2_dst *dst, const char *tgt_value)
+{
+ int fd = open(tgt_value, O_WRONLY | O_APPEND | O_CREAT, 0666);
+ if (fd == -1) {
+ if (tr2_dst_want_warning())
+ warning("trace2: could not open '%s' for '%s' tracing: %s",
+ tgt_value,
+ tr2_sysenv_display_name(dst->sysenv_var),
+ strerror(errno));
+
+ tr2_dst_trace_disable(dst);
+ return 0;
+ }
+
+ dst->fd = fd;
+ dst->need_close = 1;
+ dst->initialized = 1;
+
+ return dst->fd;
+}
+
+#ifndef NO_UNIX_SOCKETS
+#define PREFIX_AF_UNIX "af_unix:"
+#define PREFIX_AF_UNIX_STREAM "af_unix:stream:"
+#define PREFIX_AF_UNIX_DGRAM "af_unix:dgram:"
+
+static int tr2_dst_try_uds_connect(const char *path, int sock_type, int *out_fd)
+{
+ int fd;
+ struct sockaddr_un sa;
+
+ fd = socket(AF_UNIX, sock_type, 0);
+ if (fd == -1)
+ return errno;
+
+ sa.sun_family = AF_UNIX;
+ strlcpy(sa.sun_path, path, sizeof(sa.sun_path));
+
+ if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
+ int e = errno;
+ close(fd);
+ return e;
+ }
+
+ *out_fd = fd;
+ return 0;
+}
+
+#define TR2_DST_UDS_TRY_STREAM (1 << 0)
+#define TR2_DST_UDS_TRY_DGRAM (1 << 1)
+
+static int tr2_dst_try_unix_domain_socket(struct tr2_dst *dst,
+ const char *tgt_value)
+{
+ unsigned int uds_try = 0;
+ int fd;
+ int e;
+ const char *path = NULL;
+
+ /*
+ * Allow "af_unix:[<type>:]<absolute_path>"
+ *
+ * Trace2 always writes complete individual messages (without
+ * chunking), so we can talk to either DGRAM or STREAM type sockets.
+ *
+ * Allow the user to explicitly request the socket type.
+ *
+ * If they omit the socket type, try one and then the other.
+ */
+
+ if (skip_prefix(tgt_value, PREFIX_AF_UNIX_STREAM, &path))
+ uds_try |= TR2_DST_UDS_TRY_STREAM;
+
+ else if (skip_prefix(tgt_value, PREFIX_AF_UNIX_DGRAM, &path))
+ uds_try |= TR2_DST_UDS_TRY_DGRAM;
+
+ else if (skip_prefix(tgt_value, PREFIX_AF_UNIX, &path))
+ uds_try |= TR2_DST_UDS_TRY_STREAM | TR2_DST_UDS_TRY_DGRAM;
+
+ if (!path || !*path) {
+ if (tr2_dst_want_warning())
+ warning("trace2: invalid AF_UNIX value '%s' for '%s' tracing",
+ tgt_value,
+ tr2_sysenv_display_name(dst->sysenv_var));
+
+ tr2_dst_trace_disable(dst);
+ return 0;
+ }
+
+ if (!is_absolute_path(path) ||
+ strlen(path) >= sizeof(((struct sockaddr_un *)0)->sun_path)) {
+ if (tr2_dst_want_warning())
+ warning("trace2: invalid AF_UNIX path '%s' for '%s' tracing",
+ path, tr2_sysenv_display_name(dst->sysenv_var));
+
+ tr2_dst_trace_disable(dst);
+ return 0;
+ }
+
+ if (uds_try & TR2_DST_UDS_TRY_STREAM) {
+ e = tr2_dst_try_uds_connect(path, SOCK_STREAM, &fd);
+ if (!e)
+ goto connected;
+ if (e != EPROTOTYPE)
+ goto error;
+ }
+ if (uds_try & TR2_DST_UDS_TRY_DGRAM) {
+ e = tr2_dst_try_uds_connect(path, SOCK_DGRAM, &fd);
+ if (!e)
+ goto connected;
+ }
+
+error:
+ if (tr2_dst_want_warning())
+ warning("trace2: could not connect to socket '%s' for '%s' tracing: %s",
+ path, tr2_sysenv_display_name(dst->sysenv_var),
+ strerror(e));
+
+ tr2_dst_trace_disable(dst);
+ return 0;
+
+connected:
+ dst->fd = fd;
+ dst->need_close = 1;
+ dst->initialized = 1;
+
+ return dst->fd;
+}
+#endif
+
+static void tr2_dst_malformed_warning(struct tr2_dst *dst,
+ const char *tgt_value)
+{
+ warning("trace2: unknown value for '%s': '%s'",
+ tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
+}
+
+int tr2_dst_get_trace_fd(struct tr2_dst *dst)
+{
+ const char *tgt_value;
+
+ /* don't open twice */
+ if (dst->initialized)
+ return dst->fd;
+
+ dst->initialized = 1;
+
+ tgt_value = tr2_sysenv_get(dst->sysenv_var);
+
+ if (!tgt_value || !strcmp(tgt_value, "") || !strcmp(tgt_value, "0") ||
+ !strcasecmp(tgt_value, "false")) {
+ dst->fd = 0;
+ return dst->fd;
+ }
+
+ if (!strcmp(tgt_value, "1") || !strcasecmp(tgt_value, "true")) {
+ dst->fd = STDERR_FILENO;
+ return dst->fd;
+ }
+
+ if (strlen(tgt_value) == 1 && isdigit(*tgt_value)) {
+ dst->fd = atoi(tgt_value);
+ return dst->fd;
+ }
+
+ if (is_absolute_path(tgt_value)) {
+ if (is_directory(tgt_value))
+ return tr2_dst_try_auto_path(dst, tgt_value);
+ else
+ return tr2_dst_try_path(dst, tgt_value);
+ }
+
+#ifndef NO_UNIX_SOCKETS
+ if (starts_with(tgt_value, PREFIX_AF_UNIX))
+ return tr2_dst_try_unix_domain_socket(dst, tgt_value);
+#endif
+
+ /* Always warn about malformed values. */
+ tr2_dst_malformed_warning(dst, tgt_value);
+ tr2_dst_trace_disable(dst);
+ return 0;
+}
+
+int tr2_dst_trace_want(struct tr2_dst *dst)
+{
+ return !!tr2_dst_get_trace_fd(dst);
+}
+
+void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line)
+{
+ int fd = tr2_dst_get_trace_fd(dst);
+
+ strbuf_complete_line(buf_line); /* ensure final NL on buffer */
+
+ /*
+ * We do not use write_in_full() because we do not want
+ * a short-write to try again. We are using O_APPEND mode
+ * files and the kernel handles the atomic seek+write. If
+ * another thread or git process is concurrently writing to
+ * this fd or file, our remainder-write may not be contiguous
+ * with our initial write of this message. And that will
+ * confuse readers. So just don't bother.
+ *
+ * It is assumed that TRACE2 messages are short enough that
+ * the system can write them in 1 attempt and we won't see
+ * a short-write.
+ *
+ * If we get an IO error, just close the trace dst.
+ */
+ if (write(fd, buf_line->buf, buf_line->len) >= 0)
+ return;
+
+ if (tr2_dst_want_warning())
+ warning("unable to write trace to '%s': %s",
+ tr2_sysenv_display_name(dst->sysenv_var),
+ strerror(errno));
+ tr2_dst_trace_disable(dst);
+}
diff --git a/trace2/tr2_dst.h b/trace2/tr2_dst.h
new file mode 100644
index 0000000..3adf3ba
--- /dev/null
+++ b/trace2/tr2_dst.h
@@ -0,0 +1,37 @@
+#ifndef TR2_DST_H
+#define TR2_DST_H
+
+struct strbuf;
+#include "trace2/tr2_sysenv.h"
+
+struct tr2_dst {
+ enum tr2_sysenv_variable sysenv_var;
+ int fd;
+ unsigned int initialized : 1;
+ unsigned int need_close : 1;
+};
+
+/*
+ * Disable TRACE2 on the destination. In TRACE2 a destination (DST)
+ * wraps a file descriptor; it is associated with a TARGET which
+ * defines the formatting.
+ */
+void tr2_dst_trace_disable(struct tr2_dst *dst);
+
+/*
+ * Return the file descriptor for the DST.
+ * If 0, the dst is closed or disabled.
+ */
+int tr2_dst_get_trace_fd(struct tr2_dst *dst);
+
+/*
+ * Return true if the DST is opened for writing.
+ */
+int tr2_dst_trace_want(struct tr2_dst *dst);
+
+/*
+ * Write a single line/message to the trace file.
+ */
+void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line);
+
+#endif /* TR2_DST_H */
diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c
new file mode 100644
index 0000000..6948fd4
--- /dev/null
+++ b/trace2/tr2_sid.c
@@ -0,0 +1,112 @@
+#include "cache.h"
+#include "trace2/tr2_tbuf.h"
+#include "trace2/tr2_sid.h"
+
+#define TR2_ENVVAR_PARENT_SID "GIT_TRACE2_PARENT_SID"
+
+static struct strbuf tr2sid_buf = STRBUF_INIT;
+static int tr2sid_nr_git_parents;
+
+/*
+ * Compute the final component of the SID representing the current process.
+ * This should uniquely identify the process and be a valid filename (to
+ * allow writing trace2 data to per-process files). It should also be fixed
+ * length for possible use as a database key.
+ *
+ * "<yyyymmdd>T<hhmmss>.<fraction>Z-<host>-<process>"
+ *
+ * where <host> is a 9 character string:
+ * "H<first_8_chars_of_sha1_of_hostname>"
+ * "Localhost" when no hostname.
+ *
+ * where <process> is a 9 character string containing the least signifcant
+ * 32 bits in the process-id.
+ * "P<pid>"
+ * (This is an abribrary choice. On most systems pid_t is a 32 bit value,
+ * so limit doesn't matter. On larger systems, a truncated value is fine
+ * for our purposes here.)
+ */
+static void tr2_sid_append_my_sid_component(void)
+{
+ const struct git_hash_algo *algo = &hash_algos[GIT_HASH_SHA1];
+ struct tr2_tbuf tb_now;
+ git_hash_ctx ctx;
+ pid_t pid = getpid();
+ unsigned char hash[GIT_MAX_RAWSZ + 1];
+ char hex[GIT_MAX_HEXSZ + 1];
+ char hostname[HOST_NAME_MAX + 1];
+
+ tr2_tbuf_utc_datetime(&tb_now);
+ strbuf_addstr(&tr2sid_buf, tb_now.buf);
+
+ strbuf_addch(&tr2sid_buf, '-');
+ if (xgethostname(hostname, sizeof(hostname)))
+ strbuf_add(&tr2sid_buf, "Localhost", 9);
+ else {
+ algo->init_fn(&ctx);
+ algo->update_fn(&ctx, hostname, strlen(hostname));
+ algo->final_fn(hash, &ctx);
+ hash_to_hex_algop_r(hex, hash, algo);
+ strbuf_addch(&tr2sid_buf, 'H');
+ strbuf_add(&tr2sid_buf, hex, 8);
+ }
+
+ strbuf_addf(&tr2sid_buf, "-P%08"PRIx32, (uint32_t)pid);
+}
+
+/*
+ * Compute a "unique" session id (SID) for the current process. This allows
+ * all events from this process to have a single label (much like a PID).
+ *
+ * Export this into our environment so that all child processes inherit it.
+ *
+ * If we were started by another git instance, use our parent's SID as a
+ * prefix. (This lets us track parent/child relationships even if there
+ * is an intermediate shell process.)
+ *
+ * Additionally, count the number of nested git processes.
+ */
+static void tr2_sid_compute(void)
+{
+ const char *parent_sid;
+
+ if (tr2sid_buf.len)
+ return;
+
+ parent_sid = getenv(TR2_ENVVAR_PARENT_SID);
+ if (parent_sid && *parent_sid) {
+ const char *p;
+ for (p = parent_sid; *p; p++)
+ if (*p == '/')
+ tr2sid_nr_git_parents++;
+
+ strbuf_addstr(&tr2sid_buf, parent_sid);
+ strbuf_addch(&tr2sid_buf, '/');
+ tr2sid_nr_git_parents++;
+ }
+
+ tr2_sid_append_my_sid_component();
+
+ setenv(TR2_ENVVAR_PARENT_SID, tr2sid_buf.buf, 1);
+}
+
+const char *tr2_sid_get(void)
+{
+ if (!tr2sid_buf.len)
+ tr2_sid_compute();
+
+ return tr2sid_buf.buf;
+}
+
+int tr2_sid_depth(void)
+{
+ if (!tr2sid_buf.len)
+ tr2_sid_compute();
+
+ return tr2sid_nr_git_parents;
+}
+
+void tr2_sid_release(void)
+{
+ strbuf_release(&tr2sid_buf);
+}
diff --git a/trace2/tr2_sid.h b/trace2/tr2_sid.h
new file mode 100644
index 0000000..9bef321
--- /dev/null
+++ b/trace2/tr2_sid.h
@@ -0,0 +1,18 @@
+#ifndef TR2_SID_H
+#define TR2_SID_H
+
+/*
+ * Get our session id. Compute if necessary.
+ */
+const char *tr2_sid_get(void);
+
+/*
+ * Get our process depth. A top-level git process invoked from the
+ * command line will have depth=0. A child git process will have
+ * depth=1 and so on.
+ */
+int tr2_sid_depth(void);
+
+void tr2_sid_release(void);
+
+#endif /* TR2_SID_H */
diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c
new file mode 100644
index 0000000..5958cfc
--- /dev/null
+++ b/trace2/tr2_sysenv.c
@@ -0,0 +1,127 @@
+#include "cache.h"
+#include "config.h"
+#include "dir.h"
+#include "tr2_sysenv.h"
+
+/*
+ * Each entry represents a trace2 setting.
+ * See Documentation/technical/api-trace2.txt
+ */
+struct tr2_sysenv_entry {
+ const char *env_var_name;
+ const char *git_config_name;
+
+ char *value;
+ unsigned int getenv_called : 1;
+};
+
+/*
+ * This table must match "enum tr2_sysenv_variable" in tr2_sysenv.h.
+ *
+ * The strings in this table are constant and must match the published
+ * config and environment variable names as described in the documentation.
+ *
+ * We do not define entries for the GIT_TRACE2_PARENT_* environment
+ * variables because they are transient and used to pass information
+ * from parent to child git processes, rather than settings.
+ */
+/* clang-format off */
+static struct tr2_sysenv_entry tr2_sysenv_settings[] = {
+ [TR2_SYSENV_CFG_PARAM] = { "GIT_TRACE2_CONFIG_PARAMS",
+ "trace2.configparams" },
+
+ [TR2_SYSENV_DST_DEBUG] = { "GIT_TRACE2_DST_DEBUG",
+ "trace2.destinationdebug" },
+
+ [TR2_SYSENV_NORMAL] = { "GIT_TRACE2",
+ "trace2.normaltarget" },
+ [TR2_SYSENV_NORMAL_BRIEF] = { "GIT_TRACE2_BRIEF",
+ "trace2.normalbrief" },
+
+ [TR2_SYSENV_EVENT] = { "GIT_TRACE2_EVENT",
+ "trace2.eventtarget" },
+ [TR2_SYSENV_EVENT_BRIEF] = { "GIT_TRACE2_EVENT_BRIEF",
+ "trace2.eventbrief" },
+ [TR2_SYSENV_EVENT_NESTING] = { "GIT_TRACE2_EVENT_NESTING",
+ "trace2.eventnesting" },
+
+ [TR2_SYSENV_PERF] = { "GIT_TRACE2_PERF",
+ "trace2.perftarget" },
+ [TR2_SYSENV_PERF_BRIEF] = { "GIT_TRACE2_PERF_BRIEF",
+ "trace2.perfbrief" },
+};
+/* clang-format on */
+
+static int tr2_sysenv_cb(const char *key, const char *value, void *d)
+{
+ int k;
+
+ if (!starts_with(key, "trace2."))
+ return 0;
+
+ for (k = 0; k < ARRAY_SIZE(tr2_sysenv_settings); k++) {
+ if (!strcmp(key, tr2_sysenv_settings[k].git_config_name)) {
+ free(tr2_sysenv_settings[k].value);
+ tr2_sysenv_settings[k].value = xstrdup(value);
+ return 0;
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Load Trace2 settings from the system config (usually "/etc/gitconfig"
+ * unless we were built with a runtime-prefix). These are intended to
+ * define the default values for Trace2 as requested by the administrator.
+ *
+ * Then override with the Trace2 settings from the global config.
+ */
+void tr2_sysenv_load(void)
+{
+ if (ARRAY_SIZE(tr2_sysenv_settings) != TR2_SYSENV_MUST_BE_LAST)
+ BUG("tr2_sysenv_settings size is wrong");
+
+ read_very_early_config(tr2_sysenv_cb, NULL);
+}
+
+/*
+ * Return the value for the requested Trace2 setting from these sources:
+ * the system config, the global config, and the environment.
+ */
+const char *tr2_sysenv_get(enum tr2_sysenv_variable var)
+{
+ if (var >= TR2_SYSENV_MUST_BE_LAST)
+ BUG("tr2_sysenv_get invalid var '%d'", var);
+
+ if (!tr2_sysenv_settings[var].getenv_called) {
+ const char *v = getenv(tr2_sysenv_settings[var].env_var_name);
+ if (v && *v) {
+ free(tr2_sysenv_settings[var].value);
+ tr2_sysenv_settings[var].value = xstrdup(v);
+ }
+ tr2_sysenv_settings[var].getenv_called = 1;
+ }
+
+ return tr2_sysenv_settings[var].value;
+}
+
+/*
+ * Return a friendly name for this setting that is suitable for printing
+ * in an error messages.
+ */
+const char *tr2_sysenv_display_name(enum tr2_sysenv_variable var)
+{
+ if (var >= TR2_SYSENV_MUST_BE_LAST)
+ BUG("tr2_sysenv_get invalid var '%d'", var);
+
+ return tr2_sysenv_settings[var].env_var_name;
+}
+
+void tr2_sysenv_release(void)
+{
+ int k;
+
+ for (k = 0; k < ARRAY_SIZE(tr2_sysenv_settings); k++)
+ free(tr2_sysenv_settings[k].value);
+}
diff --git a/trace2/tr2_sysenv.h b/trace2/tr2_sysenv.h
new file mode 100644
index 0000000..8dd82a7
--- /dev/null
+++ b/trace2/tr2_sysenv.h
@@ -0,0 +1,36 @@
+#ifndef TR2_SYSENV_H
+#define TR2_SYSENV_H
+
+/*
+ * The Trace2 settings that can be loaded from /etc/gitconfig
+ * and/or user environment variables.
+ *
+ * Note that this set does not contain any of the transient
+ * environment variables used to pass information from parent
+ * to child git processes, such "GIT_TRACE2_PARENT_SID".
+ */
+enum tr2_sysenv_variable {
+ TR2_SYSENV_CFG_PARAM = 0,
+
+ TR2_SYSENV_DST_DEBUG,
+
+ TR2_SYSENV_NORMAL,
+ TR2_SYSENV_NORMAL_BRIEF,
+
+ TR2_SYSENV_EVENT,
+ TR2_SYSENV_EVENT_BRIEF,
+ TR2_SYSENV_EVENT_NESTING,
+
+ TR2_SYSENV_PERF,
+ TR2_SYSENV_PERF_BRIEF,
+
+ TR2_SYSENV_MUST_BE_LAST
+};
+
+void tr2_sysenv_load(void);
+
+const char *tr2_sysenv_get(enum tr2_sysenv_variable);
+const char *tr2_sysenv_display_name(enum tr2_sysenv_variable var);
+void tr2_sysenv_release(void);
+
+#endif /* TR2_SYSENV_H */
diff --git a/trace2/tr2_tbuf.c b/trace2/tr2_tbuf.c
new file mode 100644
index 0000000..2498482
--- /dev/null
+++ b/trace2/tr2_tbuf.c
@@ -0,0 +1,47 @@
+#include "cache.h"
+#include "tr2_tbuf.h"
+
+void tr2_tbuf_local_time(struct tr2_tbuf *tb)
+{
+ struct timeval tv;
+ struct tm tm;
+ time_t secs;
+
+ gettimeofday(&tv, NULL);
+ secs = tv.tv_sec;
+ localtime_r(&secs, &tm);
+
+ xsnprintf(tb->buf, sizeof(tb->buf), "%02d:%02d:%02d.%06ld", tm.tm_hour,
+ tm.tm_min, tm.tm_sec, (long)tv.tv_usec);
+}
+
+void tr2_tbuf_utc_datetime_extended(struct tr2_tbuf *tb)
+{
+ struct timeval tv;
+ struct tm tm;
+ time_t secs;
+
+ gettimeofday(&tv, NULL);
+ secs = tv.tv_sec;
+ gmtime_r(&secs, &tm);
+
+ xsnprintf(tb->buf, sizeof(tb->buf),
+ "%4d-%02d-%02dT%02d:%02d:%02d.%06ldZ", tm.tm_year + 1900,
+ tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
+ (long)tv.tv_usec);
+}
+
+void tr2_tbuf_utc_datetime(struct tr2_tbuf *tb)
+{
+ struct timeval tv;
+ struct tm tm;
+ time_t secs;
+
+ gettimeofday(&tv, NULL);
+ secs = tv.tv_sec;
+ gmtime_r(&secs, &tm);
+
+ xsnprintf(tb->buf, sizeof(tb->buf), "%4d%02d%02dT%02d%02d%02d.%06ldZ",
+ tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
+ tm.tm_min, tm.tm_sec, (long)tv.tv_usec);
+}
diff --git a/trace2/tr2_tbuf.h b/trace2/tr2_tbuf.h
new file mode 100644
index 0000000..fa853d8
--- /dev/null
+++ b/trace2/tr2_tbuf.h
@@ -0,0 +1,24 @@
+#ifndef TR2_TBUF_H
+#define TR2_TBUF_H
+
+/*
+ * A simple wrapper around a fixed buffer to avoid C syntax
+ * quirks and the need to pass around an additional size_t
+ * argument.
+ */
+struct tr2_tbuf {
+ char buf[32];
+};
+
+/*
+ * Fill buffer with formatted local time string.
+ */
+void tr2_tbuf_local_time(struct tr2_tbuf *tb);
+
+/*
+ * Fill buffer with formatted UTC datatime string.
+ */
+void tr2_tbuf_utc_datetime_extended(struct tr2_tbuf *tb);
+void tr2_tbuf_utc_datetime(struct tr2_tbuf *tb);
+
+#endif /* TR2_TBUF_H */
diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h
new file mode 100644
index 0000000..7b90469
--- /dev/null
+++ b/trace2/tr2_tgt.h
@@ -0,0 +1,134 @@
+#ifndef TR2_TGT_H
+#define TR2_TGT_H
+
+struct child_process;
+struct repository;
+struct json_writer;
+
+/*
+ * Function prototypes for a TRACE2 "target" vtable.
+ */
+
+typedef int(tr2_tgt_init_t)(void);
+typedef void(tr2_tgt_term_t)(void);
+
+typedef void(tr2_tgt_evt_version_fl_t)(const char *file, int line);
+
+typedef void(tr2_tgt_evt_start_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const char **argv);
+typedef void(tr2_tgt_evt_exit_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute, int code);
+typedef void(tr2_tgt_evt_signal_t)(uint64_t us_elapsed_absolute, int signo);
+typedef void(tr2_tgt_evt_atexit_t)(uint64_t us_elapsed_absolute, int code);
+
+typedef void(tr2_tgt_evt_error_va_fl_t)(const char *file, int line,
+ const char *fmt, va_list ap);
+
+typedef void(tr2_tgt_evt_command_path_fl_t)(const char *file, int line,
+ const char *command_path);
+typedef void(tr2_tgt_evt_command_name_fl_t)(const char *file, int line,
+ const char *name,
+ const char *hierarchy);
+typedef void(tr2_tgt_evt_command_mode_fl_t)(const char *file, int line,
+ const char *mode);
+
+typedef void(tr2_tgt_evt_alias_fl_t)(const char *file, int line,
+ const char *alias, const char **argv);
+
+typedef void(tr2_tgt_evt_child_start_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const struct child_process *cmd);
+typedef void(tr2_tgt_evt_child_exit_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid,
+ int pid, int code,
+ uint64_t us_elapsed_child);
+
+typedef void(tr2_tgt_evt_thread_start_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute);
+typedef void(tr2_tgt_evt_thread_exit_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_thread);
+
+typedef void(tr2_tgt_evt_exec_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute, int exec_id,
+ const char *exe, const char **argv);
+typedef void(tr2_tgt_evt_exec_result_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ int exec_id, int code);
+
+typedef void(tr2_tgt_evt_param_fl_t)(const char *file, int line,
+ const char *param, const char *value);
+
+typedef void(tr2_tgt_evt_repo_fl_t)(const char *file, int line,
+ const struct repository *repo);
+
+typedef void(tr2_tgt_evt_region_enter_printf_va_fl_t)(
+ const char *file, int line, uint64_t us_elapsed_absolute,
+ const char *category, const char *label, const struct repository *repo,
+ const char *fmt, va_list ap);
+typedef void(tr2_tgt_evt_region_leave_printf_va_fl_t)(
+ const char *file, int line, uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category, const char *label,
+ const struct repository *repo, const char *fmt, va_list ap);
+
+typedef void(tr2_tgt_evt_data_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region,
+ const char *category,
+ const struct repository *repo,
+ const char *key, const char *value);
+typedef void(tr2_tgt_evt_data_json_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region,
+ const char *category,
+ const struct repository *repo,
+ const char *key,
+ const struct json_writer *value);
+
+typedef void(tr2_tgt_evt_printf_va_fl_t)(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const char *fmt, va_list ap);
+
+/*
+ * "vtable" for a TRACE2 target. Use NULL if a target does not want
+ * to emit that message.
+ */
+/* clang-format off */
+struct tr2_tgt {
+ struct tr2_dst *pdst;
+
+ tr2_tgt_init_t *pfn_init;
+ tr2_tgt_term_t *pfn_term;
+
+ tr2_tgt_evt_version_fl_t *pfn_version_fl;
+ tr2_tgt_evt_start_fl_t *pfn_start_fl;
+ tr2_tgt_evt_exit_fl_t *pfn_exit_fl;
+ tr2_tgt_evt_signal_t *pfn_signal;
+ tr2_tgt_evt_atexit_t *pfn_atexit;
+ tr2_tgt_evt_error_va_fl_t *pfn_error_va_fl;
+ tr2_tgt_evt_command_path_fl_t *pfn_command_path_fl;
+ tr2_tgt_evt_command_name_fl_t *pfn_command_name_fl;
+ tr2_tgt_evt_command_mode_fl_t *pfn_command_mode_fl;
+ tr2_tgt_evt_alias_fl_t *pfn_alias_fl;
+ tr2_tgt_evt_child_start_fl_t *pfn_child_start_fl;
+ tr2_tgt_evt_child_exit_fl_t *pfn_child_exit_fl;
+ tr2_tgt_evt_thread_start_fl_t *pfn_thread_start_fl;
+ tr2_tgt_evt_thread_exit_fl_t *pfn_thread_exit_fl;
+ tr2_tgt_evt_exec_fl_t *pfn_exec_fl;
+ tr2_tgt_evt_exec_result_fl_t *pfn_exec_result_fl;
+ tr2_tgt_evt_param_fl_t *pfn_param_fl;
+ tr2_tgt_evt_repo_fl_t *pfn_repo_fl;
+ tr2_tgt_evt_region_enter_printf_va_fl_t *pfn_region_enter_printf_va_fl;
+ tr2_tgt_evt_region_leave_printf_va_fl_t *pfn_region_leave_printf_va_fl;
+ tr2_tgt_evt_data_fl_t *pfn_data_fl;
+ tr2_tgt_evt_data_json_fl_t *pfn_data_json_fl;
+ tr2_tgt_evt_printf_va_fl_t *pfn_printf_va_fl;
+};
+/* clang-format on */
+
+extern struct tr2_tgt tr2_tgt_event;
+extern struct tr2_tgt tr2_tgt_normal;
+extern struct tr2_tgt tr2_tgt_perf;
+
+#endif /* TR2_TGT_H */
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
new file mode 100644
index 0000000..9bcac20
--- /dev/null
+++ b/trace2/tr2_tgt_event.c
@@ -0,0 +1,586 @@
+#include "cache.h"
+#include "config.h"
+#include "json-writer.h"
+#include "run-command.h"
+#include "version.h"
+#include "trace2/tr2_dst.h"
+#include "trace2/tr2_tbuf.h"
+#include "trace2/tr2_sid.h"
+#include "trace2/tr2_sysenv.h"
+#include "trace2/tr2_tgt.h"
+#include "trace2/tr2_tls.h"
+
+static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 };
+
+/*
+ * The version number of the JSON data generated by the EVENT target
+ * in this source file. Update this if you make a significant change
+ * to the JSON fields or message structure. You probably do not need
+ * to update this if you just add another call to one of the existing
+ * TRACE2 API methods.
+ */
+#define TR2_EVENT_VERSION "1"
+
+/*
+ * Region nesting limit for messages written to the event target.
+ *
+ * The "region_enter" and "region_leave" messages (especially recursive
+ * messages such as those produced while diving the worktree or index)
+ * are primarily intended for the performance target during debugging.
+ *
+ * Some of the outer-most messages, however, may be of interest to the
+ * event target. Use the TR2_SYSENV_EVENT_NESTING setting to increase
+ * region details in the event target.
+ */
+static int tr2env_event_max_nesting_levels = 2;
+
+/*
+ * Use the TR2_SYSENV_EVENT_BRIEF to omit the <time>, <file>, and
+ * <line> fields from most events.
+ */
+static int tr2env_event_be_brief;
+
+static int fn_init(void)
+{
+ int want = tr2_dst_trace_want(&tr2dst_event);
+ int max_nesting;
+ int want_brief;
+ const char *nesting;
+ const char *brief;
+
+ if (!want)
+ return want;
+
+ nesting = tr2_sysenv_get(TR2_SYSENV_EVENT_NESTING);
+ if (nesting && *nesting && ((max_nesting = atoi(nesting)) > 0))
+ tr2env_event_max_nesting_levels = max_nesting;
+
+ brief = tr2_sysenv_get(TR2_SYSENV_EVENT_BRIEF);
+ if (brief && *brief &&
+ ((want_brief = git_parse_maybe_bool(brief)) != -1))
+ tr2env_event_be_brief = want_brief;
+
+ return want;
+}
+
+static void fn_term(void)
+{
+ tr2_dst_trace_disable(&tr2dst_event);
+}
+
+/*
+ * Append common key-value pairs to the currently open JSON object.
+ * "event:"<event_name>"
+ * "sid":"<sid>"
+ * "thread":"<thread_name>"
+ * "time":"<time>"
+ * "file":"<filename>"
+ * "line":<line_number>
+ * "repo":<repo_id>
+ */
+static void event_fmt_prepare(const char *event_name, const char *file,
+ int line, const struct repository *repo,
+ struct json_writer *jw)
+{
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ struct tr2_tbuf tb_now;
+
+ jw_object_string(jw, "event", event_name);
+ jw_object_string(jw, "sid", tr2_sid_get());
+ jw_object_string(jw, "thread", ctx->thread_name.buf);
+
+ /*
+ * In brief mode, only emit <time> on these 2 event types.
+ */
+ if (!tr2env_event_be_brief || !strcmp(event_name, "version") ||
+ !strcmp(event_name, "atexit")) {
+ tr2_tbuf_utc_datetime_extended(&tb_now);
+ jw_object_string(jw, "time", tb_now.buf);
+ }
+
+ if (!tr2env_event_be_brief && file && *file) {
+ jw_object_string(jw, "file", file);
+ jw_object_intmax(jw, "line", line);
+ }
+
+ if (repo)
+ jw_object_intmax(jw, "repo", repo->trace2_repo_id);
+}
+
+static void fn_version_fl(const char *file, int line)
+{
+ const char *event_name = "version";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "evt", TR2_EVENT_VERSION);
+ jw_object_string(&jw, "exe", git_version_string);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, const char **argv)
+{
+ const char *event_name = "start";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_inline_begin_array(&jw, "argv");
+ jw_array_argv(&jw, argv);
+ jw_end(&jw);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_exit_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int code)
+{
+ const char *event_name = "exit";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_intmax(&jw, "code", code);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_signal(uint64_t us_elapsed_absolute, int signo)
+{
+ const char *event_name = "signal";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_intmax(&jw, "signo", signo);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_atexit(uint64_t us_elapsed_absolute, int code)
+{
+ const char *event_name = "atexit";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, __FILE__, __LINE__, NULL, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_intmax(&jw, "code", code);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void maybe_add_string_va(struct json_writer *jw, const char *field_name,
+ const char *fmt, va_list ap)
+{
+ if (fmt && *fmt) {
+ va_list copy_ap;
+ struct strbuf buf = STRBUF_INIT;
+
+ va_copy(copy_ap, ap);
+ strbuf_vaddf(&buf, fmt, copy_ap);
+ va_end(copy_ap);
+
+ jw_object_string(jw, field_name, buf.buf);
+ strbuf_release(&buf);
+ return;
+ }
+}
+
+static void fn_error_va_fl(const char *file, int line, const char *fmt,
+ va_list ap)
+{
+ const char *event_name = "error";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ maybe_add_string_va(&jw, "msg", fmt, ap);
+ /*
+ * Also emit the format string as a field in case
+ * post-processors want to aggregate common error
+ * messages by type without argument fields (such
+ * as pathnames or branch names) cluttering it up.
+ */
+ if (fmt && *fmt)
+ jw_object_string(&jw, "fmt", fmt);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_command_path_fl(const char *file, int line, const char *pathname)
+{
+ const char *event_name = "cmd_path";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "path", pathname);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_command_name_fl(const char *file, int line, const char *name,
+ const char *hierarchy)
+{
+ const char *event_name = "cmd_name";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "name", name);
+ if (hierarchy && *hierarchy)
+ jw_object_string(&jw, "hierarchy", hierarchy);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_command_mode_fl(const char *file, int line, const char *mode)
+{
+ const char *event_name = "cmd_mode";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "name", mode);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_alias_fl(const char *file, int line, const char *alias,
+ const char **argv)
+{
+ const char *event_name = "alias";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "alias", alias);
+ jw_object_inline_begin_array(&jw, "argv");
+ jw_array_argv(&jw, argv);
+ jw_end(&jw);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_child_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const struct child_process *cmd)
+{
+ const char *event_name = "child_start";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "child_id", cmd->trace2_child_id);
+ if (cmd->trace2_hook_name) {
+ jw_object_string(&jw, "child_class", "hook");
+ jw_object_string(&jw, "hook_name", cmd->trace2_hook_name);
+ } else {
+ const char *child_class =
+ cmd->trace2_child_class ? cmd->trace2_child_class : "?";
+ jw_object_string(&jw, "child_class", child_class);
+ }
+ if (cmd->dir)
+ jw_object_string(&jw, "cd", cmd->dir);
+ jw_object_bool(&jw, "use_shell", cmd->use_shell);
+ jw_object_inline_begin_array(&jw, "argv");
+ if (cmd->git_cmd)
+ jw_array_string(&jw, "git");
+ jw_array_argv(&jw, cmd->argv);
+ jw_end(&jw);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_child_exit_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ int code, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_exit";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_rel = (double)us_elapsed_child / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "child_id", cid);
+ jw_object_intmax(&jw, "pid", pid);
+ jw_object_intmax(&jw, "code", code);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+
+ jw_release(&jw);
+}
+
+static void fn_thread_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute)
+{
+ const char *event_name = "thread_start";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_thread_exit_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_thread)
+{
+ const char *event_name = "thread_exit";
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_rel = (double)us_elapsed_thread / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int exec_id, const char *exe, const char **argv)
+{
+ const char *event_name = "exec";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "exec_id", exec_id);
+ if (exe)
+ jw_object_string(&jw, "exe", exe);
+ jw_object_inline_begin_array(&jw, "argv");
+ jw_array_argv(&jw, argv);
+ jw_end(&jw);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_exec_result_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int exec_id,
+ int code)
+{
+ const char *event_name = "exec_result";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_intmax(&jw, "exec_id", exec_id);
+ jw_object_intmax(&jw, "code", code);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_param_fl(const char *file, int line, const char *param,
+ const char *value)
+{
+ const char *event_name = "def_param";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, NULL, &jw);
+ jw_object_string(&jw, "param", param);
+ jw_object_string(&jw, "value", value);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_repo_fl(const char *file, int line,
+ const struct repository *repo)
+{
+ const char *event_name = "def_repo";
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, repo, &jw);
+ jw_object_string(&jw, "worktree", repo->worktree);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+}
+
+static void fn_region_enter_printf_va_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const char *category,
+ const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap)
+{
+ const char *event_name = "region_enter";
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ if (ctx->nr_open_regions <= tr2env_event_max_nesting_levels) {
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, repo, &jw);
+ jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
+ if (category)
+ jw_object_string(&jw, "category", category);
+ if (label)
+ jw_object_string(&jw, "label", label);
+ maybe_add_string_va(&jw, "msg", fmt, ap);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+ }
+}
+
+static void fn_region_leave_printf_va_fl(
+ const char *file, int line, uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category, const char *label,
+ const struct repository *repo, const char *fmt, va_list ap)
+{
+ const char *event_name = "region_leave";
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ if (ctx->nr_open_regions <= tr2env_event_max_nesting_levels) {
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_rel = (double)us_elapsed_region / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, repo, &jw);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
+ if (category)
+ jw_object_string(&jw, "category", category);
+ if (label)
+ jw_object_string(&jw, "label", label);
+ maybe_add_string_va(&jw, "msg", fmt, ap);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+ }
+}
+
+static void fn_data_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category,
+ const struct repository *repo, const char *key,
+ const char *value)
+{
+ const char *event_name = "data";
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ if (ctx->nr_open_regions <= tr2env_event_max_nesting_levels) {
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+ double t_rel = (double)us_elapsed_region / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, repo, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
+ jw_object_string(&jw, "category", category);
+ jw_object_string(&jw, "key", key);
+ jw_object_string(&jw, "value", value);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+ }
+}
+
+static void fn_data_json_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category,
+ const struct repository *repo, const char *key,
+ const struct json_writer *value)
+{
+ const char *event_name = "data_json";
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ if (ctx->nr_open_regions <= tr2env_event_max_nesting_levels) {
+ struct json_writer jw = JSON_WRITER_INIT;
+ double t_abs = (double)us_elapsed_absolute / 1000000.0;
+ double t_rel = (double)us_elapsed_region / 1000000.0;
+
+ jw_object_begin(&jw, 0);
+ event_fmt_prepare(event_name, file, line, repo, &jw);
+ jw_object_double(&jw, "t_abs", 6, t_abs);
+ jw_object_double(&jw, "t_rel", 6, t_rel);
+ jw_object_intmax(&jw, "nesting", ctx->nr_open_regions);
+ jw_object_string(&jw, "category", category);
+ jw_object_string(&jw, "key", key);
+ jw_object_sub_jw(&jw, "value", value);
+ jw_end(&jw);
+
+ tr2_dst_write_line(&tr2dst_event, &jw.json);
+ jw_release(&jw);
+ }
+}
+
+struct tr2_tgt tr2_tgt_event = {
+ &tr2dst_event,
+
+ fn_init,
+ fn_term,
+
+ fn_version_fl,
+ fn_start_fl,
+ fn_exit_fl,
+ fn_signal,
+ fn_atexit,
+ fn_error_va_fl,
+ fn_command_path_fl,
+ fn_command_name_fl,
+ fn_command_mode_fl,
+ fn_alias_fl,
+ fn_child_start_fl,
+ fn_child_exit_fl,
+ fn_thread_start_fl,
+ fn_thread_exit_fl,
+ fn_exec_fl,
+ fn_exec_result_fl,
+ fn_param_fl,
+ fn_repo_fl,
+ fn_region_enter_printf_va_fl,
+ fn_region_leave_printf_va_fl,
+ fn_data_fl,
+ fn_data_json_fl,
+ NULL, /* printf */
+};
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
new file mode 100644
index 0000000..438ed05
--- /dev/null
+++ b/trace2/tr2_tgt_normal.c
@@ -0,0 +1,325 @@
+#include "cache.h"
+#include "config.h"
+#include "run-command.h"
+#include "quote.h"
+#include "version.h"
+#include "trace2/tr2_dst.h"
+#include "trace2/tr2_sysenv.h"
+#include "trace2/tr2_tbuf.h"
+#include "trace2/tr2_tgt.h"
+#include "trace2/tr2_tls.h"
+
+static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0 };
+
+/*
+ * Use the TR2_SYSENV_NORMAL_BRIEF setting to omit the "<time> <file>:<line>"
+ * fields from each line written to the builtin normal target.
+ *
+ * Unit tests may want to use this to help with testing.
+ */
+static int tr2env_normal_be_brief;
+
+#define TR2FMT_NORMAL_FL_WIDTH (50)
+
+static int fn_init(void)
+{
+ int want = tr2_dst_trace_want(&tr2dst_normal);
+ int want_brief;
+ const char *brief;
+
+ if (!want)
+ return want;
+
+ brief = tr2_sysenv_get(TR2_SYSENV_NORMAL_BRIEF);
+ if (brief && *brief &&
+ ((want_brief = git_parse_maybe_bool(brief)) != -1))
+ tr2env_normal_be_brief = want_brief;
+
+ return want;
+}
+
+static void fn_term(void)
+{
+ tr2_dst_trace_disable(&tr2dst_normal);
+}
+
+static void normal_fmt_prepare(const char *file, int line, struct strbuf *buf)
+{
+ strbuf_setlen(buf, 0);
+
+ if (!tr2env_normal_be_brief) {
+ struct tr2_tbuf tb_now;
+
+ tr2_tbuf_local_time(&tb_now);
+ strbuf_addstr(buf, tb_now.buf);
+ strbuf_addch(buf, ' ');
+
+ if (file && *file)
+ strbuf_addf(buf, "%s:%d ", file, line);
+ while (buf->len < TR2FMT_NORMAL_FL_WIDTH)
+ strbuf_addch(buf, ' ');
+ }
+}
+
+static void normal_io_write_fl(const char *file, int line,
+ const struct strbuf *buf_payload)
+{
+ struct strbuf buf_line = STRBUF_INIT;
+
+ normal_fmt_prepare(file, line, &buf_line);
+ strbuf_addbuf(&buf_line, buf_payload);
+ tr2_dst_write_line(&tr2dst_normal, &buf_line);
+ strbuf_release(&buf_line);
+}
+
+static void fn_version_fl(const char *file, int line)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "version %s", git_version_string);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, const char **argv)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, "start ");
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exit_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int code)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_absolute / 1000000.0;
+
+ strbuf_addf(&buf_payload, "exit elapsed:%.6f code:%d", elapsed, code);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_signal(uint64_t us_elapsed_absolute, int signo)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_absolute / 1000000.0;
+
+ strbuf_addf(&buf_payload, "signal elapsed:%.6f code:%d", elapsed,
+ signo);
+ normal_io_write_fl(__FILE__, __LINE__, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_atexit(uint64_t us_elapsed_absolute, int code)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_absolute / 1000000.0;
+
+ strbuf_addf(&buf_payload, "atexit elapsed:%.6f code:%d", elapsed, code);
+ normal_io_write_fl(__FILE__, __LINE__, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
+ va_list ap)
+{
+ if (fmt && *fmt) {
+ va_list copy_ap;
+
+ va_copy(copy_ap, ap);
+ strbuf_vaddf(buf, fmt, copy_ap);
+ va_end(copy_ap);
+ return;
+ }
+}
+
+static void fn_error_va_fl(const char *file, int line, const char *fmt,
+ va_list ap)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, "error");
+ if (fmt && *fmt) {
+ strbuf_addch(&buf_payload, ' ');
+ maybe_append_string_va(&buf_payload, fmt, ap);
+ }
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_path_fl(const char *file, int line, const char *pathname)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "cmd_path %s", pathname);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_name_fl(const char *file, int line, const char *name,
+ const char *hierarchy)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "cmd_name %s", name);
+ if (hierarchy && *hierarchy)
+ strbuf_addf(&buf_payload, " (%s)", hierarchy);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_mode_fl(const char *file, int line, const char *mode)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "cmd_mode %s", mode);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_alias_fl(const char *file, int line, const char *alias,
+ const char **argv)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "alias %s -> ", alias);
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_child_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const struct child_process *cmd)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "child_start[%d]", cmd->trace2_child_id);
+
+ if (cmd->dir) {
+ strbuf_addstr(&buf_payload, " cd ");
+ sq_quote_buf_pretty(&buf_payload, cmd->dir);
+ strbuf_addstr(&buf_payload, ";");
+ }
+
+ /*
+ * TODO if (cmd->env) { Consider dumping changes to environment. }
+ * See trace_add_env() in run-command.c as used by original trace.c
+ */
+
+ strbuf_addch(&buf_payload, ' ');
+ if (cmd->git_cmd)
+ strbuf_addstr(&buf_payload, "git ");
+ sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_child_exit_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ int code, uint64_t us_elapsed_child)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+ double elapsed = (double)us_elapsed_child / 1000000.0;
+
+ strbuf_addf(&buf_payload, "child_exit[%d] pid:%d code:%d elapsed:%.6f",
+ cid, pid, code, elapsed);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int exec_id, const char *exe, const char **argv)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "exec[%d] ", exec_id);
+ if (exe) {
+ strbuf_addstr(&buf_payload, exe);
+ strbuf_addch(&buf_payload, ' ');
+ }
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exec_result_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int exec_id,
+ int code)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "exec_result[%d] code:%d", exec_id, code);
+ if (code > 0)
+ strbuf_addf(&buf_payload, " err:%s", strerror(code));
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_param_fl(const char *file, int line, const char *param,
+ const char *value)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "def_param %s=%s", param, value);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_repo_fl(const char *file, int line,
+ const struct repository *repo)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, "worktree ");
+ sq_quote_buf_pretty(&buf_payload, repo->worktree);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_printf_va_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, const char *fmt,
+ va_list ap)
+{
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ maybe_append_string_va(&buf_payload, fmt, ap);
+ normal_io_write_fl(file, line, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+struct tr2_tgt tr2_tgt_normal = {
+ &tr2dst_normal,
+
+ fn_init,
+ fn_term,
+
+ fn_version_fl,
+ fn_start_fl,
+ fn_exit_fl,
+ fn_signal,
+ fn_atexit,
+ fn_error_va_fl,
+ fn_command_path_fl,
+ fn_command_name_fl,
+ fn_command_mode_fl,
+ fn_alias_fl,
+ fn_child_start_fl,
+ fn_child_exit_fl,
+ NULL, /* thread_start */
+ NULL, /* thread_exit */
+ fn_exec_fl,
+ fn_exec_result_fl,
+ fn_param_fl,
+ fn_repo_fl,
+ NULL, /* region_enter */
+ NULL, /* region_leave */
+ NULL, /* data */
+ NULL, /* data_json */
+ fn_printf_va_fl,
+};
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
new file mode 100644
index 0000000..fd979db
--- /dev/null
+++ b/trace2/tr2_tgt_perf.c
@@ -0,0 +1,564 @@
+#include "cache.h"
+#include "config.h"
+#include "run-command.h"
+#include "quote.h"
+#include "version.h"
+#include "json-writer.h"
+#include "trace2/tr2_dst.h"
+#include "trace2/tr2_sid.h"
+#include "trace2/tr2_sysenv.h"
+#include "trace2/tr2_tbuf.h"
+#include "trace2/tr2_tgt.h"
+#include "trace2/tr2_tls.h"
+
+static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 };
+
+/*
+ * Use TR2_SYSENV_PERF_BRIEF to omit the "<time> <file>:<line>"
+ * fields from each line written to the builtin performance target.
+ *
+ * Unit tests may want to use this to help with testing.
+ */
+static int tr2env_perf_be_brief;
+
+#define TR2FMT_PERF_FL_WIDTH (28)
+#define TR2FMT_PERF_MAX_EVENT_NAME (12)
+#define TR2FMT_PERF_REPO_WIDTH (3)
+#define TR2FMT_PERF_CATEGORY_WIDTH (12)
+
+#define TR2_DOTS_BUFFER_SIZE (100)
+#define TR2_INDENT (2)
+#define TR2_INDENT_LENGTH(ctx) (((ctx)->nr_open_regions - 1) * TR2_INDENT)
+
+static struct strbuf dots = STRBUF_INIT;
+
+static int fn_init(void)
+{
+ int want = tr2_dst_trace_want(&tr2dst_perf);
+ int want_brief;
+ const char *brief;
+
+ if (!want)
+ return want;
+
+ strbuf_addchars(&dots, '.', TR2_DOTS_BUFFER_SIZE);
+
+ brief = tr2_sysenv_get(TR2_SYSENV_PERF_BRIEF);
+ if (brief && *brief &&
+ ((want_brief = git_parse_maybe_bool(brief)) != -1))
+ tr2env_perf_be_brief = want_brief;
+
+ return want;
+}
+
+static void fn_term(void)
+{
+ tr2_dst_trace_disable(&tr2dst_perf);
+
+ strbuf_release(&dots);
+}
+
+/*
+ * Format trace line prefix in human-readable classic format for
+ * the performance target:
+ * "[<time> [<file>:<line>] <bar>] <nr_parents> <bar>
+ * <thread_name> <bar> <event_name> <bar> [<repo>] <bar>
+ * [<elapsed_absolute>] [<elapsed_relative>] <bar>
+ * [<category>] <bar> [<dots>] "
+ */
+static void perf_fmt_prepare(const char *event_name,
+ struct tr2tls_thread_ctx *ctx, const char *file,
+ int line, const struct repository *repo,
+ uint64_t *p_us_elapsed_absolute,
+ uint64_t *p_us_elapsed_relative,
+ const char *category, struct strbuf *buf)
+{
+ int len;
+
+ strbuf_setlen(buf, 0);
+
+ if (!tr2env_perf_be_brief) {
+ struct tr2_tbuf tb_now;
+ size_t fl_end_col;
+
+ tr2_tbuf_local_time(&tb_now);
+ strbuf_addstr(buf, tb_now.buf);
+ strbuf_addch(buf, ' ');
+
+ fl_end_col = buf->len + TR2FMT_PERF_FL_WIDTH;
+
+ if (file && *file) {
+ struct strbuf buf_fl = STRBUF_INIT;
+
+ strbuf_addf(&buf_fl, "%s:%d", file, line);
+
+ if (buf_fl.len <= TR2FMT_PERF_FL_WIDTH)
+ strbuf_addbuf(buf, &buf_fl);
+ else {
+ size_t avail = TR2FMT_PERF_FL_WIDTH - 3;
+ strbuf_addstr(buf, "...");
+ strbuf_add(buf,
+ &buf_fl.buf[buf_fl.len - avail],
+ avail);
+ }
+
+ strbuf_release(&buf_fl);
+ }
+
+ while (buf->len < fl_end_col)
+ strbuf_addch(buf, ' ');
+
+ strbuf_addstr(buf, " | ");
+ }
+
+ strbuf_addf(buf, "d%d | ", tr2_sid_depth());
+ strbuf_addf(buf, "%-*s | %-*s | ", TR2_MAX_THREAD_NAME,
+ ctx->thread_name.buf, TR2FMT_PERF_MAX_EVENT_NAME,
+ event_name);
+
+ len = buf->len + TR2FMT_PERF_REPO_WIDTH;
+ if (repo)
+ strbuf_addf(buf, "r%d ", repo->trace2_repo_id);
+ while (buf->len < len)
+ strbuf_addch(buf, ' ');
+ strbuf_addstr(buf, " | ");
+
+ if (p_us_elapsed_absolute)
+ strbuf_addf(buf, "%9.6f | ",
+ ((double)(*p_us_elapsed_absolute)) / 1000000.0);
+ else
+ strbuf_addf(buf, "%9s | ", " ");
+
+ if (p_us_elapsed_relative)
+ strbuf_addf(buf, "%9.6f | ",
+ ((double)(*p_us_elapsed_relative)) / 1000000.0);
+ else
+ strbuf_addf(buf, "%9s | ", " ");
+
+ strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH,
+ TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : ""));
+
+ if (ctx->nr_open_regions > 0) {
+ int len_indent = TR2_INDENT_LENGTH(ctx);
+ while (len_indent > dots.len) {
+ strbuf_addbuf(buf, &dots);
+ len_indent -= dots.len;
+ }
+ strbuf_addf(buf, "%.*s", len_indent, dots.buf);
+ }
+}
+
+static void perf_io_write_fl(const char *file, int line, const char *event_name,
+ const struct repository *repo,
+ uint64_t *p_us_elapsed_absolute,
+ uint64_t *p_us_elapsed_relative,
+ const char *category,
+ const struct strbuf *buf_payload)
+{
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+ struct strbuf buf_line = STRBUF_INIT;
+
+ perf_fmt_prepare(event_name, ctx, file, line, repo,
+ p_us_elapsed_absolute, p_us_elapsed_relative, category,
+ &buf_line);
+ strbuf_addbuf(&buf_line, buf_payload);
+ tr2_dst_write_line(&tr2dst_perf, &buf_line);
+ strbuf_release(&buf_line);
+}
+
+static void fn_version_fl(const char *file, int line)
+{
+ const char *event_name = "version";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, git_version_string);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, const char **argv)
+{
+ const char *event_name = "start";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exit_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int code)
+{
+ const char *event_name = "exit";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "code:%d", code);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_signal(uint64_t us_elapsed_absolute, int signo)
+{
+ const char *event_name = "signal";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "signo:%d", signo);
+
+ perf_io_write_fl(__FILE__, __LINE__, event_name, NULL,
+ &us_elapsed_absolute, NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_atexit(uint64_t us_elapsed_absolute, int code)
+{
+ const char *event_name = "atexit";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "code:%d", code);
+
+ perf_io_write_fl(__FILE__, __LINE__, event_name, NULL,
+ &us_elapsed_absolute, NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
+ va_list ap)
+{
+ if (fmt && *fmt) {
+ va_list copy_ap;
+
+ va_copy(copy_ap, ap);
+ strbuf_vaddf(buf, fmt, copy_ap);
+ va_end(copy_ap);
+ return;
+ }
+}
+
+static void fn_error_va_fl(const char *file, int line, const char *fmt,
+ va_list ap)
+{
+ const char *event_name = "error";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ maybe_append_string_va(&buf_payload, fmt, ap);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_path_fl(const char *file, int line, const char *pathname)
+{
+ const char *event_name = "cmd_path";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, pathname);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_name_fl(const char *file, int line, const char *name,
+ const char *hierarchy)
+{
+ const char *event_name = "cmd_name";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, name);
+ if (hierarchy && *hierarchy)
+ strbuf_addf(&buf_payload, " (%s)", hierarchy);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_command_mode_fl(const char *file, int line, const char *mode)
+{
+ const char *event_name = "cmd_mode";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, mode);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_alias_fl(const char *file, int line, const char *alias,
+ const char **argv)
+{
+ const char *event_name = "alias";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "alias:%s argv:[", alias);
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+ strbuf_addch(&buf_payload, ']');
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_child_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const struct child_process *cmd)
+{
+ const char *event_name = "child_start";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ if (cmd->trace2_hook_name) {
+ strbuf_addf(&buf_payload, "[ch%d] class:hook hook:%s",
+ cmd->trace2_child_id, cmd->trace2_hook_name);
+ } else {
+ const char *child_class =
+ cmd->trace2_child_class ? cmd->trace2_child_class : "?";
+ strbuf_addf(&buf_payload, "[ch%d] class:%s",
+ cmd->trace2_child_id, child_class);
+ }
+
+ if (cmd->dir) {
+ strbuf_addstr(&buf_payload, " cd:");
+ sq_quote_buf_pretty(&buf_payload, cmd->dir);
+ }
+
+ strbuf_addstr(&buf_payload, " argv:[");
+ if (cmd->git_cmd) {
+ strbuf_addstr(&buf_payload, "git");
+ if (cmd->argv[0])
+ strbuf_addch(&buf_payload, ' ');
+ }
+ sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+ strbuf_addch(&buf_payload, ']');
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_child_exit_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int cid, int pid,
+ int code, uint64_t us_elapsed_child)
+{
+ const char *event_name = "child_exit";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "[ch%d] pid:%d code:%d", cid, pid, code);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ &us_elapsed_child, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_thread_start_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute)
+{
+ const char *event_name = "thread_start";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_thread_exit_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_thread)
+{
+ const char *event_name = "thread_exit";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ &us_elapsed_thread, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ int exec_id, const char *exe, const char **argv)
+{
+ const char *event_name = "exec";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "id:%d ", exec_id);
+ strbuf_addstr(&buf_payload, "argv:[");
+ if (exe) {
+ strbuf_addstr(&buf_payload, exe);
+ if (argv[0])
+ strbuf_addch(&buf_payload, ' ');
+ }
+ sq_append_quote_argv_pretty(&buf_payload, argv);
+ strbuf_addch(&buf_payload, ']');
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_exec_result_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, int exec_id,
+ int code)
+{
+ const char *event_name = "exec_result";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "id:%d code:%d", exec_id, code);
+ if (code > 0)
+ strbuf_addf(&buf_payload, " err:%s", strerror(code));
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_param_fl(const char *file, int line, const char *param,
+ const char *value)
+{
+ const char *event_name = "def_param";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "%s:%s", param, value);
+
+ perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_repo_fl(const char *file, int line,
+ const struct repository *repo)
+{
+ const char *event_name = "def_repo";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addstr(&buf_payload, "worktree:");
+ sq_quote_buf_pretty(&buf_payload, repo->worktree);
+
+ perf_io_write_fl(file, line, event_name, repo, NULL, NULL, NULL,
+ &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_region_enter_printf_va_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ const char *category,
+ const char *label,
+ const struct repository *repo,
+ const char *fmt, va_list ap)
+{
+ const char *event_name = "region_enter";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ if (label)
+ strbuf_addf(&buf_payload, "label:%s", label);
+ if (fmt && *fmt) {
+ strbuf_addch(&buf_payload, ' ');
+ maybe_append_string_va(&buf_payload, fmt, ap);
+ }
+
+ perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
+ NULL, category, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_region_leave_printf_va_fl(
+ const char *file, int line, uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category, const char *label,
+ const struct repository *repo, const char *fmt, va_list ap)
+{
+ const char *event_name = "region_leave";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ if (label)
+ strbuf_addf(&buf_payload, "label:%s", label);
+ if (fmt && *fmt) {
+ strbuf_addch(&buf_payload, ' ' );
+ maybe_append_string_va(&buf_payload, fmt, ap);
+ }
+
+ perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
+ &us_elapsed_region, category, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_data_fl(const char *file, int line, uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category,
+ const struct repository *repo, const char *key,
+ const char *value)
+{
+ const char *event_name = "data";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "%s:%s", key, value);
+
+ perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
+ &us_elapsed_region, category, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_data_json_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute,
+ uint64_t us_elapsed_region, const char *category,
+ const struct repository *repo, const char *key,
+ const struct json_writer *value)
+{
+ const char *event_name = "data_json";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ strbuf_addf(&buf_payload, "%s:%s", key, value->json.buf);
+
+ perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute,
+ &us_elapsed_region, category, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+static void fn_printf_va_fl(const char *file, int line,
+ uint64_t us_elapsed_absolute, const char *fmt,
+ va_list ap)
+{
+ const char *event_name = "printf";
+ struct strbuf buf_payload = STRBUF_INIT;
+
+ maybe_append_string_va(&buf_payload, fmt, ap);
+
+ perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+ NULL, NULL, &buf_payload);
+ strbuf_release(&buf_payload);
+}
+
+struct tr2_tgt tr2_tgt_perf = {
+ &tr2dst_perf,
+
+ fn_init,
+ fn_term,
+
+ fn_version_fl,
+ fn_start_fl,
+ fn_exit_fl,
+ fn_signal,
+ fn_atexit,
+ fn_error_va_fl,
+ fn_command_path_fl,
+ fn_command_name_fl,
+ fn_command_mode_fl,
+ fn_alias_fl,
+ fn_child_start_fl,
+ fn_child_exit_fl,
+ fn_thread_start_fl,
+ fn_thread_exit_fl,
+ fn_exec_fl,
+ fn_exec_result_fl,
+ fn_param_fl,
+ fn_repo_fl,
+ fn_region_enter_printf_va_fl,
+ fn_region_leave_printf_va_fl,
+ fn_data_fl,
+ fn_data_json_fl,
+ fn_printf_va_fl,
+};
diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c
new file mode 100644
index 0000000..067c237
--- /dev/null
+++ b/trace2/tr2_tls.c
@@ -0,0 +1,180 @@
+#include "cache.h"
+#include "thread-utils.h"
+#include "trace2/tr2_tls.h"
+
+/*
+ * Initialize size of the thread stack for nested regions.
+ * This is used to store nested region start times. Note that
+ * this stack is per-thread and not per-trace-key.
+ */
+#define TR2_REGION_NESTING_INITIAL_SIZE (100)
+
+static struct tr2tls_thread_ctx *tr2tls_thread_main;
+static uint64_t tr2tls_us_start_process;
+
+static pthread_mutex_t tr2tls_mutex;
+static pthread_key_t tr2tls_key;
+
+static int tr2_next_thread_id; /* modify under lock */
+
+void tr2tls_start_process_clock(void)
+{
+ if (tr2tls_us_start_process)
+ return;
+
+ /*
+ * Keep the absolute start time of the process (i.e. the main
+ * process) in a fixed variable since other threads need to
+ * access it. This allows them to do that without a lock on
+ * main thread's array data (because of reallocs).
+ */
+ tr2tls_us_start_process = getnanotime() / 1000;
+}
+
+struct tr2tls_thread_ctx *tr2tls_create_self(const char *thread_name,
+ uint64_t us_thread_start)
+{
+ struct tr2tls_thread_ctx *ctx = xcalloc(1, sizeof(*ctx));
+
+ /*
+ * Implicitly "tr2tls_push_self()" to capture the thread's start
+ * time in array_us_start[0]. For the main thread this gives us the
+ * application run time.
+ */
+ ctx->alloc = TR2_REGION_NESTING_INITIAL_SIZE;
+ ctx->array_us_start = (uint64_t *)xcalloc(ctx->alloc, sizeof(uint64_t));
+ ctx->array_us_start[ctx->nr_open_regions++] = us_thread_start;
+
+ ctx->thread_id = tr2tls_locked_increment(&tr2_next_thread_id);
+
+ strbuf_init(&ctx->thread_name, 0);
+ if (ctx->thread_id)
+ strbuf_addf(&ctx->thread_name, "th%02d:", ctx->thread_id);
+ strbuf_addstr(&ctx->thread_name, thread_name);
+ if (ctx->thread_name.len > TR2_MAX_THREAD_NAME)
+ strbuf_setlen(&ctx->thread_name, TR2_MAX_THREAD_NAME);
+
+ pthread_setspecific(tr2tls_key, ctx);
+
+ return ctx;
+}
+
+struct tr2tls_thread_ctx *tr2tls_get_self(void)
+{
+ struct tr2tls_thread_ctx *ctx;
+
+ if (!HAVE_THREADS)
+ return tr2tls_thread_main;
+
+ ctx = pthread_getspecific(tr2tls_key);
+
+ /*
+ * If the thread-proc did not call trace2_thread_start(), we won't
+ * have any TLS data associated with the current thread. Fix it
+ * here and silently continue.
+ */
+ if (!ctx)
+ ctx = tr2tls_create_self("unknown", getnanotime() / 1000);
+
+ return ctx;
+}
+
+int tr2tls_is_main_thread(void)
+{
+ if (!HAVE_THREADS)
+ return 1;
+
+ return pthread_getspecific(tr2tls_key) == tr2tls_thread_main;
+}
+
+void tr2tls_unset_self(void)
+{
+ struct tr2tls_thread_ctx *ctx;
+
+ ctx = tr2tls_get_self();
+
+ pthread_setspecific(tr2tls_key, NULL);
+
+ free(ctx->array_us_start);
+ free(ctx);
+}
+
+void tr2tls_push_self(uint64_t us_now)
+{
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+
+ ALLOC_GROW(ctx->array_us_start, ctx->nr_open_regions + 1, ctx->alloc);
+ ctx->array_us_start[ctx->nr_open_regions++] = us_now;
+}
+
+void tr2tls_pop_self(void)
+{
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+
+ if (!ctx->nr_open_regions)
+ BUG("no open regions in thread '%s'", ctx->thread_name.buf);
+
+ ctx->nr_open_regions--;
+}
+
+void tr2tls_pop_unwind_self(void)
+{
+ struct tr2tls_thread_ctx *ctx = tr2tls_get_self();
+
+ while (ctx->nr_open_regions > 1)
+ tr2tls_pop_self();
+}
+
+uint64_t tr2tls_region_elasped_self(uint64_t us)
+{
+ struct tr2tls_thread_ctx *ctx;
+ uint64_t us_start;
+
+ ctx = tr2tls_get_self();
+ if (!ctx->nr_open_regions)
+ return 0;
+
+ us_start = ctx->array_us_start[ctx->nr_open_regions - 1];
+
+ return us - us_start;
+}
+
+uint64_t tr2tls_absolute_elapsed(uint64_t us)
+{
+ if (!tr2tls_thread_main)
+ return 0;
+
+ return us - tr2tls_us_start_process;
+}
+
+void tr2tls_init(void)
+{
+ tr2tls_start_process_clock();
+
+ pthread_key_create(&tr2tls_key, NULL);
+ init_recursive_mutex(&tr2tls_mutex);
+
+ tr2tls_thread_main =
+ tr2tls_create_self("main", tr2tls_us_start_process);
+}
+
+void tr2tls_release(void)
+{
+ tr2tls_unset_self();
+ tr2tls_thread_main = NULL;
+
+ pthread_mutex_destroy(&tr2tls_mutex);
+ pthread_key_delete(tr2tls_key);
+}
+
+int tr2tls_locked_increment(int *p)
+{
+ int current_value;
+
+ pthread_mutex_lock(&tr2tls_mutex);
+ current_value = *p;
+ *p = current_value + 1;
+ pthread_mutex_unlock(&tr2tls_mutex);
+
+ return current_value;
+}
diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h
new file mode 100644
index 0000000..b1e327a
--- /dev/null
+++ b/trace2/tr2_tls.h
@@ -0,0 +1,103 @@
+#ifndef TR2_TLS_H
+#define TR2_TLS_H
+
+#include "strbuf.h"
+
+/*
+ * Arbitry limit for thread names for column alignment.
+ */
+#define TR2_MAX_THREAD_NAME (24)
+
+struct tr2tls_thread_ctx {
+ struct strbuf thread_name;
+ uint64_t *array_us_start;
+ int alloc;
+ int nr_open_regions; /* plays role of "nr" in ALLOC_GROW */
+ int thread_id;
+};
+
+/*
+ * Create TLS data for the current thread. This gives us a place to
+ * put per-thread data, such as thread start time, function nesting
+ * and a per-thread label for our messages.
+ *
+ * We assume the first thread is "main". Other threads are given
+ * non-zero thread-ids to help distinguish messages from concurrent
+ * threads.
+ *
+ * Truncate the thread name if necessary to help with column alignment
+ * in printf-style messages.
+ *
+ * In this and all following functions the term "self" refers to the
+ * current thread.
+ */
+struct tr2tls_thread_ctx *tr2tls_create_self(const char *thread_name,
+ uint64_t us_thread_start);
+
+/*
+ * Get our TLS data.
+ */
+struct tr2tls_thread_ctx *tr2tls_get_self(void);
+
+/*
+ * return true if the current thread is the main thread.
+ */
+int tr2tls_is_main_thread(void);
+
+/*
+ * Free our TLS data.
+ */
+void tr2tls_unset_self(void);
+
+/*
+ * Begin a new nested region and remember the start time.
+ */
+void tr2tls_push_self(uint64_t us_now);
+
+/*
+ * End the innermost nested region.
+ */
+void tr2tls_pop_self(void);
+
+/*
+ * Pop any extra (above the first) open regions on the current
+ * thread and discard. During a thread-exit, we should only
+ * have region[0] that was pushed in trace2_thread_start() if
+ * the thread exits normally.
+ */
+void tr2tls_pop_unwind_self(void);
+
+/*
+ * Compute the elapsed time since the innermost region in the
+ * current thread started and the given time (usually now).
+ */
+uint64_t tr2tls_region_elasped_self(uint64_t us);
+
+/*
+ * Compute the elapsed time since the main thread started
+ * and the given time (usually now). This is assumed to
+ * be the absolute run time of the process.
+ */
+uint64_t tr2tls_absolute_elapsed(uint64_t us);
+
+/*
+ * Initialize the tr2 TLS system.
+ */
+void tr2tls_init(void);
+
+/*
+ * Free all tr2 TLS resources.
+ */
+void tr2tls_release(void);
+
+/*
+ * Protected increment of an integer.
+ */
+int tr2tls_locked_increment(int *p);
+
+/*
+ * Capture the process start time and do nothing else.
+ */
+void tr2tls_start_process_clock(void);
+
+#endif /* TR2_TLS_H */
diff --git a/trailer.c b/trailer.c
index 0796f32..0c414f2 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1129,10 +1129,11 @@
const struct trailer_info *info,
const struct process_trailer_options *opts)
{
+ size_t origlen = out->len;
size_t i;
/* If we want the whole block untouched, we can take the fast path. */
- if (!opts->only_trailers && !opts->unfold) {
+ if (!opts->only_trailers && !opts->unfold && !opts->filter && !opts->separator) {
strbuf_add(out, info->trailer_start,
info->trailer_end - info->trailer_start);
return;
@@ -1147,15 +1148,29 @@
struct strbuf val = STRBUF_INIT;
parse_trailer(&tok, &val, NULL, trailer, separator_pos);
- if (opts->unfold)
- unfold_value(&val);
+ if (!opts->filter || opts->filter(&tok, opts->filter_data)) {
+ if (opts->unfold)
+ unfold_value(&val);
- strbuf_addf(out, "%s: %s\n", tok.buf, val.buf);
+ if (opts->separator && out->len != origlen)
+ strbuf_addbuf(out, opts->separator);
+ if (!opts->value_only)
+ strbuf_addf(out, "%s: ", tok.buf);
+ strbuf_addbuf(out, &val);
+ if (!opts->separator)
+ strbuf_addch(out, '\n');
+ }
strbuf_release(&tok);
strbuf_release(&val);
} else if (!opts->only_trailers) {
+ if (opts->separator && out->len != origlen) {
+ strbuf_addbuf(out, opts->separator);
+ }
strbuf_addstr(out, trailer);
+ if (opts->separator) {
+ strbuf_rtrim(out);
+ }
}
}
diff --git a/trailer.h b/trailer.h
index b997739..203acf4 100644
--- a/trailer.h
+++ b/trailer.h
@@ -72,6 +72,10 @@
int only_input;
int unfold;
int no_divider;
+ int value_only;
+ const struct strbuf *separator;
+ int (*filter)(const struct strbuf *, void *);
+ void *filter_data;
};
#define PROCESS_TRAILER_OPTIONS_INIT {0}
diff --git a/transport-helper.c b/transport-helper.c
index 1f52c95..9e1279b 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -33,6 +33,16 @@
check_connectivity : 1,
no_disconnect_req : 1,
no_private_update : 1;
+
+ /*
+ * As an optimization, the transport code may invoke fetch before
+ * get_refs_list. If this happens, and if the transport helper doesn't
+ * support connect or stateless_connect, we need to invoke
+ * get_refs_list ourselves if we haven't already done so. Keep track of
+ * whether we have invoked get_refs_list.
+ */
+ unsigned get_refs_list_called : 1;
+
char *export_marks;
char *import_marks;
/* These go from remote name (as in "list") to private name */
@@ -127,6 +137,8 @@
argv_array_pushf(&helper->env_array, "%s=%s",
GIT_DIR_ENVIRONMENT, get_git_dir());
+ helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
+
code = start_command(helper);
if (code < 0 && errno == ENOENT)
die(_("unable to find remote helper for '%s'"), data->name);
@@ -421,7 +433,7 @@
struct helper_data *data = transport->data;
int cat_blob_fd, code;
child_process_init(fastimport);
- fastimport->in = helper->out;
+ fastimport->in = xdup(helper->out);
argv_array_push(&fastimport->args, "fast-import");
argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
@@ -650,17 +662,25 @@
return 0;
}
+static struct ref *get_refs_list_using_list(struct transport *transport,
+ int for_push);
+
static int fetch(struct transport *transport,
int nr_heads, struct ref **to_fetch)
{
struct helper_data *data = transport->data;
int i, count;
+ get_helper(transport);
+
if (process_connect(transport, 0)) {
do_take_over(transport);
return transport->vtable->fetch(transport, nr_heads, to_fetch);
}
+ if (!data->get_refs_list_called)
+ get_refs_list_using_list(transport, 0);
+
count = 0;
for (i = 0; i < nr_heads; i++)
if (!(to_fetch[i]->status & REF_STATUS_UPTODATE))
@@ -680,13 +700,9 @@
set_helper_option(transport, "update-shallow", "true");
if (data->transport_options.filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(
- &data->transport_options.filter_options,
- &expanded_filter_spec);
- set_helper_option(transport, "filter",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ const char *spec = expand_list_objects_filter_spec(
+ &data->transport_options.filter_options);
+ set_helper_option(transport, "filter", spec);
}
if (data->transport_options.negotiation_tips)
@@ -851,6 +867,7 @@
{
int force_all = flags & TRANSPORT_PUSH_FORCE;
int mirror = flags & TRANSPORT_PUSH_MIRROR;
+ int atomic = flags & TRANSPORT_PUSH_ATOMIC;
struct helper_data *data = transport->data;
struct strbuf buf = STRBUF_INIT;
struct ref *ref;
@@ -870,6 +887,11 @@
case REF_STATUS_REJECT_NONFASTFORWARD:
case REF_STATUS_REJECT_STALE:
case REF_STATUS_REJECT_ALREADY_EXISTS:
+ if (atomic) {
+ string_list_clear(&cas_options, 0);
+ return 0;
+ } else
+ continue;
case REF_STATUS_UPTODATE:
continue;
default:
@@ -1051,6 +1073,19 @@
static struct ref *get_refs_list(struct transport *transport, int for_push,
const struct argv_array *ref_prefixes)
{
+ get_helper(transport);
+
+ if (process_connect(transport, for_push)) {
+ do_take_over(transport);
+ return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+ }
+
+ return get_refs_list_using_list(transport, for_push);
+}
+
+static struct ref *get_refs_list_using_list(struct transport *transport,
+ int for_push)
+{
struct helper_data *data = transport->data;
struct child_process *helper;
struct ref *ret = NULL;
@@ -1058,13 +1093,9 @@
struct ref *posn;
struct strbuf buf = STRBUF_INIT;
+ data->get_refs_list_called = 1;
helper = get_helper(transport);
- if (process_connect(transport, for_push)) {
- do_take_over(transport);
- return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
- }
-
if (data->push && for_push)
write_str_in_full(helper->in, "list for-push\n");
else
@@ -1111,7 +1142,6 @@
}
static struct transport_vtable vtable = {
- 0,
set_helper_option,
get_refs_list,
fetch,
diff --git a/transport-internal.h b/transport-internal.h
index 004bee5..1cde625 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -7,12 +7,6 @@
struct transport_vtable {
/**
- * This transport supports the fetch() function being called
- * without get_refs_list() first being called.
- */
- unsigned fetch_without_list : 1;
-
- /**
* Returns 0 if successful, positive if the option is not
* recognized or is inapplicable, and negative if the option
* is applicable but the value is invalid.
diff --git a/transport.c b/transport.c
index e078812..ae558af 100644
--- a/transport.c
+++ b/transport.c
@@ -122,6 +122,7 @@
struct bundle_transport_data {
int fd;
struct bundle_header header;
+ unsigned get_refs_from_bundle_called : 1;
};
static struct ref *get_refs_from_bundle(struct transport *transport,
@@ -135,6 +136,8 @@
if (for_push)
return NULL;
+ data->get_refs_from_bundle_called = 1;
+
if (data->fd > 0)
close(data->fd);
data->fd = read_bundle_header(transport->url, &data->header);
@@ -154,6 +157,9 @@
int nr_heads, struct ref **to_fetch)
{
struct bundle_transport_data *data = transport->data;
+
+ if (!data->get_refs_from_bundle_called)
+ get_refs_from_bundle(transport, 0, NULL);
return unbundle(the_repository, &data->header, data->fd,
transport->progress ? BUNDLE_VERBOSE : 0);
}
@@ -224,6 +230,7 @@
opts->no_dependents = !!value;
return 0;
} else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) {
+ list_objects_filter_die_if_populated(&opts->filter_options);
parse_list_objects_filter(&opts->filter_options, value);
return 0;
}
@@ -252,6 +259,14 @@
return 0;
}
+static void die_if_server_options(struct transport *transport)
+{
+ if (!transport->server_options || !transport->server_options->nr)
+ return;
+ advise(_("see protocol.version in 'git help config' for more details"));
+ die(_("server options require protocol version 2 or later"));
+}
+
/*
* Obtains the protocol version from the transport and writes it to
* transport->data->version, first connecting if not already connected.
@@ -286,6 +301,7 @@
break;
case protocol_v1:
case protocol_v0:
+ die_if_server_options(transport);
get_remote_heads(&reader, &refs,
for_push ? REF_NORMAL : 0,
&data->extra_have,
@@ -314,7 +330,6 @@
int ret = 0;
struct git_transport_data *data = transport->data;
struct ref *refs = NULL;
- char *dest = xstrdup(transport->url);
struct fetch_pack_args args;
struct ref *refs_tmp = NULL;
@@ -356,16 +371,17 @@
switch (data->version) {
case protocol_v2:
- refs = fetch_pack(&args, data->fd, data->conn,
+ refs = fetch_pack(&args, data->fd,
refs_tmp ? refs_tmp : transport->remote_refs,
- dest, to_fetch, nr_heads, &data->shallow,
+ to_fetch, nr_heads, &data->shallow,
&transport->pack_lockfile, data->version);
break;
case protocol_v1:
case protocol_v0:
- refs = fetch_pack(&args, data->fd, data->conn,
+ die_if_server_options(transport);
+ refs = fetch_pack(&args, data->fd,
refs_tmp ? refs_tmp : transport->remote_refs,
- dest, to_fetch, nr_heads, &data->shallow,
+ to_fetch, nr_heads, &data->shallow,
&transport->pack_lockfile, data->version);
break;
case protocol_unknown_version:
@@ -389,7 +405,6 @@
free_refs(refs_tmp);
free_refs(refs);
- free(dest);
return ret;
}
@@ -734,7 +749,6 @@
}
static struct transport_vtable taken_over_vtable = {
- 1,
NULL,
get_refs_via_connect,
fetch_refs_via_pack,
@@ -884,7 +898,6 @@
}
static struct transport_vtable bundle_vtable = {
- 0,
NULL,
get_refs_from_bundle,
fetch_refs_from_bundle,
@@ -894,7 +907,6 @@
};
static struct transport_vtable builtin_smart_vtable = {
- 1,
NULL,
get_refs_via_connect,
fetch_refs_via_pack,
@@ -1062,6 +1074,7 @@
proc.argv = argv;
proc.in = -1;
+ proc.trace2_hook_name = "pre-push";
if (start_command(&proc)) {
finish_command(&proc);
@@ -1217,6 +1230,20 @@
err = push_had_errors(remote_refs);
ret = push_ret | err;
+ if ((flags & TRANSPORT_PUSH_ATOMIC) && err) {
+ struct ref *it;
+ for (it = remote_refs; it; it = it->next)
+ switch (it->status) {
+ case REF_STATUS_NONE:
+ case REF_STATUS_UPTODATE:
+ case REF_STATUS_OK:
+ it->status = REF_STATUS_ATOMIC_PUSH_FAILED;
+ break;
+ default:
+ break;
+ }
+ }
+
if (!quiet || err)
transport_print_push_status(transport->url, remote_refs,
verbose | porcelain, porcelain,
@@ -1262,15 +1289,6 @@
struct ref **heads = NULL;
struct ref *rm;
- if (!transport->vtable->fetch_without_list)
- /*
- * Some transports (e.g. the built-in bundle transport and the
- * transport helper interface) do not work when fetching is
- * done immediately after transport creation. List the remote
- * refs anyway (if not already listed) as a workaround.
- */
- transport_get_remote_refs(transport, NULL);
-
for (rm = refs; rm; rm = rm->next) {
nr_refs++;
if (rm->peer_ref &&
@@ -1371,100 +1389,3 @@
literal_copy:
return xstrdup(url);
}
-
-static void fill_alternate_refs_command(struct child_process *cmd,
- const char *repo_path)
-{
- const char *value;
-
- if (!git_config_get_value("core.alternateRefsCommand", &value)) {
- cmd->use_shell = 1;
-
- argv_array_push(&cmd->args, value);
- argv_array_push(&cmd->args, repo_path);
- } else {
- cmd->git_cmd = 1;
-
- argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path);
- argv_array_push(&cmd->args, "for-each-ref");
- argv_array_push(&cmd->args, "--format=%(objectname)");
-
- if (!git_config_get_value("core.alternateRefsPrefixes", &value)) {
- argv_array_push(&cmd->args, "--");
- argv_array_split(&cmd->args, value);
- }
- }
-
- cmd->env = local_repo_env;
- cmd->out = -1;
-}
-
-static void read_alternate_refs(const char *path,
- alternate_ref_fn *cb,
- void *data)
-{
- struct child_process cmd = CHILD_PROCESS_INIT;
- struct strbuf line = STRBUF_INIT;
- FILE *fh;
-
- fill_alternate_refs_command(&cmd, path);
-
- if (start_command(&cmd))
- return;
-
- fh = xfdopen(cmd.out, "r");
- while (strbuf_getline_lf(&line, fh) != EOF) {
- struct object_id oid;
- const char *p;
-
- if (parse_oid_hex(line.buf, &oid, &p) || *p) {
- warning(_("invalid line while parsing alternate refs: %s"),
- line.buf);
- break;
- }
-
- cb(&oid, data);
- }
-
- fclose(fh);
- finish_command(&cmd);
-}
-
-struct alternate_refs_data {
- alternate_ref_fn *fn;
- void *data;
-};
-
-static int refs_from_alternate_cb(struct object_directory *e,
- void *data)
-{
- struct strbuf path = STRBUF_INIT;
- size_t base_len;
- struct alternate_refs_data *cb = data;
-
- if (!strbuf_realpath(&path, e->path, 0))
- goto out;
- if (!strbuf_strip_suffix(&path, "/objects"))
- goto out;
- base_len = path.len;
-
- /* Is this a git repository with refs? */
- strbuf_addstr(&path, "/refs");
- if (!is_directory(path.buf))
- goto out;
- strbuf_setlen(&path, base_len);
-
- read_alternate_refs(path.buf, cb->fn, cb->data);
-
-out:
- strbuf_release(&path);
- return 0;
-}
-
-void for_each_alternate_ref(alternate_ref_fn fn, void *data)
-{
- struct alternate_refs_data cb;
- cb.fn = fn;
- cb.data = data;
- foreach_alt_odb(refs_from_alternate_cb, &cb);
-}
diff --git a/transport.h b/transport.h
index f2ee7c4..0b5f780 100644
--- a/transport.h
+++ b/transport.h
@@ -134,7 +134,7 @@
#define TRANSPORT_PUSH_OPTIONS (1<<14)
#define TRANSPORT_RECURSE_SUBMODULES_ONLY (1<<15)
-extern int transport_summary_width(const struct ref *refs);
+int transport_summary_width(const struct ref *refs);
/* Returns a transport suitable for the url */
struct transport *transport_get(struct remote *, const char *);
@@ -262,6 +262,4 @@
void transport_print_push_status(const char *dest, struct ref *refs,
int verbose, int porcelain, unsigned int *reject_reasons);
-typedef void alternate_ref_fn(const struct object_id *oid, void *);
-extern void for_each_alternate_ref(alternate_ref_fn, void *);
#endif
diff --git a/tree-diff.c b/tree-diff.c
index e6d306f..33ded7f 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -181,7 +181,7 @@
struct tree_desc *t, struct tree_desc *tp,
int imin)
{
- unsigned mode;
+ unsigned short mode;
const char *path;
const struct object_id *oid;
int pathlen;
@@ -422,8 +422,8 @@
* diff_tree_oid(parent, commit) )
*/
for (i = 0; i < nparent; ++i)
- tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
- ttree = fill_tree_descriptor(&t, oid);
+ tptree[i] = fill_tree_descriptor(opt->repo, &tp[i], parents_oid[i]);
+ ttree = fill_tree_descriptor(opt->repo, &t, oid);
/* Enable recursion indefinitely */
opt->pathspec.recursive = opt->flags.recursive;
diff --git a/tree-walk.c b/tree-walk.c
index 1e4bbc8..bea819d 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -81,13 +81,15 @@
return result;
}
-void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
+void *fill_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const struct object_id *oid)
{
unsigned long size = 0;
void *buf = NULL;
if (oid) {
- buf = read_object_with_reference(oid, tree_type, &size, NULL);
+ buf = read_object_with_reference(r, oid, tree_type, &size, NULL);
if (!buf)
die("unable to read tree %s", oid_to_hex(oid));
}
@@ -168,40 +170,61 @@
void setup_traverse_info(struct traverse_info *info, const char *base)
{
- int pathlen = strlen(base);
+ size_t pathlen = strlen(base);
static struct traverse_info dummy;
memset(info, 0, sizeof(*info));
if (pathlen && base[pathlen-1] == '/')
pathlen--;
info->pathlen = pathlen ? pathlen + 1 : 0;
- info->name.path = base;
- info->name.pathlen = pathlen;
- if (pathlen) {
- hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1);
+ info->name = base;
+ info->namelen = pathlen;
+ if (pathlen)
info->prev = &dummy;
- }
}
-char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
+char *make_traverse_path(char *path, size_t pathlen,
+ const struct traverse_info *info,
+ const char *name, size_t namelen)
{
- int len = tree_entry_len(n);
- int pathlen = info->pathlen;
+ /* Always points to the end of the name we're about to add */
+ size_t pos = st_add(info->pathlen, namelen);
- path[pathlen + len] = 0;
+ if (pos >= pathlen)
+ BUG("too small buffer passed to make_traverse_path");
+
+ path[pos] = 0;
for (;;) {
- memcpy(path + pathlen, n->path, len);
- if (!pathlen)
+ if (pos < namelen)
+ BUG("traverse_info pathlen does not match strings");
+ pos -= namelen;
+ memcpy(path + pos, name, namelen);
+
+ if (!pos)
break;
- path[--pathlen] = '/';
- n = &info->name;
- len = tree_entry_len(n);
+ path[--pos] = '/';
+
+ if (!info)
+ BUG("traverse_info ran out of list items");
+ name = info->name;
+ namelen = info->namelen;
info = info->prev;
- pathlen -= len;
}
return path;
}
+void strbuf_make_traverse_path(struct strbuf *out,
+ const struct traverse_info *info,
+ const char *name, size_t namelen)
+{
+ size_t len = traverse_path_len(info, namelen);
+
+ strbuf_grow(out, len);
+ make_traverse_path(out->buf + out->len, out->alloc - out->len,
+ info, name, namelen);
+ strbuf_setlen(out, out->len + len);
+}
+
struct tree_desc_skip {
struct tree_desc_skip *prev;
const void *ptr;
@@ -398,13 +421,12 @@
tx[i].d = t[i];
if (info->prev) {
- strbuf_grow(&base, info->pathlen);
- make_traverse_path(base.buf, info->prev, &info->name);
- base.buf[info->pathlen-1] = '/';
- strbuf_setlen(&base, info->pathlen);
- traverse_path = xstrndup(base.buf, info->pathlen);
+ strbuf_make_traverse_path(&base, info->prev,
+ info->name, info->namelen);
+ strbuf_addch(&base, '/');
+ traverse_path = xstrndup(base.buf, base.len);
} else {
- traverse_path = xstrndup(info->name.path, info->pathlen);
+ traverse_path = xstrndup(info->name, info->pathlen);
}
info->traverse_path = traverse_path;
for (;;) {
@@ -500,7 +522,9 @@
struct object_id oid;
};
-static int find_tree_entry(struct tree_desc *t, const char *name, struct object_id *result, unsigned *mode)
+static int find_tree_entry(struct repository *r, struct tree_desc *t,
+ const char *name, struct object_id *result,
+ unsigned short *mode)
{
int namelen = strlen(name);
while (t->size) {
@@ -530,19 +554,23 @@
oidcpy(result, &oid);
return 0;
}
- return get_tree_entry(&oid, name + entrylen, result, mode);
+ return get_tree_entry(r, &oid, name + entrylen, result, mode);
}
return -1;
}
-int get_tree_entry(const struct object_id *tree_oid, const char *name, struct object_id *oid, unsigned *mode)
+int get_tree_entry(struct repository *r,
+ const struct object_id *tree_oid,
+ const char *name,
+ struct object_id *oid,
+ unsigned short *mode)
{
int retval;
void *tree;
unsigned long size;
struct object_id root;
- tree = read_object_with_reference(tree_oid, tree_type, &size, &root);
+ tree = read_object_with_reference(r, tree_oid, tree_type, &size, &root);
if (!tree)
return -1;
@@ -557,7 +585,7 @@
} else {
struct tree_desc t;
init_tree_desc(&t, tree, size);
- retval = find_tree_entry(&t, name, oid, mode);
+ retval = find_tree_entry(r, &t, name, oid, mode);
}
free(tree);
return retval;
@@ -585,7 +613,10 @@
* See the code for enum get_oid_result for a description of
* the return values.
*/
-enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned *mode)
+enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
+ struct object_id *tree_oid, const char *name,
+ struct object_id *result, struct strbuf *result_path,
+ unsigned short *mode)
{
int retval = MISSING_OBJECT;
struct dir_state *parents = NULL;
@@ -609,7 +640,8 @@
void *tree;
struct object_id root;
unsigned long size;
- tree = read_object_with_reference(¤t_tree_oid,
+ tree = read_object_with_reference(r,
+ ¤t_tree_oid,
tree_type, &size,
&root);
if (!tree)
@@ -678,7 +710,7 @@
}
/* Look up the first (or only) path component in the tree. */
- find_result = find_tree_entry(&t, namebuf.buf,
+ find_result = find_tree_entry(r, &t, namebuf.buf,
¤t_tree_oid, mode);
if (find_result) {
goto done;
@@ -722,7 +754,8 @@
*/
retval = DANGLING_SYMLINK;
- contents = read_object_file(¤t_tree_oid, &type,
+ contents = repo_read_object_file(r,
+ ¤t_tree_oid, &type,
&link_len);
if (!contents)
diff --git a/tree-walk.h b/tree-walk.h
index 8225171..abe2caf 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -16,7 +16,7 @@
unsigned int size;
};
-static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned short *modep)
{
*pathp = desc->entry.path;
*modep = desc->entry.mode;
@@ -45,19 +45,24 @@
int tree_entry(struct tree_desc *, struct name_entry *);
int tree_entry_gently(struct tree_desc *, struct name_entry *);
-void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
+void *fill_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const struct object_id *oid);
struct traverse_info;
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info);
-enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned *mode);
+enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r, struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
struct traverse_info {
const char *traverse_path;
struct traverse_info *prev;
- struct name_entry name;
- int pathlen;
+ const char *name;
+ size_t namelen;
+ unsigned mode;
+
+ size_t pathlen;
struct pathspec *pathspec;
unsigned long df_conflicts;
@@ -66,13 +71,18 @@
int show_all_errors;
};
-int get_tree_entry(const struct object_id *, const char *, struct object_id *, unsigned *);
-extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
-extern void setup_traverse_info(struct traverse_info *info, const char *base);
+int get_tree_entry(struct repository *, const struct object_id *, const char *, struct object_id *, unsigned short *);
+char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info,
+ const char *name, size_t namelen);
+void strbuf_make_traverse_path(struct strbuf *out,
+ const struct traverse_info *info,
+ const char *name, size_t namelen);
+void setup_traverse_info(struct traverse_info *info, const char *base);
-static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+static inline size_t traverse_path_len(const struct traverse_info *info,
+ size_t namelen)
{
- return info->pathlen + tree_entry_len(n);
+ return st_add(info->pathlen, namelen);
}
/* in general, positive means "kind of interesting" */
diff --git a/tree.c b/tree.c
index f416afc..1466bcc 100644
--- a/tree.c
+++ b/tree.c
@@ -197,10 +197,9 @@
struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_tree_node(r));
+ return create_object(r, oid, alloc_tree_node(r));
return object_as_type(r, obj, OBJ_TREE, 0);
}
@@ -245,19 +244,7 @@
struct tree *parse_tree_indirect(const struct object_id *oid)
{
- struct object *obj = parse_object(the_repository, oid);
- do {
- if (!obj)
- return NULL;
- if (obj->type == OBJ_TREE)
- return (struct tree *) obj;
- else if (obj->type == OBJ_COMMIT)
- obj = &(get_commit_tree(((struct commit *)obj))->object);
- else if (obj->type == OBJ_TAG)
- obj = ((struct tag *) obj)->tagged;
- else
- return NULL;
- if (!obj->parsed)
- parse_object(the_repository, &obj->oid);
- } while (1);
+ struct repository *r = the_repository;
+ struct object *obj = parse_object(r, oid);
+ return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE);
}
diff --git a/unicode-width.h b/unicode-width.h
index 7c64376..c9d0276 100644
--- a/unicode-width.h
+++ b/unicode-width.h
@@ -89,8 +89,7 @@
{ 0x0E34, 0x0E3A },
{ 0x0E47, 0x0E4E },
{ 0x0EB1, 0x0EB1 },
-{ 0x0EB4, 0x0EB9 },
-{ 0x0EBB, 0x0EBC },
+{ 0x0EB4, 0x0EBC },
{ 0x0EC8, 0x0ECD },
{ 0x0F18, 0x0F19 },
{ 0x0F35, 0x0F35 },
@@ -191,7 +190,7 @@
{ 0xA980, 0xA982 },
{ 0xA9B3, 0xA9B3 },
{ 0xA9B6, 0xA9B9 },
-{ 0xA9BC, 0xA9BC },
+{ 0xA9BC, 0xA9BD },
{ 0xA9E5, 0xA9E5 },
{ 0xAA29, 0xAA2E },
{ 0xAA31, 0xAA32 },
@@ -274,6 +273,9 @@
{ 0x11727, 0x1172B },
{ 0x1182F, 0x11837 },
{ 0x11839, 0x1183A },
+{ 0x119D4, 0x119D7 },
+{ 0x119DA, 0x119DB },
+{ 0x119E0, 0x119E0 },
{ 0x11A01, 0x11A0A },
{ 0x11A33, 0x11A38 },
{ 0x11A3B, 0x11A3E },
@@ -298,8 +300,10 @@
{ 0x11D95, 0x11D95 },
{ 0x11D97, 0x11D97 },
{ 0x11EF3, 0x11EF4 },
+{ 0x13430, 0x13438 },
{ 0x16AF0, 0x16AF4 },
{ 0x16B30, 0x16B36 },
+{ 0x16F4F, 0x16F4F },
{ 0x16F8F, 0x16F92 },
{ 0x1BC9D, 0x1BC9E },
{ 0x1BCA0, 0x1BCA3 },
@@ -319,6 +323,8 @@
{ 0x1E01B, 0x1E021 },
{ 0x1E023, 0x1E024 },
{ 0x1E026, 0x1E02A },
+{ 0x1E130, 0x1E136 },
+{ 0x1E2EC, 0x1E2EF },
{ 0x1E8D0, 0x1E8D6 },
{ 0x1E944, 0x1E94A },
{ 0xE0001, 0xE0001 },
@@ -374,8 +380,7 @@
{ 0x31C0, 0x31E3 },
{ 0x31F0, 0x321E },
{ 0x3220, 0x3247 },
-{ 0x3250, 0x32FE },
-{ 0x3300, 0x4DBF },
+{ 0x3250, 0x4DBF },
{ 0x4E00, 0xA48C },
{ 0xA490, 0xA4C6 },
{ 0xA960, 0xA97C },
@@ -387,10 +392,12 @@
{ 0xFE68, 0xFE6B },
{ 0xFF01, 0xFF60 },
{ 0xFFE0, 0xFFE6 },
-{ 0x16FE0, 0x16FE1 },
-{ 0x17000, 0x187F1 },
+{ 0x16FE0, 0x16FE3 },
+{ 0x17000, 0x187F7 },
{ 0x18800, 0x18AF2 },
{ 0x1B000, 0x1B11E },
+{ 0x1B150, 0x1B152 },
+{ 0x1B164, 0x1B167 },
{ 0x1B170, 0x1B2FB },
{ 0x1F004, 0x1F004 },
{ 0x1F0CF, 0x1F0CF },
@@ -422,16 +429,20 @@
{ 0x1F680, 0x1F6C5 },
{ 0x1F6CC, 0x1F6CC },
{ 0x1F6D0, 0x1F6D2 },
+{ 0x1F6D5, 0x1F6D5 },
{ 0x1F6EB, 0x1F6EC },
-{ 0x1F6F4, 0x1F6F9 },
-{ 0x1F910, 0x1F93E },
-{ 0x1F940, 0x1F970 },
+{ 0x1F6F4, 0x1F6FA },
+{ 0x1F7E0, 0x1F7EB },
+{ 0x1F90D, 0x1F971 },
{ 0x1F973, 0x1F976 },
-{ 0x1F97A, 0x1F97A },
-{ 0x1F97C, 0x1F9A2 },
-{ 0x1F9B0, 0x1F9B9 },
-{ 0x1F9C0, 0x1F9C2 },
-{ 0x1F9D0, 0x1F9FF },
+{ 0x1F97A, 0x1F9A2 },
+{ 0x1F9A5, 0x1F9AA },
+{ 0x1F9AE, 0x1F9CA },
+{ 0x1F9CD, 0x1F9FF },
+{ 0x1FA70, 0x1FA73 },
+{ 0x1FA78, 0x1FA7A },
+{ 0x1FA80, 0x1FA82 },
+{ 0x1FA90, 0x1FA95 },
{ 0x20000, 0x2FFFD },
{ 0x30000, 0x3FFFD }
};
diff --git a/unpack-trees.c b/unpack-trees.c
index 3563daa..f0f56d4 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -16,7 +16,7 @@
#include "submodule-config.h"
#include "fsmonitor.h"
#include "object-store.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
/*
* Error messages expected by scripts out of plumbing commands such as
@@ -219,6 +219,9 @@
enum unpack_trees_error_types e,
const char *path)
{
+ if (o->quiet)
+ return -1;
+
if (!o->show_all_errors)
return error(ERRORMSG(o, e), super_prefixed(path));
@@ -268,8 +271,7 @@
flags |= SUBMODULE_MOVE_HEAD_FORCE;
if (submodule_move_head(ce->name, old_id, new_id, flags))
- return o->gently ? -1 :
- add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
+ return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
return 0;
}
@@ -299,25 +301,6 @@
}
}
-/*
- * Unlink the last component and schedule the leading directories for
- * removal, such that empty directories get removed.
- */
-static void unlink_entry(const struct cache_entry *ce)
-{
- const struct submodule *sub = submodule_from_ce(ce);
- if (sub) {
- /* state.force is set at the caller. */
- submodule_move_head(ce->name, "HEAD", NULL,
- SUBMODULE_MOVE_HEAD_FORCE);
- }
- if (!check_leading_path(ce->name, ce_namelen(ce)))
- return;
- if (remove_or_warn(ce->ce_mode, ce->name))
- return;
- schedule_dir_for_removal(ce->name, ce_namelen(ce));
-}
-
static struct progress *get_progress(struct unpack_trees_options *o)
{
unsigned cnt = 0, total = 0;
@@ -332,7 +315,7 @@
total++;
}
- return start_delayed_progress(_("Checking out files"), total);
+ return start_delayed_progress(_("Updating files"), total);
}
static void setup_collided_checkout_detection(struct checkout *state,
@@ -410,33 +393,34 @@
unlink_entry(ce);
}
}
- remove_marked_cache_entries(index);
+ remove_marked_cache_entries(index, 0);
remove_scheduled_dirs();
if (should_update_submodules() && o->update && !o->dry_run)
load_gitmodules_file(index, &state);
enable_delayed_checkout(&state);
- if (repository_format_partial_clone && o->update && !o->dry_run) {
+ if (has_promisor_remote() && o->update && !o->dry_run) {
/*
* Prefetch the objects that are to be checked out in the loop
* below.
*/
struct oid_array to_fetch = OID_ARRAY_INIT;
- int fetch_if_missing_store = fetch_if_missing;
- fetch_if_missing = 0;
for (i = 0; i < index->cache_nr; i++) {
struct cache_entry *ce = index->cache[i];
- if ((ce->ce_flags & CE_UPDATE) &&
- !S_ISGITLINK(ce->ce_mode)) {
- if (!has_object_file(&ce->oid))
- oid_array_append(&to_fetch, &ce->oid);
- }
+
+ if (!(ce->ce_flags & CE_UPDATE) ||
+ S_ISGITLINK(ce->ce_mode))
+ continue;
+ if (!oid_object_info_extended(the_repository, &ce->oid,
+ NULL,
+ OBJECT_INFO_FOR_PREFETCH))
+ continue;
+ oid_array_append(&to_fetch, &ce->oid);
}
if (to_fetch.nr)
- fetch_objects(repository_format_partial_clone,
- to_fetch.oid, to_fetch.nr);
- fetch_if_missing = fetch_if_missing_store;
+ promisor_remote_get_direct(the_repository,
+ to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}
for (i = 0; i < index->cache_nr; i++) {
@@ -648,7 +632,7 @@
return ret;
}
-static int find_cache_pos(struct traverse_info *, const struct name_entry *);
+static int find_cache_pos(struct traverse_info *, const char *p, size_t len);
static void restore_cache_bottom(struct traverse_info *info, int bottom)
{
@@ -667,7 +651,7 @@
if (o->diff_index_cached)
return 0;
ret = o->cache_bottom;
- pos = find_cache_pos(info->prev, &info->name);
+ pos = find_cache_pos(info->prev, info->name, info->namelen);
if (pos < -1)
o->cache_bottom = -2 - pos;
@@ -702,21 +686,19 @@
struct traverse_info *info)
{
struct unpack_trees_options *o = info->data;
- int len = traverse_path_len(info, names);
- char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */);
+ struct strbuf name = STRBUF_INIT;
int pos;
- make_traverse_path(name, info, names);
- name[len++] = '/';
- name[len] = '\0';
- pos = index_name_pos(o->src_index, name, len);
+ strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
+ strbuf_addch(&name, '/');
+ pos = index_name_pos(o->src_index, name.buf, name.len);
if (pos >= 0)
BUG("This is a directory and should not exist in index");
pos = -pos - 1;
- if (!starts_with(o->src_index->cache[pos]->name, name) ||
- (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name)))
+ if (!starts_with(o->src_index->cache[pos]->name, name.buf) ||
+ (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
BUG("pos must point at the first entry in this directory");
- free(name);
+ strbuf_release(&name);
return pos;
}
@@ -726,7 +708,6 @@
* instead of ODB since we already know what these trees contain.
*/
static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
- struct name_entry *names,
struct traverse_info *info)
{
struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
@@ -816,7 +797,7 @@
* unprocessed entries before 'pos'.
*/
bottom = o->cache_bottom;
- ret = traverse_by_cache_tree(pos, nr_entries, n, names, info);
+ ret = traverse_by_cache_tree(pos, nr_entries, n, info);
o->cache_bottom = bottom;
return ret;
}
@@ -828,8 +809,10 @@
newinfo = *info;
newinfo.prev = info;
newinfo.pathspec = info->pathspec;
- newinfo.name = *p;
- newinfo.pathlen += tree_entry_len(p) + 1;
+ newinfo.name = p->path;
+ newinfo.namelen = p->pathlen;
+ newinfo.mode = p->mode;
+ newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1);
newinfo.df_conflicts |= df_conflicts;
/*
@@ -857,7 +840,7 @@
const struct object_id *oid = NULL;
if (dirmask & 1)
oid = &names[i].oid;
- buf[nr_buf++] = fill_tree_descriptor(t + i, oid);
+ buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid);
}
}
@@ -880,14 +863,18 @@
* itself - the caller needs to do the final check for the cache
* entry having more data at the end!
*/
-static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
+static int do_compare_entry_piecewise(const struct cache_entry *ce,
+ const struct traverse_info *info,
+ const char *name, size_t namelen,
+ unsigned mode)
{
- int len, pathlen, ce_len;
+ int pathlen, ce_len;
const char *ce_name;
if (info->prev) {
int cmp = do_compare_entry_piecewise(ce, info->prev,
- &info->name);
+ info->name, info->namelen,
+ info->mode);
if (cmp)
return cmp;
}
@@ -901,15 +888,15 @@
ce_len -= pathlen;
ce_name = ce->name + pathlen;
- len = tree_entry_len(n);
- return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+ return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
}
static int do_compare_entry(const struct cache_entry *ce,
const struct traverse_info *info,
- const struct name_entry *n)
+ const char *name, size_t namelen,
+ unsigned mode)
{
- int len, pathlen, ce_len;
+ int pathlen, ce_len;
const char *ce_name;
int cmp;
@@ -919,7 +906,7 @@
* it is quicker to use the precomputed version.
*/
if (!info->traverse_path)
- return do_compare_entry_piecewise(ce, info, n);
+ return do_compare_entry_piecewise(ce, info, name, namelen, mode);
cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
if (cmp)
@@ -934,13 +921,12 @@
ce_len -= pathlen;
ce_name = ce->name + pathlen;
- len = tree_entry_len(n);
- return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+ return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
}
static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
{
- int cmp = do_compare_entry(ce, info, n);
+ int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode);
if (cmp)
return cmp;
@@ -948,7 +934,7 @@
* Even if the beginning compared identically, the ce should
* compare as bigger than a directory leading up to it!
*/
- return ce_namelen(ce) > traverse_path_len(info, n);
+ return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
}
static int ce_in_traverse_path(const struct cache_entry *ce,
@@ -956,7 +942,8 @@
{
if (!info->prev)
return 1;
- if (do_compare_entry(ce, info->prev, &info->name))
+ if (do_compare_entry(ce, info->prev,
+ info->name, info->namelen, info->mode))
return 0;
/*
* If ce (blob) is the same name as the path (which is a tree
@@ -971,7 +958,7 @@
struct index_state *istate,
int is_transient)
{
- int len = traverse_path_len(info, n);
+ size_t len = traverse_path_len(info, tree_entry_len(n));
struct cache_entry *ce =
is_transient ?
make_empty_transient_cache_entry(len) :
@@ -981,7 +968,8 @@
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
oidcpy(&ce->oid, &n->oid);
- make_traverse_path(ce->name, info, n);
+ /* len+1 because the cache_entry allocates space for NUL */
+ make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
return ce;
}
@@ -1059,7 +1047,7 @@
static int unpack_failed(struct unpack_trees_options *o, const char *message)
{
discard_index(&o->result);
- if (!o->gently && !o->exiting_early) {
+ if (!o->quiet && !o->exiting_early) {
if (message)
return error("%s", message);
return -1;
@@ -1074,13 +1062,12 @@
* the directory.
*/
static int find_cache_pos(struct traverse_info *info,
- const struct name_entry *p)
+ const char *p, size_t p_len)
{
int pos;
struct unpack_trees_options *o = info->data;
struct index_state *index = o->src_index;
int pfxlen = info->pathlen;
- int p_len = tree_entry_len(p);
for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
const struct cache_entry *ce = index->cache[pos];
@@ -1116,7 +1103,7 @@
ce_len = ce_slash - ce_name;
else
ce_len = ce_namelen(ce) - pfxlen;
- cmp = name_compare(p->path, p_len, ce_name, ce_len);
+ cmp = name_compare(p, p_len, ce_name, ce_len);
/*
* Exact match; if we have a directory we need to
* delay returning it.
@@ -1131,7 +1118,7 @@
* E.g. ce_name == "t-i", and p->path == "t"; we may
* have "t/a" in the index.
*/
- if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
+ if (p_len < ce_len && !memcmp(ce_name, p, p_len) &&
ce_name[p_len] < '/')
continue; /* keep looking */
break;
@@ -1142,7 +1129,7 @@
static struct cache_entry *find_cache_entry(struct traverse_info *info,
const struct name_entry *p)
{
- int pos = find_cache_pos(info, p);
+ int pos = find_cache_pos(info, p->path, p->pathlen);
struct unpack_trees_options *o = info->data;
if (0 <= pos)
@@ -1155,10 +1142,10 @@
{
if (info->prev) {
debug_path(info->prev);
- if (*info->prev->name.path)
+ if (*info->prev->name)
putchar('/');
}
- printf("%s", info->name.path);
+ printf("%s", info->name);
}
static void debug_name_entry(int i, struct name_entry *n)
@@ -1282,7 +1269,8 @@
struct cache_entry **cache, int nr,
struct strbuf *prefix,
int select_mask, int clear_mask,
- struct exclude_list *el, int defval);
+ struct pattern_list *pl,
+ enum pattern_match_result default_match);
/* Whole directory matching */
static int clear_ce_flags_dir(struct index_state *istate,
@@ -1290,19 +1278,21 @@
struct strbuf *prefix,
char *basename,
int select_mask, int clear_mask,
- struct exclude_list *el, int defval)
+ struct pattern_list *pl,
+ enum pattern_match_result default_match)
{
struct cache_entry **cache_end;
int dtype = DT_DIR;
- int ret = is_excluded_from_list(prefix->buf, prefix->len,
- basename, &dtype, el, istate);
int rc;
+ enum pattern_match_result ret;
+ ret = path_matches_pattern_list(prefix->buf, prefix->len,
+ basename, &dtype, pl, istate);
strbuf_addch(prefix, '/');
/* If undecided, use matching result of parent dir in defval */
- if (ret < 0)
- ret = defval;
+ if (ret == UNDECIDED)
+ ret = default_match;
for (cache_end = cache; cache_end != cache + nr; cache_end++) {
struct cache_entry *ce = *cache_end;
@@ -1311,23 +1301,23 @@
}
/*
- * TODO: check el, if there are no patterns that may conflict
+ * TODO: check pl, if there are no patterns that may conflict
* with ret (iow, we know in advance the incl/excl
* decision for the entire directory), clear flag here without
* calling clear_ce_flags_1(). That function will call
- * the expensive is_excluded_from_list() on every entry.
+ * the expensive path_matches_pattern_list() on every entry.
*/
rc = clear_ce_flags_1(istate, cache, cache_end - cache,
prefix,
select_mask, clear_mask,
- el, ret);
+ pl, ret);
strbuf_setlen(prefix, prefix->len - 1);
return rc;
}
/*
* Traverse the index, find every entry that matches according to
- * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
+ * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
* number of traversed entries.
*
* If select_mask is non-zero, only entries whose ce_flags has on of
@@ -1344,7 +1334,8 @@
struct cache_entry **cache, int nr,
struct strbuf *prefix,
int select_mask, int clear_mask,
- struct exclude_list *el, int defval)
+ struct pattern_list *pl,
+ enum pattern_match_result default_match)
{
struct cache_entry **cache_end = cache + nr;
@@ -1355,7 +1346,8 @@
while(cache != cache_end) {
struct cache_entry *ce = *cache;
const char *name, *slash;
- int len, dtype, ret;
+ int len, dtype;
+ enum pattern_match_result ret;
if (select_mask && !(ce->ce_flags & select_mask)) {
cache++;
@@ -1379,7 +1371,7 @@
prefix,
prefix->buf + prefix->len - len,
select_mask, clear_mask,
- el, defval);
+ pl, default_match);
/* clear_c_f_dir eats a whole dir already? */
if (processed) {
@@ -1391,18 +1383,20 @@
strbuf_addch(prefix, '/');
cache += clear_ce_flags_1(istate, cache, cache_end - cache,
prefix,
- select_mask, clear_mask, el, defval);
+ select_mask, clear_mask, pl,
+ default_match);
strbuf_setlen(prefix, prefix->len - len - 1);
continue;
}
/* Non-directory */
dtype = ce_to_dtype(ce);
- ret = is_excluded_from_list(ce->name, ce_namelen(ce),
- name, &dtype, el, istate);
- if (ret < 0)
- ret = defval;
- if (ret > 0)
+ ret = path_matches_pattern_list(ce->name,
+ ce_namelen(ce),
+ name, &dtype, pl, istate);
+ if (ret == UNDECIDED)
+ ret = default_match;
+ if (ret == MATCHED)
ce->ce_flags &= ~clear_mask;
cache++;
}
@@ -1411,7 +1405,7 @@
static int clear_ce_flags(struct index_state *istate,
int select_mask, int clear_mask,
- struct exclude_list *el)
+ struct pattern_list *pl)
{
static struct strbuf prefix = STRBUF_INIT;
@@ -1422,13 +1416,13 @@
istate->cache_nr,
&prefix,
select_mask, clear_mask,
- el, 0);
+ pl, 0);
}
/*
* Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
*/
-static void mark_new_skip_worktree(struct exclude_list *el,
+static void mark_new_skip_worktree(struct pattern_list *pl,
struct index_state *istate,
int select_flag, int skip_wt_flag)
{
@@ -1454,7 +1448,7 @@
* 2. Widen worktree according to sparse-checkout file.
* Matched entries will have skip_wt_flag cleared (i.e. "in")
*/
- clear_ce_flags(istate, select_flag, skip_wt_flag, el);
+ clear_ce_flags(istate, select_flag, skip_wt_flag, pl);
}
static int verify_absent(const struct cache_entry *,
@@ -1470,21 +1464,21 @@
{
int i, ret;
static struct cache_entry *dfc;
- struct exclude_list el;
+ struct pattern_list pl;
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
trace_performance_enter();
- memset(&el, 0, sizeof(el));
+ memset(&pl, 0, sizeof(pl));
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout) {
char *sparse = git_pathdup("info/sparse-checkout");
- if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0)
+ if (add_patterns_from_file_to_list(sparse, "", 0, &pl, NULL) < 0)
o->skip_sparse_checkout = 1;
else
- o->el = ⪙
+ o->pl = &pl;
free(sparse);
}
@@ -1515,7 +1509,7 @@
* Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
*/
if (!o->skip_sparse_checkout)
- mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
+ mark_new_skip_worktree(o->pl, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
if (!dfc)
dfc = xcalloc(1, cache_entry_size(0));
@@ -1580,7 +1574,7 @@
* If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
* so apply_sparse_checkout() won't attempt to remove it from worktree
*/
- mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
+ mark_new_skip_worktree(o->pl, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
ret = 0;
for (i = 0; i < o->result.cache_nr; i++) {
@@ -1637,6 +1631,8 @@
WRITE_TREE_SILENT |
WRITE_TREE_REPAIR);
}
+
+ o->result.updated_workdir = 1;
discard_index(o->dst_index);
*o->dst_index = o->result;
} else {
@@ -1646,7 +1642,7 @@
done:
trace_performance_leave("unpack_trees");
- clear_exclude_list(&el);
+ clear_pattern_list(&pl);
return ret;
return_failed:
@@ -1664,8 +1660,7 @@
static int reject_merge(const struct cache_entry *ce,
struct unpack_trees_options *o)
{
- return o->gently ? -1 :
- add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
+ return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
}
static int same(const struct cache_entry *a, const struct cache_entry *b)
@@ -1712,8 +1707,7 @@
int r = check_submodule_move_head(ce,
"HEAD", oid_to_hex(&ce->oid), o);
if (r)
- return o->gently ? -1 :
- add_rejected_path(o, error_type, ce->name);
+ return add_rejected_path(o, error_type, ce->name);
return 0;
}
@@ -1731,8 +1725,7 @@
}
if (errno == ENOENT)
return 0;
- return o->gently ? -1 :
- add_rejected_path(o, error_type, ce->name);
+ return add_rejected_path(o, error_type, ce->name);
}
int verify_uptodate(const struct cache_entry *ce,
@@ -1778,7 +1771,6 @@
*/
static int verify_clean_submodule(const char *old_sha1,
const struct cache_entry *ce,
- enum unpack_trees_error_types error_type,
struct unpack_trees_options *o)
{
if (!submodule_from_ce(ce))
@@ -1789,7 +1781,6 @@
}
static int verify_clean_subdirectory(const struct cache_entry *ce,
- enum unpack_trees_error_types error_type,
struct unpack_trees_options *o)
{
/*
@@ -1812,7 +1803,7 @@
if (!sub_head && oideq(&oid, &ce->oid))
return 0;
return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
- ce, error_type, o);
+ ce, o);
}
/*
@@ -1854,8 +1845,7 @@
d.exclude_per_dir = o->dir->exclude_per_dir;
i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
if (i)
- return o->gently ? -1 :
- add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
+ return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
free(pathbuf);
return cnt;
}
@@ -1908,7 +1898,7 @@
* files that are in "foo/" we would lose
* them.
*/
- if (verify_clean_subdirectory(ce, error_type, o) < 0)
+ if (verify_clean_subdirectory(ce, o) < 0)
return -1;
return 0;
}
@@ -1924,8 +1914,7 @@
return 0;
}
- return o->gently ? -1 :
- add_rejected_path(o, error_type, name);
+ return add_rejected_path(o, error_type, name);
}
/*
@@ -2365,7 +2354,7 @@
return error("Cannot do a bind merge of %d trees",
o->merge_size);
if (a && old)
- return o->gently ? -1 :
+ return o->quiet ? -1 :
error(ERRORMSG(o, ERROR_BIND_OVERLAP),
super_prefixed(a->name),
super_prefixed(old->name));
@@ -2405,7 +2394,7 @@
if (o->update && S_ISGITLINK(old->ce_mode) &&
should_update_submodules() && !verify_uptodate(old, o))
update |= CE_UPDATE;
- add_entry(o, old, update, 0);
+ add_entry(o, old, update, CE_STAGEMASK);
return 0;
}
return merged_entry(a, old, o);
diff --git a/unpack-trees.h b/unpack-trees.h
index 0135080..f2eee0c 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -10,7 +10,7 @@
struct cache_entry;
struct unpack_trees_options;
-struct exclude_list;
+struct pattern_list;
typedef int (*merge_fn_t)(const struct cache_entry * const *src,
struct unpack_trees_options *options);
@@ -56,7 +56,7 @@
diff_index_cached,
debug_unpack,
skip_sparse_checkout,
- gently,
+ quiet,
exiting_early,
show_all_errors,
dry_run;
@@ -83,7 +83,7 @@
struct index_state *src_index;
struct index_state result;
- struct exclude_list *el; /* for internal use */
+ struct pattern_list *pl; /* for internal use */
};
int unpack_trees(unsigned n, struct tree_desc *t,
diff --git a/upload-pack.c b/upload-pack.c
index d098ef5..a00d7ec 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -140,18 +140,17 @@
argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag)
argv_array_push(&pack_objects.args, "--include-tag");
- if (filter_options.filter_spec) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
+ if (filter_options.choice) {
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
if (pack_objects.use_shell) {
struct strbuf buf = STRBUF_INIT;
- sq_quote_buf(&buf, expanded_filter_spec.buf);
+ sq_quote_buf(&buf, spec);
argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
strbuf_release(&buf);
} else {
argv_array_pushf(&pack_objects.args, "--filter=%s",
- expanded_filter_spec.buf);
+ spec);
}
}
@@ -528,13 +527,13 @@
return -1;
while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
- struct object_id sha1;
+ struct object_id oid;
const char *p;
- if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
+ if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
break;
- o = lookup_object(the_repository, sha1.hash);
+ o = lookup_object(the_repository, &oid);
if (o && o->type == OBJ_COMMIT) {
o->flags &= ~TMP_MARK;
}
@@ -592,7 +591,8 @@
return 1;
}
-static void check_non_tip(struct object_array *want_obj)
+static void check_non_tip(struct object_array *want_obj,
+ struct packet_writer *writer)
{
int i;
@@ -611,9 +611,13 @@
/* Pick one of them (we know there at least is one) */
for (i = 0; i < want_obj->nr; i++) {
struct object *o = want_obj->objects[i].item;
- if (!is_our_ref(o))
+ if (!is_our_ref(o)) {
+ packet_writer_error(writer,
+ "upload-pack: not our ref %s",
+ oid_to_hex(&o->oid));
die("git upload-pack: not our ref %s",
oid_to_hex(&o->oid));
+ }
}
}
@@ -717,7 +721,7 @@
{
struct commit_list *result;
- close_commit_graph(the_repository);
+ disable_commit_graph(the_repository);
result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
send_shallow(writer, result);
free_commit_list(result);
@@ -834,7 +838,7 @@
if (skip_prefix(line, "deepen-not ", &arg)) {
char *ref = NULL;
struct object_id oid;
- if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
+ if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
die("git upload-pack: ambiguous deepen-not: %s", line);
string_list_append(deepen_not, ref);
free(ref);
@@ -879,6 +883,7 @@
if (skip_prefix(reader->line, "filter ", &arg)) {
if (!filter_capability_requested)
die("git upload-pack: filtering capability not negotiated");
+ list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, arg);
continue;
}
@@ -936,7 +941,7 @@
* by another process that handled the initial request.
*/
if (has_non_tip)
- check_non_tip(want_obj);
+ check_non_tip(want_obj, &writer);
if (!use_sideband && daemon_mode)
no_progress = 1;
@@ -955,7 +960,7 @@
static int mark_our_ref(const char *refname, const char *refname_full,
const struct object_id *oid)
{
- struct object *o = lookup_unknown_object(oid->hash);
+ struct object *o = lookup_unknown_object(oid);
if (ref_is_hidden(refname, refname_full)) {
o->flags |= HIDDEN_REF;
@@ -1032,8 +1037,8 @@
symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
if (!symref_target || (flag & REF_ISSYMREF) == 0)
die("'%s' is a symref but it is not?", refname);
- item = string_list_append(cb_data, refname);
- item->util = xstrdup(symref_target);
+ item = string_list_append(cb_data, strip_namespace(refname));
+ item->util = xstrdup(strip_namespace(symref_target));
return 0;
}
@@ -1064,6 +1069,8 @@
allow_ref_in_want = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowsidebandall", var)) {
allow_sideband_all = git_config_bool(var, value);
+ } else if (!strcmp("core.precomposeunicode", var)) {
+ precomposed_unicode = git_config_bool(var, value);
}
if (current_config_scope() != CONFIG_SCOPE_REPO) {
@@ -1298,6 +1305,7 @@
}
if (allow_filter && skip_prefix(arg, "filter ", &p)) {
+ list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, p);
continue;
}
diff --git a/upload-pack.h b/upload-pack.h
index cab2178..4bafe16 100644
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -13,11 +13,11 @@
struct repository;
struct argv_array;
struct packet_reader;
-extern int upload_pack_v2(struct repository *r, struct argv_array *keys,
- struct packet_reader *request);
+int upload_pack_v2(struct repository *r, struct argv_array *keys,
+ struct packet_reader *request);
struct strbuf;
-extern int upload_pack_advertise(struct repository *r,
- struct strbuf *value);
+int upload_pack_advertise(struct repository *r,
+ struct strbuf *value);
#endif /* UPLOAD_PACK_H */
diff --git a/url.c b/url.c
index 25576c3..e34e5e7 100644
--- a/url.c
+++ b/url.c
@@ -46,9 +46,9 @@
break;
}
- if (c == '%') {
+ if (c == '%' && (len < 0 || len >= 3)) {
int val = hex2chr(q + 1);
- if (0 <= val) {
+ if (0 < val) {
strbuf_addch(out, val);
q += 3;
len -= 3;
@@ -86,6 +86,12 @@
return url_decode_internal(&url, len, NULL, &out, 0);
}
+char *url_percent_decode(const char *encoded)
+{
+ struct strbuf out = STRBUF_INIT;
+ return url_decode_internal(&encoded, strlen(encoded), NULL, &out, 0);
+}
+
char *url_decode_parameter_name(const char **query)
{
struct strbuf out = STRBUF_INIT;
diff --git a/url.h b/url.h
index f311c40..2a27c34 100644
--- a/url.h
+++ b/url.h
@@ -3,14 +3,22 @@
struct strbuf;
-extern int is_url(const char *url);
-extern int is_urlschemechar(int first_flag, int ch);
-extern char *url_decode(const char *url);
-extern char *url_decode_mem(const char *url, int len);
-extern char *url_decode_parameter_name(const char **query);
-extern char *url_decode_parameter_value(const char **query);
+int is_url(const char *url);
+int is_urlschemechar(int first_flag, int ch);
+char *url_decode(const char *url);
+char *url_decode_mem(const char *url, int len);
-extern void end_url_with_slash(struct strbuf *buf, const char *url);
-extern void str_end_url_with_slash(const char *url, char **dest);
+/*
+ * Similar to the url_decode_{,mem} methods above, but doesn't assume there
+ * is a scheme followed by a : at the start of the string. Instead, %-sequences
+ * before any : are also parsed.
+ */
+char *url_percent_decode(const char *encoded);
+
+char *url_decode_parameter_name(const char **query);
+char *url_decode_parameter_value(const char **query);
+
+void end_url_with_slash(struct strbuf *buf, const char *url);
+void str_end_url_with_slash(const char *url, char **dest);
#endif /* URL_H */
diff --git a/urlmatch.h b/urlmatch.h
index e482148..eed5f29 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -33,7 +33,7 @@
* '?...' and '#...' portion; will always be >= 1 */
};
-extern char *url_normalize(const char *, struct url_info *);
+char *url_normalize(const char *, struct url_info *);
struct urlmatch_item {
size_t hostmatch_len;
@@ -52,6 +52,6 @@
int (*cascade_fn)(const char *var, const char *value, void *cb);
};
-extern int urlmatch_config_entry(const char *var, const char *value, void *cb);
+int urlmatch_config_entry(const char *var, const char *value, void *cb);
#endif /* URL_MATCH_H */
diff --git a/usage.c b/usage.c
index cc80333..2fdb200 100644
--- a/usage.c
+++ b/usage.c
@@ -22,17 +22,48 @@
static NORETURN void usage_builtin(const char *err, va_list params)
{
vreportf("usage: ", err, params);
+
+ /*
+ * When we detect a usage error *before* the command dispatch in
+ * cmd_main(), we don't know what verb to report. Force it to this
+ * to facilitate post-processing.
+ */
+ trace2_cmd_name("_usage_");
+
+ /*
+ * Currently, the (err, params) are usually just the static usage
+ * string which isn't very useful here. Usually, the call site
+ * manually calls fprintf(stderr,...) with the actual detailed
+ * syntax error before calling usage().
+ *
+ * TODO It would be nice to update the call sites to pass both
+ * the static usage string and the detailed error message.
+ */
+
exit(129);
}
static NORETURN void die_builtin(const char *err, va_list params)
{
+ /*
+ * We call this trace2 function first and expect it to va_copy 'params'
+ * before using it (because an 'ap' can only be walked once).
+ */
+ trace2_cmd_error_va(err, params);
+
vreportf("fatal: ", err, params);
+
exit(128);
}
static void error_builtin(const char *err, va_list params)
{
+ /*
+ * We call this trace2 function first and expect it to va_copy 'params'
+ * before using it (because an 'ap' can only be walked once).
+ */
+ trace2_cmd_error_va(err, params);
+
vreportf("error: ", err, params);
}
diff --git a/userdiff.c b/userdiff.c
index 3a78fbf..86e3244 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -23,6 +23,14 @@
"[a-zA-Z][a-zA-Z0-9_]*"
"|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
+PATTERNS("dts",
+ "!;\n"
+ /* lines beginning with a word optionally preceded by '&' or the root */
+ "^[ \t]*((/|&?[a-zA-Z_]).*)",
+ /* -- */
+ /* Property names and math operators */
+ "[a-zA-Z0-9,._+?#-]+"
+ "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"),
IPATTERN("fortran",
"!^([C*]|[ \t]*!)\n"
"!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n"
@@ -58,7 +66,12 @@
"|[-+*/<>%&^|=!]="
"|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
PATTERNS("matlab",
- "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$",
+ /*
+ * Octave pattern is mostly the same as matlab, except that '%%%' and
+ * '##' can also be used to begin code sections, in addition to '%%'
+ * that is understood by both.
+ */
+ "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
"[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
PATTERNS("objc",
/* Negate C statements that can look like functions */
@@ -130,6 +143,12 @@
"(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
"|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"),
+PATTERNS("rust",
+ "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl)[< \t]+[^;]*)$",
+ /* -- */
+ "[a-zA-Z_][a-zA-Z0-9_]*"
+ "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
+ "|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
"[={}\"]|[^={}\" \t]+"),
PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
diff --git a/utf8.c b/utf8.c
index 83824dc..3b42fad 100644
--- a/utf8.c
+++ b/utf8.c
@@ -559,6 +559,10 @@
/*
* For writing, UTF-16 iconv typically creates "UTF-16BE-BOM"
* Some users under Windows want the little endian version
+ *
+ * We handle UTF-16 and UTF-32 ourselves only if the platform does not
+ * provide a BOM (which we require), since we want to match the behavior
+ * of the system tools and libc as much as possible.
*/
if (same_utf_encoding("UTF-16LE-BOM", out_encoding)) {
bom_str = utf16_le_bom;
@@ -568,6 +572,16 @@
bom_str = utf16_be_bom;
bom_len = sizeof(utf16_be_bom);
out_encoding = "UTF-16BE";
+#ifdef ICONV_OMITS_BOM
+ } else if (same_utf_encoding("UTF-16", out_encoding)) {
+ bom_str = utf16_be_bom;
+ bom_len = sizeof(utf16_be_bom);
+ out_encoding = "UTF-16BE";
+ } else if (same_utf_encoding("UTF-32", out_encoding)) {
+ bom_str = utf32_be_bom;
+ bom_len = sizeof(utf32_be_bom);
+ out_encoding = "UTF-32BE";
+#endif
}
conv = iconv_open(out_encoding, in_encoding);
diff --git a/utf8.h b/utf8.h
index 84efbfc..fcd5167 100644
--- a/utf8.h
+++ b/utf8.h
@@ -16,7 +16,7 @@
int utf8_fprintf(FILE *, const char *, ...);
extern const char utf8_bom[];
-extern int skip_utf8_bom(char **, size_t);
+int skip_utf8_bom(char **, size_t);
void strbuf_add_wrapped_text(struct strbuf *buf,
const char *text, int indent, int indent2, int width);
diff --git a/varint.h b/varint.h
index c1c44d9..f78bb0c 100644
--- a/varint.h
+++ b/varint.h
@@ -1,7 +1,7 @@
#ifndef VARINT_H
#define VARINT_H
-extern int encode_varint(uintmax_t, unsigned char *);
-extern uintmax_t decode_varint(const unsigned char **);
+int encode_varint(uintmax_t, unsigned char *);
+uintmax_t decode_varint(const unsigned char **);
#endif /* VARINT_H */
diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
index 189c32d..a7fc099 100644
--- a/vcs-svn/sliding_window.h
+++ b/vcs-svn/sliding_window.h
@@ -13,6 +13,6 @@
#define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT }
-extern int move_window(struct sliding_view *view, off_t off, size_t width);
+int move_window(struct sliding_view *view, off_t off, size_t width);
#endif
diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
index 10a2cbc..625d950 100644
--- a/vcs-svn/svndiff.h
+++ b/vcs-svn/svndiff.h
@@ -4,7 +4,7 @@
struct line_buffer;
struct sliding_view;
-extern int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
- struct sliding_view *preimage, FILE *postimage);
+int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
+ struct sliding_view *preimage, FILE *postimage);
#endif
diff --git a/walker.c b/walker.c
index d74ae59..06cd2bd 100644
--- a/walker.c
+++ b/walker.c
@@ -285,7 +285,7 @@
error("Could not interpret response from server '%s' as something to pull", target[i]);
goto done;
}
- if (process(walker, lookup_unknown_object(oids[i].hash)))
+ if (process(walker, lookup_unknown_object(&oids[i])))
goto done;
}
diff --git a/worktree.c b/worktree.c
index d6a0ee7..5b4793c 100644
--- a/worktree.c
+++ b/worktree.c
@@ -49,18 +49,24 @@
struct worktree *worktree = NULL;
struct strbuf path = STRBUF_INIT;
struct strbuf worktree_path = STRBUF_INIT;
- int is_bare = 0;
strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
- is_bare = !strbuf_strip_suffix(&worktree_path, "/.git");
- if (is_bare)
+ if (!strbuf_strip_suffix(&worktree_path, "/.git"))
strbuf_strip_suffix(&worktree_path, "/.");
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
worktree = xcalloc(1, sizeof(*worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
- worktree->is_bare = is_bare;
+ /*
+ * NEEDSWORK: If this function is called from a secondary worktree and
+ * config.worktree is present, is_bare_repository_cfg will reflect the
+ * contents of config.worktree, not the contents of the main worktree.
+ * This means that worktree->is_bare may be set to 0 even if the main
+ * worktree is configured to be bare.
+ */
+ worktree->is_bare = (is_bare_repository_cfg == 1) ||
+ is_bare_repository();
add_head_info(worktree);
strbuf_release(&path);
@@ -222,9 +228,12 @@
free(to_free);
return NULL;
}
- for (; *list; list++)
- if (!fspathcmp(path, real_path((*list)->path)))
+ for (; *list; list++) {
+ const char *wt_path = real_path_if_valid((*list)->path);
+
+ if (wt_path && !fspathcmp(path, wt_path))
break;
+ }
free(path);
free(to_free);
return *list;
@@ -444,7 +453,7 @@
DIR *dir;
struct dirent *d;
int ret = 0;
- struct repository_format format;
+ struct repository_format format = REPOSITORY_FORMAT_INIT;
submodule_gitdir = git_pathdup_submodule(path, "%s", "");
if (!submodule_gitdir)
@@ -462,8 +471,10 @@
read_repository_format(&format, sb.buf);
if (format.version != 0) {
strbuf_release(&sb);
+ clear_repository_format(&format);
return 1;
}
+ clear_repository_format(&format);
/* Replace config by worktrees. */
strbuf_setlen(&sb, sb.len - strlen("config"));
diff --git a/worktree.h b/worktree.h
index 9e3b0b7..caecc7a 100644
--- a/worktree.h
+++ b/worktree.h
@@ -30,37 +30,37 @@
* The caller is responsible for freeing the memory from the returned
* worktree(s).
*/
-extern struct worktree **get_worktrees(unsigned flags);
+struct worktree **get_worktrees(unsigned flags);
/*
* Returns 1 if linked worktrees exist, 0 otherwise.
*/
-extern int submodule_uses_worktrees(const char *path);
+int submodule_uses_worktrees(const char *path);
/*
* Return git dir of the worktree. Note that the path may be relative.
* If wt is NULL, git dir of current worktree is returned.
*/
-extern const char *get_worktree_git_dir(const struct worktree *wt);
+const char *get_worktree_git_dir(const struct worktree *wt);
/*
* Search a worktree that can be unambiguously identified by
* "arg". "prefix" must not be NULL.
*/
-extern struct worktree *find_worktree(struct worktree **list,
- const char *prefix,
- const char *arg);
+struct worktree *find_worktree(struct worktree **list,
+ const char *prefix,
+ const char *arg);
/*
* Return true if the given worktree is the main one.
*/
-extern int is_main_worktree(const struct worktree *wt);
+int is_main_worktree(const struct worktree *wt);
/*
* Return the reason string if the given worktree is locked or NULL
* otherwise.
*/
-extern const char *worktree_lock_reason(struct worktree *wt);
+const char *worktree_lock_reason(struct worktree *wt);
#define WT_VALIDATE_WORKTREE_MISSING_OK (1 << 0)
@@ -68,28 +68,28 @@
* Return zero if the worktree is in good condition. Error message is
* returned if "errmsg" is not NULL.
*/
-extern int validate_worktree(const struct worktree *wt,
- struct strbuf *errmsg,
- unsigned flags);
+int validate_worktree(const struct worktree *wt,
+ struct strbuf *errmsg,
+ unsigned flags);
/*
* Update worktrees/xxx/gitdir with the new path.
*/
-extern void update_worktree_location(struct worktree *wt,
- const char *path_);
+void update_worktree_location(struct worktree *wt,
+ const char *path_);
/*
* Free up the memory for worktree(s)
*/
-extern void free_worktrees(struct worktree **);
+void free_worktrees(struct worktree **);
/*
* Check if a per-worktree symref points to a ref in the main worktree
* or any linked worktree, and return the worktree that holds the ref,
* or NULL otherwise. The result may be destroyed by the next call.
*/
-extern const struct worktree *find_shared_symref(const char *symref,
- const char *target);
+const struct worktree *find_shared_symref(const char *symref,
+ const char *target);
/*
* Similar to head_ref() for all HEADs _except_ one from the current
@@ -104,8 +104,8 @@
* Similar to git_path() but can produce paths for a specified
* worktree instead of current one
*/
-extern const char *worktree_git_path(const struct worktree *wt,
- const char *fmt, ...)
+const char *worktree_git_path(const struct worktree *wt,
+ const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
/*
diff --git a/wrapper.c b/wrapper.c
index ea3cf64..c55d772 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -4,12 +4,6 @@
#include "cache.h"
#include "config.h"
-static void do_nothing(size_t size)
-{
-}
-
-static void (*try_to_free_routine)(size_t size) = do_nothing;
-
static int memory_limit_check(size_t size, int gentle)
{
static size_t limit = 0;
@@ -30,24 +24,11 @@
return 0;
}
-try_to_free_t set_try_to_free_routine(try_to_free_t routine)
-{
- try_to_free_t old = try_to_free_routine;
- if (!routine)
- routine = do_nothing;
- try_to_free_routine = routine;
- return old;
-}
-
char *xstrdup(const char *str)
{
char *ret = strdup(str);
- if (!ret) {
- try_to_free_routine(strlen(str) + 1);
- ret = strdup(str);
- if (!ret)
- die("Out of memory, strdup failed");
- }
+ if (!ret)
+ die("Out of memory, strdup failed");
return ret;
}
@@ -61,19 +42,13 @@
if (!ret && !size)
ret = malloc(1);
if (!ret) {
- try_to_free_routine(size);
- ret = malloc(size);
- if (!ret && !size)
- ret = malloc(1);
- if (!ret) {
- if (!gentle)
- die("Out of memory, malloc failed (tried to allocate %lu bytes)",
- (unsigned long)size);
- else {
- error("Out of memory, malloc failed (tried to allocate %lu bytes)",
- (unsigned long)size);
- return NULL;
- }
+ if (!gentle)
+ die("Out of memory, malloc failed (tried to allocate %lu bytes)",
+ (unsigned long)size);
+ else {
+ error("Out of memory, malloc failed (tried to allocate %lu bytes)",
+ (unsigned long)size);
+ return NULL;
}
}
#ifdef XMALLOC_POISON
@@ -138,14 +113,8 @@
ret = realloc(ptr, size);
if (!ret && !size)
ret = realloc(ptr, 1);
- if (!ret) {
- try_to_free_routine(size);
- ret = realloc(ptr, size);
- if (!ret && !size)
- ret = realloc(ptr, 1);
- if (!ret)
- die("Out of memory, realloc failed");
- }
+ if (!ret)
+ die("Out of memory, realloc failed");
return ret;
}
@@ -160,14 +129,8 @@
ret = calloc(nmemb, size);
if (!ret && (!nmemb || !size))
ret = calloc(1, 1);
- if (!ret) {
- try_to_free_routine(nmemb * size);
- ret = calloc(nmemb, size);
- if (!ret && (!nmemb || !size))
- ret = calloc(1, 1);
- if (!ret)
- die("Out of memory, calloc failed");
- }
+ if (!ret)
+ die("Out of memory, calloc failed");
return ret;
}
@@ -502,7 +465,7 @@
* Try TMP_MAX different filenames.
*/
gettimeofday(&tv, NULL);
- value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid();
+ value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
filename_template = &pattern[len - 6 - suffix_len];
for (count = 0; count < TMP_MAX; ++count) {
uint64_t v = value;
diff --git a/wt-status.c b/wt-status.c
index 1f564b1..ad6282c 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -17,6 +17,9 @@
#include "utf8.h"
#include "worktree.h"
#include "lockfile.h"
+#include "sequencer.h"
+
+#define AB_DELAY_WARNING_IN_MS (2 * 1000)
static const char cut_line[] =
"------------------------ >8 ------------------------\n";
@@ -178,9 +181,15 @@
return;
if (s->whence != FROM_COMMIT)
;
- else if (!s->is_initial)
- status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
- else
+ else if (!s->is_initial) {
+ if (!strcmp(s->reference, "HEAD"))
+ status_printf_ln(s, c,
+ _(" (use \"git restore --staged <file>...\" to unstage)"));
+ else
+ status_printf_ln(s, c,
+ _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
+ s->reference);
+ } else
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
if (!both_deleted) {
@@ -193,7 +202,6 @@
} else {
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
}
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_cached_header(struct wt_status *s)
@@ -205,11 +213,16 @@
return;
if (s->whence != FROM_COMMIT)
; /* NEEDSWORK: use "git reset --unresolve"??? */
- else if (!s->is_initial)
- status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
- else
+ else if (!s->is_initial) {
+ if (!strcmp(s->reference, "HEAD"))
+ status_printf_ln(s, c
+ , _(" (use \"git restore --staged <file>...\" to unstage)"));
+ else
+ status_printf_ln(s, c,
+ _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
+ s->reference);
+ } else
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_dirty_header(struct wt_status *s,
@@ -225,10 +238,9 @@
status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
else
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
- status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
+ status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
if (has_dirty_submodules)
status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_other_header(struct wt_status *s,
@@ -240,7 +252,6 @@
if (!s->hints)
return;
status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_trailer(struct wt_status *s)
@@ -748,12 +759,23 @@
void wt_status_collect(struct wt_status *s)
{
+ trace2_region_enter("status", "worktrees", s->repo);
wt_status_collect_changes_worktree(s);
- if (s->is_initial)
+ trace2_region_leave("status", "worktrees", s->repo);
+
+ if (s->is_initial) {
+ trace2_region_enter("status", "initial", s->repo);
wt_status_collect_changes_initial(s);
- else
+ trace2_region_leave("status", "initial", s->repo);
+ } else {
+ trace2_region_enter("status", "index", s->repo);
wt_status_collect_changes_index(s);
+ trace2_region_leave("status", "index", s->repo);
+ }
+
+ trace2_region_enter("status", "untracked", s->repo);
wt_status_collect_untracked(s);
+ trace2_region_leave("status", "untracked", s->repo);
wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
if (s->state.merge_in_progress && !has_unmerged(s))
@@ -995,13 +1017,19 @@
return len;
}
-void wt_status_add_cut_line(FILE *fp)
+void wt_status_append_cut_line(struct strbuf *buf)
{
const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
+
+ strbuf_commented_addf(buf, "%s", cut_line);
+ strbuf_add_commented_lines(buf, explanation, strlen(explanation));
+}
+
+void wt_status_add_cut_line(FILE *fp)
+{
struct strbuf buf = STRBUF_INIT;
- fprintf(fp, "%c %s", comment_line_char, cut_line);
- strbuf_add_commented_lines(&buf, explanation, strlen(explanation));
+ wt_status_append_cut_line(&buf);
fputs(buf.buf, fp);
strbuf_release(&buf);
}
@@ -1067,14 +1095,29 @@
struct branch *branch;
char comment_line_string[3];
int i;
+ uint64_t t_begin = 0;
assert(s->branch && !s->is_initial);
if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
return;
branch = branch_get(branch_name);
+
+ t_begin = getnanotime();
+
if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
return;
+ if (advice_status_ahead_behind_warning &&
+ s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
+ uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
+ if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
+ strbuf_addf(&sb, _("\n"
+ "It took %.2f seconds to compute the branch ahead/behind values.\n"
+ "You can use '--no-ahead-behind' to avoid this.\n"),
+ t_delta_in_ms / 1000.0);
+ }
+ }
+
i = 0;
if (s->display_comment_prefix) {
comment_line_string[i++] = comment_line_char;
@@ -1197,7 +1240,9 @@
int i;
if (starts_with(line->buf, "exec ") ||
- starts_with(line->buf, "x "))
+ starts_with(line->buf, "x ") ||
+ starts_with(line->buf, "label ") ||
+ starts_with(line->buf, "l "))
return;
split = strbuf_split_max(line, ' ', 3);
@@ -1369,16 +1414,28 @@
static void show_cherry_pick_in_progress(struct wt_status *s,
const char *color)
{
- status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
- find_unique_abbrev(&s->state.cherry_pick_head_oid, DEFAULT_ABBREV));
+ if (is_null_oid(&s->state.cherry_pick_head_oid))
+ status_printf_ln(s, color,
+ _("Cherry-pick currently in progress."));
+ else
+ status_printf_ln(s, color,
+ _("You are currently cherry-picking commit %s."),
+ find_unique_abbrev(&s->state.cherry_pick_head_oid,
+ DEFAULT_ABBREV));
+
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
_(" (fix conflicts and run \"git cherry-pick --continue\")"));
+ else if (is_null_oid(&s->state.cherry_pick_head_oid))
+ status_printf_ln(s, color,
+ _(" (run \"git cherry-pick --continue\" to continue)"));
else
status_printf_ln(s, color,
_(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
status_printf_ln(s, color,
+ _(" (use \"git cherry-pick --skip\" to skip this patch)"));
+ status_printf_ln(s, color,
_(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
}
wt_longstatus_print_trailer(s);
@@ -1387,16 +1444,27 @@
static void show_revert_in_progress(struct wt_status *s,
const char *color)
{
- status_printf_ln(s, color, _("You are currently reverting commit %s."),
- find_unique_abbrev(&s->state.revert_head_oid, DEFAULT_ABBREV));
+ if (is_null_oid(&s->state.revert_head_oid))
+ status_printf_ln(s, color,
+ _("Revert currently in progress."));
+ else
+ status_printf_ln(s, color,
+ _("You are currently reverting commit %s."),
+ find_unique_abbrev(&s->state.revert_head_oid,
+ DEFAULT_ABBREV));
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
_(" (fix conflicts and run \"git revert --continue\")"));
+ else if (is_null_oid(&s->state.revert_head_oid))
+ status_printf_ln(s, color,
+ _(" (run \"git revert --continue\" to continue)"));
else
status_printf_ln(s, color,
_(" (all conflicts fixed: run \"git revert --continue\")"));
status_printf_ln(s, color,
+ _(" (use \"git revert --skip\" to skip this patch)"));
+ status_printf_ln(s, color,
_(" (use \"git revert --abort\" to cancel the revert operation)"));
}
wt_longstatus_print_trailer(s);
@@ -1563,6 +1631,7 @@
{
struct stat st;
struct object_id oid;
+ enum replay_action action;
if (!stat(git_path_merge_head(r), &st)) {
wt_status_check_rebase(NULL, state);
@@ -1580,7 +1649,15 @@
state->revert_in_progress = 1;
oidcpy(&state->revert_head_oid, &oid);
}
-
+ if (!sequencer_get_last_command(r, &action)) {
+ if (action == REPLAY_PICK) {
+ state->cherry_pick_in_progress = 1;
+ oidcpy(&state->cherry_pick_head_oid, &null_oid);
+ } else {
+ state->revert_in_progress = 1;
+ oidcpy(&state->revert_head_oid, &null_oid);
+ }
+ }
if (get_detached_from)
wt_status_get_detached_from(r, state);
}
@@ -1628,9 +1705,9 @@
} else if (s->state.detached_from) {
branch_name = s->state.detached_from;
if (s->state.detached_at)
- on_what = _("HEAD detached at ");
+ on_what = HEAD_DETACHED_AT;
else
- on_what = _("HEAD detached from ");
+ on_what = HEAD_DETACHED_FROM;
} else {
branch_name = "";
on_what = _("Not currently on any branch.");
@@ -1840,7 +1917,7 @@
color_fprintf(s->fp, branch_color_local, "%s", branch_name);
sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base,
- s->ahead_behind_flags);
+ 0, s->ahead_behind_flags);
if (sti < 0) {
if (!base)
goto conclude;
@@ -1979,7 +2056,7 @@
branch = branch_get(branch_name);
base = NULL;
ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind,
- &base, s->ahead_behind_flags);
+ &base, 0, s->ahead_behind_flags);
if (base) {
base = shorten_unambiguous_ref(base, 0);
fprintf(s->fp, "# branch.upstream %s%c", base, eol);
@@ -2028,9 +2105,7 @@
/*
* Fix-up changed entries before we print them.
*/
-static void wt_porcelain_v2_fix_up_changed(
- struct string_list_item *it,
- struct wt_status *s)
+static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
{
struct wt_status_change_data *d = it->util;
@@ -2090,7 +2165,7 @@
char submodule_token[5];
char sep_char, eol_char;
- wt_porcelain_v2_fix_up_changed(it, s);
+ wt_porcelain_v2_fix_up_changed(it);
wt_porcelain_v2_submodule_state(d, submodule_token);
key[0] = d->index_status ? d->index_status : '.';
@@ -2291,6 +2366,13 @@
void wt_status_print(struct wt_status *s)
{
+ trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
+ trace2_data_intmax("status", s->repo, "count/untracked",
+ s->untracked.nr);
+ trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
+
+ trace2_region_enter("status", "print", s->repo);
+
switch (s->status_format) {
case STATUS_FORMAT_SHORT:
wt_shortstatus_print(s);
@@ -2309,6 +2391,8 @@
wt_longstatus_print(s);
break;
}
+
+ trace2_region_leave("status", "print", s->repo);
}
/**
diff --git a/wt-status.h b/wt-status.h
index 3a95975..77dad5b 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -1,7 +1,6 @@
#ifndef STATUS_H
#define STATUS_H
-#include <stdio.h>
#include "string-list.h"
#include "color.h"
#include "pathspec.h"
@@ -65,6 +64,9 @@
STATUS_FORMAT_UNSPECIFIED
};
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
struct wt_status_state {
int merge_in_progress;
int am_in_progress;
@@ -129,6 +131,7 @@
};
size_t wt_status_locate_end(const char *s, size_t len);
+void wt_status_append_cut_line(struct strbuf *buf);
void wt_status_add_cut_line(FILE *fp);
void wt_status_prepare(struct repository *r, struct wt_status *s);
void wt_status_print(struct wt_status *s);
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 80f060d..8509f9e 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -306,6 +306,10 @@
git_xmerge_style = XDL_MERGE_DIFF3;
else if (!strcmp(value, "merge"))
git_xmerge_style = 0;
+ /*
+ * Please update _git_checkout() in
+ * git-completion.bash when you add new merge config
+ */
else
die("unknown style '%s' given for '%s'",
value, var);
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 2d41fff..ede4246 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -27,9 +27,9 @@
void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
int buffer_is_binary(const char *ptr, unsigned long size);
-extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
-extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
-extern int git_xmerge_config(const char *var, const char *value, void *cb);
+void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
+void xdiff_clear_find_func(xdemitconf_t *xecfg);
+int git_xmerge_config(const char *var, const char *value, void *cb);
extern int git_xmerge_style;
/*
@@ -46,14 +46,14 @@
* The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
* are treated for the comparision.
*/
-extern int xdiff_compare_lines(const char *l1, long s1,
- const char *l2, long s2, long flags);
+int xdiff_compare_lines(const char *l1, long s1,
+ const char *l2, long s2, long flags);
/*
* Returns a hash of the string s of length len.
* The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
* are treated for the hash.
*/
-extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
+unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
#endif
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b158369..032e3a9 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -113,9 +113,9 @@
} bdiffparam_t;
-#define xdl_malloc(x) malloc(x)
+#define xdl_malloc(x) xmalloc(x)
#define xdl_free(ptr) free(ptr)
-#define xdl_realloc(ptr,x) realloc(ptr,x)
+#define xdl_realloc(ptr,x) xrealloc(ptr,x)
void *xdl_mmfile_first(mmfile_t *mmf, long *size);
long xdl_mmfile_size(mmfile_t *mmf);
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 7778dc2..30713ae 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -210,7 +210,7 @@
if (fs1 < 0)
fs1 = 0;
if (fs1 < s1) {
- s2 -= s1 - fs1;
+ s2 = XDL_MAX(s2 - (s1 - fs1), 0);
s1 = fs1;
}
}
@@ -232,7 +232,7 @@
if (fe1 < 0)
fe1 = xe->xdf1.nrec;
if (fe1 > e1) {
- e2 += fe1 - e1;
+ e2 = XDL_MIN(e2 + (fe1 - e1), xe->xdf2.nrec);
e1 = fe1;
}
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index ec85f59..c7b35a9 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -42,8 +42,6 @@
*/
#include "xinclude.h"
-#include "xtypes.h"
-#include "xdiff.h"
#define MAX_PTR UINT_MAX
#define MAX_CNT UINT_MAX
diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index f35c448..a4285ac 100644
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
@@ -23,13 +23,7 @@
#if !defined(XINCLUDE_H)
#define XINCLUDE_H
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <limits.h>
-
+#include "git-compat-util.h"
#include "xmacros.h"
#include "xdiff.h"
#include "xtypes.h"
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index f3573d9..3c5601b 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -20,8 +20,6 @@
*
*/
#include "xinclude.h"
-#include "xtypes.h"
-#include "xdiff.h"
/*
* The basic idea of patience diff is to find lines that are unique in
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 963e1c5..cfa6e22 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -20,13 +20,9 @@
*
*/
-#include <limits.h>
-#include <assert.h>
#include "xinclude.h"
-
-
long xdl_bogosqrt(long n) {
long i;
